fix(mothership): refresh client settings after scoped mutations

Author: Sg312

apps/sim/app/workspace/[workspaceId]/home/hooks/stream/handle-resource-event.test.ts

@@ -7,9 +7,13 @@ import { knowledgeKeys } from '@/hooks/queries/utils/knowledge-keys'
 
 const mocks = vi.hoisted(() => ({
   invalidateResourceQueries: vi.fn(),
+  refreshGeneralSettings: vi.fn(),
   removeWorkflowFromActiveCache: vi.fn(),
   notifyWorkflowExternalUpdate: vi.fn(),
 }))
+vi.mock('@/hooks/queries/general-settings', () => ({
+  refreshGeneralSettings: mocks.refreshGeneralSettings,
+}))
 vi.mock('@/lib/workflows/external-update', () => ({
   notifyWorkflowExternalUpdate: mocks.notifyWorkflowExternalUpdate,
 }))
@@ -587,3 +591,44 @@ it('seeds only fresh matching search effects and never seeds replayed or foreign
   handleResourceEvent({ deps: { ...deps, organizationId: 'other' } } as StreamLoopContext, event)
   expect(deps.queryClient.setQueryData).not.toHaveBeenCalled()
 })
+
+it.each([undefined, 'ws-1'])(
+  'refreshes account preferences in either chat scope (%s) without panel effects',
+  (workspaceId) => {
+    const refreshRoute = vi.fn()
+    const deps = makeStreamLoopDeps({
+      workspaceId,
+      organizationId: workspaceId ? undefined : 'org',
+      refreshRoute,
+    })
+    handleResourceEvent({ deps } as StreamLoopContext, {
+      ...removeEvent('file', 'unused'),
+      payload: {
+        op: 'refresh',
+        replay: true,
+        resource: { type: 'settings', scope: 'account', id: 'preferences' },
+      },
+    })
+    expect(mocks.refreshGeneralSettings).toHaveBeenCalledWith(deps.queryClient)
+    expect(deps.addResource).not.toHaveBeenCalled()
+    expect(deps.setResources).not.toHaveBeenCalled()
+    expect(refreshRoute).not.toHaveBeenCalled()
+  }
+)
+
+it('refreshes organization policy and its server layout only within the owning organization', () => {
+  const refreshRoute = vi.fn()
+  const deps = makeStreamLoopDeps({ workspaceId: undefined, organizationId: 'org', refreshRoute })
+  for (const organizationId of ['other', 'org']) {
+    handleResourceEvent({ deps } as StreamLoopContext, {
+      ...removeEvent('file', 'unused'),
+      payload: {
+        op: 'refresh',
+        resource: { type: 'settings', scope: 'organization', organizationId, id: 'access-control' },
+      },
+    })
+  }
+  expect(refreshRoute).toHaveBeenCalledOnce()
+  expect(deps.queryClient.invalidateQueries).toHaveBeenCalledOnce()
+  expect(deps.addResource).not.toHaveBeenCalled()
+})

apps/sim/app/workspace/[workspaceId]/home/hooks/stream/handle-resource-event.ts

@@ -18,6 +18,7 @@ import {
   hasRenderableFilePreviewContent,
   shouldReplaceSession,
 } from '@/app/workspace/[workspaceId]/home/hooks/preview'
