Merge branch 'investigate/portless' into dev

# Conflicts:
#	packages/app/e2e/helpers/workspace-setup.ts
#	packages/app/src/components/sidebar-workspace-list.tsx
#	packages/app/src/contexts/session-context.tsx
#	packages/app/src/hooks/use-sidebar-workspaces-list.test.ts
#	packages/app/src/screens/workspace/workspace-tab-menu.ts
#	packages/app/src/stores/workspace-setup-store.ts
#	packages/app/src/stores/workspace-tabs-store.ts
#	packages/app/src/utils/sidebar-project-row-model.test.ts
#	packages/app/src/utils/sidebar-shortcuts.test.ts
#	packages/app/src/utils/workspace-tab-identity.ts
#	packages/server/src/server/bootstrap.ts
#	packages/server/src/server/worktree-session.ts

packages/app/src/utils/workspace-tab-identity.ts

@@ -26,6 +26,10 @@ export function normalizeWorkspaceTabTarget(
     const launcherId = trimNonEmpty(value.launcherId);
     return launcherId ? { kind: "launcher", launcherId } : null;
   }
+  if (value.kind === "setup") {
+    const workspaceId = trimNonEmpty(value.workspaceId);
+    return workspaceId ? { kind: "setup", workspaceId: workspaceId.replace(/\\/g, "/") } : null;
+  }
   return null;
 }
 
@@ -52,6 +56,9 @@ export function workspaceTabTargetsEqual(
     // Launcher tabs are intentionally always unique, even when reopened repeatedly.
     return false;
   }
+  if (left.kind === "setup" && right.kind === "setup") {
+    return left.workspaceId === right.workspaceId;
+  }
   return false;
 }
 
@@ -68,6 +75,9 @@ export function buildDeterministicWorkspaceTabId(target: WorkspaceTabTarget): st
   if (target.kind === "launcher") {
     return `launcher_${target.launcherId}`;
   }
+  if (target.kind === "setup") {
+    return `setup_${target.workspaceId}`;
+  }
   return `file_${target.path}`;
 }