Merge branch 'wip/fx17-memory-scope' into wip/platform-org-wiring

Author: waleedlatif1

apps/sim/lib/mothership/memory/application/read-scope.test.ts

@@ -36,6 +36,7 @@ function queueChat(mode = 'plan', membership = true) {
     { userId: 'actor', organizationId: 'org-1', workspaceId: null, type: 'mothership', mode },
   ])
   queueTableRows(member, membership ? [{ role: 'member' }] : [])
+  queueTableRows(organization, [{ id: 'org-1' }])
 }
 describe('private memory scope', () => {
   beforeEach(() => {
@@ -72,6 +73,7 @@ describe('private memory scope', () => {
       },
     ])
     queueTableRows(member, [{ role: 'member' }])
+    queueTableRows(organization, [{ id: 'org-1' }])
     expect(await readMemoryScope.execute({ principal: principal(), input })).toEqual({
       enabled: false,
       userId: 'actor',

apps/sim/lib/mothership/memory/application/read-scope.ts

@@ -65,11 +65,9 @@ export const readMemoryScope = defineAuthorizedChatUseCase({
       )
     }
     // The worker keys a graph by this id (`["organization", id]`, else `["personal"]`). A personal
-    // workspace moved into its owner's personal organization keeps the personal graph it had, so a
-    // workspace chat names only a team (the payer rule); an organization chat names its own.
-    const graphOrganizationId =
-      context.organizationId ??
-      (await resolvePayerOrganizationId(db, context.workspaceOrganizationId ?? null))
+    // organization has one member, so its workspace and organization chats share that member's
+    // personal graph: the scope names only a team (the payer rule).
+    const graphOrganizationId = await resolvePayerOrganizationId(db, spaceOrganizationId)
     return {
       enabled,
       ...(spaceId ? { spaceId } : {}),

apps/sim/lib/mothership/memory/application/spaces.integration.ts

@@ -80,15 +80,20 @@ const create = (name: string) =>
 const select = (spaceId: string | null) =>
   selectMemorySpace.execute({ principal: principal(), input: { ...input, spaceId } })
 const list = () => listMemorySpaces.execute({ principal: principal(), input })
-async function scope(chatId: string, workspaceId?: string, userId = ids.owner) {
+async function scope(
+  chatId: string,
+  workspaceId?: string,
+  userId = ids.owner,
+  organizationId = ids.org
+) {
   const options = { audience: MEMORY_SCOPE_AUDIENCE, ttlMs: 60_000 }
   const caller = workspaceId
     ? createTrustedCopilotPrincipal(
         { userId, workspaceId, chatId, delegationId: generateId() },
         options
       )
     : createTrustedOrganizationCopilotPrincipal(
-        { userId, organizationId: ids.org, chatId, delegationId: generateId() },
+        { userId, organizationId, chatId, delegationId: generateId() },
         options
       )
   return readMemoryScope.execute({
@@ -637,6 +642,29 @@ describe('a workspace chat moved into its owner’s personal organization', () =
     })
   })
 
+  it('shares that personal graph with an organization chat in the same personal organization', async () => {
+    const workspaceChatId = await workspaceChat(ids.personalWorkspace)
+    const organizationChat = await createOrganizationChatRecord(
+      { userId: ids.personalOwner, organizationId: personalOrganizationId },
+      'agent'
+    )
+
+    const workspaceGraph = await scope(workspaceChatId, ids.personalWorkspace, ids.personalOwner)
+    expect(
+      await scope(organizationChat.id, undefined, ids.personalOwner, personalOrganizationId)
+    ).toEqual({
+      enabled: true,
+      userId: ids.personalOwner,
+      organizationId: workspaceGraph.organizationId,
+      workspaceId: null,
+    })
+    const teamChat = await createOrganizationChatRecord(
+      { userId: ids.other, organizationId: ids.org },
+      'agent'
+    )
+    expect((await scope(teamChat.id, undefined, ids.other)).organizationId).toBe(ids.org)
+  })
+
   it('keeps the default graph when a chosen space has no organization to own it', async () => {
     const chatId = await workspaceChat(ids.unownedWorkspace, generateId())