fix(web): prevent stale session/workspace state writeback

Author: Yumiue

web/src/stores/useSessionStore.test.ts

@@ -187,6 +187,68 @@ describe('useSessionStore', () => {
     expect(useChatStore.getState().isTransitioning).toBe(false)
   })
 
+  it('resetForWorkspaceSwitch aborts in-flight switchSession and blocks stale writeback', async () => {
+    const mockBindStream = vi.fn().mockResolvedValue({})
+    let resolveLoad!: (value: any) => void
+    const mockLoadSession = vi.fn().mockImplementation(
+      () => new Promise((resolve) => { resolveLoad = resolve }),
+    )
+    const mockAPI = { bindStream: mockBindStream, loadSession: mockLoadSession } as any
+
+    const switchPromise = useSessionStore.getState().switchSession('sess-old', mockAPI)
+    await Promise.resolve()
+
+    useSessionStore.getState().resetForWorkspaceSwitch()
+
+    resolveLoad({
+      payload: {
+        messages: [{ role: 'assistant', content: 'stale payload', tool_calls: [] }],
+        agent_mode: 'plan',
+      },
+    })
+    await switchPromise
+
+    expect(useChatStore.getState().messages).toHaveLength(0)
+    expect(useChatStore.getState().agentMode).toBe('build')
+  })
+
+  it('switchSession applies only latest request when older request resolves later', async () => {
+    const mockBindStream = vi.fn().mockResolvedValue({})
+    let resolveLoadA!: (value: any) => void
+    let resolveLoadB!: (value: any) => void
+    const mockLoadSession = vi
+      .fn()
+      .mockImplementationOnce(() => new Promise((resolve) => { resolveLoadA = resolve }))
+      .mockImplementationOnce(() => new Promise((resolve) => { resolveLoadB = resolve }))
+    const mockAPI = { bindStream: mockBindStream, loadSession: mockLoadSession } as any
+
+    const switchA = useSessionStore.getState().switchSession('sess-a', mockAPI)
+    await Promise.resolve()
+    const switchB = useSessionStore.getState().switchSession('sess-b', mockAPI)
+    await Promise.resolve()
+
+    resolveLoadB({
+      payload: {
+        messages: [{ role: 'assistant', content: 'new payload', tool_calls: [] }],
+        agent_mode: 'plan',
+      },
+    })
+    await switchB
+
+    resolveLoadA({
+      payload: {
+        messages: [{ role: 'assistant', content: 'old payload', tool_calls: [] }],
+        agent_mode: 'build',
+      },
+    })
+    await switchA
+
+    expect(useSessionStore.getState().currentSessionId).toBe('sess-b')
+    expect(useChatStore.getState().messages).toHaveLength(1)
+    expect(useChatStore.getState().messages[0].content).toBe('new payload')
+    expect(useChatStore.getState().agentMode).toBe('plan')
+  })
+
   it('fetchSessions auto-selects first session and binds stream', async () => {
     const setMessagesSpy = vi.spyOn(useChatStore.getState(), 'setMessages')
     const addMessageSpy = vi.spyOn(useChatStore.getState(), 'addMessage')

web/src/stores/useSessionStore.ts

@@ -262,6 +262,7 @@ export async function reloadSessionAfterCheckpointRestore(
 
 let _fetchSessionsPromise: Promise<void> | null = null
 let _fetchSessionsSeq = 0
+let _switchSessionSeq = 0
 
 export const useSessionStore = create<SessionState>((set, get) => ({
   projects: [],
@@ -290,6 +291,7 @@ export const useSessionStore = create<SessionState>((set, get) => ({
     if (prevAbort) {
       prevAbort.abort()
     }
+    const switchSeq = ++_switchSessionSeq
     const abortCtrl = new AbortController()
     set({ _switchAbort: abortCtrl, loading: true })
 
@@ -308,13 +310,15 @@ export const useSessionStore = create<SessionState>((set, get) => ({
 
       // 3. Bind stream (events will be discarded due to isTransitioning)
       await gatewayAPI.bindStream({ session_id: sessionId, channel: 'all' })
+      if (abortCtrl.signal.aborted || switchSeq !== _switchSessionSeq || get()._switchAbort !== abortCtrl) return
 
       // 4. Load historical messages (concurrently fetch todos + runtime snapshot)
       const sessionFrame = await loadSessionWithInsights(gatewayAPI, sessionId)
+      if (abortCtrl.signal.aborted || switchSeq !== _switchSessionSeq || get()._switchAbort !== abortCtrl) return
       const sessionData = sessionFrame.payload as { messages?: BackendMessage[]; agent_mode?: string }
 
       // Check if this request was superseded
-      if (abortCtrl.signal.aborted) return
+      if (abortCtrl.signal.aborted || switchSeq !== _switchSessionSeq || get()._switchAbort !== abortCtrl) return
 
       // 5. Load messages and stop transitioning
       if (sessionData.messages && sessionData.messages.length > 0) {
@@ -326,7 +330,7 @@ export const useSessionStore = create<SessionState>((set, get) => ({
       useChatStore.getState().setAgentMode(restoredMode)
       chatStore.setTransitioning(false)
     } catch (err) {
-      if (abortCtrl.signal.aborted) return
+      if (abortCtrl.signal.aborted || switchSeq !== _switchSessionSeq || get()._switchAbort !== abortCtrl) return
       console.error('switchSession failed:', err)
       // Revert to previous session and re-bind its stream
       set({ currentSessionId: prevSessionId })
@@ -335,7 +339,7 @@ export const useSessionStore = create<SessionState>((set, get) => ({
       }
       useChatStore.getState().setTransitioning(false)
     } finally {
-      if (get()._switchAbort === abortCtrl) {
+      if (switchSeq === _switchSessionSeq && get()._switchAbort === abortCtrl) {
         set({ loading: false, _switchAbort: null })
       }
     }
@@ -379,9 +383,14 @@ export const useSessionStore = create<SessionState>((set, get) => ({
   },
 
   resetForWorkspaceSwitch: () => {
+    const currentAbort = get()._switchAbort
+    if (currentAbort) {
+      currentAbort.abort()
+    }
     _fetchSessionsPromise = null
     _fetchSessionsSeq += 1
-    set({ _initialBindDone: false, loading: false })
+    _switchSessionSeq += 1
+    set({ _initialBindDone: false, loading: false, _switchAbort: null })
   },
 
   removeSessionLocally: (sessionId) => {

web/src/stores/useWorkspaceStore.test.ts

@@ -4,6 +4,7 @@ import { useChatStore } from './useChatStore'
 import { useSessionStore } from './useSessionStore'
 import { useUIStore } from './useUIStore'
 import { useGatewayStore } from './useGatewayStore'
+import { useRuntimeInsightStore } from './useRuntimeInsightStore'
 
 function flushPromises() {
 	return new Promise((resolve) => setTimeout(resolve, 0))
@@ -32,13 +33,17 @@ describe('useWorkspaceStore', () => {
 		useUIStore.setState({
 			showToast: vi.fn(),
 			clearFileChanges: vi.fn(),
+			clearCheckpointRollbackUndo: vi.fn(),
 			resetPreviewTabs: vi.fn(),
 			setSearchQuery: vi.fn(),
 		} as any)
 		useGatewayStore.setState({
 			setCurrentRunId: vi.fn(),
 			notifyProviderChanged: vi.fn(),
 		} as any)
+		useRuntimeInsightStore.setState({
+			reset: vi.fn(),
+		} as any)
 	})
 
 	it('deduplicates concurrent fetchWorkspaces calls', async () => {
@@ -80,7 +85,9 @@ describe('useWorkspaceStore', () => {
 
 		expect(useChatStore.getState().clearMessages).toHaveBeenCalled()
 		expect(useSessionStore.getState().resetForWorkspaceSwitch).toHaveBeenCalled()
+		expect(useRuntimeInsightStore.getState().reset).toHaveBeenCalled()
 		expect(useUIStore.getState().clearFileChanges).toHaveBeenCalled()
+		expect(useUIStore.getState().clearCheckpointRollbackUndo).toHaveBeenCalled()
 		expect(useUIStore.getState().resetPreviewTabs).toHaveBeenCalled()
 		expect(gatewayAPI.switchWorkspace).toHaveBeenCalledWith('w2')
 		expect(useGatewayStore.getState().notifyProviderChanged).toHaveBeenCalled()
@@ -124,6 +131,31 @@ describe('useWorkspaceStore', () => {
 		expect(showToast).toHaveBeenCalledWith('Failed to create workspace', 'error')
 	})
 
+	it('createWorkspace clears runtime insight and rollback undo before switching', async () => {
+		const gatewayAPI = {
+			createWorkspace: vi.fn().mockResolvedValue({
+				payload: {
+					workspace: {
+						hash: 'w-new',
+						path: '/new',
+						name: 'New',
+						created_at: '1',
+						updated_at: '1',
+					},
+				},
+			}),
+			switchWorkspace: vi.fn().mockResolvedValue(undefined),
+		} as any
+		const fetchSessions = useSessionStore.getState().fetchSessions as any
+
+		await useWorkspaceStore.getState().createWorkspace('/new', gatewayAPI, 'New')
+
+		expect(useRuntimeInsightStore.getState().reset).toHaveBeenCalled()
+		expect(useUIStore.getState().clearCheckpointRollbackUndo).toHaveBeenCalled()
+		expect(gatewayAPI.switchWorkspace).toHaveBeenCalledWith('w-new')
+		expect(fetchSessions).toHaveBeenCalledWith(gatewayAPI, true)
+	})
+
 	it('deleteWorkspace switches to remaining first workspace when current is removed', async () => {
 		const switchWorkspace = vi.spyOn(useWorkspaceStore.getState(), 'switchWorkspace')
 		useWorkspaceStore.setState({

web/src/stores/useWorkspaceStore.ts

@@ -5,6 +5,7 @@ import { useSessionStore } from '@/stores/useSessionStore'
 import { useChatStore } from '@/stores/useChatStore'
 import { useUIStore } from '@/stores/useUIStore'
 import { useGatewayStore } from '@/stores/useGatewayStore'
+import { useRuntimeInsightStore } from '@/stores/useRuntimeInsightStore'
 
 /** 工作区记录 */
 export interface Workspace {
@@ -101,7 +102,9 @@ export const useWorkspaceStore = create<WorkspaceState>((set, get) => ({
     })
     useSessionStore.getState().resetForWorkspaceSwitch()
     useGatewayStore.getState().setCurrentRunId('')
+    useRuntimeInsightStore.getState().reset()
     useUIStore.getState().clearFileChanges()
+    useUIStore.getState().clearCheckpointRollbackUndo()
     useUIStore.getState().resetPreviewTabs()
     useUIStore.getState().setSearchQuery('')
 
@@ -144,7 +147,9 @@ export const useWorkspaceStore = create<WorkspaceState>((set, get) => ({
     })
     useSessionStore.getState().resetForWorkspaceSwitch()
     useGatewayStore.getState().setCurrentRunId('')
+    useRuntimeInsightStore.getState().reset()
     useUIStore.getState().clearFileChanges()
+    useUIStore.getState().clearCheckpointRollbackUndo()
     useUIStore.getState().resetPreviewTabs()
     useUIStore.getState().setSearchQuery('')