fix(agent): 修复切换仓库时 Agent 实例不跟随切换的问题

src/renderer/App/hooks/useFocusSession.ts

@@ -22,7 +22,7 @@ export function useFocusSession({ onSwitchWorktree, onSwitchTab }: UseFocusSessi
       if (session) {
         // Switch to the session's worktree first, then set active session (same as RunningProjectsPopover)
         onSwitchWorktree(session.cwd);
-        useAgentSessionsStore.getState().setActiveId(session.cwd, sessionId);
+        useAgentSessionsStore.getState().setActiveId(session.repoPath, session.cwd, sessionId);
         onSwitchTab('chat');
       }
     });

src/renderer/components/chat/AgentPanel.tsx

@@ -452,9 +452,8 @@ export function AgentPanel({ repoPath, cwd, isActive = false, onSwitchWorktree }
   useEffect(() => {
     if (!cwd || groups.length === 0) return;
 
-    const normalizedCwd = normalizePath(cwd);
     const unsubscribe = useAgentSessionsStore.subscribe(
-      (state) => state.activeIds[normalizedCwd],
+      (state) => state.activeIds[`${normalizePath(repoPath)}::${normalizePath(cwd)}`],
       (storeActiveId) => {
         if (!storeActiveId) return;
 
@@ -476,7 +475,7 @@ export function AgentPanel({ repoPath, cwd, isActive = false, onSwitchWorktree }
     );
 
     return unsubscribe;
-  }, [cwd, groups, updateCurrentGroupState]);
+  }, [repoPath, cwd, groups, updateCurrentGroupState]);
 
   // Empty state agent menu
   const [showAgentMenu, setShowAgentMenu] = useState(false);
@@ -607,7 +606,7 @@ export function AgentPanel({ repoPath, cwd, isActive = false, onSwitchWorktree }
         };
       });
 
-      setActiveId(cwd, newSession.id);
+      setActiveId(repoPath, cwd, newSession.id);
       clearContinueRequest();
     }
   }, [
@@ -791,7 +790,7 @@ export function AgentPanel({ repoPath, cwd, isActive = false, onSwitchWorktree }
   // Handle session selection
   const handleSelectSession = useCallback(
     (id: string, groupId?: string) => {
-      setActiveId(cwd, id);
+      setActiveId(repoPath, cwd, id);
 
       updateCurrentGroupState((state) => {
         const targetGroupId = groupId || state.groups.find((g) => g.sessionIds.includes(id))?.id;
@@ -806,7 +805,7 @@ export function AgentPanel({ repoPath, cwd, isActive = false, onSwitchWorktree }
         };
       });
     },
-    [cwd, setActiveId, updateCurrentGroupState]
+    [cwd, repoPath, setActiveId, updateCurrentGroupState]
   );
 
   // Notification payload may carry either UI session id or Claude sessionId.
@@ -942,14 +941,14 @@ export function AgentPanel({ repoPath, cwd, isActive = false, onSwitchWorktree }
     const nextIndex = (currentIndex + 1) % activeGroup.sessionIds.length;
     const nextSessionId = activeGroup.sessionIds[nextIndex];
 
-    setActiveId(cwd, nextSessionId);
+    setActiveId(repoPath, cwd, nextSessionId);
     updateCurrentGroupState((state) => ({
       ...state,
       groups: state.groups.map((g) =>
         g.id === activeGroupId ? { ...g, activeSessionId: nextSessionId } : g
       ),
     }));
-  }, [groups, activeGroupId, cwd, setActiveId, updateCurrentGroupState]);
+  }, [groups, activeGroupId, cwd, repoPath, setActiveId, updateCurrentGroupState]);
 
   const handlePrevSession = useCallback(() => {
     const activeGroup = groups.find((g) => g.id === activeGroupId);
@@ -959,14 +958,14 @@ export function AgentPanel({ repoPath, cwd, isActive = false, onSwitchWorktree }
     const prevIndex = currentIndex <= 0 ? activeGroup.sessionIds.length - 1 : currentIndex - 1;
     const prevSessionId = activeGroup.sessionIds[prevIndex];
 
-    setActiveId(cwd, prevSessionId);
+    setActiveId(repoPath, cwd, prevSessionId);
     updateCurrentGroupState((state) => ({
       ...state,
       groups: state.groups.map((g) =>
         g.id === activeGroupId ? { ...g, activeSessionId: prevSessionId } : g
       ),
     }));
-  }, [groups, activeGroupId, cwd, setActiveId, updateCurrentGroupState]);
+  }, [groups, activeGroupId, cwd, repoPath, setActiveId, updateCurrentGroupState]);
 
   const handleInitialized = useCallback(
     (id: string) => {
@@ -1340,7 +1339,10 @@ export function AgentPanel({ repoPath, cwd, isActive = false, onSwitchWorktree }
 
     const normalizedCwd = normalizePath(cwd);
     const currentState = worktreeGroupStates[normalizedCwd];
-    const storeActiveId = useAgentSessionsStore.getState().activeIds[normalizedCwd];
+    const storeActiveId =
+      useAgentSessionsStore.getState().activeIds[
+        `${normalizePath(repoPath)}::${normalizePath(cwd)}`
+      ];
 
     // If no groups exist but sessions do, create a group with all sessions
     if (!currentState || currentState.groups.length === 0) {
@@ -1386,7 +1388,7 @@ export function AgentPanel({ repoPath, cwd, isActive = false, onSwitchWorktree }
         }
       }
     }
-  }, [cwd, currentWorktreeSessions, worktreeGroupStates, setGroupState]);
+  }, [repoPath, cwd, currentWorktreeSessions, worktreeGroupStates, setGroupState]);
 
   // Maintain global session IDs - include ALL sessions across all repos
   // This ensures terminals stay mounted when switching between repos

