Macro is a unified workspace for teams: email, chat, docs, tasks, agents, calls, and CRM — @-linked together with shared AI memory.
TypeScript agentaiai-agentsall-in-onecrmcrm-systememaillinearmcpmessagingnotesnotionofficerustslackslack-alternativestartupstartup-toolstypescriptworkspace
perf: share email link identity metadata (#5034)
teo816d9b151552
diff --git a/apps/web/src/features/entity/composed/list-entity/email-links-context.tsx b/apps/web/src/features/entity/composed/list-entity/email-links-context.tsxdeleted file mode 100644index 4b04aa9ee2..0000000000--- a/apps/web/src/features/entity/composed/list-entity/email-links-context.tsx+++ /dev/null@@ -1,43 +0,0 @@-import { useEmailLinksQuery } from '@queries/email/link';-import type { Link } from '@service-email/generated/schemas';-import {- type Accessor,- createContext,- type FlowComponent,- useContext,-} from 'solid-js';--type EmailLinks = Accessor<Link[]>;--const EmailLinksContext = createContext<EmailLinks>();--/** Provides already-loaded email links to an entity-list subtree. */-export const EmailLinksProvider: FlowComponent<{ links: EmailLinks }> = (- props-) => (- <EmailLinksContext.Provider value={props.links}>- {props.children}- </EmailLinksContext.Provider>-);--/** Explicit query-owning adapter for standalone entity lists. */-export const EmailLinksQueryProvider: FlowComponent = (props) => {- const linksQuery = useEmailLinksQuery();- const links = (): Link[] => linksQuery.data?.links ?? [];-- return (- <EmailLinksProvider links={links}>{props.children}</EmailLinksProvider>- );-};--/** Returns links from the nearest entity-list metadata provider. */-export function useEmailLinks(): EmailLinks {- const links = useContext(EmailLinksContext);- if (!links) {- throw new Error(- 'useEmailLinks can only be used under an EmailLinksProvider'- );- }-- return links;-}diff --git a/apps/web/src/features/entity/composed/list-entity/email-links-context.test.tsx b/apps/web/src/features/entity/composed/list-entity/email.test.tsxsimilarity index 56%rename from apps/web/src/features/entity/composed/list-entity/email-links-context.test.tsxrename to apps/web/src/features/entity/composed/list-entity/email.test.tsxindex 152d8e7094..9af10731d2 100644--- a/apps/web/src/features/entity/composed/list-entity/email-links-context.test.tsx+++ b/apps/web/src/features/entity/composed/list-entity/email.test.tsx@@ -5,17 +5,21 @@import type { Link } from '@service-email/generated/schemas';import { fireEvent, render, screen } from '@solidjs/testing-library';import { createSignal, Show } from 'solid-js';-import { describe, expect, it, vi } from 'vitest';-import type { EmailEntity, EntityData } from '../../types/entity';-import { EmailInboxChip, useOwningInboxForEntity } from './email';-import { EmailLinksProvider } from './email-links-context';+import { beforeEach, describe, expect, it, vi } from 'vitest';+import type { EntityData } from '../../types/entity';+import { useOwningInboxForEntity } from './email';-vi.mock('@core/component/UserIcon', () => ({- UserIcon: () => <span data-testid="inbox-icon" />,+const mocks = vi.hoisted(() => ({+ links: vi.fn(),}));-vi.mock('../../entity', () => ({ Entity: {} }));+vi.mock('@core/context/emailLinks', () => ({+ useEmailLinksContext: () => ({ links: mocks.links }),+}));++vi.mock('@core/component/UserIcon', () => ({ UserIcon: () => null }));vi.mock('../../components/Badges', () => ({ DraftBadge: () => null }));+vi.mock('../../entity', () => ({ Entity: {} }));vi.mock('../../extractors-search/HitSnippet', () => ({HitSnippet: () => null,}));@@ -59,43 +63,20 @@ function RecycledRowInboxConsumer() {);}-describe('EmailLinksContext', () => {- it('supports the real email-row consumer', () => {- const links = (): Link[] => [- { id: 'primary-inbox' } as Link,- {- id: 'secondary-inbox',- email_address: '[email protected]',- } as Link,- ];- const entity = {- type: 'email',- linkId: 'secondary-inbox',- } as EmailEntity;-- render(() => (- <EmailLinksProvider links={links}>- <EmailInboxChip entity={entity} />- </EmailLinksProvider>- ));-- expect(screen.getByTitle('[email protected]')).toBeTruthy();- });+beforeEach(() => {+ mocks.links.mockReset();+ mocks.links.mockReturnValue([+ { id: 'primary-inbox' } as Link,+ {+ id: 'secondary-inbox',+ email_address: '[email protected]',+ } as Link,+ ]);+});+describe('useOwningInboxForEntity', () => {it('updates inbox attribution when a mounted row changes entity type', async () => {- const links = (): Link[] => [- { id: 'primary-inbox' } as Link,- {- id: 'secondary-inbox',- email_address: '[email protected]',- } as Link,- ];-- render(() => (- <EmailLinksProvider links={links}>- <RecycledRowInboxConsumer />- </EmailLinksProvider>- ));+ render(() => <RecycledRowInboxConsumer />);expect(screen.queryByText('[email protected]')).toBeNull();await fireEvent.click(screen.getByRole('button', { name: 'Recycle row' }));diff --git a/apps/web/src/features/entity/composed/list-entity/email.tsx b/apps/web/src/features/entity/composed/list-entity/email.tsxindex 9c470bee6c..b1fccc9ce0 100644--- a/apps/web/src/features/entity/composed/list-entity/email.tsx+++ b/apps/web/src/features/entity/composed/list-entity/email.tsx@@ -1,5 +1,6 @@import { inboxIconProps } from '@core/component/inboxIcon';import { UserIcon } from '@core/component/UserIcon';+import { useEmailLinksContext } from '@core/context/emailLinks';import { cn } from '@ui';import { type Accessor, createMemo, Show } from 'solid-js';import { DraftBadge } from '../../components/Badges';@@ -11,7 +12,6 @@ import {type EntityData,isEmailEntity,} from '../../types/entity';-import { useEmailLinks } from './email-links-context';/*** Resolves the linked inbox a thread belongs to, but only when the user has@@ -20,7 +20,7 @@ import { useEmailLinks } from './email-links-context';* thread shared with the user that isn't one of their own/delegated inboxes.*/export function useOwningInbox(entity: Accessor<EmailEntity | undefined>) {- const links = useEmailLinks();+ const { links } = useEmailLinksContext();return createMemo(() => {const linkId = entity()?.linkId;if (!linkId) return undefined;diff --git a/apps/web/src/features/entity/composed/list-entity/list-entity-metadata-provider.test.tsx b/apps/web/src/features/entity/composed/list-entity/list-entity-metadata-provider.test.tsxindex 06572d0bfe..b69f516035 100644--- a/apps/web/src/features/entity/composed/list-entity/list-entity-metadata-provider.test.tsx+++ b/apps/web/src/features/entity/composed/list-entity/list-entity-metadata-provider.test.tsx@@ -5,48 +5,37 @@import { useTagSets } from '@property/tags/tag-sets-context';import { render, screen } from '@solidjs/testing-library';import { beforeEach, describe, expect, it, vi } from 'vitest';-import { useEmailLinks } from './email-links-context';import {ListEntityMetadataQueryProvider,ListEntityNoopMetadataProvider,} from './list-entity-metadata-provider';const mocks = vi.hoisted(() => ({- useEmailLinksQuery: vi.fn(),useTagsQuery: vi.fn(),}));-vi.mock('@queries/email/link', () => ({- useEmailLinksQuery: mocks.useEmailLinksQuery,-}));-vi.mock('@queries/properties/tags', () => ({useTagsQuery: mocks.useTagsQuery,}));function MetadataConsumer(props: { label: string }) {- const emailLinks = useEmailLinks();const tagSets = useTagSets();return (<span>- {props.label}:{emailLinks().length}:{tagSets().length}+ {props.label}:{tagSets().length}</span>);}beforeEach(() => {- mocks.useEmailLinksQuery.mockReset();mocks.useTagsQuery.mockReset();- mocks.useEmailLinksQuery.mockReturnValue({- data: { links: [{ id: 'inbox-1' }] },- });mocks.useTagsQuery.mockReturnValue({data: [{ scope: 'user', options: [] }],});});describe('ListEntityMetadataProvider', () => {- it('shares one query observer of each kind across a collection', () => {+ it('shares one tag query across a collection', () => {render(() => (<ListEntityMetadataQueryProvider><MetadataConsumer label="first" />@@ -54,9 +43,8 @@ describe('ListEntityMetadataProvider', () => {</ListEntityMetadataQueryProvider>));- expect(screen.getByText('first:1:1')).toBeTruthy();- expect(screen.getByText('second:1:1')).toBeTruthy();- expect(mocks.useEmailLinksQuery).toHaveBeenCalledOnce();+ expect(screen.getByText('first:1')).toBeTruthy();+ expect(screen.getByText('second:1')).toBeTruthy();expect(mocks.useTagsQuery).toHaveBeenCalledOnce();});@@ -67,8 +55,7 @@ describe('ListEntityMetadataProvider', () => {</ListEntityNoopMetadataProvider>));- expect(screen.getByText('noop:0:0')).toBeTruthy();- expect(mocks.useEmailLinksQuery).not.toHaveBeenCalled();+ expect(screen.getByText('noop:0')).toBeTruthy();expect(mocks.useTagsQuery).not.toHaveBeenCalled();});});diff --git a/apps/web/src/features/entity/composed/list-entity/list-entity-metadata-provider.tsx b/apps/web/src/features/entity/composed/list-entity/list-entity-metadata-provider.tsxindex 0b03ae435e..40aaa49981 100644--- a/apps/web/src/features/entity/composed/list-entity/list-entity-metadata-provider.tsx+++ b/apps/web/src/features/entity/composed/list-entity/list-entity-metadata-provider.tsx@@ -2,25 +2,16 @@ import {TagSetsProvider,TagSetsQueryProvider,} from '@property/tags/tag-sets-context';-import type { Link } from '@service-email/generated/schemas';import type { TagSetResponse } from '@service-properties/generated/schemas/tagSetResponse';import type { Accessor, FlowComponent } from 'solid-js';-import {- EmailLinksProvider,- EmailLinksQueryProvider,-} from './email-links-context';-const EMPTY_EMAIL_LINKS: Link[] = [];const EMPTY_TAG_SETS: TagSetResponse[] = [];/** Provides caller-owned metadata to a ListEntity collection without queries. */export const ListEntityMetadataProvider: FlowComponent<{- emailLinks: Accessor<Link[]>;tagSets: Accessor<TagSetResponse[]>;}> = (props) => (- <EmailLinksProvider links={props.emailLinks}>- <TagSetsProvider tagSets={props.tagSets}>{props.children}</TagSetsProvider>- </EmailLinksProvider>+ <TagSetsProvider tagSets={props.tagSets}>{props.children}</TagSetsProvider>);/**@@ -28,20 +19,15 @@ export const ListEntityMetadataProvider: FlowComponent<{* optional metadata. Use for intentionally local or static collections.*/export const ListEntityNoopMetadataProvider: FlowComponent = (props) => (- <ListEntityMetadataProvider- emailLinks={() => EMPTY_EMAIL_LINKS}- tagSets={() => EMPTY_TAG_SETS}- >+ <ListEntityMetadataProvider tagSets={() => EMPTY_TAG_SETS}>{props.children}</ListEntityMetadataProvider>);/**- * Owns the shared metadata queries required by a standalone ListEntity- * collection. Soup lists use their soup-specific metadata provider instead.+ * Owns the metadata queries needed by a standalone ListEntity collection.+ * Soup lists use their soup-specific metadata provider instead.*/export const ListEntityMetadataQueryProvider: FlowComponent = (props) => (- <EmailLinksQueryProvider>- <TagSetsQueryProvider>{props.children}</TagSetsQueryProvider>- </EmailLinksQueryProvider>+ <TagSetsQueryProvider>{props.children}</TagSetsQueryProvider>);diff --git a/apps/web/src/features/next-soup/soup-view/soup-row-metadata-provider.tsx b/apps/web/src/features/next-soup/soup-view/soup-row-metadata-provider.tsxindex 929369058a..c95fddb1eb 100644--- a/apps/web/src/features/next-soup/soup-view/soup-row-metadata-provider.tsx+++ b/apps/web/src/features/next-soup/soup-view/soup-row-metadata-provider.tsx@@ -1,20 +1,17 @@-import { EmailLinksQueryProvider } from '@entity/composed/list-entity/email-links-context';import { TagSetsProvider } from '@property/tags/tag-sets-context';import type { FlowComponent } from 'solid-js';import { useSoupView } from './soup-view-context';/**- * Owns non-soup queries used to enrich virtualized entity rows and adapts- * soup-owned metadata into the domain contexts consumed by row components.+ * Adapts soup-owned metadata into the domain contexts consumed by virtualized+ * row components.*/export const SoupRowMetadataProvider: FlowComponent = (props) => {const { tagFilter } = useSoupView();return (- <EmailLinksQueryProvider>- <TagSetsProvider tagSets={tagFilter.tagSets}>- {props.children}- </TagSetsProvider>- </EmailLinksQueryProvider>+ <TagSetsProvider tagSets={tagFilter.tagSets}>+ {props.children}+ </TagSetsProvider>);};diff --git a/apps/web/src/lib/core/auth/logout.ts b/apps/web/src/lib/core/auth/logout.tsindex d4228bceb4..6fd290c0f0 100644--- a/apps/web/src/lib/core/auth/logout.ts+++ b/apps/web/src/lib/core/auth/logout.ts@@ -5,6 +5,7 @@ import { syncLoginStorage } from '@core/util/cookies';import { clearRegisteredCaches } from '@graphql-cache/lifecycle';import { authKeys, type UserInfoData } from '@queries/auth/user-info';import { queryClient } from '@queries/client';+import { emailKeys } from '@queries/email/keys';import { clearDocumentQueryCache } from '@queries/storage/document-cache';import { authServiceClient } from '@service-auth/client';import { createCallback } from '@solid-primitives/rootless';@@ -32,6 +33,7 @@ export async function clearLocalAuthSession() {syncLoginStorage(false);clearDocumentQueryCache(queryClient);queryClient.setQueryData(authKeys.userInfo.queryKey, unauthenticatedUserInfo);+ queryClient.removeQueries({ queryKey: emailKeys.links.queryKey });// Queued mutations are user intent; never allow them to replay under a// subsequent account sharing this anonymous device cache scope.diff --git a/apps/web/src/lib/core/context/emailLinks.test.tsx b/apps/web/src/lib/core/context/emailLinks.test.tsxnew file mode 100644index 0000000000..ba1897c832--- /dev/null+++ b/apps/web/src/lib/core/context/emailLinks.test.tsx@@ -0,0 +1,81 @@+/**+ * @vitest-environment jsdom+ */++import type { Link } from '@service-email/generated/schemas';+import { render, screen } from '@solidjs/testing-library';+import { createSignal } from 'solid-js';+import { beforeEach, describe, expect, it, vi } from 'vitest';+import { EmailLinksContextProvider, useEmailLinksContext } from './emailLinks';++const mocks = vi.hoisted(() => ({+ useEmailLinksQuery: vi.fn(),+ useIsAuthenticated: vi.fn(),+}));++vi.mock('@queries/email/link', () => ({+ useEmailLinksQuery: mocks.useEmailLinksQuery,+}));++vi.mock('./user', () => ({+ useIsAuthenticated: mocks.useIsAuthenticated,+}));++function Consumer(props: { label: string }) {+ const { links, isConnectedSecondaryInbox } = useEmailLinksContext();+ return (+ <span>+ {props.label}:{links().length}:+ {String(isConnectedSecondaryInbox('macro|[email protected]'))}+ </span>+ );+}++beforeEach(() => {+ mocks.useEmailLinksQuery.mockReset();+ mocks.useIsAuthenticated.mockReset();+});++describe('EmailLinksContext', () => {+ it('shares reactive identity metadata across consumers', () => {+ const [authenticated, setAuthenticated] = createSignal(true);+ const [data] = createSignal({+ links: [+ {+ id: 'secondary-inbox',+ email_address: '[email protected]',+ is_primary: false,+ } as Link,+ ],+ });+ let queryEnabled: (() => boolean) | undefined;++ mocks.useIsAuthenticated.mockReturnValue(authenticated);+ mocks.useEmailLinksQuery.mockImplementation((enabled) => {+ queryEnabled = enabled;+ return {+ get data() {+ return data();+ },+ };+ });++ render(() => (+ <EmailLinksContextProvider>+ <Consumer label="first" />+ <Consumer label="second" />+ </EmailLinksContextProvider>+ ));++ expect(screen.getByText('first:1:true')).toBeTruthy();+ expect(screen.getByText('second:1:true')).toBeTruthy();+ expect(mocks.useEmailLinksQuery).toHaveBeenCalledOnce();+ expect(queryEnabled?.()).toBe(true);++ setAuthenticated(false);++ expect(screen.getByText('first:0:false')).toBeTruthy();+ expect(screen.getByText('second:0:false')).toBeTruthy();+ expect(queryEnabled?.()).toBe(false);+ });+});diff --git a/apps/web/src/lib/core/context/emailLinks.ts b/apps/web/src/lib/core/context/emailLinks.tsnew file mode 100644index 0000000000..f855945240--- /dev/null+++ b/apps/web/src/lib/core/context/emailLinks.ts@@ -0,0 +1,55 @@+import { useEmailLinksQuery } from '@queries/email/link';+import type { Link } from '@service-email/generated/schemas';+import { type Accessor, createMemo } from 'solid-js';+import { macroIdToEmail, tryMacroId } from '../user/macroId';+import { createAssertedContextProvider } from './createContext';+import { useIsAuthenticated } from './user';++const EMPTY_LINKS: Link[] = [];++type EmailLinksContextValue = {+ links: Accessor<Link[]>;+ isConnectedSecondaryInbox: (id: string | undefined | null) => boolean;+};++/**+ * Owns app-wide email-link identity metadata used by shared UI such as avatars.+ * Feature screens that need query status or refetch controls keep their own+ * query observer.+ */+export const [EmailLinksContextProvider, useEmailLinksContext] =+ createAssertedContextProvider(+ 'EmailLinksContext',+ (): EmailLinksContextValue => {+ const isAuthenticated = useIsAuthenticated();+ const linksQuery = useEmailLinksQuery(() => isAuthenticated() === true);++ const links = (): Link[] =>+ isAuthenticated() === true+ ? (linksQuery.data?.links ?? EMPTY_LINKS)+ : EMPTY_LINKS;++ const secondaryInboxEmails = createMemo(() => {+ const emails = new Set<string>();+ for (const link of links()) {+ if (!link.is_primary) {+ emails.add(link.email_address.toLowerCase());+ }+ }+ return emails;+ });++ const isConnectedSecondaryInbox = (+ id: string | undefined | null+ ): boolean => {+ if (!id) return false;+ const macroId = tryMacroId(id);+ if (!macroId) return false;+ return secondaryInboxEmails().has(+ macroIdToEmail(macroId).toLowerCase()+ );+ };++ return { links, isConnectedSecondaryInbox };+ }+ );diff --git a/apps/web/src/lib/core/user/inboxOnly.ts b/apps/web/src/lib/core/user/inboxOnly.tsindex 5628a2370e..c90df26196 100644--- a/apps/web/src/lib/core/user/inboxOnly.ts+++ b/apps/web/src/lib/core/user/inboxOnly.ts@@ -1,6 +1,4 @@-import { useEmailLinksQuery } from '@queries/email/link';-import { createMemo } from 'solid-js';-import { macroIdToEmail, tryMacroId } from './macroId';+import { useEmailLinksContext } from '@core/context/emailLinks';/*** Predicate: is this macro id a connected secondary inbox (an extra mailbox the@@ -9,20 +7,5 @@ import { macroIdToEmail, tryMacroId } from './macroId';* loggable user (its own macro id) and reports `is_primary = true`.*/export function useIsConnectedSecondaryInbox() {- const linksQuery = useEmailLinksQuery();-- const inboxOnlyEmails = createMemo(() => {- const set = new Set<string>();- for (const link of linksQuery.data?.links ?? []) {- if (!link.is_primary) set.add(link.email_address.toLowerCase());- }- return set;- });-- return (id: string | undefined | null): boolean => {- if (!id) return false;- const macroId = tryMacroId(id);- if (!macroId) return false;- return inboxOnlyEmails().has(macroIdToEmail(macroId).toLowerCase());- };+ return useEmailLinksContext().isConnectedSecondaryInbox;}diff --git a/apps/web/src/lib/queries/email/link.ts b/apps/web/src/lib/queries/email/link.tsindex d99edfc10b..62f7566fb1 100644--- a/apps/web/src/lib/queries/email/link.ts+++ b/apps/web/src/lib/queries/email/link.ts@@ -14,6 +14,8 @@ const LINK_STALE_TIME = 5 * 60 * 1000;const HEALTH_PROBE_STALE_TIME = 15 * 60 * 1000;+const queryEnabled = () => true;+/*** Asks the server to probe each linked inbox's grant against Google and record its* health, so a grant that died while the user was away surfaces soon after they return@@ -35,10 +37,11 @@ export function useInboxHealthProbeQuery() {}));}-export function useEmailLinksQuery() {+export function useEmailLinksQuery(enabled: Accessor<boolean> = queryEnabled) {return useQuery(() => ({queryKey: emailKeys.links.queryKey,queryFn: async () => throwOnErr(async () => await emailClient.getLinks()),+ enabled: enabled(),staleTime: LINK_STALE_TIME,refetchOnWindowFocus: 'always',}));diff --git a/apps/web/src/routes/Root.tsx b/apps/web/src/routes/Root.tsxindex 9c2580c40b..fb8740322a 100644--- a/apps/web/src/routes/Root.tsx+++ b/apps/web/src/routes/Root.tsx@@ -34,6 +34,7 @@ import { clearLocalAuthSession } from '@core/auth/logout';import { ChatAttachmentsInit } from '@core/component/AI/signal/globalAttachments';import { ToastRegion } from '@core/component/Toast/ToastRegion';import { ChannelsContextProvider } from '@core/context/channels';+import { EmailLinksContextProvider } from '@core/context/emailLinks';import { QuickAccessProvider } from '@core/context/quickAccess';import { TeamContextProvider } from '@core/context/team';import {@@ -615,46 +616,48 @@ export function Root() {<PosthogProvider><EntityProvider><UserContextProvider>- <BrowserNotificationModal />- <IosPushNotificationModal />- <GlobalShareInboxConflictDialog />- <QuerySyncProviderWithUserId />- <UserInfoSideEffects />- <TeamContextProvider>- <ConfiguredGlobalAppStateProvider>- <MutationUndoProvider>- <ChannelsContextProvider>- <CallProvider>- <CallKitSync />- <CallStartedNotifier />- <QuickAccessProvider>- <SearchProvider>- <ChatAttachmentsInit />- <ReactiveFavicon />- <Title>{tabTitle()}</Title>- <Suspense>- <IsomorphicRouter- transformUrl={transformShortIdInUrlPathname}- root={Layout}- rootPreload={rootPreload}- base={ROUTER_BASE}- >- {{- path: '/',- component: TauriRouteListener,- children: ROUTES,- }}- </IsomorphicRouter>- </Suspense>- <InitialInteractiveOnboardingModal />- <ToastRegion />- </SearchProvider>- </QuickAccessProvider>- </CallProvider>- </ChannelsContextProvider>- </MutationUndoProvider>- </ConfiguredGlobalAppStateProvider>- </TeamContextProvider>+ <EmailLinksContextProvider>+ <BrowserNotificationModal />+ <IosPushNotificationModal />+ <GlobalShareInboxConflictDialog />+ <QuerySyncProviderWithUserId />+ <UserInfoSideEffects />+ <TeamContextProvider>+ <ConfiguredGlobalAppStateProvider>+ <MutationUndoProvider>+ <ChannelsContextProvider>+ <CallProvider>+ <CallKitSync />+ <CallStartedNotifier />+ <QuickAccessProvider>+ <SearchProvider>+ <ChatAttachmentsInit />+ <ReactiveFavicon />+ <Title>{tabTitle()}</Title>+ <Suspense>+ <IsomorphicRouter+ transformUrl={transformShortIdInUrlPathname}+ root={Layout}+ rootPreload={rootPreload}+ base={ROUTER_BASE}+ >+ {{+ path: '/',+ component: TauriRouteListener,+ children: ROUTES,+ }}+ </IsomorphicRouter>+ </Suspense>+ <InitialInteractiveOnboardingModal />+ <ToastRegion />+ </SearchProvider>+ </QuickAccessProvider>+ </CallProvider>+ </ChannelsContextProvider>+ </MutationUndoProvider>+ </ConfiguredGlobalAppStateProvider>+ </TeamContextProvider>+ </EmailLinksContextProvider></UserContextProvider></EntityProvider></PosthogProvider>