+import { refreshSettings } from '@/app/workspace/[workspaceId]/home/hooks/stream/refresh-settings'
 import type { StreamLoopContext } from '@/app/workspace/[workspaceId]/home/hooks/stream/stream-context'
 import type {
   MothershipResource,
@@ -56,6 +57,22 @@ export function handleResourceEvent(ctx: StreamLoopContext, parsed: ResourceEven
   } = ctx.deps
   const onResourceEvent = onResourceEventRef.current
   const payload = parsed.payload
+  if (payload.resource.type === 'settings') {
+    const settings = payload.resource
+    if (
+      settings.scope === 'organization' &&
+      (!settings.organizationId || settings.organizationId !== ctx.deps.organizationId)
+    )
+      return
+    if (
+      settings.scope === 'workspace' &&
+      (!settings.workspaceId || (chatWorkspaceId && settings.workspaceId !== chatWorkspaceId))
+    )
+      return
+    refreshSettings(queryClient, settings)
+    if (settings.scope !== 'account' || settings.id === 'profile') ctx.deps.refreshRoute?.()
+    return
+  }
   if (payload.resource.type === 'search') {
     if (payload.op === 'refresh' || payload.op === 'clear_view') return
     const search = payload.resource.search

apps/sim/app/workspace/[workspaceId]/home/hooks/stream/refresh-settings.ts

@@ -0,0 +1,23 @@
+import type { QueryClient } from '@tanstack/react-query'
+import type { SettingsRefresh } from '@/lib/mothership/generated/resources'
+import { userProfileKeys } from '@/hooks/queries/current-user-data'
+import { refreshGeneralSettings } from '@/hooks/queries/general-settings'
+import { mothershipChatKeys } from '@/hooks/queries/mothership-chats'
+
+/** Read canonical settings again; replay must never restore a historical setting value. */
+export function refreshSettings(queryClient: QueryClient, settings: SettingsRefresh): void {
+  if (settings.scope === 'account' && settings.id === 'preferences') {
+    void refreshGeneralSettings(queryClient)
+    return
+  }
+  if (settings.scope === 'account' && settings.id === 'profile') {
+    void queryClient.invalidateQueries({ queryKey: userProfileKeys.all })
+    return
+  }
+  // Access, billing and integration policies affect resources beyond the Settings screen.
+  // Keep live chat history stable while revalidating the rest of the current viewer's cache.
+  void queryClient.invalidateQueries({
+    predicate: (query) =>
+      settings.id === 'recently-deleted' || query.queryKey[0] !== mothershipChatKeys.all[0],
+  })
+}

apps/sim/app/workspace/[workspaceId]/home/hooks/stream/stream-context.ts

@@ -89,6 +89,7 @@ export interface StreamLoopDeps {
   workspaceId?: string
   organizationId?: string
   queryClient: QueryClient
+  refreshRoute?: () => void
   assistantId: string
   expectedGen: number | undefined
   options: StreamLoopOptions

apps/sim/app/workspace/[workspaceId]/home/hooks/use-chat.ts

@@ -2078,6 +2078,7 @@ export function useChat(
       }
       const clearStreamResourceActivity = () => clearResourceActivity(activityTracker, true)
       const ctx = createStreamLoopContext({
+        refreshRoute: () => router.refresh(),
         viewerId,
         workspaceId,
         organizationId,
@@ -2223,6 +2224,7 @@ export function useChat(
       return { sawStreamError: settledError, sawComplete: state.sawCompleteEvent }
     },
     [
+      router,
       viewerId,
       workspaceId,
       queryClient,

apps/sim/app/workspace/[workspaceId]/knowledge/knowledge.test.tsx

@@ -115,7 +115,7 @@ vi.mock('@/app/workspace/[workspaceId]/components/resource/components/action-bar
     return null
   },
 }))
-vi.mock('@/app/workspace/[workspaceId]/components', () => ({
+vi.mock('@/app/workspace/[workspaceId]/components/resource/resource', () => ({
   Resource: Object.assign(({ children }: { children: ReactNode }) => <>{children}</>, {
     Header: () => null,
     Options: () => null,
@@ -124,6 +124,9 @@ vi.mock('@/app/workspace/[workspaceId]/components', () => ({
       return <>{overlay}</>
     },
   }),
+  EMPTY_CELL_PLACEHOLDER: '',
+}))
+vi.mock('@/app/workspace/[workspaceId]/components/resource/use-resource-row-selection', () => ({
   useResourceRowSelection: ({ onDeleteSelected }: { onDeleteSelected: () => void }) => {
     mocks.deleteKey = onDeleteSelected
     return {
@@ -133,14 +136,6 @@ vi.mock('@/app/workspace/[workspaceId]/components', () => ({
       clearSelection: vi.fn(),
     }
   },
-  ownerCell: () => ({ label: '' }),
-  OwnerAvatar: () => null,
-  timeCell: () => ({ label: '' }),
-  resourceListState: () => 'ready',
-  selectionLabel: () => 'selected items',
-  reportBulkOutcome: vi.fn(),
-  EMPTY_CELL_PLACEHOLDER: '',
-  FILTER_SECTION_LABEL_CLASS: '',
 }))
 vi.mock('@/app/workspace/[workspaceId]/components/folders/use-folder-navigation', () => ({
   useFolderNavigation: () => ({

apps/sim/hooks/queries/general-settings.test.tsx

@@ -19,6 +19,7 @@ vi.mock('@/lib/core/utils/theme', () => ({
   syncThemeToNextThemes: mockSyncTheme,
 }))
 
+import { refreshSettings } from '@/app/workspace/[workspaceId]/home/hooks/stream/refresh-settings'
 import { type GeneralSettings, generalSettingsKeys } from '@/hooks/queries/current-user-data'
 import { useGeneralSettings } from '@/hooks/queries/general-settings'
 
@@ -76,4 +77,44 @@ describe('useGeneralSettings', () => {
     expect(mockSyncTheme).toHaveBeenCalledWith('dark')
     expect(mockRequestJson).not.toHaveBeenCalled()
   })
+  it('applies settings on an organization surface with no mounted settings hook', async () => {
+    queryClient.setQueryData(generalSettingsKeys.settings(), HYDRATED_SETTINGS)
+    mockRequestJson.mockResolvedValue({ data: { ...HYDRATED_SETTINGS, theme: 'light' } })
+    refreshSettings(queryClient, { type: 'settings', scope: 'account', id: 'preferences' })
+    await vi.waitFor(() => expect(mockSyncTheme).toHaveBeenLastCalledWith('light'))
+    expect(queryClient.getQueryData(generalSettingsKeys.settings())).toMatchObject({
+      theme: 'light',
+    })
+  })
+
+  it('applies a Mothership preference write to the mounted UI without reloading or replaying old values', async () => {
+    queryClient.setQueryData(generalSettingsKeys.settings(), HYDRATED_SETTINGS)
+    act(() =>
+      root.render(
+        <QueryClientProvider client={queryClient}>
+          <Probe />
+        </QueryClientProvider>
+      )
+    )
+    mockRequestJson.mockResolvedValue({ data: { ...HYDRATED_SETTINGS, theme: 'light' } })
+    await act(async () => {
+      refreshSettings(queryClient, { type: 'settings', scope: 'account', id: 'preferences' })
+      await vi.waitFor(() =>
+        expect(queryClient.getQueryData(generalSettingsKeys.settings())).toMatchObject({
+          theme: 'light',
+        })
+      )
+    })
+    expect(mockSyncTheme).toHaveBeenLastCalledWith('light')
+    mockRequestJson.mockResolvedValue({ data: { ...HYDRATED_SETTINGS, theme: 'system' } })
+    await act(async () => {
+      refreshSettings(queryClient, { type: 'settings', scope: 'account', id: 'preferences' })
+      await vi.waitFor(() =>
+        expect(queryClient.getQueryData(generalSettingsKeys.settings())).toMatchObject({
+          theme: 'system',
+        })
+      )
+    })
+    expect(mockSyncTheme).toHaveBeenLastCalledWith('system')
+  })
 })

apps/sim/hooks/queries/general-settings.ts

@@ -23,16 +23,29 @@ async function fetchGeneralSettings(signal?: AbortSignal): Promise<GeneralSettin
   return mapGeneralSettingsResponse(data)
 }
 
+const generalSettingsQuery = {
+  queryKey: generalSettingsKeys.settings(),
+  queryFn: ({ signal }: { signal: AbortSignal }) => fetchGeneralSettings(signal),
+  staleTime: GENERAL_SETTINGS_STALE_TIME,
+}
+
+/** Organization chat may have no mounted settings consumer; apply the current theme explicitly. */
+export async function refreshGeneralSettings(queryClient: QueryClient): Promise<void> {
+  try {
+    await queryClient.invalidateQueries({ queryKey: generalSettingsKeys.all, refetchType: 'none' })
+    const settings = await queryClient.fetchQuery(generalSettingsQuery)
+    syncThemeToNextThemes(settings.theme)
+  } catch (error) {
+    logger.error('Failed to refresh general settings', { error })
+  }
+}
+
 /**
  * Hook to fetch general settings.
  * TanStack Query is now the single source of truth for general settings.
  */
 export function useGeneralSettings() {
-  const query = useQuery({
-    queryKey: generalSettingsKeys.settings(),
-    queryFn: ({ signal }) => fetchGeneralSettings(signal),
-    staleTime: GENERAL_SETTINGS_STALE_TIME,
-  })
+  const query = useQuery(generalSettingsQuery)
 
   useEffect(() => {
     if (query.data?.theme) syncThemeToNextThemes(query.data.theme)
@@ -46,11 +59,7 @@ export function useGeneralSettings() {
  * Use on hover to warm data before navigation.
  */
 export function prefetchGeneralSettings(queryClient: QueryClient) {
-  queryClient.prefetchQuery({
-    queryKey: generalSettingsKeys.settings(),
-    queryFn: ({ signal }) => fetchGeneralSettings(signal),
-    staleTime: GENERAL_SETTINGS_STALE_TIME,
-  })
+  queryClient.prefetchQuery(generalSettingsQuery)
 }
 
 /**

apps/sim/lib/mothership/agent-cli/resource-effects.test.ts

@@ -34,6 +34,22 @@ async function effectsFor(path: string, method: string, data: unknown = {}, stat
 }
 
 describe('confirmed CLI resource effects', () => {
+  it.each([
+    ['secrets/API_KEY', 'PUT', 'secrets'],
+    ['secrets/API_KEY', 'DELETE', 'secrets'],
+    ['credentials/connections', 'POST', 'credentials'],
+    ['credentials/id', 'PATCH', 'credentials'],
+    ['custom-tools', 'POST', 'custom-tools'],
+    ['mcp-servers/id', 'DELETE', 'mcp'],
+    ['sandboxes/id', 'PATCH', 'sandboxes'],
+  ])('refreshes settings only after a successful %s mutation', async (path, method, section) => {
+    expect(await effectsFor(path, method)).toEqual([
+      { op: 'refresh', resource: { type: 'settings', scope: 'workspace', id: section } },
+    ])
+    expect(await effectsFor(path, method, {}, 403)).toEqual([])
+    expect(await effectsFor(path, 'GET')).toEqual([])
+  })
+
   it.each([
     ['/', 'Report (final).md', 'files/Report%20(final).md'],
     ['/A%2FB/100%25', 'notes.md', 'files/A%2FB/100%25/notes.md'],

apps/sim/lib/mothership/agent-cli/resource-effects.ts

@@ -1,11 +1,16 @@
 import type { z } from 'zod'
 import type { AnyApiRouteContract } from '@/lib/api/contracts/types'
+import * as credentials from '@/lib/api/contracts/v2/credentials'
+import * as customTools from '@/lib/api/contracts/v2/custom-tools'
 import * as files from '@/lib/api/contracts/v2/files'
 import * as knowledge from '@/lib/api/contracts/v2/knowledge'
 import * as chunks from '@/lib/api/contracts/v2/knowledge-chunks'
 import * as tags from '@/lib/api/contracts/v2/knowledge-tags'
 import * as logs from '@/lib/api/contracts/v2/logs'
 import * as logStats from '@/lib/api/contracts/v2/logs-stats'
+import * as mcpServers from '@/lib/api/contracts/v2/mcp-servers'
+import * as sandboxes from '@/lib/api/contracts/v2/sandboxes'
+import * as secrets from '@/lib/api/contracts/v2/secrets'
 import * as tables from '@/lib/api/contracts/v2/tables'
 import * as workflows from '@/lib/api/contracts/v2/workflows'
 import { parseFolderPath } from '@/lib/folders/paths'
@@ -125,7 +130,42 @@ function folders(contracts: Record<string, unknown>, type: ResourceKind): Effect
   })
 }
 
+function settingsMutations(
+  section: string,
+  contracts: Pick<AnyApiRouteContract, 'method' | 'path'>[]
+): EffectRoute[] {
+  return contracts.map(({ method, path }) => ({
+    method,
+    path,
+    async project() {
+      return [{ op: 'refresh', resource: { type: 'settings', scope: 'workspace', id: section } }]
+    },
+  }))
+}
+
 const EFFECT_ROUTES: EffectRoute[] = [
+  ...settingsMutations('secrets', [secrets.v2SetSecretContract, secrets.v2DeleteSecretContract]),
+  ...settingsMutations('credentials', [
+    credentials.v2CreateCredentialConnectionContract,
+    credentials.v2CreateServiceAccountCredentialContract,
+    credentials.v2UpdateCredentialContract,
+    credentials.v2DeleteCredentialContract,
+  ]),
+  ...settingsMutations('custom-tools', [
+    customTools.v2CreateCustomToolContract,
+    customTools.v2UpdateCustomToolContract,
+    customTools.v2DeleteCustomToolContract,
+  ]),
+  ...settingsMutations('mcp', [
+    mcpServers.v2CreateMcpServerContract,
+    mcpServers.v2UpdateMcpServerContract,
+    mcpServers.v2DeleteMcpServerContract,
+  ]),
+  ...settingsMutations('sandboxes', [
+    sandboxes.v2CreateSandboxContract,
+    sandboxes.v2UpdateSandboxContract,
+    sandboxes.v2DeleteSandboxContract,
+  ]),
   {
     ...after(workflows.v2GetWorkflowContract, ({ data }) => upsert('workflow', data, true)),
     readOnly: true,