Update workspace model ownership flows

packages/app/e2e/helpers/seed-client.ts

@@ -25,11 +25,18 @@ export interface SeedDaemonClient {
     error: string | null;
   }>;
   createWorkspace(input: {
-    backing: "local" | "worktree";
-    cwd?: string;
-    projectId?: string;
-    branch?: string;
-    baseBranch?: string;
+    source:
+      | { kind: "directory"; path: string; projectId?: string }
+      | {
+          kind: "worktree";
+          cwd?: string;
+          projectId?: string;
+          action?: "branch-off" | "checkout";
+          refName?: string;
+          baseBranch?: string;
+          githubPrNumber?: number;
+          worktreeSlug?: string;
+        };
     title?: string;
   }): Promise<{
     workspace: { id: string; name: string } | null;
@@ -64,6 +71,7 @@ export interface SeedDaemonClient {
   createAgent(options: {
     provider: string;
     cwd: string;
+    workspaceId?: string;
     title?: string;
     modeId?: string;
     model?: string;

packages/app/e2e/same-directory-workspaces.spec.ts

@@ -28,9 +28,7 @@ async function createSecondWorkspaceOnSameDir(
   title: string,
 ): Promise<string> {
   const created = await seeded.client.createWorkspace({
-    backing: "local",
-    cwd: seeded.repoPath,
-    projectId: seeded.projectId,
+    source: { kind: "directory", path: seeded.repoPath, projectId: seeded.projectId },
     title,
   });
   if (!created.workspace) {

packages/app/e2e/sidebar-model-b.spec.ts

@@ -26,9 +26,7 @@ function projectNewWorktreeIcon(page: Page, projectKey: string) {
 
 async function seedSecondWorkspace(seeded: SeededWorkspace, title: string): Promise<string> {
   const created = await seeded.client.createWorkspace({
-    backing: "local",
-    cwd: seeded.repoPath,
-    projectId: seeded.projectId,
+    source: { kind: "directory", path: seeded.repoPath, projectId: seeded.projectId },
     title,
   });
   if (!created.workspace) {

packages/app/e2e/workspace-model-regressions.spec.ts

@@ -0,0 +1,101 @@
+import { test, expect } from "./fixtures";
+import {
+  expectComposerEditable,
+  expectComposerVisible,
+  fillComposerDraft,
+} from "./helpers/composer";
+import { clickNewChat, gotoWorkspace } from "./helpers/launcher";
+import { connectNewWorkspaceDaemonClient } from "./helpers/new-workspace";
+import { seedWorkspace, type SeededWorkspace } from "./helpers/seed-client";
+import { getVisibleWorkspaceAgentTabIds } from "./helpers/workspace-tabs";
+
+type NewWorkspaceDaemonClient = Awaited<ReturnType<typeof connectNewWorkspaceDaemonClient>>;
+
+test.describe("Workspace model regressions", () => {
+  let client: NewWorkspaceDaemonClient;
+
+  test.describe.configure({ timeout: 240_000 });
+
+  test.beforeEach(async () => {
+    client = await connectNewWorkspaceDaemonClient();
+  });
+
+  test.afterEach(async () => {
+    await client?.close().catch(() => undefined);
+  });
+
+  test("same-directory workspace does not inherit legacy cwd-only agent tabs", async ({ page }) => {
+    const seeded = await seedWorkspace({ repoPrefix: "workspace-legacy-agents-" });
+
+    try {
+      const legacyAgent = await seeded.client.createAgent({
+        provider: "mock",
+        cwd: seeded.repoPath,
+        title: "Legacy cwd-only agent",
+        modeId: "load-test",
+        model: "ten-second-stream",
+      });
+      const secondWorkspace = await seeded.client.createWorkspace({
+        source: { kind: "directory", path: seeded.repoPath, projectId: seeded.projectId },
+        title: "Fresh workspace",
+      });
+      if (!secondWorkspace.workspace) {
+        throw new Error(secondWorkspace.error ?? "Failed to create same-directory workspace");
+      }
+
+      await gotoWorkspace(page, secondWorkspace.workspace.id);
+
+      await expect
+        .poll(() => getVisibleWorkspaceAgentTabIds(page), { timeout: 30_000 })
+        .toEqual([]);
+
+      await gotoWorkspace(page, seeded.workspaceId);
+      await expect
+        .poll(() => getVisibleWorkspaceAgentTabIds(page), { timeout: 30_000 })
+        .toContain(`workspace-tab-agent_${legacyAgent.id}`);
+    } finally {
+      await seeded.cleanup();
+    }
+  });
+
+  test("new agent tab in a same-directory workspace picks a default model for the saved provider", async ({
+    page,
+  }) => {
+    const seeded: SeededWorkspace = await seedWorkspace({
+      repoPrefix: "workspace-new-agent-model-",
+    });
+
+    try {
+      const secondWorkspace = await seeded.client.createWorkspace({
+        source: { kind: "directory", path: seeded.repoPath, projectId: seeded.projectId },
+        title: "Fresh workspace",
+      });
+      if (!secondWorkspace.workspace) {
+        throw new Error(secondWorkspace.error ?? "Failed to create same-directory workspace");
+      }
+
+      await page.addInitScript(() => {
+        localStorage.setItem(
+          "@paseo:create-agent-preferences",
+          JSON.stringify({
+            provider: "codex",
+            providerPreferences: {
+              codex: { mode: "full-access" },
+            },
+          }),
+        );
+      });
+      await gotoWorkspace(page, secondWorkspace.workspace.id);
+      await clickNewChat(page);
+
+      await expectComposerVisible(page);
+      await expectComposerEditable(page);
+      await fillComposerDraft(page, "d");
+      await expect(page.getByText("No model is available for the selected provider")).toHaveCount(
+        0,
+      );
+    } finally {
+      await seeded.cleanup();
+    }
+  });
+});

packages/app/src/screens/new-workspace-screen.tsx

@@ -791,11 +791,19 @@ async function createMultiplicityWorkspace(input: {
     ? (resolveCheckoutRequest(input.selectedItem, input.currentBranch)?.refName ?? undefined)
     : undefined;
   const payload = await input.client.createWorkspace({
-    backing: input.backing,
-    cwd: input.project.iconWorkingDir,
-    projectId: input.project.projectKey,
-    ...(isWorktree ? { branch: createNameId() } : {}),
-    ...(baseBranch ? { baseBranch } : {}),
+    source: isWorktree
+      ? {
+          kind: "worktree",
+          cwd: input.project.iconWorkingDir,
+          projectId: input.project.projectKey,
+          worktreeSlug: createNameId(),
+          ...(baseBranch ? { baseBranch } : {}),
+        }
+      : {
+          kind: "directory",
+          path: input.project.iconWorkingDir,
+          projectId: input.project.projectKey,
+        },
   });
   if (payload.error || !payload.workspace) {
     throw new Error(payload.error ?? input.createFailedMessage);