fix(settings): isolate identity lifecycle state

Author: waleedlatif1

apps/sim/app/workspace/[workspaceId]/home/components/message-content/components/agent-group/tool-permission-card.tsx

@@ -16,7 +16,7 @@ import { createLogger } from '@sim/logger'
 import { useQueryClient } from '@tanstack/react-query'
 import { requestJson } from '@/lib/api/client/request'
 import { copilotToolPermissionContract } from '@/lib/api/contracts/copilot'
-import { generalSettingsKeys } from '@/hooks/queries/general-settings-data'
+import { generalSettingsKeys } from '@/hooks/queries/current-user-data'
 import { useToolPermissionStore } from '@/stores/tool-permission/store'
 
 const logger = createLogger('ToolPermissionCard')

apps/sim/app/workspace/[workspaceId]/prefetch.ts

@@ -10,16 +10,16 @@ import { getWorkspaceHostContextForViewer } from '@/lib/workspaces/host-context'
 import { listWorkspacesForViewer } from '@/lib/workspaces/list'
 import { getWorkspacePermissionsForAuthorizedViewer } from '@/lib/workspaces/permissions/utils'
 import { prefetchResourceFolders } from '@/app/workspace/[workspaceId]/lib/prefetch-resource-folders'
+import {
+  mapUserProfileResponse,
+  USER_PROFILE_STALE_TIME,
+  userProfileKeys,
+} from '@/hooks/queries/current-user-data'
 import {
   MOTHERSHIP_CHAT_LIST_STALE_TIME,
   mapChat,
   mothershipChatKeys,
 } from '@/hooks/queries/mothership-chats'
-import {
-  mapUserProfileResponse,
-  USER_PROFILE_STALE_TIME,
-  userProfileKeys,
-} from '@/hooks/queries/user-profile-data'
 import { workflowKeys } from '@/hooks/queries/utils/workflow-keys'
 import { mapWorkflow, WORKFLOW_LIST_STALE_TIME } from '@/hooks/queries/utils/workflow-list-query'
 import { normalizeWorkspacesResponse } from '@/hooks/queries/utils/workspace-list-query'

apps/sim/app/workspace/[workspaceId]/settings/[section]/prefetch.test.ts

@@ -26,7 +26,7 @@ vi.mock('@/lib/api/server/routes', () => ({
 }))
 
 import { SECTION_PREFETCHERS } from '@/app/workspace/[workspaceId]/settings/[section]/prefetch'
-import { generalSettingsKeys } from '@/hooks/queries/general-settings-data'
+import { generalSettingsKeys } from '@/hooks/queries/current-user-data'
 import { credentialGroupKeys } from '@/hooks/queries/utils/credential-group-queries'
 
 describe('general settings prefetch', () => {

apps/sim/app/workspace/[workspaceId]/settings/components/general/general.tsx

@@ -188,13 +188,18 @@ export function General() {
   }
 
   const handleSignOut = async () => {
+    const logoutUrl = '/login?fromLogout=true'
+    let canNavigateInApp = false
+
     try {
-      await Promise.all([signOut(), clearUserData()])
-      router.push('/login?fromLogout=true')
+      const [, inMemoryResetSucceeded] = await Promise.all([signOut(), clearUserData()])
+      canNavigateInApp = inMemoryResetSucceeded
     } catch (error) {
       logger.error('Error signing out:', { error })
-      router.push('/login?fromLogout=true')
     }
+
+    if (canNavigateInApp) router.push(logoutUrl)
+    else window.location.assign(logoutUrl)
   }
 
   const handleResetPasswordConfirm = async () => {

apps/sim/app/workspace/[workspaceId]/w/[workflowId]/hooks/use-workflow-execution.test.tsx

@@ -14,6 +14,8 @@ const {
   mockFetch,
   mockHandleExecutionCancelledConsole,
   mockHandleExecutionErrorConsole,
+  mockPersistenceExecutionEnded,
+  mockPersistenceExecutionStarted,
   mockRequestJson,
   mockResolveStartCandidates,
   mockSelectBestTrigger,
@@ -89,6 +91,8 @@ const {
     mockFetch: vi.fn(),
     mockHandleExecutionCancelledConsole: vi.fn(),
     mockHandleExecutionErrorConsole: vi.fn(),
+    mockPersistenceExecutionEnded: vi.fn(),
+    mockPersistenceExecutionStarted: vi.fn(() => ({})),
     mockRequestJson: vi.fn(),
     mockResolveStartCandidates: vi.fn(),
     mockSelectBestTrigger: vi.fn(),
@@ -237,8 +241,8 @@ vi.mock('@/stores/execution', () => ({
 vi.mock('@/stores/terminal', () => ({
   clearExecutionPointer: vi.fn(),
   consolePersistence: {
-    executionStarted: vi.fn(),
-    executionEnded: vi.fn(),
+    executionStarted: mockPersistenceExecutionStarted,
+    executionEnded: mockPersistenceExecutionEnded,
     persist: vi.fn(),
   },
   loadExecutionPointer: vi.fn(),
@@ -402,6 +406,9 @@ describe('useWorkflowExecution cancellation', () => {
 describe('useWorkflowExecution attachment uploads', () => {
   beforeEach(() => {
     vi.clearAllMocks()
+    executionStoreState.getWorkflowExecution.mockReturnValue(
+      executionStoreState.workflowExecutions.get('workflow-1')!
+    )
     executionStoreState.getCurrentExecutionId.mockReturnValue(null)
     mockResolveStartCandidates.mockReturnValue([])
     mockSelectBestTrigger.mockReturnValue([])
@@ -538,6 +545,46 @@ describe('useWorkflowExecution attachment uploads', () => {
     unmount()
   })
 
+  it('does not let an overlapping run without lifecycle ownership end the active run', async () => {
+    const persistenceExecution = {}
+    let resolveActiveRun: (() => void) | undefined
+    mockPersistenceExecutionStarted.mockReturnValueOnce(persistenceExecution)
+    mockExecute.mockImplementationOnce(
+      () =>
+        new Promise<void>((resolve) => {
+          resolveActiveRun = resolve
+        })
+    )
+    const { result, unmount } = renderWorkflowExecutionHook()
+
+    let activeRun: unknown
+    await act(async () => {
+      activeRun = await result().handleRunWorkflow({ input: 'active run' })
+    })
+
+    executionStoreState.getWorkflowExecution.mockReturnValue({
+      ...executionStoreState.getWorkflowExecution(),
+      isExecuting: true,
+    })
+
+    await act(async () => {
+      await result().handleRunWorkflow()
+    })
+
+    expect(mockPersistenceExecutionStarted).toHaveBeenCalledTimes(1)
+    expect(mockPersistenceExecutionEnded).not.toHaveBeenCalled()
+
+    await act(async () => {
+      resolveActiveRun?.()
+      await drainStream(activeRun)
+    })
+
+    expect(mockPersistenceExecutionEnded).toHaveBeenCalledOnce()
+    expect(mockPersistenceExecutionEnded).toHaveBeenCalledWith(persistenceExecution)
+
+    unmount()
+  })
+
   it('uses only projected live thinking without changing normal settle behavior', async () => {
     mockExecute.mockImplementationOnce(async (options) => {
       options.onExecutionId?.('execution-1')