fix(chat): sync project selection with active session

Author: enowdev

src/components/layout/AppShell.tsx

@@ -416,10 +416,17 @@ export const AppShell: React.FC = () => {
     let currentSessionId = useSessionStore.getState().activeSessionId;
     let currentProjectId = useProjectStore.getState().activeProjectId;
     const currentProjects = useProjectStore.getState().projects;
+    const currentSessions = useSessionStore.getState().sessions;
 
-    // If we already have an active session, just return it
     if (currentSessionId) {
-      const proj = currentProjects.find(p => p.id === currentProjectId);
+      const activeSession = currentSessions.find((session) => session.id === currentSessionId);
+      const sessionProjectId = activeSession?.projectId ?? currentProjectId;
+      const proj = currentProjects.find((project) => project.id === sessionProjectId);
+
+      if (sessionProjectId && sessionProjectId !== currentProjectId) {
+        setActiveProjectId(sessionProjectId);
+      }
+
       return { sessionId: currentSessionId, projectPath: proj?.path ?? '' };
     }
 

src/components/sidebar/SessionList.tsx

@@ -12,7 +12,7 @@ import { Session } from '@/types';
 
 export const SessionList: React.FC = () => {
   const { sessions, activeSessionId, setActiveSessionId, removeSession, addSession, setSessions } = useSessionStore();
-  const { projects, activeProjectId } = useProjectStore();
+  const { projects, activeProjectId, setActiveProjectId } = useProjectStore();
   const [expandedProjects, setExpandedProjects] = useState<Set<string>>(() => {
     return new Set(activeProjectId ? [activeProjectId] : []);
   });