Fix workspace-owned Playwright flows

packages/app/e2e/helpers/composer.ts

@@ -2,7 +2,8 @@ import { expect, type Page } from "@playwright/test";
 import { buildHostWorkspaceRoute } from "@/utils/host-routes";
 import { createTempGitRepo } from "./workspace";
 import { connectSeedClient, type SeedDaemonClient } from "./seed-client";
-import { connectWorkspaceSetupClient, openHomeWithProject } from "./workspace-setup";
+import { gotoAppShell } from "./app";
+import { connectWorkspaceSetupClient } from "./workspace-setup";
 import { selectWorkspaceInSidebar } from "./sidebar";
 import { getServerId } from "./server-id";
 import { waitForTabBar } from "./launcher";
@@ -164,6 +165,7 @@ export async function startRunningMockAgent(
   const agent = await client.createAgent({
     provider: "mock",
     cwd: repo.path,
+    workspaceId: opened.workspace.id,
     model: opts.model,
   });
   const agentUrl = `${buildHostWorkspaceRoute(serverId, opened.workspace.id)}?open=${encodeURIComponent(`agent:${agent.id}`)}`;
@@ -188,7 +190,7 @@ export async function openGithubWorkspace(
   const client = await connectWorkspaceSetupClient();
   const opened = await client.openProject(repoPath);
   if (!opened.workspace) throw new Error(opened.error ?? `Failed to open project ${repoPath}`);
-  await openHomeWithProject(page, repoPath);
+  await gotoAppShell(page);
   await selectWorkspaceInSidebar(page, opened.workspace.id);
   await waitForTabBar(page);
   return { cleanup: () => client.close().catch(() => undefined) };

packages/app/e2e/helpers/pins.ts

@@ -12,6 +12,9 @@ function pinToggle(page: Page, target: PinnedTabTarget) {
 }
 
 function menuItemFor(page: Page, target: PinnedTabTarget) {
+  if (target.kind === "draft") {
+    return page.getByTestId("workspace-new-tab-menu-agent");
+  }
   return page.getByTestId(`workspace-new-tab-menu-${target.kind}`);
 }
 

packages/app/e2e/helpers/rewind-flow.ts

@@ -178,6 +178,7 @@ export async function launchAgent(input: {
   const agent = await client.createAgent({
     ...fullAccessConfig(input.provider),
     cwd: input.cwd,
+    workspaceId: opened.workspace.id,
     title: `rewind-flow-${input.provider}-${randomUUID()}`,
   });
   const handle = {

packages/app/e2e/terminal-keystroke-stress.spec.ts

@@ -139,6 +139,7 @@ async function measureAppBurstEcho(input: {
         : await input.harness.client.createAgent({
             provider: "mock",
             cwd: input.harness.tempRepo.path,
+            workspaceId: input.harness.workspaceId,
             title: "Large WebSocket payload",
             modeId: "load-test",
           });

packages/app/src/components/agent-list.tsx

@@ -77,6 +77,7 @@ function buildHistoricalAgentDetail(agent: AggregatedAgent): Agent {
     },
     title: agent.title,
     cwd: agent.cwd,
+    workspaceId: agent.workspaceId,
     model: null,
     thinkingOptionId: null,
     requiresAttention: agent.requiresAttention,
@@ -101,6 +102,7 @@ function rememberArchivedAgentDetail(agent: AggregatedAgent) {
       ...existing,
       archivedAt: existing?.archivedAt ?? agent.archivedAt,
       cwd: existing?.cwd ?? agent.cwd,
+      workspaceId: existing?.workspaceId ?? agent.workspaceId,
     });
     return next;
   });

packages/app/src/hooks/use-agent-history.ts

@@ -60,6 +60,7 @@ export async function fetchAgentHistoryPage(input: {
       status: agent.status,
       lastActivityAt: agent.lastActivityAt,
       cwd: agent.cwd,
+      workspaceId: agent.workspaceId,
       provider: agent.provider,
       pendingPermissionCount: agent.pendingPermissions.length,
       requiresAttention: agent.requiresAttention,

packages/app/src/hooks/use-aggregated-agents.ts

@@ -78,6 +78,7 @@ export function useAggregatedAgents(options?: {
           status: agent.status,
           lastActivityAt: agent.lastActivityAt,
           cwd: agent.cwd,
+          workspaceId: agent.workspaceId,
           provider: agent.provider,
           pendingPermissionCount: agent.pendingPermissions.length,
           requiresAttention: agent.requiresAttention,

packages/app/src/types/agent-directory.ts

@@ -8,6 +8,7 @@ export type AgentDirectoryEntry = Pick<
   | "status"
   | "lastActivityAt"
   | "cwd"
+  | "workspaceId"
   | "provider"
   | "requiresAttention"
   | "attentionReason"

packages/app/src/workspace-pins/store.ts

@@ -31,6 +31,14 @@ export const usePinnedTargetsStore = create<PinnedTargetsState>()(
     {
       name: "pinned-tab-targets",
       version: 1,
+      merge: (persistedState, currentState) => {
+        const persisted = persistedState as Partial<PinnedTargetsState> | null;
+        return {
+          ...currentState,
+          ...persisted,
+          pinned: persisted?.pinned ?? applyDefaultPinnedTargets([]),
+        };
+      },
       storage: createJSONStorage(() => AsyncStorage),
       partialize: (state) => ({ pinned: state.pinned }),
       migrate: (persistedState, version) => {