Fix project session focus restoration

web/src/components/projects/__tests__/projectStarters.test.ts

@@ -45,6 +45,7 @@ const summary = (
       id: `p-${kind}-${totalUsd}`,
       name: kind,
       kind,
+      isPersonal: false,
       threadId: null,
       createdAt: "",
       updatedAt: ""

web/src/components/workspace/WorkspaceShell.tsx

@@ -112,6 +112,9 @@ const WorkspaceShell = () => {
     [theme, isDragging]
   );
   const tabs = useWorkspaceTabsStore((state) => state.tabs);
+  const activeProjectId = useWorkspaceTabsStore(
+    (state) => state.activeProjectId
+  );
   const activeTabId = useWorkspaceTabsStore((state) => state.activeTabId);
   const setTitle = useWorkspaceTabsStore((state) => state.setTitle);
   const setCurrentWorkflowId = useWorkflowManager(
@@ -128,6 +131,13 @@ const WorkspaceShell = () => {
     () => tabs.find((tab) => tab.id === activeTabId) ?? null,
     [tabs, activeTabId]
   );
+  const visibleTabs = useMemo(
+    () =>
+      activeProjectId
+        ? tabs.filter((tab) => tab.projectId === activeProjectId)
+        : tabs.filter((tab) => tab.projectId === undefined),
+    [activeProjectId, tabs]
+  );
 
   // The left rail (PanelLeft) is position:fixed, so its open drawer normally
   // floats over the content. The node canvas keeps the overlay so it stays
@@ -185,7 +195,7 @@ const WorkspaceShell = () => {
             className="workspace-content"
             style={{ marginLeft: contentMarginLeft }}
           >
-            {tabs.length === 0 && (
+            {visibleTabs.length === 0 && (
               <div className="workspace-empty">
                 <Suspense fallback={null}>
                   <NewProjectSurface />

web/src/components/workspace/WorkspaceTabBar.tsx

@@ -319,6 +319,13 @@ const WorkspaceTabBar = React.memo(function WorkspaceTabBar() {
   const activeProjectId = useWorkspaceTabsStore(
     (state) => state.activeProjectId
   );
+  const visibleTabs = useMemo(
+    () =>
+      activeProjectId
+        ? tabs.filter((tab) => tab.projectId === activeProjectId)
+        : tabs.filter((tab) => tab.projectId === undefined),
+    [activeProjectId, tabs]
+  );
 
   const activeTab = useMemo(
     () => tabs.find((tab) => tab.id === activeTabId) ?? null,
@@ -328,11 +335,11 @@ const WorkspaceTabBar = React.memo(function WorkspaceTabBar() {
   // The store keeps its tabs in render order — the open project's tabs are one
   // contiguous run behind the scope chip — so the bar renders `tabs` as they
   // come and a tab's index on screen is its index in the store.
-  const firstGroupedTabId = tabs.find(
+  const firstGroupedTabId = visibleTabs.find(
     (tab) => tab.projectId === activeProjectId
   )?.id;
   const groupName =
-    tabs.find((tab) => tab.type === "project" && tab.ref === activeProjectId)
+    visibleTabs.find((tab) => tab.type === "project" && tab.ref === activeProjectId)
       ?.title ?? "Project";
 
   const newTabButtonRef = useRef<HTMLButtonElement>(null);
@@ -628,7 +635,7 @@ const WorkspaceTabBar = React.memo(function WorkspaceTabBar() {
       </button>
       {isMobile ? (
         <MobileDocumentSelector
-          tabs={tabs}
+          tabs={visibleTabs}
           activeTabId={activeTabId}
           typeColor={TYPE_COLOR}
           typeGlyph={TYPE_GLYPH}
@@ -638,7 +645,7 @@ const WorkspaceTabBar = React.memo(function WorkspaceTabBar() {
         />
       ) : (
         <div className="tabs">
-          {tabs.map((tab) => (
+          {visibleTabs.map((tab) => (
             <Fragment key={tab.id}>
               {tab.id === firstGroupedTabId && activeProjectId && (
                 <ProjectScopeChip