src/renderer/components/layout/MainContent.tsx

@@ -112,7 +112,7 @@ export function MainContent({
   const activeIds = useAgentSessionsStore((s) => s.activeIds);
   const activeSessionId = useMemo(() => {
     if (!repoPath || !worktreePath) return null;
-    const key = normalizePath(worktreePath);
+    const key = `${normalizePath(repoPath)}::${normalizePath(worktreePath)}`;
     const activeId = activeIds[key];
     if (activeId) {
       const session = sessions.find((s) => s.id === activeId);

src/renderer/components/layout/RunningProjectsPopover.tsx

@@ -204,7 +204,7 @@ export function RunningProjectsPopover({
           break;
         case 'agent':
           await onSelectWorktreeByPath(item.session.cwd);
-          setAgentActiveId(item.session.cwd, item.session.id);
+          setAgentActiveId(item.session.repoPath, item.session.cwd, item.session.id);
           onSwitchTab?.('chat');
           break;
         case 'terminal':

src/renderer/stores/agentSessions.ts

@@ -44,12 +44,21 @@ function isResumableAgent(agentCommand: string): boolean {
   return agentCommand?.startsWith('claude') ?? false;
 }
 
+/**
+ * Composite key for activeIds: uniquely identifies a repo+worktree pair.
+ * Prevents cross-repo session pollution when different repos have worktrees
+ * with the same path name.
+ */
+function makeActiveKey(repoPath: string, cwd: string): string {
+  return `${normalizePath(repoPath)}::${normalizePath(cwd)}`;
+}
+
 // Group states indexed by normalized worktree path
 type WorktreeGroupStates = Record<string, AgentGroupState>;
 
 interface AgentSessionsState {
   sessions: Session[];
-  activeIds: Record<string, string | null>; // key = cwd (worktree path)
+  activeIds: Record<string, string | null>; // key = makeActiveKey(repoPath, cwd)
   groupStates: WorktreeGroupStates; // Group states per worktree (not persisted)
   runtimeStates: Record<string, SessionRuntimeState>; // Runtime output states (not persisted)
   enhancedInputStates: Record<string, EnhancedInputState>; // Enhanced input states per session (not persisted)
@@ -58,7 +67,7 @@ interface AgentSessionsState {
   addSession: (session: Session) => void;
   removeSession: (id: string) => void;
   updateSession: (id: string, updates: Partial<Session>) => void;
-  setActiveId: (cwd: string, sessionId: string | null) => void;
+  setActiveId: (repoPath: string, cwd: string, sessionId: string | null) => void;
   reorderSessions: (repoPath: string, cwd: string, fromIndex: number, toIndex: number) => void;
   getSessions: (repoPath: string, cwd: string) => Session[];
   getActiveSessionId: (repoPath: string, cwd: string) => string | null;
@@ -191,7 +200,10 @@ export const useAgentSessionsStore = create<AgentSessionsState>()(
         const newSession = { ...session, displayOrder: maxOrder + 1 };
         return {
           sessions: [...state.sessions, newSession],
-          activeIds: { ...state.activeIds, [normalizePath(session.cwd)]: session.id },
+          activeIds: {
+            ...state.activeIds,
+            [makeActiveKey(session.repoPath, session.cwd)]: session.id,
+          },
           // Initialize enhanced input state for new session to ensure auto-popup works
           enhancedInputStates: {
             ...state.enhancedInputStates,
@@ -241,9 +253,9 @@ export const useAgentSessionsStore = create<AgentSessionsState>()(
         sessions: state.sessions.map((s) => (s.id === id ? { ...s, ...updates } : s)),
       })),
 
-    setActiveId: (cwd, sessionId) =>
+    setActiveId: (repoPath, cwd, sessionId) =>
       set((state) => ({
-        activeIds: { ...state.activeIds, [normalizePath(cwd)]: sessionId },
+        activeIds: { ...state.activeIds, [makeActiveKey(repoPath, cwd)]: sessionId },
       })),
 
     reorderSessions: (repoPath, cwd, fromIndex, toIndex) =>
@@ -289,15 +301,14 @@ export const useAgentSessionsStore = create<AgentSessionsState>()(
 
     getActiveSessionId: (repoPath, cwd) => {
       const state = get();
-      const activeId = state.activeIds[normalizePath(cwd)];
+      const key = makeActiveKey(repoPath, cwd);
+      const activeId = state.activeIds[key];
       if (activeId) {
-        // Verify the session exists and matches repoPath
         const session = state.sessions.find((s) => s.id === activeId);
-        if (session && session.repoPath === repoPath) {
+        if (session) {
           return activeId;
         }
       }
-      // Fallback to first session for this repo+cwd
       const firstSession = state.sessions.find(
         (s) => s.repoPath === repoPath && pathsEqual(s.cwd, cwd)
       );
@@ -530,19 +541,37 @@ export const useAgentSessionsStore = create<AgentSessionsState>()(
 );
 
 /**
- * Selector hook: get active session ID for a given worktree path.
- * Falls back to the first session under that cwd.
+ * Selector hook: get active session ID for a given repo+worktree pair.
+ * Falls back to the first session under that repo+cwd.
+ *
+ * @param cwd - The worktree path (required).
+ * @param repoPath - Optional repo path for cross-repo isolation. If omitted, falls back to matching by cwd only.
  */
-export function useActiveSessionId(cwd: string | undefined | null): string | null {
+export function useActiveSessionId(
+  cwd: string | undefined | null,
+  repoPath?: string | undefined | null
+): string | null {
   return useAgentSessionsStore((state) => {
     if (!cwd) return null;
+    if (repoPath) {
+      const key = makeActiveKey(repoPath, cwd);
+      const activeId = state.activeIds[key];
+      if (activeId) {
+        const session = state.sessions.find((s) => s.id === activeId);
+        if (session) return activeId;
+      }
+      const first = state.sessions.find(
+        (s) => s.repoPath === repoPath && normalizePath(s.cwd) === normalizePath(cwd)
+      );
+      return first?.id ?? null;
+    }
+    // Backward compatibility: match by cwd only
     const key = normalizePath(cwd);
     const activeId = state.activeIds[key];
     if (activeId) {
       const session = state.sessions.find((s) => s.id === activeId);
       if (session) return activeId;
     }
-    // Fallback to first session for this cwd
     const first = state.sessions.find((s) => normalizePath(s.cwd) === key);
     return first?.id ?? null;
   });