diff --git a/apps/desktop/plans/v1-create-scenario-analysis.md b/apps/desktop/plans/v1-create-scenario-analysis.md
new file mode 100644
index 00000000000..8fd4af66375
--- /dev/null
+++ b/apps/desktop/plans/v1-create-scenario-analysis.md
@@ -0,0 +1,198 @@
+# V1 Workspace Creation — Scenario Analysis
+
+Walks through every user scenario in the V1 create flow. Identifies what works, what's wrong, and what V2 should do differently.
+
+---
+
+## Scenario 1: Prompt only (most common)
+
+**User action:** Types "fix the login bug", hits Cmd+Enter. No workspace name, no branch name.
+
+**Renderer** (`PromptGroup.tsx:740-806`):
+1. `displayName = "fix the login bug"` (from `trimmedPrompt`)
+2. `willGenerateAIName = true` (no branchNameEdited, has prompt, no PR)
+3. Shows pending workspace with "generating-branch" status
+4. Calls `generateBranchNameMutation.mutateAsync({ prompt, projectId })` with 30s timeout
+5. **AI succeeds** → `aiBranchName = "fix-login-bug"`
+6. Sends to server: `{ name: undefined, prompt: "fix the login bug", branchName: "fix-login-bug" }`
+
+**Server** (`create.ts:369-374`):
+1. `input.branchName` is set → `branch = sanitizeBranchNameWithMaxLength(withPrefix("fix-login-bug"))` → e.g. `"kiet/fix-login-bug"`
+2. Collision check runs (line 382): `input.branchName?.trim()` is truthy
+3. No existing workspace on that branch → creates new worktree + workspace
+4. `workspace.name = input.name ?? branch = "kiet/fix-login-bug"` (since `name` is undefined)
+5. `isUnnamed: true`
+
+**Post-create** (`useCreateWorkspace.ts:79-100`):
+1. `wasExisting = false` → sets up pending terminal, runs setup script
+2. Navigates to workspace
+
+**UX issues:**
+- ✅ Works well when AI succeeds
+- ❌ **Workspace name becomes the branch name** (`"kiet/fix-login-bug"`) because `input.name` was undefined. User sees a slash-separated branch string as their workspace title instead of their prompt.
+- The `isUnnamed: true` flag triggers a post-create auto-rename via `attemptWorkspaceAutoRenameFromPrompt` in `initializeWorkspaceWorktree` (`create.ts:523`), which is ANOTHER AI call. So there are TWO serial AI calls: one for branch name, one for workspace display name.
+
+---
+
+## Scenario 2: Prompt only, AI branch gen fails
+
+**User action:** Same as Scenario 1 but AI times out or auth fails.
+
+**Renderer** (`PromptGroup.tsx:780-806`):
+1. Catches error, shows `"Using random branch name"` toast
+2. `aiBranchName = null`
+3. Sends to server: `{ name: undefined, prompt: "fix the login bug", branchName: undefined }`
+
+**Server** (`create.ts:376-380`):
+1. `input.branchName` is undefined → hits the `else` branch
+2. `branch = generateBranchName({ existingBranches, authorPrefix })` → e.g. `"kiet/cheerful-umbrella"`
+3. Collision check at line 382: `input.branchName?.trim()` is **falsy** → **collision check SKIPPED entirely**
+4. Creates new worktree + workspace
+5. `workspace.name = "kiet/cheerful-umbrella"`
+
+**UX issues:**
+- ✅ Always creates a new workspace (random name can't collide)
+- ❌ Workspace name is `"kiet/cheerful-umbrella"` — meaningless to the user
+- ❌ Post-create auto-rename (another AI call) may also fail, leaving the random name permanently
+
+---
+
+## Scenario 3: Explicit workspace name, no branch name
+
+**User action:** Types workspace name "Login Fix", types prompt, no branch name.
+
+**Renderer** (`PromptGroup.tsx:984-989`):
+1. `workspaceNameEdited = true`, `workspaceName = "Login Fix"`
+2. `branchNameEdited = false`
+3. AI branch gen runs (same as Scenario 1)
+4. Sends: `{ name: "Login Fix", prompt: "...", branchName: "fix-login-bug" }`
+
+**Server**:
+1. Branch from AI name → `"kiet/fix-login-bug"`
+2. Collision check runs (branchName was set)
+3. Creates workspace with `name: "Login Fix"` (input.name is set)
+4. `isUnnamed: false`
+
+**UX:** ✅ Works correctly. User sees "Login Fix" as workspace name.
+
+---
+
+## Scenario 4: Explicit branch name, no workspace name
+
+**User action:** Types branch name "feature/auth-fix" in the branch input, types prompt.
+
+**Renderer** (`PromptGroup.tsx:990-999`):
+1. `branchNameEdited = true`, `branchName = "feature/auth-fix"`
+2. `willGenerateAIName = false` (branchNameEdited is true)
+3. AI branch gen does NOT run
+4. Sends: `{ name: undefined, prompt: "...", branchName: "feature/auth-fix" }`
+
+**Server** (`create.ts:369-374`):
+1. `branch = sanitizeBranchNameWithMaxLength(withPrefix("feature/auth-fix"))` → `"kiet/feature/auth-fix"`
+2. Collision check runs (branchName was set)
+3. If branch already has a workspace → returns `{ wasExisting: true }`, navigates to existing
+4. If no collision → creates new, `workspace.name = "kiet/feature/auth-fix"`, `isUnnamed: true`
+
+**UX issues:**
+- ❌ Collision check fires because `input.branchName?.trim()` is truthy — **even though the user might not intend to open an existing workspace**. They typed a branch name for a NEW workspace and it silently opens something else.
+- ❌ Workspace name is the prefixed branch string, not the prompt
+- ❌ No user confirmation: "This branch already has a workspace, open it?" — just silently navigates
+
+---
+
+## Scenario 5: No prompt, no name, no branch (empty create)
+
+**User action:** Hits Cmd+Enter with nothing filled in.
+
+**Renderer** (`PromptGroup.tsx:740-746`):
+1. `displayName = "New workspace"`
+2. `willGenerateAIName = false` (no trimmedPrompt)
+3. No AI branch gen
+4. Sends: `{ name: undefined, prompt: undefined, branchName: undefined }`
+
+**Server** (`create.ts:376-380`):
+1. All undefined → `branch = generateBranchName(...)` → random `"kiet/cheerful-umbrella"`
+2. Collision check skipped (branchName wasn't set)
+3. Creates workspace with `name: "kiet/cheerful-umbrella"`, `isUnnamed: true`
+
+**UX issues:**
+- ✅ Always works (random name)
+- ❌ Meaningless workspace name
+- ❌ Post-create rename has no prompt to derive from, so the auto-rename AI call has nothing to work with → stays as random name
+
+---
+
+## Scenario 6: PR link (create from PR)
+
+**User action:** Links a PR, types a prompt, hits create.
+
+**Renderer** (`PromptGroup.tsx:960-978`):
+1. `linkedPR` is set → takes a completely different code path
+2. Calls `createFromPr.mutateAsyncWithSetup({ projectId, prUrl }, launchRequest)`
+3. Does NOT call `createWorkspace` at all
+
+**V1 `createFromPr`** (`useCreateFromPr.ts`):
+1. Calls `electronTrpc.workspaces.createFromPr.mutateAsync({ projectId, prUrl })`
+2. Server clones the PR's head branch, creates worktree
+3. Workspace name = PR title
+4. Branch name = PR head branch
+
+**UX:** ✅ Works well. PR provides all naming context.
+
+---
+
+## Scenario 7: Branch selected from base-branch picker, then create
+
+**User action:** Opens base-branch picker, selects `feature/existing`, then hits create with a prompt.
+
+**Renderer**: 
+1. `compareBaseBranch = "feature/existing"` is set
+2. This is the BASE branch (what the new branch forks from), NOT the workspace branch
+3. AI branch gen runs normally, creates a new branch from `feature/existing`
+
+**UX:** ✅ Works correctly. The base-branch picker only sets the fork point.
+
+---
+
+## Scenario 8: Branch selected from base-branch picker, "Open" action on existing workspace
+
+**User action:** Opens base-branch picker, sees a branch with an active workspace, clicks "Open".
+
+**Renderer** (`PromptGroup.tsx:1111-1117`):
+1. Calls `handleOpenActiveWorkspace(workspaceId)`
+2. Closes modal, navigates to existing workspace
+3. Does NOT call create at all
+
+**UX:** ✅ Works correctly. Clear intent from user action.
+
+---
+
+## Summary of V1 issues
+
+### Naming
+1. **Workspace display name is the branch name when user didn't type a name.** The user typed a prompt but the workspace gets named `"kiet/fix-login-bug"` or `"kiet/cheerful-umbrella"` instead of their prompt or a human-friendly derivative.
+2. **Two serial AI calls** — one for branch name (renderer), one for auto-rename (server). Both can fail independently, and the auto-rename runs after create, so the user sees the branch name flash then change.
+3. **Random names are meaningless** when AI fails — `"cheerful-umbrella"` tells you nothing about the workspace.
+
+### Collision behavior
+4. **Silent open on branch collision** — when user types a branch name that already has a workspace, V1 silently navigates to the existing one with `wasExisting: true` and toast still says "Workspace created." No confirmation dialog, no visual indication that the user's prompt/attachments/agent selection were all ignored.
+5. **Collision check gate is fragile** — it's based on `input.branchName?.trim()`, which means collision check only runs for user-typed branch names. But the USER might have typed a branch name intending to create a new workspace on that branch. The condition conflates "user provided a name" with "check for collisions."
+
+### Architecture
+6. **Branch name generation split across renderer + server** — the renderer does AI generation, the server does random fallback. The server also does prefix application. Two different processes own parts of the branch name logic, making it hard to reason about what name you'll get.
+7. **`useExistingBranch` boolean is a separate code path** — adds complexity to the input schema and collision logic for what could be a single `behavior.onExistingBranch: "use" | "error"` flag.
+8. **`sourceWorkspaceId` adds another code path** for forking from an existing workspace's branch — but none of this is exercised by the modal UI. It's dead surface area in the create endpoint.
+
+---
+
+## What V2 should do differently
+
+| V1 problem | V2 approach |
+|------------|-------------|
+| Workspace name = branch name | `workspaceName = input.prompt \|\| branchName` — prompt is always preferred for display name |
+| Two serial AI calls | Single AI call (renderer) for branch name; workspace display name derived from prompt synchronously (no second AI call) |
+| Silent open on collision | When branch collision detected and user provided explicit branch: return `opened_existing_workspace` outcome + renderer shows distinct toast "Opened existing workspace" (not "Workspace created") |
+| Random names when AI fails | Derive from prompt slug (`sanitizeBranchNameWithMaxLength(prompt)`) before falling back to random. Random is last resort, not first fallback. |
+| Collision check gate tied to `input.branchName` | Gate on a semantic flag: was the branch name auto-generated or user-provided? Only run collision check on user-provided names. |
+| Branch name logic split renderer/server | Server owns all branch name resolution. Renderer sends `prompt` + optional `branchName`. Server derives branch from prompt, applies deduplication, skips collision check on auto-generated names. |
+| `useExistingBranch` / `sourceWorkspaceId` dead paths | Not in V2 schema. Single `behavior.onExistingWorkspace` / `behavior.onExistingWorktree` flags. |
diff --git a/apps/desktop/plans/v2-create-decisions-final.md b/apps/desktop/plans/v2-create-decisions-final.md
new file mode 100644
index 00000000000..367e272ce0a
--- /dev/null
+++ b/apps/desktop/plans/v2-create-decisions-final.md
@@ -0,0 +1,124 @@
+# V2 Create Workspace — Final Decisions
+
+## 1. Branch name generation
+
+**Owner:** Renderer.
+
+**Phase 1 flow:**
+1. User typed a branch name → use it
+2. No branch name → derive from prompt slug (`sanitizeBranchNameWithMaxLength(prompt)` → `fix-the-login-bug`)
+3. No prompt either → `workspace-${crypto.randomUUID().slice(0, 8)}`
+
+Host-service receives a branch name every time. Never `undefined`. Host-service deduplicates it (decision #8).
+
+**Phase 2:** AI branch gen runs async in parallel — fire at submit, don't block create. If AI returns before the host-service call, swap in the better name. Requires `workspaceCreation.generateBranchName` on host-service (decision #3).
+
+## 2. Workspace display name
+
+**Owner:** Renderer.
+
+Renderer sends `workspaceName` explicitly:
+- User typed a name → use it
+- No name → use prompt text (truncated)
+- No prompt → use branch name
+
+No post-create AI rename. No flash. What you see in the modal is what you get.
+
+## 3. AI branch name generation
+
+**Behavior:** Not in Phase 1. Use prompt slug (`sanitizeBranchNameWithMaxLength(prompt)`) — purely client-side, no backend call, no project ID needed.
+
+**No `electronTrpc` calls from V2 modal for workspace operations.** The existing `electronTrpc.workspaces.generateBranchName` is a V1 endpoint that requires a V1 local project ID. The V2 modal must not call it — that's a boundary violation.
+
+**Phase 2 migration:** Add `workspaceCreation.generateBranchName({ projectId, prompt })` to host-service. It has the repo (for branch dedup) and needs a model provider for the AI call. The gap is the host-service doesn't have access to the user's AI credentials today (`callSmallModel` reads from Electron settings). Either extend the host-service model provider for utility calls, or proxy through it to the user's config.
+
+**How V1's AI branch gen works** (for reference):
+1. `callSmallModel` picks user's configured provider (OpenAI/Anthropic)
+2. Sends prompt with instruction: "Generate a concise git branch name (2-4 words, kebab-case)"
+3. Sanitizes + deduplicates against existing branches
+4. Returns name without prefix (server applies prefix)
+5. Needs: repo path (for branch list), git author config (for prefix), AI credentials
+
+**File:** `apps/desktop/src/lib/trpc/routers/workspaces/utils/ai-branch-name.ts`
+
+## 4. Collision detection
+
+**None.** No collision detection. No `opened_existing_workspace` outcome from the create modal flow.
+
+The host-service receives a branch name and deduplicates it against existing branches. If `fix-the-login-bug` exists, it becomes `fix-the-login-bug-2`. Always creates a new workspace. Never silently opens an existing one.
+
+If the user wants to open an existing workspace, they use the sidebar.
+
+## 5. Collision UX
+
+**N/A.** There is no collision — the branch name is always unique after dedup. The create modal always creates.
+
+Remove the `opened_existing_workspace`, `opened_worktree`, and `adopted_external_worktree` outcome paths from the create flow. The only outcome is `created_workspace`.
+
+## 6. Modal close timing
+
+**Behavior:** Close immediately on submit. Show pending workspace skeleton in sidebar. Navigate when create succeeds.
+
+**Draft preservation:** Stash a snapshot of the draft into a zustand atom before closing. Close + reset the modal normally. On create failure, restore the stash and reopen the modal so the user can retry. On create success, clear the stash.
+
+This doesn't depend on the context provider staying mounted — the zustand atom survives route changes and component lifecycle.
+
+## 7. Pending workspace phases
+
+**Single phase:** `creating`. That's it.
+
+No `generating-branch` (no blocking AI), no `preparing` (no renderer-side prep between close and API call). Skeleton appears, host-service call runs, skeleton resolves to workspace or error.
+
+## 8. Worktree creation always creates a new branch
+
+**Behavior:** Always `git worktree add -b branchName worktreePath baseBranch`. If the branch name already exists (despite dedup), fall back to a new deduplicated name — never check out the existing branch.
+
+Checking out an existing branch into a worktree is a separate intent (e.g. "import existing branch" or `createFromPr`). The create flow should never silently check out someone else's branch. If the `-b` fails because the branch exists, append a suffix and retry — don't switch to a checkout.
+
+V1's try/catch pattern (`worktree add` then fallback to `worktree add -b`) conflates "create" and "checkout" intents. V2 keeps them separate.
+
+## 9. Branch dedup
+
+**Owner:** Host-service (at create time).
+
+Host-service has the authoritative branch list from git at create time. It deduplicates the incoming branch name against existing branches. `fix-the-login-bug` → `fix-the-login-bug-2` if it exists. Renderer sends its best-effort name; host-service guarantees uniqueness.
+
+## 9. `sanitizeBranchNameWithMaxLength` location
+
+**Decision:** Copy into host-service for dedup. Renderer keeps its copy for the branch name preview in the UI. Both need it — renderer for preview, host-service for dedup + sanitization of the final name.
+
+## 10. Host-service input schema
+
+`names.branchName` is always provided by renderer. `names.workspaceName` is always provided by renderer. Host-service sanitizes + deduplicates `branchName` before creating the worktree. Uses `workspaceName` as-is for the cloud row display name.
+
+## 11. Return shape
+
+Simplified. No `outcome` field — create always creates.
+
+```ts
+{ workspace: { id, branch, ... }, warnings: string[] }
+```
+
+Remove `opened_existing_workspace`, `opened_worktree`, `adopted_external_worktree` outcomes and all their code paths from the host-service. The create endpoint does one thing: create a workspace on a deduplicated branch name.
+
+## 12. PR create path
+
+**Separate endpoint:** `workspaceCreation.createFromPr({ projectId, prUrl })`.
+
+The PR flow is fundamentally different from normal create — it parses a PR URL, fetches metadata (title, head branch, fork info), checks out the PR's branch with remote tracking, and handles cross-repo fork PRs. None of this overlaps with the normal branch-name-from-prompt flow.
+
+V1 does this as a separate `createFromPr` mutation that takes just `{ projectId, prUrl }` and the server does all resolution. V2 should do the same, using Octokit instead of `gh` CLI.
+
+**Not in Phase 1.** For now, when user links a PR, the renderer uses the PR's head branch as `branchName` and PR title as `workspaceName`, then calls the normal `create` endpoint. This creates a worktree on a new local branch — it doesn't check out the actual PR with remote tracking. Good enough for Phase 1, but loses fork PR support and proper remote setup.
+
+Phase 2 adds `workspaceCreation.createFromPr` with full PR checkout semantics.
+
+## 13. Init/setup flow
+
+**Streamlined.** After worktree + cloud row creation, if `runSetupScript` is true, the host-service runs the setup script (`.superset/setup.sh` or equivalent) inside the worktree before returning. No background job manager, no progress events, no separate init system.
+
+Create blocks until setup is done. The workspace is fully ready when the renderer navigates to it.
+
+V1's complexity (workspaceInitManager, initializeWorkspaceWorktree, async AI rename, progress tracking) is unnecessary. The only post-create work is running a shell script in the worktree directory.
+
+If setup scripts turn out to be too slow (>10s), we can split later: return immediately, run setup async, show "running setup..." in the workspace view. But start simple.
diff --git a/apps/desktop/plans/v2-workspace-init-status.md b/apps/desktop/plans/v2-workspace-init-status.md
new file mode 100644
index 00000000000..e8921938d4a
--- /dev/null
+++ b/apps/desktop/plans/v2-workspace-init-status.md
@@ -0,0 +1,298 @@
+# V2 Workspace Creation Status — Design
+
+## Concept
+
+When the user creates a workspace, navigate immediately to a pending workspace page. The host-service writes progress to an in-memory map that the pending page polls for step-by-step detail. The create promise runs independently of component lifecycle (fire-and-forget from PromptGroup) and updates the `pendingWorkspaces` collection on resolve/reject.
+
+Multiple workspaces can be creating simultaneously. Each has its own sidebar skeleton, clickable to view progress.
+
+## Ownership
+
+Three actors, each with a clear responsibility:
+
+1. **PromptGroup** (fires create, owns the promise): inserts pending row into collection, fires `void createWorkspace(...)`, updates collection to `succeeded`/`failed` when the promise resolves/rejects. Runs independently of component lifecycle — the async closure keeps running after the modal unmounts. Only touches the collection (not React state), so no stale-component issues.
+
+2. **Sidebar** (always visible): reads `pendingWorkspaces` via `useLiveQuery`. Shows skeleton + status. Clickable. Does not poll — just reacts to collection changes.
+
+3. **Pending page** (optional progress viewer): polls `workspaceCreation.getProgress({ pendingId })` every 500ms for step-by-step detail. Only runs while the page is mounted. If user navigates away, polling stops but create continues. On `succeeded`, auto-navigates to real workspace.
+
+## Data model: `pendingWorkspaces` local collection
+
+Backed by `localStorageCollectionOptions` from `@tanstack/react-db`, same as `v2SidebarProjects`, `v2WorkspaceLocalState`, etc. Persists to localStorage, survives app restart.
+
+```ts
+export const pendingWorkspaceSchema = z.object({
+    // Identity
+    id: z.string().uuid(),             // renderer-generated, NOT the eventual workspace ID
+    projectId: z.string().uuid(),
+
+    // Draft data (preserved for retry on failure)
+    name: z.string(),                  // resolved workspace display name
+    branchName: z.string(),            // resolved branch name
+    prompt: z.string(),
+    compareBaseBranch: z.string().nullable(),
+    runSetupScript: z.boolean(),
+    linkedIssues: z.array(z.unknown()),
+    linkedPR: z.unknown().nullable(),
+    hostTarget: z.unknown(),           // WorkspaceHostTarget
+
+    // Status (updated by PromptGroup's create promise)
+    status: z.enum(["creating", "failed", "succeeded"]),
+    error: z.string().nullable(),      // set when status === "failed"
+    workspaceId: z.string().nullable(),// set when status === "succeeded"
+
+    createdAt: persistedDateSchema,
+});
+```
+
+**Lifecycle:**
+1. On submit: insert row with `status: "creating"`
+2. Promise resolves: set `status: "succeeded"`, `workspaceId: realId`
+3. Promise rejects: set `status: "failed"`, `error: message`
+4. On navigate to real workspace: delete the pending row
+5. On retry (from failed page): reset `status: "creating"`, re-fire create
+6. On dismiss: delete the pending row
+
+## Progress polling
+
+### Host-service: in-memory progress map
+
+```ts
+// Module-level (not persisted, not in DB)
+const createProgress = new Map<string, { step: string }>();
+```
+
+The create mutation writes its current step as it progresses:
+
+```ts
+createProgress.set(input.pendingId, { step: "ensuring_repo" });
+// ... clone/resolve ...
+createProgress.set(input.pendingId, { step: "creating_worktree" });
+// ... git worktree add ...
+createProgress.set(input.pendingId, { step: "registering" });
+// ... cloud API ...
+createProgress.delete(input.pendingId); // done — tRPC response carries the result
+```
+
+### Host-service: query endpoint
+
+```ts
+workspaceCreation.getProgress({ pendingId })
+// → { step: "creating_worktree" } | null (not found / already done)
+```
+
+### Pending page: polls with react-query
+
+```ts
+const { data: progress } = useQuery({
+    queryKey: ["workspaceCreation", "getProgress", pendingId],
+    queryFn: () => client.workspaceCreation.getProgress.query({ pendingId }),
+    refetchInterval: 500,
+    enabled: pendingWorkspace?.status === "creating",
+});
+```
+
+~10 small queries over 5 seconds. Polling stops when status changes to `succeeded` or `failed` (detected via `useLiveQuery` on the collection).
+
+## Flow
+
+```
+User clicks Create
+    ↓
+PromptGroup:
+  1. Compute names (branch, workspace)
+  2. Insert into pendingWorkspaces collection (status: "creating")
+  3. Store attachments in IndexedDB
+  4. Close modal
+  5. Navigate to /v2-workspace/pending/$pendingId
+  6. Fire void createWorkspace(...) — runs independently
+    ↓
+Pending page mounts, starts polling:
+┌──────────────────────────────────────────┐
+│ fix the login bug                        │
+│ ⑂ fix-the-login-bug                     │
+│                                          │
+│ Creating workspace...                    │
+│ ├─ Ensuring local repository      ✓     │
+│ ├─ Creating worktree              ✓     │
+│ ├─ Registering workspace          ●     │
+│                                          │
+└──────────────────────────────────────────┘
+    ↓
+PromptGroup's create promise resolves:
+  → Updates collection: status: "succeeded", workspaceId: realId
+    ↓
+Pending page detects succeeded (via useLiveQuery):
+  → Stops polling
+  → Navigates to /v2-workspace/$workspaceId
+  → Dispatches initialCommands to terminal pane
+    ↓
+Normal workspace UI (setup running in terminal)
+```
+
+**On failure:**
+```
+PromptGroup's create promise rejects:
+  → Updates collection: status: "failed", error: message
+    ↓
+Pending page detects failed (via useLiveQuery):
+  → Stops polling
+  → Shows error + Retry + Dismiss
+```
+
+**If user navigates away from pending page:**
+- Polling stops (component unmounts)
+- Create promise still runs (it's a closure, not tied to React lifecycle)
+- Collection still gets updated on resolve/reject
+- Sidebar skeleton still reflects current status
+- User can click skeleton to return to pending page
+
+## Sidebar behavior
+
+The sidebar renders pending workspaces from the `pendingWorkspaces` collection alongside real workspaces from `v2Workspaces`:
+
+- **Creating:** workspace name + spinner + "Creating..." label
+- **Failed:** workspace name + error badge
+- **Succeeded:** brief flash, then replaced by the real workspace from collections
+
+All states are clickable — navigate to `/v2-workspace/pending/$id`.
+
+## Input schema update
+
+Add `pendingId` to create input:
+
+```ts
+workspaceCreation.create({
+    pendingId: z.string(),    // renderer-generated UUID for progress polling correlation
+    projectId: z.string(),
+    names: { ... },
+    composer: { ... },
+    linkedContext: { ... },
+})
+```
+
+## Return shape update
+
+Add `initialCommands`:
+
+```ts
+{
+    workspace: { id, branch, ... },
+    initialCommands: string[] | null,
+    warnings: string[],
+}
+```
+
+Host-service reads setup config, returns commands, does not execute them. Renderer dispatches to terminal pane.
+
+## Pending workspace route
+
+**Route:** `/v2-workspace/pending/$pendingId`
+
+- Reads pending workspace from `pendingWorkspaces` collection via `useLiveQuery`
+- Polls `workspaceCreation.getProgress` for step detail while `status === "creating"`
+- Shows workspace name + branch name + step progress
+- On `succeeded` (detected via collection): auto-navigate to `/v2-workspace/$workspaceId`
+- On `failed` (detected via collection): error message + Retry + Dismiss
+
+## Retry flow
+
+From the failed pending page:
+1. User clicks Retry
+2. Update the pending row: `status: "creating"`, clear `error`
+3. Re-fire `createWorkspace` with the same data from the pending row + attachments from IndexedDB
+4. Same polling + collection-update flow as initial create
+
+## Replaces
+
+| Old | New |
+|-----|-----|
+| `pendingWorkspace` in zustand store (single item) | `pendingWorkspaces` local collection (multiple) |
+| `stashedDraft` zustand atom | Draft data lives in the pending row itself |
+| `setPendingWorkspace` / `clearPendingWorkspace` / `setPendingWorkspaceStatus` | Collection insert / update / delete |
+| `restoreStashedDraft` (reopen modal) | Retry from pending page (no modal reopen) |
+
+## Files to change
+
+### Host-service
+| File | Change |
+|------|--------|
+| `.../workspace-creation/workspace-creation.ts` | Accept `pendingId`, write to in-memory progress map, add `getProgress` query, remove `execSync`, return `initialCommands` |
+
+### Renderer — data
+| File | Change |
+|------|--------|
+| `.../CollectionsProvider/dashboardSidebarLocal/schema.ts` | Add `pendingWorkspaceSchema` |
+| `.../CollectionsProvider/collections.ts` | Add `pendingWorkspaces` collection |
+| `renderer/stores/new-workspace-modal.ts` | Remove `pendingWorkspace`, `stashedDraft` and related actions (moved to collection) |
+| **New:** `renderer/lib/pending-attachment-store.ts` | IndexedDB wrapper for attachment blobs |
+
+### Renderer — UI
+| File | Change |
+|------|--------|
+| **New:** `.../v2-workspace/pending/$pendingId/page.tsx` | Pending workspace progress page (polls getProgress, navigates on success) |
+| `.../PromptGroup/PromptGroup.tsx` | Insert into collection, store attachments in IndexedDB, fire-and-forget create, update collection on resolve/reject |
+| `.../DashboardSidebar/...` | Query `pendingWorkspaces` collection, render skeletons |
+
+## Attachments: IndexedDB blob storage
+
+Attachments (images, PDFs, markdown files) can't go in the localStorage-backed collection — they're too large. Store raw blobs in IndexedDB alongside the pending workspace metadata.
+
+### Storage pattern
+
+```ts
+// Key scheme: "pending-attachments/${pendingId}/${index}-${filename}"
+
+// On import (user adds file in modal):
+const blob = await fetch(blobUrl).then(r => r.blob());
+await idb.put("pending-attachments", {
+    blob,
+    mediaType: file.mediaType,
+    filename: file.filename,
+}, `${pendingId}/${index}-${file.filename}`);
+
+// On submit:
+// Read blobs from IndexedDB → convert to data URLs → send in API payload
+
+// On retry:
+// Read same blobs → convert again
+
+// On success or dismiss:
+// Delete all entries matching pendingId prefix
+```
+
+### No compression
+
+Images and PDFs are already compressed — gzipping saves 0-2%. IndexedDB has no practical size limit. These blobs are ephemeral (seconds to minutes). Not worth the CPU cost.
+
+### Pending workspace row stores metadata only
+
+The `pendingWorkspaces` collection row holds attachment metadata (not data):
+
+```ts
+attachments: z.array(z.object({
+    filename: z.string(),
+    mediaType: z.string(),
+    size: z.number(),
+})).default([]),
+```
+
+The actual blobs are in IndexedDB, keyed by `pendingId`.
+
+### Files
+
+| File | Change |
+|------|--------|
+| **New:** `renderer/lib/pending-attachment-store.ts` | IndexedDB wrapper: `storeAttachments(pendingId, files)`, `loadAttachments(pendingId)`, `clearAttachments(pendingId)` |
+| `.../PromptGroup/PromptGroup.tsx` | Store attachments to IndexedDB on submit, load on retry |
+
+## Not in scope
+
+- Attachment compression (not needed — IndexedDB has no size limit, most files already compressed)
+- Agent launch (Phase 2)
+- AI workspace rename (dropped)
+- Streaming setup output (setup runs in terminal pane — user sees it live)
+
+## TODO: cleanup
+
+- **Clean up module-level `createProgress` Map.** Entries are deleted on create completion, but if the process crashes mid-create or the promise is abandoned, stale entries leak. Add a TTL sweep (e.g. delete entries older than 5 minutes on each `getProgress` call) or use a `WeakRef`-based approach. Not urgent — the map holds tiny objects and the host-service restarts clear it.
diff --git a/apps/desktop/src/renderer/lib/formatRelativeTime/formatRelativeTime.test.ts b/apps/desktop/src/renderer/lib/formatRelativeTime/formatRelativeTime.test.ts
index 7424e33e990..3787653bac8 100644
--- a/apps/desktop/src/renderer/lib/formatRelativeTime/formatRelativeTime.test.ts
+++ b/apps/desktop/src/renderer/lib/formatRelativeTime/formatRelativeTime.test.ts
@@ -16,11 +16,18 @@ describe("formatRelativeTime", () => {
 		Date.now = originalDateNow;
 	};
 
-	it('returns "now" for timestamps less than 1 minute ago', () => {
+	it('returns "now" for timestamps less than 5 seconds ago', () => {
 		mockNow();
 		expect(formatRelativeTime(NOW)).toBe("now");
-		expect(formatRelativeTime(NOW - 30 * 1000)).toBe("now"); // 30 seconds ago
-		expect(formatRelativeTime(NOW - 59 * 1000)).toBe("now"); // 59 seconds ago
+		expect(formatRelativeTime(NOW - 4 * 1000)).toBe("now");
+		restoreNow();
+	});
+
+	it("returns seconds for timestamps between 5-59 seconds ago", () => {
+		mockNow();
+		expect(formatRelativeTime(NOW - 5 * 1000)).toBe("5s");
+		expect(formatRelativeTime(NOW - 30 * 1000)).toBe("30s");
+		expect(formatRelativeTime(NOW - 59 * 1000)).toBe("59s");
 		restoreNow();
 	});
 
diff --git a/apps/desktop/src/renderer/lib/formatRelativeTime/formatRelativeTime.ts b/apps/desktop/src/renderer/lib/formatRelativeTime/formatRelativeTime.ts
index a55ed489e2b..27bed8ba713 100644
--- a/apps/desktop/src/renderer/lib/formatRelativeTime/formatRelativeTime.ts
+++ b/apps/desktop/src/renderer/lib/formatRelativeTime/formatRelativeTime.ts
@@ -1,12 +1,14 @@
 export function formatRelativeTime(timestamp: number): string {
 	const now = Date.now();
 	const diffMs = now - timestamp;
+	const diffSeconds = Math.floor(diffMs / 1000);
 	const diffMinutes = Math.floor(diffMs / 60000);
 	const diffHours = Math.floor(diffMinutes / 60);
 	const diffDays = Math.floor(diffHours / 24);
 	const diffMonths = Math.floor(diffDays / 30);
 
-	if (diffMinutes < 1) return "now";
+	if (diffSeconds < 5) return "now";
+	if (diffMinutes < 1) return `${diffSeconds}s`;
 	if (diffMinutes < 60) return `${diffMinutes}m`;
 	if (diffHours < 24) return `${diffHours}h`;
 	if (diffDays < 30) return `${diffDays}d`;
diff --git a/apps/desktop/src/renderer/lib/pending-attachment-store.ts b/apps/desktop/src/renderer/lib/pending-attachment-store.ts
new file mode 100644
index 00000000000..aeb450811f9
--- /dev/null
+++ b/apps/desktop/src/renderer/lib/pending-attachment-store.ts
@@ -0,0 +1,138 @@
+/**
+ * IndexedDB store for pending workspace attachment blobs.
+ * Blobs are keyed by `${pendingId}/${index}` and stored raw (no compression).
+ */
+
+const DB_NAME = "superset-pending-attachments";
+const STORE_NAME = "blobs";
+const DB_VERSION = 1;
+
+interface StoredAttachment {
+	blob: Blob;
+	mediaType: string;
+	filename: string;
+}
+
+function openDb(): Promise<IDBDatabase> {
+	return new Promise((resolve, reject) => {
+		const request = indexedDB.open(DB_NAME, DB_VERSION);
+		request.onupgradeneeded = () => {
+			const db = request.result;
+			if (!db.objectStoreNames.contains(STORE_NAME)) {
+				db.createObjectStore(STORE_NAME);
+			}
+		};
+		request.onsuccess = () => resolve(request.result);
+		request.onerror = () => reject(request.error);
+	});
+}
+
+/**
+ * Store attachment blobs from the PromptInput into IndexedDB.
+ * Call before closing the modal so blobs survive for retry.
+ */
+export async function storeAttachments(
+	pendingId: string,
+	files: Array<{ url: string; mediaType: string; filename?: string }>,
+): Promise<void> {
+	if (files.length === 0) return;
+
+	const db = await openDb();
+	const store = db.transaction(STORE_NAME, "readwrite").objectStore(STORE_NAME);
+
+	await Promise.all(
+		files.map(async (file) => {
+			const blobId = crypto.randomUUID();
+			const response = await fetch(file.url);
+			const blob = await response.blob();
+			const value: StoredAttachment = {
+				blob,
+				mediaType: file.mediaType,
+				filename: file.filename ?? "attachment",
+			};
+			return new Promise<void>((resolve, reject) => {
+				const request = store.put(value, `${pendingId}/${blobId}`);
+				request.onsuccess = () => resolve();
+				request.onerror = () => reject(request.error);
+			});
+		}),
+	);
+
+	db.close();
+}
+
+/**
+ * Load stored attachment blobs and convert them to data URLs
+ * for the API payload. Used on retry.
+ */
+export async function loadAttachments(
+	pendingId: string,
+): Promise<Array<{ data: string; mediaType: string; filename: string }>> {
+	const db = await openDb();
+	const store = db.transaction(STORE_NAME, "readonly").objectStore(STORE_NAME);
+
+	const entries: StoredAttachment[] = await new Promise((resolve, reject) => {
+		const prefix = `${pendingId}/`;
+		const range = IDBKeyRange.bound(prefix, `${prefix}\uffff`);
+		const request = store.openCursor(range);
+		const results: StoredAttachment[] = [];
+
+		request.onsuccess = () => {
+			const cursor = request.result;
+			if (!cursor) {
+				resolve(results);
+				return;
+			}
+			results.push(cursor.value as StoredAttachment);
+			cursor.continue();
+		};
+		request.onerror = () => reject(request.error);
+	});
+
+	db.close();
+
+	return Promise.all(
+		entries.map(async (entry) => ({
+			data: await blobToDataUrl(entry.blob),
+			mediaType: entry.mediaType,
+			filename: entry.filename,
+		})),
+	);
+}
+
+/**
+ * Delete all stored attachments for a pending workspace.
+ * Call on create success or dismiss.
+ */
+export async function clearAttachments(pendingId: string): Promise<void> {
+	const db = await openDb();
+	const store = db.transaction(STORE_NAME, "readwrite").objectStore(STORE_NAME);
+
+	await new Promise<void>((resolve, reject) => {
+		const prefix = `${pendingId}/`;
+		const range = IDBKeyRange.bound(prefix, `${prefix}\uffff`);
+		const request = store.openCursor(range);
+
+		request.onsuccess = () => {
+			const cursor = request.result;
+			if (!cursor) {
+				resolve();
+				return;
+			}
+			cursor.delete();
+			cursor.continue();
+		};
+		request.onerror = () => reject(request.error);
+	});
+
+	db.close();
+}
+
+function blobToDataUrl(blob: Blob): Promise<string> {
+	return new Promise((resolve, reject) => {
+		const reader = new FileReader();
+		reader.onloadend = () => resolve(reader.result as string);
+		reader.onerror = () => reject(new Error("Failed to read blob"));
+		reader.readAsDataURL(blob);
+	});
+}
diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/components/DashboardSidebar/components/DashboardSidebarWorkspaceItem/DashboardSidebarWorkspaceItem.tsx b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/components/DashboardSidebar/components/DashboardSidebarWorkspaceItem/DashboardSidebarWorkspaceItem.tsx
index 1fc60f6f72f..a825932302c 100644
--- a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/components/DashboardSidebar/components/DashboardSidebarWorkspaceItem/DashboardSidebarWorkspaceItem.tsx
+++ b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/components/DashboardSidebar/components/DashboardSidebarWorkspaceItem/DashboardSidebarWorkspaceItem.tsx
@@ -1,3 +1,4 @@
+import { useNavigate } from "@tanstack/react-router";
 import { useDiffStats } from "renderer/hooks/host-service/useDiffStats";
 import type { DashboardSidebarWorkspace } from "../../types";
 import { DashboardSidebarDeleteDialog } from "../DashboardSidebarDeleteDialog";
@@ -56,7 +57,15 @@ export function DashboardSidebarWorkspaceItem({
 		workspaceName: name,
 	});
 
-	const isCreating = !!creationStatus;
+	const navigate = useNavigate();
+	const isPending = !!creationStatus;
+	const handlePendingClick = isPending
+		? () => {
+				void navigate({
+					to: `/pending/${id}` as string,
+				});
+			}
+		: undefined;
 
 	if (isCollapsed) {
 		const content = (
@@ -72,9 +81,9 @@ export function DashboardSidebarWorkspaceItem({
 				<DashboardSidebarCollapsedWorkspaceButton
 					hostType={hostType}
 					isActive={isActive}
-					onClick={isCreating ? undefined : handleClick}
+					onClick={isPending ? handlePendingClick : handleClick}
 					creationStatus={creationStatus}
-					disabled={isCreating}
+					disabled={isPending}
 					aria-label={
 						creationStatus ? `Creating workspace: ${name}` : undefined
 					}
@@ -84,7 +93,7 @@ export function DashboardSidebarWorkspaceItem({
 
 		return (
 			<>
-				{isCreating ? (
+				{isPending ? (
 					content
 				) : (
 					<DashboardSidebarWorkspaceContextMenu
@@ -113,7 +122,7 @@ export function DashboardSidebarWorkspaceItem({
 					</DashboardSidebarWorkspaceContextMenu>
 				)}
 
-				{!isCreating && (
+				{!isPending && (
 					<DashboardSidebarDeleteDialog
 						open={isDeleteDialogOpen}
 						onOpenChange={setIsDeleteDialogOpen}
@@ -134,9 +143,9 @@ export function DashboardSidebarWorkspaceItem({
 			isRenaming={isRenaming}
 			renameValue={renameValue}
 			shortcutLabel={shortcutLabel}
-			diffStats={isCreating ? null : diffStats}
-			onClick={isCreating ? undefined : handleClick}
-			onDoubleClick={isCreating ? undefined : startRename}
+			diffStats={isPending ? null : diffStats}
+			onClick={isPending ? handlePendingClick : handleClick}
+			onDoubleClick={isPending ? undefined : startRename}
 			onDeleteClick={() => setIsDeleteDialogOpen(true)}
 			onRenameValueChange={setRenameValue}
 			onSubmitRename={submitRename}
@@ -146,7 +155,7 @@ export function DashboardSidebarWorkspaceItem({
 
 	return (
 		<>
-			{isCreating ? (
+			{isPending ? (
 				expandedContent
 			) : (
 				<DashboardSidebarWorkspaceContextMenu
@@ -175,7 +184,7 @@ export function DashboardSidebarWorkspaceItem({
 				</DashboardSidebarWorkspaceContextMenu>
 			)}
 
-			{!isCreating && (
+			{!isPending && (
 				<DashboardSidebarDeleteDialog
 					open={isDeleteDialogOpen}
 					onOpenChange={setIsDeleteDialogOpen}
diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/components/DashboardSidebar/components/DashboardSidebarWorkspaceItem/components/DashboardSidebarCollapsedWorkspaceButton/DashboardSidebarCollapsedWorkspaceButton.tsx b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/components/DashboardSidebar/components/DashboardSidebarWorkspaceItem/components/DashboardSidebarCollapsedWorkspaceButton/DashboardSidebarCollapsedWorkspaceButton.tsx
index cabc8e1045b..e153977e529 100644
--- a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/components/DashboardSidebar/components/DashboardSidebarWorkspaceItem/components/DashboardSidebarCollapsedWorkspaceButton/DashboardSidebarCollapsedWorkspaceButton.tsx
+++ b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/components/DashboardSidebar/components/DashboardSidebarWorkspaceItem/components/DashboardSidebarCollapsedWorkspaceButton/DashboardSidebarCollapsedWorkspaceButton.tsx
@@ -9,7 +9,7 @@ interface DashboardSidebarCollapsedWorkspaceButtonProps
 	hostType: DashboardSidebarWorkspaceHostType;
 	isActive: boolean;
 	workspaceStatus?: ActivePaneStatus | null;
-	creationStatus?: "preparing" | "generating-branch" | "creating";
+	creationStatus?: "preparing" | "generating-branch" | "creating" | "failed";
 }
 
 export const DashboardSidebarCollapsedWorkspaceButton = forwardRef<
diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/components/DashboardSidebar/components/DashboardSidebarWorkspaceItem/components/DashboardSidebarExpandedWorkspaceRow/DashboardSidebarExpandedWorkspaceRow.tsx b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/components/DashboardSidebar/components/DashboardSidebarWorkspaceItem/components/DashboardSidebarExpandedWorkspaceRow/DashboardSidebarExpandedWorkspaceRow.tsx
index 52431995bd4..a036e5ae698 100644
--- a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/components/DashboardSidebar/components/DashboardSidebarWorkspaceItem/components/DashboardSidebarExpandedWorkspaceRow/DashboardSidebarExpandedWorkspaceRow.tsx
+++ b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/components/DashboardSidebar/components/DashboardSidebarWorkspaceItem/components/DashboardSidebarExpandedWorkspaceRow/DashboardSidebarExpandedWorkspaceRow.tsx
@@ -162,7 +162,14 @@ export const DashboardSidebarExpandedWorkspaceRow = forwardRef<
 
 						<div className="col-start-2 row-start-1 grid h-5 shrink-0 items-center [&>*]:col-start-1 [&>*]:row-start-1">
 							{creationStatusText ? (
-								<span className="text-[11px] text-muted-foreground">
+								<span
+									className={cn(
+										"text-[11px]",
+										creationStatus === "failed"
+											? "text-destructive"
+											: "text-muted-foreground",
+									)}
+								>
 									{creationStatusText}
 								</span>
 							) : (
diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/components/DashboardSidebar/components/DashboardSidebarWorkspaceItem/components/DashboardSidebarWorkspaceIcon/DashboardSidebarWorkspaceIcon.tsx b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/components/DashboardSidebar/components/DashboardSidebarWorkspaceItem/components/DashboardSidebarWorkspaceIcon/DashboardSidebarWorkspaceIcon.tsx
index c87f5536e6e..85248582359 100644
--- a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/components/DashboardSidebar/components/DashboardSidebarWorkspaceItem/components/DashboardSidebarWorkspaceIcon/DashboardSidebarWorkspaceIcon.tsx
+++ b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/components/DashboardSidebar/components/DashboardSidebarWorkspaceItem/components/DashboardSidebarWorkspaceIcon/DashboardSidebarWorkspaceIcon.tsx
@@ -1,4 +1,5 @@
 import { cn } from "@superset/ui/utils";
+import { HiExclamationTriangle } from "react-icons/hi2";
 import { LuCloud, LuFolderGit2, LuLaptop } from "react-icons/lu";
 import { AsciiSpinner } from "renderer/screens/main/components/AsciiSpinner";
 import { StatusIndicator } from "renderer/screens/main/components/StatusIndicator";
@@ -10,7 +11,7 @@ interface DashboardSidebarWorkspaceIconProps {
 	isActive: boolean;
 	variant: "collapsed" | "expanded";
 	workspaceStatus?: ActivePaneStatus | null;
-	creationStatus?: "preparing" | "generating-branch" | "creating";
+	creationStatus?: "preparing" | "generating-branch" | "creating" | "failed";
 }
 
 const OVERLAY_POSITION = {
@@ -29,7 +30,9 @@ export function DashboardSidebarWorkspaceIcon({
 
 	return (
 		<>
-			{creationStatus || workspaceStatus === "working" ? (
+			{creationStatus === "failed" ? (
+				<HiExclamationTriangle className="size-4 text-destructive" />
+			) : creationStatus || workspaceStatus === "working" ? (
 				<AsciiSpinner className="text-base" />
 			) : hostType === "cloud" ? (
 				<LuCloud
diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/components/DashboardSidebar/components/DashboardSidebarWorkspaceItem/utils/getCreationStatusText.ts b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/components/DashboardSidebar/components/DashboardSidebarWorkspaceItem/utils/getCreationStatusText.ts
index 0e5dbec717c..d98c17efbf8 100644
--- a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/components/DashboardSidebar/components/DashboardSidebarWorkspaceItem/utils/getCreationStatusText.ts
+++ b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/components/DashboardSidebar/components/DashboardSidebarWorkspaceItem/utils/getCreationStatusText.ts
@@ -7,6 +7,7 @@ const CREATION_STATUS_LABELS: Record<
 	preparing: "Preparing...",
 	"generating-branch": "Generating...",
 	creating: "Creating...",
+	failed: "Failed",
 } as const;
 
 export function getCreationStatusText(
diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/components/DashboardSidebar/hooks/useDashboardSidebarData/useDashboardSidebarData.ts b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/components/DashboardSidebar/hooks/useDashboardSidebarData/useDashboardSidebarData.ts
index 1698f253625..9c60cb14333 100644
--- a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/components/DashboardSidebar/hooks/useDashboardSidebarData/useDashboardSidebarData.ts
+++ b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/components/DashboardSidebar/hooks/useDashboardSidebarData/useDashboardSidebarData.ts
@@ -8,7 +8,6 @@ import { getHostServiceClientByUrl } from "renderer/lib/host-service-client";
 import { useDashboardSidebarState } from "renderer/routes/_authenticated/hooks/useDashboardSidebarState";
 import { useCollections } from "renderer/routes/_authenticated/providers/CollectionsProvider";
 import { useLocalHostService } from "renderer/routes/_authenticated/providers/LocalHostServiceProvider";
-import { usePendingWorkspace } from "renderer/stores/new-workspace-modal";
 import { MOCK_ORG_ID } from "shared/constants";
 import type {
 	DashboardSidebarProject,
@@ -25,7 +24,19 @@ export function useDashboardSidebarData() {
 	const collections = useCollections();
 	const { machineId, activeHostUrl } = useLocalHostService();
 	const { toggleProjectCollapsed } = useDashboardSidebarState();
-	const pendingWorkspace = usePendingWorkspace();
+
+	// Query pending workspaces from the local collection
+	const { data: pendingWorkspaces = [] } = useLiveQuery(
+		(q) =>
+			q.from({ pw: collections.pendingWorkspaces }).select(({ pw }) => ({
+				id: pw.id,
+				projectId: pw.projectId,
+				name: pw.name,
+				branchName: pw.branchName,
+				status: pw.status,
+			})),
+		[collections],
+	);
 	const activeOrganizationId = env.SKIP_ENV_VALIDATION
 		? MOCK_ORG_ID
 		: (session?.session?.activeOrganizationId ?? null);
@@ -268,45 +279,41 @@ export function useDashboardSidebarData() {
 			});
 		}
 
-		// Inject pending workspace if it exists
-		if (pendingWorkspace && machineId) {
-			const project = projectsById.get(pendingWorkspace.projectId);
-			if (!project) {
-				// Log warning if pending workspace references non-existent project
-				console.warn(
-					`Pending workspace ${pendingWorkspace.id} references non-existent project ${pendingWorkspace.projectId}`,
-				);
-			} else {
-				const pendingItem: DashboardSidebarWorkspace = {
-					id: pendingWorkspace.id,
-					projectId: pendingWorkspace.projectId,
-					hostId: "",
-					hostType: "local-device",
-					accentColor: null,
-					name: pendingWorkspace.name,
-					branch: "",
-					pullRequest: null,
-					repoUrl:
-						project.githubOwner && project.githubRepoName
-							? `https://github.com/${project.githubOwner}/${project.githubRepoName}`
-							: null,
-					branchExistsOnRemote: false,
-					previewUrl: null,
-					needsRebase: null,
-					behindCount: null,
-					createdAt: new Date(),
-					updatedAt: new Date(),
-					creationStatus: pendingWorkspace.status,
-				};
+		// Inject pending workspaces (creating / failed)
+		for (const pw of pendingWorkspaces) {
+			if (pw.status === "succeeded") continue; // will appear as a real workspace
+			const project = projectsById.get(pw.projectId);
+			if (!project) continue;
 
-				project.childEntries.push({
-					tabOrder: PENDING_WORKSPACE_TAB_ORDER,
-					child: {
-						type: "workspace",
-						workspace: pendingItem,
-					},
-				});
-			}
+			const pendingItem: DashboardSidebarWorkspace = {
+				id: pw.id,
+				projectId: pw.projectId,
+				hostId: "",
+				hostType: "local-device",
+				accentColor: null,
+				name: pw.name,
+				branch: pw.branchName,
+				pullRequest: null,
+				repoUrl:
+					project.githubOwner && project.githubRepoName
+						? `https://github.com/${project.githubOwner}/${project.githubRepoName}`
+						: null,
+				branchExistsOnRemote: false,
+				previewUrl: null,
+				needsRebase: null,
+				behindCount: null,
+				createdAt: new Date(),
+				updatedAt: new Date(),
+				creationStatus: pw.status,
+			};
+
+			project.childEntries.push({
+				tabOrder: PENDING_WORKSPACE_TAB_ORDER,
+				child: {
+					type: "workspace",
+					workspace: pendingItem,
+				},
+			});
 		}
 
 		return sidebarProjects.flatMap((project) => {
@@ -325,7 +332,7 @@ export function useDashboardSidebarData() {
 	}, [
 		machineId,
 		localPullRequestsByWorkspaceId,
-		pendingWorkspace,
+		pendingWorkspaces,
 		sidebarProjects,
 		sidebarSections,
 		sidebarWorkspaces,
diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/components/DashboardSidebar/types.ts b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/components/DashboardSidebar/types.ts
index a8a52331141..329d90bd701 100644
--- a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/components/DashboardSidebar/types.ts
+++ b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/components/DashboardSidebar/types.ts
@@ -36,7 +36,7 @@ export interface DashboardSidebarWorkspace {
 	behindCount: number | null;
 	createdAt: Date;
 	updatedAt: Date;
-	creationStatus?: "preparing" | "generating-branch" | "creating";
+	creationStatus?: "preparing" | "generating-branch" | "creating" | "failed";
 }
 
 export interface DashboardSidebarSection {
diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/pending/$pendingId/page.tsx b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/pending/$pendingId/page.tsx
new file mode 100644
index 00000000000..f4ab5c46b1b
--- /dev/null
+++ b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/pending/$pendingId/page.tsx
@@ -0,0 +1,326 @@
+import { eq } from "@tanstack/db";
+import { useLiveQuery } from "@tanstack/react-db";
+import { useQuery } from "@tanstack/react-query";
+import { createFileRoute, useNavigate } from "@tanstack/react-router";
+import { useCallback, useEffect, useRef, useState } from "react";
+import { GoGitBranch } from "react-icons/go";
+import { HiCheck, HiExclamationTriangle } from "react-icons/hi2";
+import { env } from "renderer/env.renderer";
+import { formatRelativeTime } from "renderer/lib/formatRelativeTime";
+import { getHostServiceClientByUrl } from "renderer/lib/host-service-client";
+import {
+	clearAttachments,
+	loadAttachments,
+} from "renderer/lib/pending-attachment-store";
+import { useCreateDashboardWorkspace } from "renderer/routes/_authenticated/components/DashboardNewWorkspaceModal/hooks/useCreateDashboardWorkspace";
+import { useCollections } from "renderer/routes/_authenticated/providers/CollectionsProvider";
+import { useLocalHostService } from "renderer/routes/_authenticated/providers/LocalHostServiceProvider";
+
+/**
+ * Pending workspace progress page.
+ *
+ * Lives at /_dashboard/pending/$pendingId (NOT under /v2-workspace/) because
+ * the v2-workspace layout wraps children in WorkspaceTrpcProvider. During route
+ * transitions away from a real workspace, the layout would strip the provider
+ * while the old workspace's TerminalPane is still mounted — causing a crash.
+ * Keeping this route outside v2-workspace avoids that entirely.
+ */
+export const Route = createFileRoute(
+	"/_authenticated/_dashboard/pending/$pendingId/",
+)({
+	component: PendingWorkspacePage,
+});
+
+function useRetryCreate(
+	pendingId: string,
+	pending: {
+		projectId: string;
+		name: string;
+		branchName: string;
+		prompt: string;
+		baseBranch: string | null;
+		runSetupScript: boolean;
+		linkedIssues: unknown[];
+		linkedPR: unknown;
+		hostTarget: unknown;
+		attachmentCount: number;
+	} | null,
+) {
+	const collections = useCollections();
+	const createWorkspace = useCreateDashboardWorkspace();
+
+	return useCallback(async () => {
+		if (!pending) return;
+
+		collections.pendingWorkspaces.update(pendingId, (draft) => {
+			draft.status = "creating";
+			draft.error = null;
+		});
+
+		const internalIssueIds = (
+			pending.linkedIssues as Array<{ source?: string; taskId?: string }>
+		)
+			.filter((i) => i.source === "internal" && i.taskId)
+			.map((i) => i.taskId as string);
+		const githubIssueUrls = (
+			pending.linkedIssues as Array<{ source?: string; url?: string }>
+		)
+			.filter((i) => i.source === "github" && i.url)
+			.map((i) => i.url as string);
+		const linkedPR = pending.linkedPR as { url?: string } | null;
+
+		let attachmentPayload:
+			| Array<{ data: string; mediaType: string; filename: string }>
+			| undefined;
+		if (pending.attachmentCount > 0) {
+			try {
+				attachmentPayload = await loadAttachments(pendingId);
+			} catch {
+				// proceed without
+			}
+		}
+
+		try {
+			const result = await createWorkspace({
+				pendingId,
+				projectId: pending.projectId,
+				hostTarget: pending.hostTarget as
+					| { kind: "local" }
+					| { kind: "host"; hostId: string },
+				names: {
+					workspaceName: pending.name,
+					branchName: pending.branchName,
+				},
+				composer: {
+					prompt: pending.prompt || undefined,
+					baseBranch: pending.baseBranch || undefined,
+					runSetupScript: pending.runSetupScript,
+				},
+				linkedContext: {
+					internalIssueIds:
+						internalIssueIds.length > 0 ? internalIssueIds : undefined,
+					githubIssueUrls:
+						githubIssueUrls.length > 0 ? githubIssueUrls : undefined,
+					linkedPrUrl: linkedPR?.url,
+					attachments: attachmentPayload,
+				},
+			});
+
+			collections.pendingWorkspaces.update(pendingId, (draft) => {
+				draft.status = "succeeded";
+				draft.workspaceId = result.workspace?.id ?? null;
+				draft.initialCommands = result.initialCommands ?? null;
+			});
+			void clearAttachments(pendingId);
+		} catch (err) {
+			collections.pendingWorkspaces.update(pendingId, (draft) => {
+				draft.status = "failed";
+				draft.error =
+					err instanceof Error ? err.message : "Failed to create workspace";
+			});
+		}
+	}, [collections, createWorkspace, pending, pendingId]);
+}
+
+function PendingWorkspacePage() {
+	const { pendingId } = Route.useParams();
+	const navigate = useNavigate();
+	const collections = useCollections();
+	const { activeHostUrl } = useLocalHostService();
+	const navigatedRef = useRef(false);
+
+	// Read pending workspace from collection (declared early for useRetryCreate)
+	const { data: pendingRows } = useLiveQuery(
+		(q) =>
+			q
+				.from({ pw: collections.pendingWorkspaces })
+				.where(({ pw }) => eq(pw.id, pendingId))
+				.select(({ pw }) => ({ ...pw })),
+		[collections, pendingId],
+	);
+	const pending = pendingRows?.[0] ?? null;
+	const retryCreate = useRetryCreate(pendingId, pending);
+
+	// Poll host-service for step-by-step progress
+	const hostUrl =
+		pending?.hostTarget &&
+		typeof pending.hostTarget === "object" &&
+		"kind" in (pending.hostTarget as Record<string, unknown>)
+			? (pending.hostTarget as { kind: string; hostId?: string }).kind ===
+				"local"
+				? activeHostUrl
+				: `${env.RELAY_URL}/hosts/${(pending.hostTarget as { hostId: string }).hostId}`
+			: activeHostUrl;
+
+	const { data: progress } = useQuery({
+		queryKey: ["workspaceCreation", "getProgress", pendingId, hostUrl],
+		queryFn: async () => {
+			if (!hostUrl) return null;
+			const client = getHostServiceClientByUrl(hostUrl);
+			return client.workspaceCreation.getProgress.query({
+				pendingId,
+			});
+		},
+		refetchInterval: 500,
+		enabled: pending?.status === "creating" && !!hostUrl,
+	});
+
+	const steps = progress?.steps ?? [];
+
+	// Elapsed timer + staleness detection
+	const STALE_THRESHOLD_MS = 2 * 60 * 1000;
+	const [now, setNow] = useState(Date.now());
+	useEffect(() => {
+		if (pending?.status !== "creating") return;
+		const interval = setInterval(() => setNow(Date.now()), 1000);
+		return () => clearInterval(interval);
+	}, [pending?.status]);
+
+	const createdAtMs = pending?.createdAt
+		? new Date(pending.createdAt).getTime()
+		: now;
+	const elapsedMs = Math.max(0, now - createdAtMs);
+	const elapsedLabel = formatRelativeTime(createdAtMs);
+	const isStale =
+		pending?.status === "creating" && elapsedMs > STALE_THRESHOLD_MS;
+
+	// Auto-navigate to real workspace on success
+	useEffect(() => {
+		if (
+			pending?.status === "succeeded" &&
+			pending.workspaceId &&
+			!navigatedRef.current
+		) {
+			navigatedRef.current = true;
+			void navigate({
+				to: "/v2-workspace/$workspaceId",
+				params: { workspaceId: pending.workspaceId },
+			});
+			// Clean up the pending row after a short delay
+			setTimeout(() => {
+				collections.pendingWorkspaces.delete(pendingId);
+			}, 1000);
+		}
+	}, [collections, navigate, pending, pendingId]);
+
+	if (!pending) {
+		return (
+			<div className="flex h-full items-center justify-center text-muted-foreground">
+				Workspace not found
+			</div>
+		);
+	}
+
+	return (
+		<div className="flex h-full w-full flex-1 justify-center pt-24">
+			<div className="w-full max-w-sm space-y-5 p-8">
+				{/* Header */}
+				<div className="space-y-1">
+					<h2 className="text-lg font-semibold">{pending.name}</h2>
+					<div className="flex items-center gap-1.5 text-sm text-muted-foreground">
+						<GoGitBranch className="size-3.5" />
+						<span className="font-mono">{pending.branchName}</span>
+					</div>
+				</div>
+
+				{/* Status */}
+				{pending.status === "creating" && (
+					<div className="space-y-3">
+						<div className="flex items-center justify-between">
+							<p
+								className={`text-sm ${isStale ? "text-amber-500" : "text-muted-foreground"}`}
+							>
+								{isStale
+									? "This is taking longer than expected..."
+									: "Creating workspace..."}
+							</p>
+							<span className="text-xs tabular-nums text-muted-foreground/50">
+								{elapsedLabel}
+							</span>
+						</div>
+						{steps.length > 0 && (
+							<div className="space-y-2">
+								{steps.map((step) => (
+									<div
+										key={step.id}
+										className="flex items-center gap-2.5 text-sm"
+									>
+										{step.status === "done" ? (
+											<HiCheck className="size-4 text-emerald-500" />
+										) : step.status === "active" ? (
+											<div className="size-4 flex items-center justify-center">
+												<div className="size-2.5 rounded-full bg-foreground animate-pulse" />
+											</div>
+										) : (
+											<div className="size-4 flex items-center justify-center">
+												<div className="size-2 rounded-full bg-muted-foreground/30" />
+											</div>
+										)}
+										<span
+											className={
+												step.status === "done" || step.status === "active"
+													? "text-foreground"
+													: "text-muted-foreground/50"
+											}
+										>
+											{step.label}
+										</span>
+									</div>
+								))}
+							</div>
+						)}
+						<div className="flex gap-2 pt-1">
+							<button
+								type="button"
+								className="rounded-md border px-3 py-1.5 text-sm text-muted-foreground hover:text-foreground hover:bg-accent"
+								onClick={() => {
+									collections.pendingWorkspaces.delete(pendingId);
+									void clearAttachments(pendingId);
+									void navigate({ to: "/" });
+								}}
+							>
+								Dismiss
+							</button>
+						</div>
+					</div>
+				)}
+
+				{pending.status === "succeeded" && (
+					<div className="flex items-center gap-2 text-sm text-emerald-500">
+						<HiCheck className="size-4" />
+						<span>Workspace created — opening...</span>
+					</div>
+				)}
+
+				{pending.status === "failed" && (
+					<div className="space-y-4">
+						<div className="flex items-start gap-2 text-sm text-destructive">
+							<HiExclamationTriangle className="size-4 mt-0.5 shrink-0" />
+							<span>{pending.error ?? "Failed to create workspace"}</span>
+						</div>
+						<div className="flex gap-2">
+							<button
+								type="button"
+								className="rounded-md bg-primary px-3 py-1.5 text-sm text-primary-foreground hover:bg-primary/90"
+								onClick={() => void retryCreate()}
+							>
+								Retry
+							</button>
+							<button
+								type="button"
+								className="rounded-md border px-3 py-1.5 text-sm hover:bg-accent"
+								onClick={() => {
+									collections.pendingWorkspaces.delete(pendingId);
+									void clearAttachments(pendingId);
+									void navigate({ to: "/" });
+								}}
+							>
+								Dismiss
+							</button>
+						</div>
+					</div>
+				)}
+			</div>
+		</div>
+	);
+}
diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/layout.tsx b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/layout.tsx
index 1d07c99086f..bc6eba977ee 100644
--- a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/layout.tsx
+++ b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/layout.tsx
@@ -64,6 +64,14 @@ function V2WorkspaceLayout() {
 		ensureWorkspaceInSidebar(workspace.id, workspace.projectId);
 	}, [ensureWorkspaceInSidebar, workspace]);
 
+	// TODO: This renders child routes without WorkspaceTrpcProvider when
+	// the workspace hasn't loaded from collections yet, or during route
+	// transitions (e.g. navigating away from a workspace). If the outgoing
+	// workspace page hasn't fully unmounted, its components (TerminalPane,
+	// etc.) will crash with "useWorkspaceClient must be used within
+	// WorkspaceClientProvider". Either the layout should never render
+	// children without the provider, or the provider should move to the
+	// page level so each page owns its own context.
 	if (!workspaceId || !workspace) {
 		return <Outlet />;
 	}
diff --git a/apps/desktop/src/renderer/routes/_authenticated/components/DashboardNewWorkspaceModal/DashboardNewWorkspaceDraftContext.tsx b/apps/desktop/src/renderer/routes/_authenticated/components/DashboardNewWorkspaceModal/DashboardNewWorkspaceDraftContext.tsx
index 07d4bc41f1f..7e032257160 100644
--- a/apps/desktop/src/renderer/routes/_authenticated/components/DashboardNewWorkspaceModal/DashboardNewWorkspaceDraftContext.tsx
+++ b/apps/desktop/src/renderer/routes/_authenticated/components/DashboardNewWorkspaceModal/DashboardNewWorkspaceDraftContext.tsx
@@ -7,52 +7,64 @@ import {
 	useMemo,
 	useState,
 } from "react";
-import type { WorkspaceHostTarget } from "renderer/routes/_authenticated/components/DashboardNewWorkspaceModal/components/DashboardNewWorkspaceForm/components/DevicePicker";
+import type { WorkspaceHostTarget } from "./components/DashboardNewWorkspaceForm/components/DevicePicker";
+import { useCreateDashboardWorkspace } from "./hooks/useCreateDashboardWorkspace";
+
+export type LinkedIssue = {
+	slug: string; // "#123" for GitHub, "SUP-123" for internal
+	title: string;
+	source?: "github" | "internal";
+	url?: string; // GitHub issue URL
+	taskId?: string; // Internal task ID for navigation
+	number?: number; // GitHub issue number
+	state?: "open" | "closed";
+};
 
-export type DashboardNewWorkspaceTab =
-	| "prompt"
-	| "issues"
-	| "pull-requests"
-	| "branches";
+export type LinkedPR = {
+	prNumber: number;
+	title: string;
+	url: string;
+	state: string;
+};
 
 export interface DashboardNewWorkspaceDraft {
-	activeTab: DashboardNewWorkspaceTab;
 	selectedProjectId: string | null;
 	hostTarget: WorkspaceHostTarget;
 	prompt: string;
+	baseBranch: string | null;
+	runSetupScript: boolean;
+	workspaceName: string;
+	workspaceNameEdited: boolean;
 	branchName: string;
 	branchNameEdited: boolean;
-	compareBaseBranch: string | null;
-	showAdvanced: boolean;
-	branchSearch: string;
-	issuesQuery: string;
-	pullRequestsQuery: string;
-	branchesQuery: string;
+	linkedIssues: LinkedIssue[];
+	linkedPR: LinkedPR | null;
 }
 
 interface DashboardNewWorkspaceDraftState extends DashboardNewWorkspaceDraft {
 	draftVersion: number;
+	resetKey: number;
 }
 
 const initialDraft: DashboardNewWorkspaceDraft = {
-	activeTab: "prompt",
 	selectedProjectId: null,
 	hostTarget: { kind: "local" },
 	prompt: "",
+	baseBranch: null,
+	runSetupScript: true,
+	workspaceName: "",
+	workspaceNameEdited: false,
 	branchName: "",
 	branchNameEdited: false,
-	compareBaseBranch: null,
-	showAdvanced: false,
-	branchSearch: "",
-	issuesQuery: "",
-	pullRequestsQuery: "",
-	branchesQuery: "",
+	linkedIssues: [],
+	linkedPR: null,
 };
 
 function buildInitialDraftState(): DashboardNewWorkspaceDraftState {
 	return {
 		...initialDraft,
 		draftVersion: 0,
+		resetKey: 0,
 	};
 }
 
@@ -69,8 +81,10 @@ interface DashboardNewWorkspaceActionOptions {
 interface DashboardNewWorkspaceDraftContextValue {
 	draft: DashboardNewWorkspaceDraft;
 	draftVersion: number;
+	resetKey: number;
 	closeModal: () => void;
 	closeAndResetDraft: () => void;
+	createWorkspace: ReturnType<typeof useCreateDashboardWorkspace>;
 	runAsyncAction: <T>(
 		promise: Promise<T>,
 		messages: DashboardNewWorkspaceActionMessages,
@@ -89,26 +103,16 @@ export function DashboardNewWorkspaceDraftProvider({
 }: PropsWithChildren<{ onClose: () => void }>) {
 	const [state, setState] = useState(buildInitialDraftState);
 
+	// Owned here so onSuccess survives Dialog unmounting content on close.
+	const createWorkspace = useCreateDashboardWorkspace();
+
 	const updateDraft = useCallback(
 		(patch: Partial<DashboardNewWorkspaceDraft>) => {
-			setState((state) => {
-				const entries = Object.entries(patch) as Array<
-					[
-						keyof DashboardNewWorkspaceDraft,
-						DashboardNewWorkspaceDraft[keyof DashboardNewWorkspaceDraft],
-					]
-				>;
-				const hasChanges = entries.some(([key, value]) => state[key] !== value);
-				if (!hasChanges) {
-					return state;
-				}
-
-				return {
-					...state,
-					...patch,
-					draftVersion: state.draftVersion + 1,
-				};
-			});
+			setState((state) => ({
+				...state,
+				...patch,
+				draftVersion: state.draftVersion + 1,
+			}));
 		},
 		[],
 	);
@@ -117,6 +121,7 @@ export function DashboardNewWorkspaceDraftProvider({
 		setState((state) => ({
 			...initialDraft,
 			draftVersion: state.draftVersion + 1,
+			resetKey: state.resetKey + 1,
 		}));
 	}, []);
 
@@ -148,28 +153,30 @@ export function DashboardNewWorkspaceDraftProvider({
 	const value = useMemo<DashboardNewWorkspaceDraftContextValue>(
 		() => ({
 			draft: {
-				activeTab: state.activeTab,
 				selectedProjectId: state.selectedProjectId,
 				hostTarget: state.hostTarget,
 				prompt: state.prompt,
+				baseBranch: state.baseBranch,
+				runSetupScript: state.runSetupScript,
+				workspaceName: state.workspaceName,
+				workspaceNameEdited: state.workspaceNameEdited,
 				branchName: state.branchName,
 				branchNameEdited: state.branchNameEdited,
-				compareBaseBranch: state.compareBaseBranch,
-				showAdvanced: state.showAdvanced,
-				branchSearch: state.branchSearch,
-				issuesQuery: state.issuesQuery,
-				pullRequestsQuery: state.pullRequestsQuery,
-				branchesQuery: state.branchesQuery,
+				linkedIssues: state.linkedIssues,
+				linkedPR: state.linkedPR,
 			},
 			draftVersion: state.draftVersion,
+			resetKey: state.resetKey,
 			closeModal: onClose,
 			closeAndResetDraft,
+			createWorkspace,
 			runAsyncAction,
 			updateDraft,
 			resetDraft,
 		}),
 		[
 			closeAndResetDraft,
+			createWorkspace,
 			onClose,
 			resetDraft,
 			runAsyncAction,
diff --git a/apps/desktop/src/renderer/routes/_authenticated/components/DashboardNewWorkspaceModal/DashboardNewWorkspaceModal.tsx b/apps/desktop/src/renderer/routes/_authenticated/components/DashboardNewWorkspaceModal/DashboardNewWorkspaceModal.tsx
index 12bf45f75db..6e887f5c2f9 100644
--- a/apps/desktop/src/renderer/routes/_authenticated/components/DashboardNewWorkspaceModal/DashboardNewWorkspaceModal.tsx
+++ b/apps/desktop/src/renderer/routes/_authenticated/components/DashboardNewWorkspaceModal/DashboardNewWorkspaceModal.tsx
@@ -1,3 +1,7 @@
+import {
+	PromptInputProvider,
+	usePromptInputController,
+} from "@superset/ui/ai-elements/prompt-input";
 import {
 	Dialog,
 	DialogContent,
@@ -5,38 +9,65 @@ import {
 	DialogHeader,
 	DialogTitle,
 } from "@superset/ui/dialog";
+import { useEffect, useRef } from "react";
+import { electronTrpc } from "renderer/lib/electron-trpc";
 import {
 	useCloseNewWorkspaceModal,
 	useNewWorkspaceModalOpen,
 	usePreSelectedProjectId,
 } from "renderer/stores/new-workspace-modal";
-import { DashboardNewWorkspaceForm } from "./components/DashboardNewWorkspaceForm";
-import { DashboardNewWorkspaceDraftProvider } from "./DashboardNewWorkspaceDraftContext";
+import { DashboardNewWorkspaceModalContent } from "./components/DashboardNewWorkspaceModalContent";
+import {
+	DashboardNewWorkspaceDraftProvider,
+	useDashboardNewWorkspaceDraft,
+} from "./DashboardNewWorkspaceDraftContext";
+
+/** Clears the PromptInputProvider text & attachments when the draft resets. */
+function PromptInputResetSync() {
+	const { resetKey } = useDashboardNewWorkspaceDraft();
+	const { textInput, attachments } = usePromptInputController();
+	const prevResetKeyRef = useRef(resetKey);
+
+	useEffect(() => {
+		if (resetKey !== prevResetKeyRef.current) {
+			prevResetKeyRef.current = resetKey;
+			textInput.clear();
+			attachments.clear();
+		}
+	}, [resetKey, textInput.clear, attachments.clear]);
+
+	return null;
+}
 
 export function DashboardNewWorkspaceModal() {
 	const isOpen = useNewWorkspaceModalOpen();
 	const closeModal = useCloseNewWorkspaceModal();
 	const preSelectedProjectId = usePreSelectedProjectId();
 
+	// Prevents AgentSelect from flashing "No agent" while presets load after refresh.
+	electronTrpc.settings.getAgentPresets.useQuery();
+
 	return (
 		<DashboardNewWorkspaceDraftProvider onClose={closeModal}>
-			<Dialog open={isOpen} onOpenChange={(open) => !open && closeModal()}>
-				<DialogHeader className="sr-only">
-					<DialogTitle>New Workspace</DialogTitle>
-					<DialogDescription>
-						Create a new workspace from a PR, branch, issue, or prompt.
-					</DialogDescription>
-				</DialogHeader>
-				<DialogContent
-					showCloseButton={false}
-					className="bg-popover text-popover-foreground sm:max-w-[560px] max-h-[min(70vh,600px)] !top-[calc(50%-min(35vh,300px))] !-translate-y-0 flex flex-col overflow-hidden p-0"
-				>
-					<DashboardNewWorkspaceForm
-						isOpen={isOpen}
-						preSelectedProjectId={preSelectedProjectId}
-					/>
-				</DialogContent>
-			</Dialog>
+			<PromptInputProvider>
+				<PromptInputResetSync />
+				<Dialog open={isOpen} onOpenChange={(open) => !open && closeModal()}>
+					<DialogHeader className="sr-only">
+						<DialogTitle>New Workspace</DialogTitle>
+						<DialogDescription>Create a new workspace</DialogDescription>
+					</DialogHeader>
+					<DialogContent
+						showCloseButton={false}
+						onFocusOutside={(e) => e.preventDefault()}
+						className="bg-popover text-popover-foreground sm:max-w-[560px] max-h-[min(70vh,600px)] !top-[calc(50%-min(35vh,300px))] !-translate-y-0 flex flex-col overflow-hidden p-0"
+					>
+						<DashboardNewWorkspaceModalContent
+							isOpen={isOpen}
+							preSelectedProjectId={preSelectedProjectId}
+						/>
+					</DialogContent>
+				</Dialog>
+			</PromptInputProvider>
 		</DashboardNewWorkspaceDraftProvider>
 	);
 }
diff --git a/apps/desktop/src/renderer/routes/_authenticated/components/DashboardNewWorkspaceModal/components/DashboardNewWorkspaceForm/DashboardNewWorkspaceForm.tsx b/apps/desktop/src/renderer/routes/_authenticated/components/DashboardNewWorkspaceModal/components/DashboardNewWorkspaceForm/DashboardNewWorkspaceForm.tsx
deleted file mode 100644
index fe5b9b3ab0c..00000000000
--- a/apps/desktop/src/renderer/routes/_authenticated/components/DashboardNewWorkspaceModal/components/DashboardNewWorkspaceForm/DashboardNewWorkspaceForm.tsx
+++ /dev/null
@@ -1,90 +0,0 @@
-import { useCallback } from "react";
-import { useDashboardNewWorkspaceDraft } from "../../DashboardNewWorkspaceDraftContext";
-import { DashboardNewWorkspaceFormHeader } from "./components/DashboardNewWorkspaceFormHeader";
-import { DashboardNewWorkspaceListTabContent } from "./components/DashboardNewWorkspaceListTabContent";
-import { DashboardNewWorkspacePromptTabContent } from "./components/DashboardNewWorkspacePromptTabContent";
-import { useDashboardNewWorkspaceProjectSelection } from "./hooks/useDashboardNewWorkspaceProjectSelection";
-import { useResolvedLocalProject } from "./hooks/useResolvedLocalProject";
-
-interface DashboardNewWorkspaceFormProps {
-	isOpen: boolean;
-	preSelectedProjectId: string | null;
-}
-
-/** Main form for the new workspace modal with collection-based project selection. */
-export function DashboardNewWorkspaceForm({
-	isOpen,
-	preSelectedProjectId,
-}: DashboardNewWorkspaceFormProps) {
-	const { draft, updateDraft } = useDashboardNewWorkspaceDraft();
-	const handleSelectProject = useCallback(
-		(selectedProjectId: string | null) => {
-			updateDraft({ selectedProjectId });
-		},
-		[updateDraft],
-	);
-	const { githubRepository, githubRepositoryId } =
-		useDashboardNewWorkspaceProjectSelection({
-			isOpen,
-			preSelectedProjectId,
-			selectedProjectId: draft.selectedProjectId,
-			onSelectProject: handleSelectProject,
-		});
-	const resolvedLocalProjectId = useResolvedLocalProject(githubRepository);
-
-	const listTab = draft.activeTab === "prompt" ? null : draft.activeTab;
-	const isListTab = listTab !== null;
-	const listQuery =
-		draft.activeTab === "issues"
-			? draft.issuesQuery
-			: draft.activeTab === "branches"
-				? draft.branchesQuery
-				: draft.pullRequestsQuery;
-
-	const handleListQueryChange = (value: string) => {
-		switch (draft.activeTab) {
-			case "issues":
-				updateDraft({ issuesQuery: value });
-				return;
-			case "branches":
-				updateDraft({ branchesQuery: value });
-				return;
-			case "pull-requests":
-				updateDraft({ pullRequestsQuery: value });
-				return;
-			default:
-				return;
-		}
-	};
-
-	return (
-		<>
-			<DashboardNewWorkspaceFormHeader
-				activeTab={draft.activeTab}
-				hostTarget={draft.hostTarget}
-				selectedProjectId={draft.selectedProjectId}
-				onSelectTab={(activeTab) => updateDraft({ activeTab })}
-				onSelectHostTarget={(hostTarget) => updateDraft({ hostTarget })}
-				onSelectProject={handleSelectProject}
-			/>
-
-			{isListTab ? (
-				<DashboardNewWorkspaceListTabContent
-					activeTab={listTab}
-					projectId={draft.selectedProjectId}
-					githubRepositoryId={githubRepositoryId}
-					hostTarget={draft.hostTarget}
-					localProjectId={resolvedLocalProjectId}
-					query={listQuery}
-					onQueryChange={handleListQueryChange}
-				/>
-			) : (
-				<DashboardNewWorkspacePromptTabContent
-					projectId={draft.selectedProjectId}
-					localProjectId={resolvedLocalProjectId}
-					hostTarget={draft.hostTarget}
-				/>
-			)}
-		</>
-	);
-}
diff --git a/apps/desktop/src/renderer/routes/_authenticated/components/DashboardNewWorkspaceModal/components/DashboardNewWorkspaceForm/PromptGroup/PromptGroup.tsx b/apps/desktop/src/renderer/routes/_authenticated/components/DashboardNewWorkspaceModal/components/DashboardNewWorkspaceForm/PromptGroup/PromptGroup.tsx
new file mode 100644
index 00000000000..317eec2d656
--- /dev/null
+++ b/apps/desktop/src/renderer/routes/_authenticated/components/DashboardNewWorkspaceModal/components/DashboardNewWorkspaceForm/PromptGroup/PromptGroup.tsx
@@ -0,0 +1,435 @@
+import {
+	PromptInput,
+	PromptInputAttachment,
+	PromptInputAttachments,
+	PromptInputFooter,
+	PromptInputSubmit,
+	PromptInputTextarea,
+	PromptInputTools,
+	useProviderAttachments,
+} from "@superset/ui/ai-elements/prompt-input";
+import { Input } from "@superset/ui/input";
+import { cn } from "@superset/ui/utils";
+import { AnimatePresence, motion } from "framer-motion";
+import { ArrowUpIcon } from "lucide-react";
+import { useCallback, useEffect, useMemo, useRef, useState } from "react";
+import { LuGitPullRequest } from "react-icons/lu";
+import { AgentSelect } from "renderer/components/AgentSelect";
+import { LinkedIssuePill } from "renderer/components/Chat/ChatInterface/components/ChatInputFooter/components/LinkedIssuePill";
+import { IssueLinkCommand } from "renderer/components/Chat/ChatInterface/components/IssueLinkCommand";
+import { useAgentLaunchPreferences } from "renderer/hooks/useAgentLaunchPreferences";
+import { PLATFORM } from "renderer/hotkeys";
+import { electronTrpc } from "renderer/lib/electron-trpc";
+import { useNewWorkspaceModalOpen } from "renderer/stores/new-workspace-modal";
+import { getEnabledAgentConfigs } from "shared/utils/agent-settings";
+import { sanitizeUserBranchName, slugifyForBranch } from "shared/utils/branch";
+import type { LinkedPR } from "../../../DashboardNewWorkspaceDraftContext";
+import { useDashboardNewWorkspaceDraft } from "../../../DashboardNewWorkspaceDraftContext";
+import { DevicePicker } from "../components/DevicePicker";
+import { useBranchContext } from "../hooks/useBranchContext";
+import { AttachmentButtons } from "./components/AttachmentButtons";
+import { CompareBaseBranchPicker } from "./components/CompareBaseBranchPicker";
+import { GitHubIssueLinkCommand } from "./components/GitHubIssueLinkCommand";
+import { LinkedGitHubIssuePill } from "./components/LinkedGitHubIssuePill";
+import { LinkedPRPill } from "./components/LinkedPRPill";
+import { PRLinkCommand } from "./components/PRLinkCommand";
+import { ProjectPickerPill } from "./components/ProjectPickerPill";
+import { useSubmitWorkspace } from "./hooks/useSubmitWorkspace";
+import {
+	AGENT_STORAGE_KEY,
+	PILL_BUTTON_CLASS,
+	type ProjectOption,
+	type WorkspaceCreateAgent,
+} from "./types";
+
+interface PromptGroupProps {
+	projectId: string | null;
+	selectedProject: ProjectOption | undefined;
+	recentProjects: ProjectOption[];
+	onSelectProject: (projectId: string) => void;
+}
+
+export function PromptGroup(props: PromptGroupProps) {
+	return <PromptGroupInner {...props} />;
+}
+
+function PromptGroupInner({
+	projectId,
+	selectedProject,
+	recentProjects,
+	onSelectProject,
+}: PromptGroupProps) {
+	const modKey = PLATFORM === "mac" ? "⌘" : "Ctrl";
+	const isNewWorkspaceModalOpen = useNewWorkspaceModalOpen();
+	const { closeModal, draft, updateDraft } = useDashboardNewWorkspaceDraft();
+	const attachments = useProviderAttachments();
+	const {
+		baseBranch,
+		hostTarget,
+		prompt,
+		workspaceName,
+		branchName,
+		branchNameEdited,
+		linkedIssues,
+		linkedPR,
+	} = draft;
+
+	// ── Agent presets ────────────────────────────────────────────────
+	const agentPresetsQuery = electronTrpc.settings.getAgentPresets.useQuery();
+	const enabledAgentPresets = useMemo(
+		() => getEnabledAgentConfigs(agentPresetsQuery.data ?? []),
+		[agentPresetsQuery.data],
+	);
+	const selectableAgentIds = useMemo(
+		() => enabledAgentPresets.map((preset) => preset.id),
+		[enabledAgentPresets],
+	);
+	const { selectedAgent, setSelectedAgent } =
+		useAgentLaunchPreferences<WorkspaceCreateAgent>({
+			agentStorageKey: AGENT_STORAGE_KEY,
+			defaultAgent: "claude",
+			fallbackAgent: "none",
+			validAgents: ["none", ...selectableAgentIds],
+			agentsReady: agentPresetsQuery.isFetched,
+		});
+
+	// ── Link commands ────────────────────────────────────────────────
+	const [issueLinkOpen, setIssueLinkOpen] = useState(false);
+	const [gitHubIssueLinkOpen, setGitHubIssueLinkOpen] = useState(false);
+	const [prLinkOpen, setPRLinkOpen] = useState(false);
+	const plusMenuRef = useRef<HTMLDivElement>(null);
+	const trimmedPrompt = prompt.trim();
+
+	// ── Branch data ──────────────────────────────────────────────────
+	const {
+		data: branchData,
+		isLoading: isBranchesLoading,
+		isError: isBranchesError,
+	} = useBranchContext(projectId, hostTarget);
+
+	const effectiveCompareBaseBranch =
+		baseBranch || branchData?.defaultBranch || null;
+
+	const branchPreview = branchNameEdited
+		? sanitizeUserBranchName(branchName)
+		: slugifyForBranch(trimmedPrompt);
+
+	// Reset baseBranch on project or host change
+	const previousProjectIdRef = useRef(projectId);
+	const previousHostRef = useRef(JSON.stringify(hostTarget));
+	useEffect(() => {
+		const nextHost = JSON.stringify(hostTarget);
+		if (
+			previousProjectIdRef.current !== projectId ||
+			previousHostRef.current !== nextHost
+		) {
+			previousProjectIdRef.current = projectId;
+			previousHostRef.current = nextHost;
+			updateDraft({ baseBranch: null });
+		}
+	}, [projectId, hostTarget, updateDraft]);
+
+	// ── Create ───────────────────────────────────────────────────────
+	const handleCreate = useSubmitWorkspace(projectId);
+
+	const handlePromptSubmit = useCallback(() => {
+		void handleCreate();
+	}, [handleCreate]);
+
+	useEffect(() => {
+		if (!isNewWorkspaceModalOpen) return;
+		const handler = (e: KeyboardEvent) => {
+			if (e.key === "Enter" && (e.metaKey || e.ctrlKey)) {
+				e.preventDefault();
+				void handleCreate();
+			}
+		};
+		window.addEventListener("keydown", handler);
+		return () => window.removeEventListener("keydown", handler);
+	}, [isNewWorkspaceModalOpen, handleCreate]);
+
+	// ── Issue / PR linking ───────────────────────────────────────────
+	const addLinkedIssue = (
+		slug: string,
+		title: string,
+		taskId: string | undefined,
+		url?: string,
+	) => {
+		if (linkedIssues.some((issue) => issue.slug === slug)) return;
+		updateDraft({
+			linkedIssues: [
+				...linkedIssues,
+				{ slug, title, source: "internal", taskId, url },
+			],
+		});
+	};
+
+	const addLinkedGitHubIssue = (
+		issueNumber: number,
+		title: string,
+		url: string,
+		state: string,
+	) => {
+		if (linkedIssues.some((i) => i.url === url)) return;
+		updateDraft({
+			linkedIssues: [
+				...linkedIssues,
+				{
+					slug: `#${issueNumber}`,
+					title,
+					source: "github" as const,
+					url,
+					number: issueNumber,
+					state: state.toLowerCase() === "closed" ? "closed" : "open",
+				},
+			],
+		});
+	};
+
+	const removeLinkedIssue = (slug: string) =>
+		updateDraft({
+			linkedIssues: linkedIssues.filter((i) => i.slug !== slug),
+		});
+
+	const setLinkedPR = (pr: LinkedPR) => updateDraft({ linkedPR: pr });
+	const removeLinkedPR = () => updateDraft({ linkedPR: null });
+
+	// ── Render ────────────────────────────────────────────────────────
+	return (
+		<div className="p-3 space-y-2">
+			{/* Workspace name + branch name */}
+			<div className="flex items-center">
+				<Input
+					className="border-none bg-transparent dark:bg-transparent shadow-none text-base font-medium px-0 h-auto focus-visible:ring-0 placeholder:text-muted-foreground/40 min-w-0 flex-1"
+					placeholder="Workspace name (optional)"
+					value={workspaceName}
+					onChange={(e) =>
+						updateDraft({
+							workspaceName: e.target.value,
+							workspaceNameEdited: true,
+						})
+					}
+					onBlur={() => {
+						if (!workspaceName.trim())
+							updateDraft({ workspaceName: "", workspaceNameEdited: false });
+					}}
+				/>
+				<div className="shrink min-w-0 ml-auto max-w-[50%]">
+					<Input
+						className={cn(
+							"border-none bg-transparent dark:bg-transparent shadow-none text-xs font-mono text-muted-foreground/60 px-0 h-auto focus-visible:ring-0 placeholder:text-muted-foreground/30 focus:text-muted-foreground text-right placeholder:text-right overflow-hidden text-ellipsis",
+						)}
+						placeholder={branchPreview || "branch name"}
+						value={branchName}
+						onChange={(e) =>
+							updateDraft({
+								branchName: e.target.value.replace(/\s+/g, "-"),
+								branchNameEdited: true,
+							})
+						}
+						onBlur={() => {
+							const sanitized = sanitizeUserBranchName(branchName.trim());
+							if (!sanitized)
+								updateDraft({ branchName: "", branchNameEdited: false });
+							else updateDraft({ branchName: sanitized });
+						}}
+					/>
+				</div>
+			</div>
+
+			{/* Prompt input */}
+			<PromptInput
+				onSubmit={handlePromptSubmit}
+				multiple
+				maxFiles={5}
+				maxFileSize={10 * 1024 * 1024}
+				className="[&>[data-slot=input-group]]:rounded-[13px] [&>[data-slot=input-group]]:border-[0.5px] [&>[data-slot=input-group]]:shadow-none [&>[data-slot=input-group]]:bg-foreground/[0.02]"
+			>
+				{(linkedPR ||
+					linkedIssues.length > 0 ||
+					attachments.files.length > 0) && (
+					<div className="flex flex-wrap items-start gap-2 px-3 pt-3 self-stretch">
+						<AnimatePresence initial={false}>
+							{linkedPR && (
+								<motion.div
+									key="linked-pr"
+									initial={{ opacity: 0, scale: 0.8 }}
+									animate={{ opacity: 1, scale: 1 }}
+									exit={{ opacity: 0, scale: 0.8 }}
+									transition={{ duration: 0.15 }}
+								>
+									<LinkedPRPill
+										prNumber={linkedPR.prNumber}
+										title={linkedPR.title}
+										state={linkedPR.state}
+										onRemove={removeLinkedPR}
+									/>
+								</motion.div>
+							)}
+							{linkedIssues.map((issue) => (
+								<motion.div
+									key={issue.url ?? issue.slug}
+									initial={{ opacity: 0, scale: 0.8 }}
+									animate={{ opacity: 1, scale: 1 }}
+									exit={{ opacity: 0, scale: 0.8 }}
+									transition={{ duration: 0.15 }}
+								>
+									{issue.source === "github" && issue.number != null ? (
+										<LinkedGitHubIssuePill
+											issueNumber={issue.number}
+											title={issue.title}
+											state={issue.state ?? "open"}
+											onRemove={() => removeLinkedIssue(issue.slug)}
+										/>
+									) : (
+										<LinkedIssuePill
+											slug={issue.slug}
+											title={issue.title}
+											url={issue.url}
+											taskId={issue.taskId}
+											onRemove={() => removeLinkedIssue(issue.slug)}
+										/>
+									)}
+								</motion.div>
+							))}
+						</AnimatePresence>
+						<PromptInputAttachments>
+							{(file) => <PromptInputAttachment data={file} />}
+						</PromptInputAttachments>
+					</div>
+				)}
+				<PromptInputTextarea
+					autoFocus
+					placeholder="What do you want to do?"
+					className="min-h-10"
+					value={prompt}
+					onChange={(e) => updateDraft({ prompt: e.target.value })}
+				/>
+				<PromptInputFooter>
+					<PromptInputTools className="gap-1.5">
+						<AgentSelect<WorkspaceCreateAgent>
+							agents={enabledAgentPresets}
+							value={selectedAgent}
+							placeholder="No agent"
+							onValueChange={setSelectedAgent}
+							onBeforeConfigureAgents={closeModal}
+							triggerClassName={`${PILL_BUTTON_CLASS} px-1.5 gap-1 text-foreground w-auto max-w-[160px]`}
+							iconClassName="size-3 object-contain"
+							allowNone
+							noneLabel="No agent"
+							noneValue="none"
+						/>
+					</PromptInputTools>
+					<div className="flex items-center gap-2">
+						<AttachmentButtons
+							anchorRef={plusMenuRef}
+							onOpenIssueLink={() =>
+								requestAnimationFrame(() => setIssueLinkOpen(true))
+							}
+							onOpenGitHubIssue={() =>
+								requestAnimationFrame(() => setGitHubIssueLinkOpen(true))
+							}
+							onOpenPRLink={() =>
+								requestAnimationFrame(() => setPRLinkOpen(true))
+							}
+						/>
+						<IssueLinkCommand
+							variant="popover"
+							anchorRef={plusMenuRef}
+							open={issueLinkOpen}
+							onOpenChange={setIssueLinkOpen}
+							onSelect={addLinkedIssue}
+						/>
+						<GitHubIssueLinkCommand
+							open={gitHubIssueLinkOpen}
+							onOpenChange={setGitHubIssueLinkOpen}
+							onSelect={(issue) =>
+								addLinkedGitHubIssue(
+									issue.issueNumber,
+									issue.title,
+									issue.url,
+									issue.state,
+								)
+							}
+							projectId={projectId}
+							hostTarget={hostTarget}
+							anchorRef={plusMenuRef}
+						/>
+						<PRLinkCommand
+							open={prLinkOpen}
+							onOpenChange={setPRLinkOpen}
+							onSelect={setLinkedPR}
+							projectId={projectId}
+							hostTarget={hostTarget}
+							anchorRef={plusMenuRef}
+						/>
+						<PromptInputSubmit
+							className="size-[22px] rounded-full border border-transparent bg-foreground/10 shadow-none p-[5px] hover:bg-foreground/20"
+							onClick={(e) => {
+								e.preventDefault();
+								void handleCreate();
+							}}
+						>
+							<ArrowUpIcon className="size-3.5 text-muted-foreground" />
+						</PromptInputSubmit>
+					</div>
+				</PromptInputFooter>
+			</PromptInput>
+
+			{/* Bottom bar */}
+			<div className="flex items-center justify-between gap-2">
+				<div className="flex items-center gap-2 min-w-0 flex-1">
+					<ProjectPickerPill
+						selectedProject={selectedProject}
+						recentProjects={recentProjects}
+						onSelectProject={onSelectProject}
+					/>
+					<AnimatePresence mode="wait" initial={false}>
+						{linkedPR ? (
+							<motion.span
+								key="linked-pr-label"
+								initial={{ opacity: 0, x: -8, filter: "blur(4px)" }}
+								animate={{ opacity: 1, x: 0, filter: "blur(0px)" }}
+								exit={{ opacity: 0, x: 8, filter: "blur(4px)" }}
+								transition={{ duration: 0.2, ease: "easeOut" }}
+								className="flex items-center gap-1 text-xs text-muted-foreground"
+							>
+								<LuGitPullRequest className="size-3 shrink-0" />
+								based off PR #{linkedPR.prNumber}
+							</motion.span>
+						) : (
+							<motion.div
+								key="branch-picker"
+								className="min-w-0"
+								initial={{ opacity: 0, x: -8, filter: "blur(4px)" }}
+								animate={{ opacity: 1, x: 0, filter: "blur(0px)" }}
+								exit={{ opacity: 0, x: 8, filter: "blur(4px)" }}
+								transition={{ duration: 0.2, ease: "easeOut" }}
+							>
+								<CompareBaseBranchPicker
+									effectiveCompareBaseBranch={effectiveCompareBaseBranch}
+									defaultBranch={branchData?.defaultBranch}
+									isBranchesLoading={isBranchesLoading}
+									isBranchesError={isBranchesError}
+									branches={branchData?.branches ?? []}
+									onSelectCompareBaseBranch={(branch) =>
+										updateDraft({ baseBranch: branch })
+									}
+								/>
+							</motion.div>
+						)}
+					</AnimatePresence>
+				</div>
+				<div className="flex items-center gap-1.5">
+					<DevicePicker
+						hostTarget={hostTarget}
+						onSelectHostTarget={(t) => updateDraft({ hostTarget: t })}
+					/>
+					<span className="text-[11px] text-muted-foreground/50">
+						{modKey}↵
+					</span>
+				</div>
+			</div>
+		</div>
+	);
+}
diff --git a/apps/desktop/src/renderer/routes/_authenticated/components/DashboardNewWorkspaceModal/components/DashboardNewWorkspaceForm/PromptGroup/components/AttachmentButtons/AttachmentButtons.tsx b/apps/desktop/src/renderer/routes/_authenticated/components/DashboardNewWorkspaceModal/components/DashboardNewWorkspaceForm/PromptGroup/components/AttachmentButtons/AttachmentButtons.tsx
new file mode 100644
index 00000000000..d753778a9a7
--- /dev/null
+++ b/apps/desktop/src/renderer/routes/_authenticated/components/DashboardNewWorkspaceModal/components/DashboardNewWorkspaceForm/PromptGroup/components/AttachmentButtons/AttachmentButtons.tsx
@@ -0,0 +1,74 @@
+import {
+	PromptInputButton,
+	usePromptInputAttachments,
+} from "@superset/ui/ai-elements/prompt-input";
+import { Tooltip, TooltipContent, TooltipTrigger } from "@superset/ui/tooltip";
+import { PaperclipIcon } from "lucide-react";
+import { GoIssueOpened } from "react-icons/go";
+import { LuGitPullRequest } from "react-icons/lu";
+import { SiLinear } from "react-icons/si";
+import { PILL_BUTTON_CLASS } from "../../types";
+
+interface AttachmentButtonsProps {
+	anchorRef: React.RefObject<HTMLDivElement | null>;
+	onOpenIssueLink: () => void;
+	onOpenGitHubIssue: () => void;
+	onOpenPRLink: () => void;
+}
+
+export function AttachmentButtons({
+	anchorRef,
+	onOpenIssueLink,
+	onOpenGitHubIssue,
+	onOpenPRLink,
+}: AttachmentButtonsProps) {
+	const attachments = usePromptInputAttachments();
+	return (
+		<div ref={anchorRef} className="flex items-center gap-1">
+			<Tooltip>
+				<TooltipTrigger asChild>
+					<PromptInputButton
+						className={`${PILL_BUTTON_CLASS} w-[22px]`}
+						onClick={() => attachments.openFileDialog()}
+					>
+						<PaperclipIcon className="size-3.5" />
+					</PromptInputButton>
+				</TooltipTrigger>
+				<TooltipContent side="bottom">Add attachment</TooltipContent>
+			</Tooltip>
+			<Tooltip>
+				<TooltipTrigger asChild>
+					<PromptInputButton
+						className={`${PILL_BUTTON_CLASS} w-[22px]`}
+						onClick={onOpenIssueLink}
+					>
+						<SiLinear className="size-3.5" />
+					</PromptInputButton>
+				</TooltipTrigger>
+				<TooltipContent side="bottom">Link issue</TooltipContent>
+			</Tooltip>
+			<Tooltip>
+				<TooltipTrigger asChild>
+					<PromptInputButton
+						className={`${PILL_BUTTON_CLASS} w-[22px]`}
+						onClick={onOpenGitHubIssue}
+					>
+						<GoIssueOpened className="size-3.5" />
+					</PromptInputButton>
+				</TooltipTrigger>
+				<TooltipContent side="bottom">Link GitHub issue</TooltipContent>
+			</Tooltip>
+			<Tooltip>
+				<TooltipTrigger asChild>
+					<PromptInputButton
+						className={`${PILL_BUTTON_CLASS} w-[22px]`}
+						onClick={onOpenPRLink}
+					>
+						<LuGitPullRequest className="size-3.5" />
+					</PromptInputButton>
+				</TooltipTrigger>
+				<TooltipContent side="bottom">Link pull request</TooltipContent>
+			</Tooltip>
+		</div>
+	);
+}
diff --git a/apps/desktop/src/renderer/routes/_authenticated/components/DashboardNewWorkspaceModal/components/DashboardNewWorkspaceForm/PromptGroup/components/AttachmentButtons/index.ts b/apps/desktop/src/renderer/routes/_authenticated/components/DashboardNewWorkspaceModal/components/DashboardNewWorkspaceForm/PromptGroup/components/AttachmentButtons/index.ts
new file mode 100644
index 00000000000..1bcf39bf3f0
--- /dev/null
+++ b/apps/desktop/src/renderer/routes/_authenticated/components/DashboardNewWorkspaceModal/components/DashboardNewWorkspaceForm/PromptGroup/components/AttachmentButtons/index.ts
@@ -0,0 +1 @@
+export { AttachmentButtons } from "./AttachmentButtons";
diff --git a/apps/desktop/src/renderer/routes/_authenticated/components/DashboardNewWorkspaceModal/components/DashboardNewWorkspaceForm/PromptGroup/components/CompareBaseBranchPicker/CompareBaseBranchPicker.tsx b/apps/desktop/src/renderer/routes/_authenticated/components/DashboardNewWorkspaceModal/components/DashboardNewWorkspaceForm/PromptGroup/components/CompareBaseBranchPicker/CompareBaseBranchPicker.tsx
new file mode 100644
index 00000000000..1d470bb6919
--- /dev/null
+++ b/apps/desktop/src/renderer/routes/_authenticated/components/DashboardNewWorkspaceModal/components/DashboardNewWorkspaceForm/PromptGroup/components/CompareBaseBranchPicker/CompareBaseBranchPicker.tsx
@@ -0,0 +1,134 @@
+import {
+	Command,
+	CommandEmpty,
+	CommandInput,
+	CommandItem,
+	CommandList,
+} from "@superset/ui/command";
+import { Popover, PopoverContent, PopoverTrigger } from "@superset/ui/popover";
+import { useMemo, useState } from "react";
+import { GoGitBranch } from "react-icons/go";
+import { HiCheck, HiChevronUpDown } from "react-icons/hi2";
+import { formatRelativeTime } from "renderer/lib/formatRelativeTime";
+
+interface CompareBaseBranchPickerProps {
+	effectiveCompareBaseBranch: string | null;
+	defaultBranch: string | null | undefined;
+	isBranchesLoading: boolean;
+	isBranchesError: boolean;
+	branches: Array<{
+		name: string;
+		lastCommitDate: number;
+		isLocal: boolean;
+		hasWorkspace: boolean;
+	}>;
+	onSelectCompareBaseBranch: (branchName: string) => void;
+}
+
+export function CompareBaseBranchPicker({
+	effectiveCompareBaseBranch,
+	defaultBranch,
+	isBranchesLoading,
+	isBranchesError,
+	branches,
+	onSelectCompareBaseBranch,
+}: CompareBaseBranchPickerProps) {
+	const [open, setOpen] = useState(false);
+	const [branchSearch, setBranchSearch] = useState("");
+
+	const filteredBranches = useMemo(() => {
+		if (!branchSearch) return branches;
+		const searchLower = branchSearch.toLowerCase();
+		return branches.filter((b) => b.name.toLowerCase().includes(searchLower));
+	}, [branches, branchSearch]);
+
+	if (isBranchesError) {
+		return (
+			<span className="text-xs text-destructive">Failed to load branches</span>
+		);
+	}
+
+	return (
+		<Popover
+			open={open}
+			onOpenChange={(v) => {
+				setOpen(v);
+				if (!v) setBranchSearch("");
+			}}
+		>
+			<PopoverTrigger asChild>
+				<button
+					type="button"
+					disabled={isBranchesLoading}
+					className="flex items-center gap-1 text-xs text-muted-foreground hover:text-foreground transition-colors disabled:opacity-50 min-w-0 max-w-full"
+				>
+					<GoGitBranch className="size-3 shrink-0" />
+					{isBranchesLoading ? (
+						<span className="h-2.5 w-14 rounded-sm bg-muted-foreground/15 animate-pulse" />
+					) : (
+						<span className="font-mono truncate">
+							{effectiveCompareBaseBranch || "..."}
+						</span>
+					)}
+					<HiChevronUpDown className="size-3 shrink-0" />
+				</button>
+			</PopoverTrigger>
+			<PopoverContent
+				className="w-96 p-0"
+				align="start"
+				onWheel={(event) => event.stopPropagation()}
+			>
+				<Command shouldFilter={false}>
+					<CommandInput
+						placeholder="Search branches..."
+						value={branchSearch}
+						onValueChange={setBranchSearch}
+					/>
+					<CommandList className="max-h-[400px]">
+						<CommandEmpty>No branches found</CommandEmpty>
+						{filteredBranches.map((branch) => (
+							<CommandItem
+								key={branch.name}
+								value={branch.name}
+								onSelect={() => {
+									onSelectCompareBaseBranch(branch.name);
+									setOpen(false);
+								}}
+								className="group h-11 flex items-center justify-between gap-3 px-3"
+							>
+								<span className="flex items-center gap-2.5 truncate flex-1 min-w-0">
+									<GoGitBranch className="size-3.5 shrink-0 text-muted-foreground" />
+									<span className="truncate font-mono text-xs">
+										{branch.name}
+									</span>
+									<span className="flex items-center gap-1.5 shrink-0">
+										{branch.name === defaultBranch && (
+											<span className="text-[10px] text-muted-foreground bg-muted px-1.5 py-0.5 rounded">
+												default
+											</span>
+										)}
+										{branch.hasWorkspace && (
+											<span className="text-[10px] text-muted-foreground/60 bg-muted/60 px-1.5 py-0.5 rounded">
+												workspace
+											</span>
+										)}
+									</span>
+								</span>
+								<span className="flex items-center gap-2 shrink-0">
+									{branch.lastCommitDate > 0 && (
+										<span className="text-[11px] text-muted-foreground/70">
+											{formatRelativeTime(branch.lastCommitDate * 1000)}
+										</span>
+									)}
+									{effectiveCompareBaseBranch === branch.name && (
+										<HiCheck className="size-4 text-primary" />
+									)}
+								</span>
+							</CommandItem>
+						))}
+					</CommandList>
+				</Command>
+			</PopoverContent>
+		</Popover>
+	);
+}
diff --git a/apps/desktop/src/renderer/routes/_authenticated/components/DashboardNewWorkspaceModal/components/DashboardNewWorkspaceForm/PromptGroup/components/CompareBaseBranchPicker/index.ts b/apps/desktop/src/renderer/routes/_authenticated/components/DashboardNewWorkspaceModal/components/DashboardNewWorkspaceForm/PromptGroup/components/CompareBaseBranchPicker/index.ts
new file mode 100644
index 00000000000..b2481b345b6
--- /dev/null
+++ b/apps/desktop/src/renderer/routes/_authenticated/components/DashboardNewWorkspaceModal/components/DashboardNewWorkspaceForm/PromptGroup/components/CompareBaseBranchPicker/index.ts
@@ -0,0 +1 @@
+export { CompareBaseBranchPicker } from "./CompareBaseBranchPicker";
diff --git a/apps/desktop/src/renderer/routes/_authenticated/components/DashboardNewWorkspaceModal/components/DashboardNewWorkspaceForm/PromptGroup/components/GitHubIssueLinkCommand/GitHubIssueLinkCommand.tsx b/apps/desktop/src/renderer/routes/_authenticated/components/DashboardNewWorkspaceModal/components/DashboardNewWorkspaceForm/PromptGroup/components/GitHubIssueLinkCommand/GitHubIssueLinkCommand.tsx
new file mode 100644
index 00000000000..0820c0b943e
--- /dev/null
+++ b/apps/desktop/src/renderer/routes/_authenticated/components/DashboardNewWorkspaceModal/components/DashboardNewWorkspaceForm/PromptGroup/components/GitHubIssueLinkCommand/GitHubIssueLinkCommand.tsx
@@ -0,0 +1,154 @@
+import {
+	Command,
+	CommandEmpty,
+	CommandGroup,
+	CommandInput,
+	CommandItem,
+	CommandList,
+} from "@superset/ui/command";
+import { Popover, PopoverAnchor, PopoverContent } from "@superset/ui/popover";
+import { useQuery } from "@tanstack/react-query";
+import type React from "react";
+import type { RefObject } from "react";
+import { useState } from "react";
+import { env } from "renderer/env.renderer";
+import { useDebouncedValue } from "renderer/hooks/useDebouncedValue";
+import { getHostServiceClientByUrl } from "renderer/lib/host-service-client";
+import { useLocalHostService } from "renderer/routes/_authenticated/providers/LocalHostServiceProvider";
+import {
+	IssueIcon,
+	type IssueState,
+} from "renderer/screens/main/components/IssueIcon/IssueIcon";
+import type { WorkspaceHostTarget } from "../../../components/DevicePicker";
+
+const MAX_RESULTS = 20;
+
+const normalizeIssueState = (state: string): IssueState =>
+	state.toLowerCase() === "closed" ? "closed" : "open";
+
+export interface SelectedIssue {
+	issueNumber: number;
+	title: string;
+	url: string;
+	state: string;
+}
+
+interface GitHubIssueLinkCommandProps {
+	open: boolean;
+	onOpenChange: (open: boolean) => void;
+	onSelect: (issue: SelectedIssue) => void;
+	projectId: string | null;
+	hostTarget: WorkspaceHostTarget;
+	anchorRef: RefObject<HTMLElement | null>;
+}
+
+export function GitHubIssueLinkCommand({
+	open,
+	onOpenChange,
+	onSelect,
+	projectId,
+	hostTarget,
+	anchorRef,
+}: GitHubIssueLinkCommandProps) {
+	const [searchQuery, setSearchQuery] = useState("");
+	const debouncedQuery = useDebouncedValue(searchQuery, 300);
+	const { activeHostUrl } = useLocalHostService();
+
+	const hostUrl =
+		hostTarget.kind === "local"
+			? activeHostUrl
+			: `${env.RELAY_URL}/hosts/${hostTarget.hostId}`;
+
+	const { data, isLoading } = useQuery({
+		queryKey: [
+			"workspaceCreation",
+			"searchGitHubIssues",
+			projectId,
+			hostUrl,
+			debouncedQuery,
+		],
+		queryFn: async () => {
+			if (!hostUrl || !projectId) return { issues: [] };
+			const client = getHostServiceClientByUrl(hostUrl);
+			return client.workspaceCreation.searchGitHubIssues.query({
+				projectId,
+				query: debouncedQuery.trim() || undefined,
+				limit: MAX_RESULTS,
+			});
+		},
+		enabled: !!projectId && !!hostUrl && open,
+	});
+
+	const searchResults = data?.issues ?? [];
+
+	const handleClose = () => {
+		setSearchQuery("");
+		onOpenChange(false);
+	};
+
+	const handleSelect = (issue: (typeof searchResults)[number]) => {
+		onSelect({
+			issueNumber: issue.issueNumber,
+			title: issue.title,
+			url: issue.url,
+			state: issue.state,
+		});
+		handleClose();
+	};
+
+	return (
+		<Popover open={open}>
+			<PopoverAnchor virtualRef={anchorRef as React.RefObject<Element>} />
+			<PopoverContent
+				className="w-80 p-0"
+				align="start"
+				side="bottom"
+				onWheel={(event) => event.stopPropagation()}
+				onPointerDownOutside={handleClose}
+				onEscapeKeyDown={handleClose}
+				onFocusOutside={(e) => e.preventDefault()}
+			>
+				<Command shouldFilter={false}>
+					<CommandInput
+						placeholder="Search issues..."
+						value={searchQuery}
+						onValueChange={setSearchQuery}
+					/>
+					<CommandList className="max-h-[280px]">
+						{searchResults.length === 0 && (
+							<CommandEmpty>
+								{isLoading ? "Loading issues..." : "No open issues found."}
+							</CommandEmpty>
+						)}
+						{searchResults.length > 0 && (
+							<CommandGroup heading={searchQuery ? "Results" : "Open issues"}>
+								{searchResults.map((issue) => (
+									<CommandItem
+										key={issue.issueNumber}
+										value={`${issue.issueNumber}-${issue.title}`}
+										onSelect={() => handleSelect(issue)}
+										className="group"
+									>
+										<IssueIcon
+											state={normalizeIssueState(issue.state)}
+											className="size-3.5 shrink-0"
+										/>
+										<span className="shrink-0 font-mono text-xs text-muted-foreground">
+											#{issue.issueNumber}
+										</span>
+										<span className="min-w-0 flex-1 truncate text-xs">
+											{issue.title}
+										</span>
+										<span className="shrink-0 hidden text-xs text-muted-foreground group-data-[selected=true]:inline">
+											Link ↵
+										</span>
+									</CommandItem>
+								))}
+							</CommandGroup>
+						)}
+					</CommandList>
+				</Command>
+			</PopoverContent>
+		</Popover>
+	);
+}
diff --git a/apps/desktop/src/renderer/routes/_authenticated/components/DashboardNewWorkspaceModal/components/DashboardNewWorkspaceForm/PromptGroup/components/GitHubIssueLinkCommand/index.ts b/apps/desktop/src/renderer/routes/_authenticated/components/DashboardNewWorkspaceModal/components/DashboardNewWorkspaceForm/PromptGroup/components/GitHubIssueLinkCommand/index.ts
new file mode 100644
index 00000000000..c7d5f8cdb50
--- /dev/null
+++ b/apps/desktop/src/renderer/routes/_authenticated/components/DashboardNewWorkspaceModal/components/DashboardNewWorkspaceForm/PromptGroup/components/GitHubIssueLinkCommand/index.ts
@@ -0,0 +1 @@
+export { GitHubIssueLinkCommand } from "./GitHubIssueLinkCommand";
diff --git a/apps/desktop/src/renderer/routes/_authenticated/components/DashboardNewWorkspaceModal/components/DashboardNewWorkspaceForm/PromptGroup/components/LinkedGitHubIssuePill/LinkedGitHubIssuePill.tsx b/apps/desktop/src/renderer/routes/_authenticated/components/DashboardNewWorkspaceModal/components/DashboardNewWorkspaceForm/PromptGroup/components/LinkedGitHubIssuePill/LinkedGitHubIssuePill.tsx
new file mode 100644
index 00000000000..75ecb4b52d2
--- /dev/null
+++ b/apps/desktop/src/renderer/routes/_authenticated/components/DashboardNewWorkspaceModal/components/DashboardNewWorkspaceForm/PromptGroup/components/LinkedGitHubIssuePill/LinkedGitHubIssuePill.tsx
@@ -0,0 +1,59 @@
+import { Button } from "@superset/ui/button";
+import { XIcon } from "lucide-react";
+import {
+	IssueIcon,
+	type IssueState,
+} from "renderer/screens/main/components/IssueIcon/IssueIcon";
+
+interface LinkedGitHubIssuePillProps {
+	issueNumber: number;
+	title: string;
+	state: string;
+	onRemove: () => void;
+}
+
+// Normalize issue state to valid IssueState type
+const normalizeIssueState = (state: string): IssueState =>
+	state.toLowerCase() === "closed" ? "closed" : "open";
+
+export function LinkedGitHubIssuePill({
+	issueNumber,
+	title,
+	state,
+	onRemove,
+}: LinkedGitHubIssuePillProps) {
+	return (
+		<div
+			title={title}
+			className="group flex items-center gap-2.5 rounded-md border border-border/50 bg-muted/60 px-3 py-2 text-sm transition-all select-none hover:bg-accent hover:ring-1 hover:ring-border dark:hover:bg-accent/50"
+		>
+			<div className="relative flex size-7 shrink-0 items-center justify-center rounded-md bg-foreground/10 p-0.5">
+				<IssueIcon
+					state={normalizeIssueState(state)}
+					className="size-5 transition-opacity group-hover:opacity-0"
+				/>
+				<Button
+					aria-label="Remove linked issue"
+					className="pointer-events-none absolute inset-0 size-7 cursor-pointer rounded-md p-0 opacity-0 transition-opacity group-hover:pointer-events-auto group-hover:opacity-100 [&>svg]:size-3"
+					onClick={(e) => {
+						e.stopPropagation();
+						onRemove();
+					}}
+					type="button"
+					variant="ghost"
+				>
+					<XIcon />
+					<span className="sr-only">Remove</span>
+				</Button>
+			</div>
+			<div className="flex flex-col items-start leading-tight">
+				<span className="max-w-[180px] truncate font-medium">{title}</span>
+				<div className="flex items-center gap-1.5 text-muted-foreground text-[10px] uppercase tracking-widest">
+					<span>#{issueNumber}</span>
+					<span>·</span>
+					<span>GitHub</span>
+				</div>
+			</div>
+		</div>
+	);
+}
diff --git a/apps/desktop/src/renderer/routes/_authenticated/components/DashboardNewWorkspaceModal/components/DashboardNewWorkspaceForm/PromptGroup/components/LinkedGitHubIssuePill/index.ts b/apps/desktop/src/renderer/routes/_authenticated/components/DashboardNewWorkspaceModal/components/DashboardNewWorkspaceForm/PromptGroup/components/LinkedGitHubIssuePill/index.ts
new file mode 100644
index 00000000000..fe1657259a6
--- /dev/null
+++ b/apps/desktop/src/renderer/routes/_authenticated/components/DashboardNewWorkspaceModal/components/DashboardNewWorkspaceForm/PromptGroup/components/LinkedGitHubIssuePill/index.ts
@@ -0,0 +1 @@
+export { LinkedGitHubIssuePill } from "./LinkedGitHubIssuePill";
diff --git a/apps/desktop/src/renderer/routes/_authenticated/components/DashboardNewWorkspaceModal/components/DashboardNewWorkspaceForm/PromptGroup/components/LinkedPRPill/LinkedPRPill.tsx b/apps/desktop/src/renderer/routes/_authenticated/components/DashboardNewWorkspaceModal/components/DashboardNewWorkspaceForm/PromptGroup/components/LinkedPRPill/LinkedPRPill.tsx
new file mode 100644
index 00000000000..9e2c4b35720
--- /dev/null
+++ b/apps/desktop/src/renderer/routes/_authenticated/components/DashboardNewWorkspaceModal/components/DashboardNewWorkspaceForm/PromptGroup/components/LinkedPRPill/LinkedPRPill.tsx
@@ -0,0 +1,55 @@
+import { Button } from "@superset/ui/button";
+import { XIcon } from "lucide-react";
+import {
+	PRIcon,
+	type PRState,
+} from "renderer/screens/main/components/PRIcon/PRIcon";
+
+interface LinkedPRPillProps {
+	prNumber: number;
+	title: string;
+	state: string;
+	onRemove: () => void;
+}
+
+export function LinkedPRPill({
+	prNumber,
+	title,
+	state,
+	onRemove,
+}: LinkedPRPillProps) {
+	return (
+		<div
+			title={title}
+			className="group flex items-center gap-2.5 rounded-md border border-border/50 bg-muted/60 px-3 py-2 text-sm transition-all select-none hover:bg-accent hover:ring-1 hover:ring-border dark:hover:bg-accent/50"
+		>
+			<div className="relative flex size-7 shrink-0 items-center justify-center rounded-md bg-foreground/10 p-0.5">
+				<PRIcon
+					state={state as PRState}
+					className="size-5 transition-opacity group-hover:opacity-0"
+				/>
+				<Button
+					aria-label="Remove linked PR"
+					className="pointer-events-none absolute inset-0 size-7 cursor-pointer rounded-md p-0 opacity-0 transition-opacity group-hover:pointer-events-auto group-hover:opacity-100 [&>svg]:size-3"
+					onClick={(e) => {
+						e.stopPropagation();
+						onRemove();
+					}}
+					type="button"
+					variant="ghost"
+				>
+					<XIcon />
+					<span className="sr-only">Remove</span>
+				</Button>
+			</div>
+			<div className="flex flex-col items-start leading-tight">
+				<span className="max-w-[180px] truncate font-medium">{title}</span>
+				<div className="flex items-center gap-1.5 text-muted-foreground text-[10px] uppercase tracking-widest">
+					<span>#{prNumber}</span>
+					<span>·</span>
+					<span>GitHub</span>
+				</div>
+			</div>
+		</div>
+	);
+}
diff --git a/apps/desktop/src/renderer/routes/_authenticated/components/DashboardNewWorkspaceModal/components/DashboardNewWorkspaceForm/PromptGroup/components/LinkedPRPill/index.ts b/apps/desktop/src/renderer/routes/_authenticated/components/DashboardNewWorkspaceModal/components/DashboardNewWorkspaceForm/PromptGroup/components/LinkedPRPill/index.ts
new file mode 100644
index 00000000000..1042cfae4d8
--- /dev/null
+++ b/apps/desktop/src/renderer/routes/_authenticated/components/DashboardNewWorkspaceModal/components/DashboardNewWorkspaceForm/PromptGroup/components/LinkedPRPill/index.ts
@@ -0,0 +1 @@
+export { LinkedPRPill } from "./LinkedPRPill";
diff --git a/apps/desktop/src/renderer/routes/_authenticated/components/DashboardNewWorkspaceModal/components/DashboardNewWorkspaceForm/PromptGroup/components/PRLinkCommand/PRLinkCommand.tsx b/apps/desktop/src/renderer/routes/_authenticated/components/DashboardNewWorkspaceModal/components/DashboardNewWorkspaceForm/PromptGroup/components/PRLinkCommand/PRLinkCommand.tsx
new file mode 100644
index 00000000000..a5b79ae418e
--- /dev/null
+++ b/apps/desktop/src/renderer/routes/_authenticated/components/DashboardNewWorkspaceModal/components/DashboardNewWorkspaceForm/PromptGroup/components/PRLinkCommand/PRLinkCommand.tsx
@@ -0,0 +1,168 @@
+import {
+	Command,
+	CommandEmpty,
+	CommandGroup,
+	CommandInput,
+	CommandItem,
+	CommandList,
+} from "@superset/ui/command";
+import { Popover, PopoverAnchor, PopoverContent } from "@superset/ui/popover";
+import { useQuery } from "@tanstack/react-query";
+import type React from "react";
+import type { RefObject } from "react";
+import { useState } from "react";
+import { env } from "renderer/env.renderer";
+import { useDebouncedValue } from "renderer/hooks/useDebouncedValue";
+import { getHostServiceClientByUrl } from "renderer/lib/host-service-client";
+import { useLocalHostService } from "renderer/routes/_authenticated/providers/LocalHostServiceProvider";
+import {
+	PRIcon,
+	type PRState,
+} from "renderer/screens/main/components/PRIcon/PRIcon";
+import type { WorkspaceHostTarget } from "../../../components/DevicePicker";
+
+export interface SelectedPR {
+	prNumber: number;
+	title: string;
+	url: string;
+	state: string;
+}
+
+interface PRLinkCommandProps {
+	open: boolean;
+	onOpenChange: (open: boolean) => void;
+	onSelect: (pr: SelectedPR) => void;
+	projectId: string | null;
+	hostTarget: WorkspaceHostTarget;
+	anchorRef: RefObject<HTMLElement | null>;
+}
+
+function normalizeState(state: string, isDraft: boolean): string {
+	if (isDraft) return "draft";
+	if (state === "OPEN" || state === "open") return "open";
+	return state.toLowerCase();
+}
+
+export function PRLinkCommand({
+	open,
+	onOpenChange,
+	onSelect,
+	projectId,
+	hostTarget,
+	anchorRef,
+}: PRLinkCommandProps) {
+	const [searchQuery, setSearchQuery] = useState("");
+	const debouncedQuery = useDebouncedValue(searchQuery, 300);
+	const { activeHostUrl } = useLocalHostService();
+
+	const hostUrl =
+		hostTarget.kind === "local"
+			? activeHostUrl
+			: `${env.RELAY_URL}/hosts/${hostTarget.hostId}`;
+
+	const { data, isLoading } = useQuery({
+		queryKey: [
+			"workspaceCreation",
+			"searchPullRequests",
+			projectId,
+			hostUrl,
+			debouncedQuery,
+		],
+		queryFn: async () => {
+			if (!hostUrl || !projectId) return { pullRequests: [] };
+			const client = getHostServiceClientByUrl(hostUrl);
+			return client.workspaceCreation.searchPullRequests.query({
+				projectId,
+				query: debouncedQuery.trim() || undefined,
+				limit: 30,
+			});
+		},
+		enabled: !!projectId && !!hostUrl && open,
+	});
+
+	const pullRequests = data?.pullRequests ?? [];
+	const debouncedTrimmed = debouncedQuery.trim();
+
+	const handleClose = () => {
+		setSearchQuery("");
+		onOpenChange(false);
+	};
+
+	const handleSelect = (pr: (typeof pullRequests)[number]) => {
+		onSelect({
+			prNumber: pr.prNumber,
+			title: pr.title,
+			url: pr.url,
+			state: normalizeState(pr.state, pr.isDraft),
+		});
+		handleClose();
+	};
+
+	return (
+		<Popover open={open}>
+			<PopoverAnchor virtualRef={anchorRef as React.RefObject<Element>} />
+			<PopoverContent
+				className="w-80 p-0"
+				align="start"
+				side="bottom"
+				onWheel={(event) => event.stopPropagation()}
+				onPointerDownOutside={handleClose}
+				onEscapeKeyDown={handleClose}
+				onFocusOutside={(e) => e.preventDefault()}
+			>
+				<Command shouldFilter={false}>
+					<CommandInput
+						placeholder="Search pull requests..."
+						value={searchQuery}
+						onValueChange={setSearchQuery}
+					/>
+					<CommandList className="max-h-[280px]">
+						{pullRequests.length === 0 && (
+							<CommandEmpty>
+								{isLoading
+									? debouncedTrimmed
+										? "Searching..."
+										: "Loading pull requests..."
+									: debouncedTrimmed
+										? "No pull requests found."
+										: "No open pull requests."}
+							</CommandEmpty>
+						)}
+						{pullRequests.length > 0 && (
+							<CommandGroup
+								heading={
+									debouncedTrimmed
+										? `${pullRequests.length} result${pullRequests.length === 1 ? "" : "s"}`
+										: "Recent pull requests"
+								}
+							>
+								{pullRequests.map((pr) => (
+									<CommandItem
+										key={pr.prNumber}
+										value={`${pr.prNumber}-${pr.title}`}
+										onSelect={() => handleSelect(pr)}
+										className="group"
+									>
+										<PRIcon
+											state={normalizeState(pr.state, pr.isDraft) as PRState}
+											className="size-3.5 shrink-0"
+										/>
+										<span className="shrink-0 font-mono text-xs text-muted-foreground">
+											#{pr.prNumber}
+										</span>
+										<span className="min-w-0 flex-1 truncate text-xs">
+											{pr.title}
+										</span>
+										<span className="shrink-0 hidden text-xs text-muted-foreground group-data-[selected=true]:inline">
+											Link ↵
+										</span>
+									</CommandItem>
+								))}
+							</CommandGroup>
+						)}
+					</CommandList>
+				</Command>
+			</PopoverContent>
+		</Popover>
+	);
+}
diff --git a/apps/desktop/src/renderer/routes/_authenticated/components/DashboardNewWorkspaceModal/components/DashboardNewWorkspaceForm/PromptGroup/components/PRLinkCommand/index.ts b/apps/desktop/src/renderer/routes/_authenticated/components/DashboardNewWorkspaceModal/components/DashboardNewWorkspaceForm/PromptGroup/components/PRLinkCommand/index.ts
new file mode 100644
index 00000000000..ba614340e89
--- /dev/null
+++ b/apps/desktop/src/renderer/routes/_authenticated/components/DashboardNewWorkspaceModal/components/DashboardNewWorkspaceForm/PromptGroup/components/PRLinkCommand/index.ts
@@ -0,0 +1 @@
+export { PRLinkCommand } from "./PRLinkCommand";
diff --git a/apps/desktop/src/renderer/routes/_authenticated/components/DashboardNewWorkspaceModal/components/DashboardNewWorkspaceForm/PromptGroup/components/ProjectPickerPill/ProjectPickerPill.tsx b/apps/desktop/src/renderer/routes/_authenticated/components/DashboardNewWorkspaceModal/components/DashboardNewWorkspaceForm/PromptGroup/components/ProjectPickerPill/ProjectPickerPill.tsx
new file mode 100644
index 00000000000..37490d407f1
--- /dev/null
+++ b/apps/desktop/src/renderer/routes/_authenticated/components/DashboardNewWorkspaceModal/components/DashboardNewWorkspaceForm/PromptGroup/components/ProjectPickerPill/ProjectPickerPill.tsx
@@ -0,0 +1,79 @@
+import { PromptInputButton } from "@superset/ui/ai-elements/prompt-input";
+import {
+	Command,
+	CommandEmpty,
+	CommandGroup,
+	CommandInput,
+	CommandItem,
+	CommandList,
+} from "@superset/ui/command";
+import { Popover, PopoverContent, PopoverTrigger } from "@superset/ui/popover";
+import { useState } from "react";
+import { HiCheck, HiChevronUpDown } from "react-icons/hi2";
+import { ProjectThumbnail } from "renderer/routes/_authenticated/components/ProjectThumbnail";
+import { PILL_BUTTON_CLASS, type ProjectOption } from "../../types";
+
+interface ProjectPickerPillProps {
+	selectedProject: ProjectOption | undefined;
+	recentProjects: ProjectOption[];
+	onSelectProject: (projectId: string) => void;
+}
+
+export function ProjectPickerPill({
+	selectedProject,
+	recentProjects,
+	onSelectProject,
+}: ProjectPickerPillProps) {
+	const [open, setOpen] = useState(false);
+
+	return (
+		<Popover open={open} onOpenChange={setOpen}>
+			<PopoverTrigger asChild>
+				<PromptInputButton
+					className={`${PILL_BUTTON_CLASS} px-1.5 gap-1 text-foreground w-auto max-w-[140px]`}
+				>
+					{selectedProject && (
+						<ProjectThumbnail
+							projectName={selectedProject.name}
+							githubOwner={selectedProject.githubOwner}
+							className="!size-3"
+						/>
+					)}
+					<span className="truncate">
+						{selectedProject?.name ?? "Select project"}
+					</span>
+					<HiChevronUpDown className="size-3 shrink-0 text-muted-foreground" />
+				</PromptInputButton>
+			</PopoverTrigger>
+			<PopoverContent align="start" className="w-60 p-0">
+				<Command>
+					<CommandInput placeholder="Search projects..." />
+					<CommandList>
+						<CommandEmpty>No projects found.</CommandEmpty>
+						<CommandGroup>
+							{recentProjects.map((project) => (
+								<CommandItem
+									key={project.id}
+									value={project.name}
+									onSelect={() => {
+										onSelectProject(project.id);
+										setOpen(false);
+									}}
+								>
+									<ProjectThumbnail
+										projectName={project.name}
+										githubOwner={project.githubOwner}
+									/>
+									{project.name}
+									{project.id === selectedProject?.id && (
+										<HiCheck className="ml-auto size-4" />
+									)}
+								</CommandItem>
+							))}
+						</CommandGroup>
+					</CommandList>
+				</Command>
+			</PopoverContent>
+		</Popover>
+	);
+}
diff --git a/apps/desktop/src/renderer/routes/_authenticated/components/DashboardNewWorkspaceModal/components/DashboardNewWorkspaceForm/PromptGroup/components/ProjectPickerPill/index.ts b/apps/desktop/src/renderer/routes/_authenticated/components/DashboardNewWorkspaceModal/components/DashboardNewWorkspaceForm/PromptGroup/components/ProjectPickerPill/index.ts
new file mode 100644
index 00000000000..5a501c182e3
--- /dev/null
+++ b/apps/desktop/src/renderer/routes/_authenticated/components/DashboardNewWorkspaceModal/components/DashboardNewWorkspaceForm/PromptGroup/components/ProjectPickerPill/index.ts
@@ -0,0 +1 @@
+export { ProjectPickerPill } from "./ProjectPickerPill";
diff --git a/apps/desktop/src/renderer/routes/_authenticated/components/DashboardNewWorkspaceModal/components/DashboardNewWorkspaceForm/PromptGroup/hooks/useSubmitWorkspace/index.ts b/apps/desktop/src/renderer/routes/_authenticated/components/DashboardNewWorkspaceModal/components/DashboardNewWorkspaceForm/PromptGroup/hooks/useSubmitWorkspace/index.ts
new file mode 100644
index 00000000000..20473c95be6
--- /dev/null
+++ b/apps/desktop/src/renderer/routes/_authenticated/components/DashboardNewWorkspaceModal/components/DashboardNewWorkspaceForm/PromptGroup/hooks/useSubmitWorkspace/index.ts
@@ -0,0 +1 @@
+export { useSubmitWorkspace } from "./useSubmitWorkspace";
diff --git a/apps/desktop/src/renderer/routes/_authenticated/components/DashboardNewWorkspaceModal/components/DashboardNewWorkspaceForm/PromptGroup/hooks/useSubmitWorkspace/mapLinkedContext.ts b/apps/desktop/src/renderer/routes/_authenticated/components/DashboardNewWorkspaceModal/components/DashboardNewWorkspaceForm/PromptGroup/hooks/useSubmitWorkspace/mapLinkedContext.ts
new file mode 100644
index 00000000000..4d8d25875c9
--- /dev/null
+++ b/apps/desktop/src/renderer/routes/_authenticated/components/DashboardNewWorkspaceModal/components/DashboardNewWorkspaceForm/PromptGroup/hooks/useSubmitWorkspace/mapLinkedContext.ts
@@ -0,0 +1,30 @@
+import type { DashboardNewWorkspaceDraft } from "../../../../../DashboardNewWorkspaceDraftContext";
+
+interface MappedLinkedContext {
+	internalIssueIds: string[] | undefined;
+	githubIssueUrls: string[] | undefined;
+	linkedPrUrl: string | undefined;
+}
+
+/**
+ * Maps draft linked issues/PR into the API payload shape.
+ * Pure function — no side effects, no hooks.
+ */
+export function mapLinkedContext(
+	draft: DashboardNewWorkspaceDraft,
+): MappedLinkedContext {
+	const internalIssueIds = draft.linkedIssues
+		.filter((i) => i.source === "internal" && i.taskId)
+		.map((i) => i.taskId as string);
+
+	const githubIssueUrls = draft.linkedIssues
+		.filter((i) => i.source === "github" && i.url)
+		.map((i) => i.url as string);
+
+	return {
+		internalIssueIds:
+			internalIssueIds.length > 0 ? internalIssueIds : undefined,
+		githubIssueUrls: githubIssueUrls.length > 0 ? githubIssueUrls : undefined,
+		linkedPrUrl: draft.linkedPR?.url,
+	};
+}
diff --git a/apps/desktop/src/renderer/routes/_authenticated/components/DashboardNewWorkspaceModal/components/DashboardNewWorkspaceForm/PromptGroup/hooks/useSubmitWorkspace/resolveNames.ts b/apps/desktop/src/renderer/routes/_authenticated/components/DashboardNewWorkspaceModal/components/DashboardNewWorkspaceForm/PromptGroup/hooks/useSubmitWorkspace/resolveNames.ts
new file mode 100644
index 00000000000..338058c0b0f
--- /dev/null
+++ b/apps/desktop/src/renderer/routes/_authenticated/components/DashboardNewWorkspaceModal/components/DashboardNewWorkspaceForm/PromptGroup/hooks/useSubmitWorkspace/resolveNames.ts
@@ -0,0 +1,35 @@
+import { sanitizeUserBranchName, slugifyForBranch } from "shared/utils/branch";
+import { generateFriendlyBranchName } from "shared/utils/friendly-branch-name";
+import type { DashboardNewWorkspaceDraft } from "../../../../../DashboardNewWorkspaceDraftContext";
+
+interface ResolvedNames {
+	branchName: string;
+	workspaceName: string;
+}
+
+/**
+ * Resolves the branch name and workspace display name from draft state.
+ * Pure function — no side effects, no hooks.
+ *
+ * Priority:
+ * - Branch: user-typed (sanitized) > prompt slug > friendly random
+ * - Workspace: user-typed > prompt text > same as branch
+ */
+export function resolveNames(draft: DashboardNewWorkspaceDraft): ResolvedNames {
+	const trimmedPrompt = draft.prompt.trim();
+	const friendlyFallback = generateFriendlyBranchName();
+
+	const branchName =
+		draft.branchNameEdited && draft.branchName.trim()
+			? sanitizeUserBranchName(draft.branchName.trim())
+			: trimmedPrompt
+				? slugifyForBranch(trimmedPrompt)
+				: friendlyFallback;
+
+	const workspaceName =
+		draft.workspaceNameEdited && draft.workspaceName.trim()
+			? draft.workspaceName.trim()
+			: trimmedPrompt || friendlyFallback;
+
+	return { branchName, workspaceName };
+}
diff --git a/apps/desktop/src/renderer/routes/_authenticated/components/DashboardNewWorkspaceModal/components/DashboardNewWorkspaceForm/PromptGroup/hooks/useSubmitWorkspace/useSubmitWorkspace.ts b/apps/desktop/src/renderer/routes/_authenticated/components/DashboardNewWorkspaceModal/components/DashboardNewWorkspaceForm/PromptGroup/hooks/useSubmitWorkspace/useSubmitWorkspace.ts
new file mode 100644
index 00000000000..4f7022ee8d6
--- /dev/null
+++ b/apps/desktop/src/renderer/routes/_authenticated/components/DashboardNewWorkspaceModal/components/DashboardNewWorkspaceForm/PromptGroup/hooks/useSubmitWorkspace/useSubmitWorkspace.ts
@@ -0,0 +1,134 @@
+import { useProviderAttachments } from "@superset/ui/ai-elements/prompt-input";
+import { toast } from "@superset/ui/sonner";
+import { useNavigate } from "@tanstack/react-router";
+import { useCallback } from "react";
+import {
+	clearAttachments,
+	storeAttachments,
+} from "renderer/lib/pending-attachment-store";
+import { useCollections } from "renderer/routes/_authenticated/providers/CollectionsProvider";
+import { useDashboardNewWorkspaceDraft } from "../../../../../DashboardNewWorkspaceDraftContext";
+import { mapLinkedContext } from "./mapLinkedContext";
+import { resolveNames } from "./resolveNames";
+
+/**
+ * Returns a callback that submits a new workspace:
+ * resolve names → store attachments → insert pending row → close modal →
+ * navigate to pending page → fire-and-forget host-service call →
+ * update collection on resolve/reject.
+ */
+export function useSubmitWorkspace(projectId: string | null) {
+	const navigate = useNavigate();
+	const { closeAndResetDraft, createWorkspace, draft } =
+		useDashboardNewWorkspaceDraft();
+	const attachments = useProviderAttachments();
+	const collections = useCollections();
+
+	return useCallback(async () => {
+		if (!projectId) {
+			toast.error("Select a project first");
+			return;
+		}
+
+		// 1. Resolve names
+		const { branchName, workspaceName } = resolveNames(draft);
+
+		// 2. Store attachments in IndexedDB before closing modal
+		const pendingId = crypto.randomUUID();
+		const detachedFiles = attachments.takeFiles();
+		if (detachedFiles.length > 0) {
+			try {
+				await storeAttachments(pendingId, detachedFiles);
+			} catch (err) {
+				toast.error(
+					err instanceof Error ? err.message : "Failed to store attachments",
+				);
+				return;
+			} finally {
+				for (const file of detachedFiles) {
+					if (file.url?.startsWith("blob:")) URL.revokeObjectURL(file.url);
+				}
+			}
+		}
+
+		// 3. Insert pending workspace (full draft for retry)
+		collections.pendingWorkspaces.insert({
+			id: pendingId,
+			projectId,
+			name: workspaceName,
+			branchName,
+			prompt: draft.prompt,
+			baseBranch: draft.baseBranch ?? null,
+			runSetupScript: draft.runSetupScript,
+			linkedIssues: draft.linkedIssues as unknown[],
+			linkedPR: draft.linkedPR,
+			hostTarget: draft.hostTarget,
+			attachmentCount: detachedFiles.length,
+			status: "creating",
+			error: null,
+			workspaceId: null,
+			initialCommands: null,
+			createdAt: new Date(),
+		});
+
+		// 4. Close modal, navigate to pending page
+		closeAndResetDraft();
+		void navigate({ to: `/pending/${pendingId}` as string });
+
+		// 5. Fire create (fire-and-forget — closure survives modal unmount)
+		const linked = mapLinkedContext(draft);
+
+		let attachmentPayload:
+			| Array<{ data: string; mediaType: string; filename: string }>
+			| undefined;
+		if (detachedFiles.length > 0) {
+			try {
+				const { loadAttachments } = await import(
+					"renderer/lib/pending-attachment-store"
+				);
+				attachmentPayload = await loadAttachments(pendingId);
+			} catch {
+				// Non-fatal — create proceeds without attachments
+			}
+		}
+
+		try {
+			const result = await createWorkspace({
+				pendingId,
+				projectId,
+				hostTarget: draft.hostTarget,
+				names: { workspaceName, branchName },
+				composer: {
+					prompt: draft.prompt.trim() || undefined,
+					baseBranch: draft.baseBranch || undefined,
+					runSetupScript: draft.runSetupScript,
+				},
+				linkedContext: {
+					...linked,
+					attachments: attachmentPayload,
+				},
+			});
+
+			collections.pendingWorkspaces.update(pendingId, (row) => {
+				row.status = "succeeded";
+				row.workspaceId = result.workspace?.id ?? null;
+				row.initialCommands = result.initialCommands ?? null;
+			});
+			void clearAttachments(pendingId);
+		} catch (err) {
+			collections.pendingWorkspaces.update(pendingId, (row) => {
+				row.status = "failed";
+				row.error =
+					err instanceof Error ? err.message : "Failed to create workspace";
+			});
+		}
+	}, [
+		attachments,
+		closeAndResetDraft,
+		collections,
+		createWorkspace,
+		draft,
+		navigate,
+		projectId,
+	]);
+}
diff --git a/apps/desktop/src/renderer/routes/_authenticated/components/DashboardNewWorkspaceModal/components/DashboardNewWorkspaceForm/components/PromptGroup/index.ts b/apps/desktop/src/renderer/routes/_authenticated/components/DashboardNewWorkspaceModal/components/DashboardNewWorkspaceForm/PromptGroup/index.ts
similarity index 100%
rename from apps/desktop/src/renderer/routes/_authenticated/components/DashboardNewWorkspaceModal/components/DashboardNewWorkspaceForm/components/PromptGroup/index.ts
rename to apps/desktop/src/renderer/routes/_authenticated/components/DashboardNewWorkspaceModal/components/DashboardNewWorkspaceForm/PromptGroup/index.ts
diff --git a/apps/desktop/src/renderer/routes/_authenticated/components/DashboardNewWorkspaceModal/components/DashboardNewWorkspaceForm/PromptGroup/types.ts b/apps/desktop/src/renderer/routes/_authenticated/components/DashboardNewWorkspaceModal/components/DashboardNewWorkspaceForm/PromptGroup/types.ts
new file mode 100644
index 00000000000..7122c70c026
--- /dev/null
+++ b/apps/desktop/src/renderer/routes/_authenticated/components/DashboardNewWorkspaceModal/components/DashboardNewWorkspaceForm/PromptGroup/types.ts
@@ -0,0 +1,15 @@
+import type { AgentDefinitionId } from "shared/utils/agent-settings";
+
+export type WorkspaceCreateAgent = AgentDefinitionId | "none";
+
+export const AGENT_STORAGE_KEY = "lastSelectedWorkspaceCreateAgent";
+
+export const PILL_BUTTON_CLASS =
+	"!h-[22px] min-h-0 rounded-md border-[0.5px] border-border bg-foreground/[0.04] shadow-none text-[11px]";
+
+export interface ProjectOption {
+	id: string;
+	name: string;
+	githubOwner: string | null;
+	githubRepoName: string | null;
+}
diff --git a/apps/desktop/src/renderer/routes/_authenticated/components/DashboardNewWorkspaceModal/components/DashboardNewWorkspaceForm/components/BranchesGroup/BranchesGroup.tsx b/apps/desktop/src/renderer/routes/_authenticated/components/DashboardNewWorkspaceModal/components/DashboardNewWorkspaceForm/components/BranchesGroup/BranchesGroup.tsx
deleted file mode 100644
index 455999262f6..00000000000
--- a/apps/desktop/src/renderer/routes/_authenticated/components/DashboardNewWorkspaceModal/components/DashboardNewWorkspaceForm/components/BranchesGroup/BranchesGroup.tsx
+++ /dev/null
@@ -1,206 +0,0 @@
-import { Button } from "@superset/ui/button";
-import { CommandEmpty, CommandGroup, CommandItem } from "@superset/ui/command";
-import { eq } from "@tanstack/db";
-import { useLiveQuery } from "@tanstack/react-db";
-import { useNavigate } from "@tanstack/react-router";
-import Fuse from "fuse.js";
-import { useCallback, useMemo } from "react";
-import { GoArrowUpRight, GoGitBranch, GoGlobe } from "react-icons/go";
-import { useDebouncedValue } from "renderer/hooks/useDebouncedValue";
-import { electronTrpc } from "renderer/lib/electron-trpc";
-import { navigateToV2Workspace } from "renderer/routes/_authenticated/_dashboard/utils/workspace-navigation";
-import type { WorkspaceHostTarget } from "renderer/routes/_authenticated/components/DashboardNewWorkspaceModal/components/DashboardNewWorkspaceForm/components/DevicePicker";
-import { useCollections } from "renderer/routes/_authenticated/providers/CollectionsProvider";
-import { useDashboardNewWorkspaceDraft } from "../../../../DashboardNewWorkspaceDraftContext";
-import { useCreateDashboardWorkspace } from "../../../../hooks/useCreateDashboardWorkspace";
-
-interface BranchesGroupProps {
-	projectId: string | null;
-	localProjectId: string | null;
-	hostTarget: WorkspaceHostTarget;
-}
-
-export function BranchesGroup({
-	projectId,
-	localProjectId,
-	hostTarget,
-}: BranchesGroupProps) {
-	const navigate = useNavigate();
-	const collections = useCollections();
-	const { createWorkspace } = useCreateDashboardWorkspace();
-	const { draft, closeAndResetDraft, runAsyncAction } =
-		useDashboardNewWorkspaceDraft();
-
-	const hasLocalProject = !!localProjectId;
-
-	const { data: localData, isLoading: isLocalLoading } =
-		electronTrpc.projects.getBranchesLocal.useQuery(
-			{ projectId: localProjectId ?? "" },
-			{ enabled: hasLocalProject },
-		);
-
-	const { data: remoteData } = electronTrpc.projects.getBranches.useQuery(
-		{ projectId: localProjectId ?? "" },
-		{ enabled: hasLocalProject },
-	);
-
-	const data = remoteData ?? localData;
-
-	// Check v2Workspaces for existing workspaces by branch
-	const { data: v2WorkspacesData } = useLiveQuery(
-		(q) =>
-			q
-				.from({ ws: collections.v2Workspaces })
-				.where(({ ws }) => eq(ws.projectId, projectId ?? ""))
-				.select(({ ws }) => ({ id: ws.id, branch: ws.branch })),
-		[collections, projectId],
-	);
-
-	const workspaceByBranch = useMemo(() => {
-		const map = new Map<string, string>();
-		for (const w of v2WorkspacesData ?? []) {
-			map.set(w.branch, w.id);
-		}
-		return map;
-	}, [v2WorkspacesData]);
-
-	const defaultBranch = data?.defaultBranch ?? "main";
-
-	const branches = (data?.branches ?? []).sort((a, b) => {
-		if (a.name === defaultBranch) return -1;
-		if (b.name === defaultBranch) return 1;
-		if (a.isLocal !== b.isLocal) return a.isLocal ? -1 : 1;
-		return a.name.localeCompare(b.name);
-	});
-
-	const branchRows = useMemo(() => {
-		return branches.map((branch) => ({
-			branch,
-			existingWorkspaceId: workspaceByBranch.get(branch.name),
-		}));
-	}, [branches, workspaceByBranch]);
-
-	const debouncedQuery = useDebouncedValue(draft.branchesQuery, 150);
-
-	const branchFuse = useMemo(
-		() =>
-			new Fuse(branchRows, {
-				keys: ["branch.name"],
-				threshold: 0.3,
-				includeScore: true,
-				ignoreLocation: true,
-			}),
-		[branchRows],
-	);
-
-	const visibleBranchRows = useMemo(() => {
-		const query = debouncedQuery.trim();
-		if (!query) {
-			return branchRows.slice(0, 100);
-		}
-		return branchFuse
-			.search(query)
-			.slice(0, 100)
-			.map((result) => result.item);
-	}, [debouncedQuery, branchRows, branchFuse]);
-
-	const handleCreate = useCallback(
-		(branchName: string) => {
-			if (!projectId) return;
-			void runAsyncAction(
-				createWorkspace({
-					projectId,
-					name: branchName,
-					branch: branchName,
-					hostTarget,
-				}),
-				{
-					loading: "Creating workspace from branch...",
-					success: "Workspace created",
-					error: (err) =>
-						err instanceof Error ? err.message : "Failed to create workspace",
-				},
-			);
-		},
-		[createWorkspace, hostTarget, projectId, runAsyncAction],
-	);
-
-	const handleOpen = useCallback(
-		(workspaceId: string) => {
-			closeAndResetDraft();
-			navigateToV2Workspace(workspaceId, navigate);
-		},
-		[closeAndResetDraft, navigate],
-	);
-
-	const handleBranchAction = useCallback(
-		(branchName: string) => {
-			const existingId = workspaceByBranch.get(branchName);
-			if (existingId) {
-				handleOpen(existingId);
-				return;
-			}
-			handleCreate(branchName);
-		},
-		[handleCreate, handleOpen, workspaceByBranch],
-	);
-
-	if (!projectId) {
-		return (
-			<CommandGroup>
-				<CommandEmpty>Select a project to view branches.</CommandEmpty>
-			</CommandGroup>
-		);
-	}
-
-	if (!hasLocalProject) {
-		return (
-			<CommandGroup>
-				<CommandEmpty>No local repository linked to this project.</CommandEmpty>
-			</CommandGroup>
-		);
-	}
-
-	if (isLocalLoading) {
-		return (
-			<CommandGroup>
-				<CommandEmpty>Loading branches...</CommandEmpty>
-			</CommandGroup>
-		);
-	}
-
-	return (
-		<CommandGroup>
-			<CommandEmpty>No branches found.</CommandEmpty>
-			{visibleBranchRows.map(({ branch, existingWorkspaceId }) => {
-				const buttonLabel = existingWorkspaceId ? "Open" : "Create";
-				return (
-					<CommandItem
-						key={branch.name}
-						onSelect={() => handleBranchAction(branch.name)}
-						className="group h-12"
-					>
-						{existingWorkspaceId ? (
-							<GoArrowUpRight className="size-4 shrink-0 text-muted-foreground" />
-						) : branch.isLocal ? (
-							<GoGitBranch className="size-4 shrink-0 text-muted-foreground" />
-						) : (
-							<GoGlobe className="size-4 shrink-0 text-muted-foreground" />
-						)}
-						<span className="truncate flex-1">{branch.name}</span>
-						<Button
-							size="xs"
-							className="shrink-0 hidden group-data-[selected=true]:inline-flex"
-							onClick={(e) => {
-								e.stopPropagation();
-								handleBranchAction(branch.name);
-							}}
-						>
-							{buttonLabel} ↵
-						</Button>
-					</CommandItem>
-				);
-			})}
-		</CommandGroup>
-	);
-}
diff --git a/apps/desktop/src/renderer/routes/_authenticated/components/DashboardNewWorkspaceModal/components/DashboardNewWorkspaceForm/components/BranchesGroup/index.ts b/apps/desktop/src/renderer/routes/_authenticated/components/DashboardNewWorkspaceModal/components/DashboardNewWorkspaceForm/components/BranchesGroup/index.ts
deleted file mode 100644
index 75953e3d249..00000000000
--- a/apps/desktop/src/renderer/routes/_authenticated/components/DashboardNewWorkspaceModal/components/DashboardNewWorkspaceForm/components/BranchesGroup/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { BranchesGroup } from "./BranchesGroup";
diff --git a/apps/desktop/src/renderer/routes/_authenticated/components/DashboardNewWorkspaceModal/components/DashboardNewWorkspaceForm/components/DashboardNewWorkspaceFormHeader/DashboardNewWorkspaceFormHeader.tsx b/apps/desktop/src/renderer/routes/_authenticated/components/DashboardNewWorkspaceModal/components/DashboardNewWorkspaceForm/components/DashboardNewWorkspaceFormHeader/DashboardNewWorkspaceFormHeader.tsx
deleted file mode 100644
index cd712d1bbd6..00000000000
--- a/apps/desktop/src/renderer/routes/_authenticated/components/DashboardNewWorkspaceModal/components/DashboardNewWorkspaceForm/components/DashboardNewWorkspaceFormHeader/DashboardNewWorkspaceFormHeader.tsx
+++ /dev/null
@@ -1,52 +0,0 @@
-import { Tabs, TabsList, TabsTrigger } from "@superset/ui/tabs";
-import type { WorkspaceHostTarget } from "renderer/routes/_authenticated/components/DashboardNewWorkspaceModal/components/DashboardNewWorkspaceForm/components/DevicePicker";
-import type { DashboardNewWorkspaceTab } from "../../../../DashboardNewWorkspaceDraftContext";
-import { DevicePicker } from "../DevicePicker";
-import { ProjectSelector } from "../ProjectSelector";
-
-interface DashboardNewWorkspaceFormHeaderProps {
-	activeTab: DashboardNewWorkspaceTab;
-	hostTarget: WorkspaceHostTarget;
-	selectedProjectId: string | null;
-	onSelectTab: (tab: DashboardNewWorkspaceTab) => void;
-	onSelectHostTarget: (hostTarget: WorkspaceHostTarget) => void;
-	onSelectProject: (projectId: string | null) => void;
-}
-
-export function DashboardNewWorkspaceFormHeader({
-	activeTab,
-	hostTarget,
-	selectedProjectId,
-	onSelectTab,
-	onSelectHostTarget,
-	onSelectProject,
-}: DashboardNewWorkspaceFormHeaderProps) {
-	return (
-		<div className="flex items-center justify-between border-b px-4 py-2.5">
-			<Tabs
-				value={activeTab}
-				onValueChange={(value) =>
-					onSelectTab(value as DashboardNewWorkspaceTab)
-				}
-			>
-				<TabsList>
-					<TabsTrigger value="prompt">Prompt</TabsTrigger>
-					<TabsTrigger value="issues">Issues</TabsTrigger>
-					<TabsTrigger value="pull-requests">Pull requests</TabsTrigger>
-					<TabsTrigger value="branches">Branches</TabsTrigger>
-				</TabsList>
-			</Tabs>
-			<div className="flex items-center gap-1">
-				<DevicePicker
-					hostTarget={hostTarget}
-					onSelectHostTarget={onSelectHostTarget}
-				/>
-				<div className="mx-0.5 h-4 w-px bg-border" />
-				<ProjectSelector
-					selectedProjectId={selectedProjectId}
-					onSelectProject={onSelectProject}
-				/>
-			</div>
-		</div>
-	);
-}
diff --git a/apps/desktop/src/renderer/routes/_authenticated/components/DashboardNewWorkspaceModal/components/DashboardNewWorkspaceForm/components/DashboardNewWorkspaceFormHeader/index.ts b/apps/desktop/src/renderer/routes/_authenticated/components/DashboardNewWorkspaceModal/components/DashboardNewWorkspaceForm/components/DashboardNewWorkspaceFormHeader/index.ts
deleted file mode 100644
index f4469410524..00000000000
--- a/apps/desktop/src/renderer/routes/_authenticated/components/DashboardNewWorkspaceModal/components/DashboardNewWorkspaceForm/components/DashboardNewWorkspaceFormHeader/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { DashboardNewWorkspaceFormHeader } from "./DashboardNewWorkspaceFormHeader";
diff --git a/apps/desktop/src/renderer/routes/_authenticated/components/DashboardNewWorkspaceModal/components/DashboardNewWorkspaceForm/components/DashboardNewWorkspaceListTabContent/DashboardNewWorkspaceListTabContent.tsx b/apps/desktop/src/renderer/routes/_authenticated/components/DashboardNewWorkspaceModal/components/DashboardNewWorkspaceForm/components/DashboardNewWorkspaceListTabContent/DashboardNewWorkspaceListTabContent.tsx
deleted file mode 100644
index aa01a2dd257..00000000000
--- a/apps/desktop/src/renderer/routes/_authenticated/components/DashboardNewWorkspaceModal/components/DashboardNewWorkspaceForm/components/DashboardNewWorkspaceListTabContent/DashboardNewWorkspaceListTabContent.tsx
+++ /dev/null
@@ -1,65 +0,0 @@
-import { Command, CommandInput, CommandList } from "@superset/ui/command";
-import type { WorkspaceHostTarget } from "renderer/routes/_authenticated/components/DashboardNewWorkspaceModal/components/DashboardNewWorkspaceForm/components/DevicePicker";
-import type { DashboardNewWorkspaceTab } from "../../../../DashboardNewWorkspaceDraftContext";
-import { BranchesGroup } from "../BranchesGroup";
-import { IssuesGroup } from "../IssuesGroup";
-import { PullRequestsGroup } from "../PullRequestsGroup";
-
-const COMMAND_CLASS_NAME =
-	"[&_[cmdk-group-heading]]:text-muted-foreground **:data-[slot=command-input-wrapper]:h-12 [&_[cmdk-group-heading]]:px-2 [&_[cmdk-group-heading]]:font-medium [&_[cmdk-group]]:px-2 [&_[cmdk-group]:not([hidden])_~[cmdk-group]]:pt-0 [&_[cmdk-input-wrapper]_svg]:h-5 [&_[cmdk-input-wrapper]_svg]:w-5 [&_[cmdk-input]]:h-12 [&_[cmdk-item]]:px-2 [&_[cmdk-item]]:py-3 [&_[cmdk-item]_svg]:h-5 [&_[cmdk-item]_svg]:w-5 flex h-full w-full flex-1 flex-col overflow-hidden rounded-none";
-
-interface DashboardNewWorkspaceListTabContentProps {
-	activeTab: Exclude<DashboardNewWorkspaceTab, "prompt">;
-	projectId: string | null;
-	githubRepositoryId: string | null;
-	hostTarget: WorkspaceHostTarget;
-	localProjectId: string | null;
-	query: string;
-	onQueryChange: (value: string) => void;
-}
-
-export function DashboardNewWorkspaceListTabContent({
-	activeTab,
-	projectId,
-	githubRepositoryId,
-	hostTarget,
-	localProjectId,
-	query,
-	onQueryChange,
-}: DashboardNewWorkspaceListTabContentProps) {
-	return (
-		<Command shouldFilter={false} className={COMMAND_CLASS_NAME}>
-			<CommandInput
-				value={query}
-				onValueChange={onQueryChange}
-				placeholder={
-					activeTab === "issues"
-						? "Search by slug, title, or description"
-						: activeTab === "branches"
-							? "Search by name"
-							: "Search by title, number, or author"
-				}
-			/>
-
-			<CommandList className="!max-h-none flex-1 overflow-y-auto">
-				{activeTab === "pull-requests" && (
-					<PullRequestsGroup
-						projectId={projectId}
-						githubRepositoryId={githubRepositoryId}
-						hostTarget={hostTarget}
-					/>
-				)}
-				{activeTab === "branches" && (
-					<BranchesGroup
-						projectId={projectId}
-						localProjectId={localProjectId}
-						hostTarget={hostTarget}
-					/>
-				)}
-				{activeTab === "issues" && (
-					<IssuesGroup projectId={projectId} hostTarget={hostTarget} />
-				)}
-			</CommandList>
-		</Command>
-	);
-}
diff --git a/apps/desktop/src/renderer/routes/_authenticated/components/DashboardNewWorkspaceModal/components/DashboardNewWorkspaceForm/components/DashboardNewWorkspaceListTabContent/index.ts b/apps/desktop/src/renderer/routes/_authenticated/components/DashboardNewWorkspaceModal/components/DashboardNewWorkspaceForm/components/DashboardNewWorkspaceListTabContent/index.ts
deleted file mode 100644
index af9feb38a8c..00000000000
--- a/apps/desktop/src/renderer/routes/_authenticated/components/DashboardNewWorkspaceModal/components/DashboardNewWorkspaceForm/components/DashboardNewWorkspaceListTabContent/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { DashboardNewWorkspaceListTabContent } from "./DashboardNewWorkspaceListTabContent";
diff --git a/apps/desktop/src/renderer/routes/_authenticated/components/DashboardNewWorkspaceModal/components/DashboardNewWorkspaceForm/components/DashboardNewWorkspacePromptTabContent/DashboardNewWorkspacePromptTabContent.tsx b/apps/desktop/src/renderer/routes/_authenticated/components/DashboardNewWorkspaceModal/components/DashboardNewWorkspaceForm/components/DashboardNewWorkspacePromptTabContent/DashboardNewWorkspacePromptTabContent.tsx
deleted file mode 100644
index 801c7311f06..00000000000
--- a/apps/desktop/src/renderer/routes/_authenticated/components/DashboardNewWorkspaceModal/components/DashboardNewWorkspaceForm/components/DashboardNewWorkspacePromptTabContent/DashboardNewWorkspacePromptTabContent.tsx
+++ /dev/null
@@ -1,24 +0,0 @@
-import type { WorkspaceHostTarget } from "renderer/routes/_authenticated/components/DashboardNewWorkspaceModal/components/DashboardNewWorkspaceForm/components/DevicePicker";
-import { PromptGroup } from "../PromptGroup";
-
-interface DashboardNewWorkspacePromptTabContentProps {
-	projectId: string | null;
-	localProjectId: string | null;
-	hostTarget: WorkspaceHostTarget;
-}
-
-export function DashboardNewWorkspacePromptTabContent({
-	projectId,
-	localProjectId,
-	hostTarget,
-}: DashboardNewWorkspacePromptTabContentProps) {
-	return (
-		<div className="flex-1 overflow-y-auto">
-			<PromptGroup
-				projectId={projectId}
-				localProjectId={localProjectId}
-				hostTarget={hostTarget}
-			/>
-		</div>
-	);
-}
diff --git a/apps/desktop/src/renderer/routes/_authenticated/components/DashboardNewWorkspaceModal/components/DashboardNewWorkspaceForm/components/DashboardNewWorkspacePromptTabContent/index.ts b/apps/desktop/src/renderer/routes/_authenticated/components/DashboardNewWorkspaceModal/components/DashboardNewWorkspaceForm/components/DashboardNewWorkspacePromptTabContent/index.ts
deleted file mode 100644
index 0dd4c4cbf1a..00000000000
--- a/apps/desktop/src/renderer/routes/_authenticated/components/DashboardNewWorkspaceModal/components/DashboardNewWorkspaceForm/components/DashboardNewWorkspacePromptTabContent/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { DashboardNewWorkspacePromptTabContent } from "./DashboardNewWorkspacePromptTabContent";
diff --git a/apps/desktop/src/renderer/routes/_authenticated/components/DashboardNewWorkspaceModal/components/DashboardNewWorkspaceForm/components/IssuesGroup/IssuesGroup.tsx b/apps/desktop/src/renderer/routes/_authenticated/components/DashboardNewWorkspaceModal/components/DashboardNewWorkspaceForm/components/IssuesGroup/IssuesGroup.tsx
deleted file mode 100644
index d31ef1e646c..00000000000
--- a/apps/desktop/src/renderer/routes/_authenticated/components/DashboardNewWorkspaceModal/components/DashboardNewWorkspaceForm/components/IssuesGroup/IssuesGroup.tsx
+++ /dev/null
@@ -1,211 +0,0 @@
-import { Avatar } from "@superset/ui/atoms/Avatar";
-import { Button } from "@superset/ui/button";
-import { CommandEmpty, CommandGroup, CommandItem } from "@superset/ui/command";
-import { toast } from "@superset/ui/sonner";
-import { eq, isNull } from "@tanstack/db";
-import { useLiveQuery } from "@tanstack/react-db";
-import { useNavigate } from "@tanstack/react-router";
-import { useMemo } from "react";
-import { GoArrowUpRight } from "react-icons/go";
-import { HiOutlineUserCircle } from "react-icons/hi2";
-import { SiLinear } from "react-icons/si";
-import { GATED_FEATURES, usePaywall } from "renderer/components/Paywall";
-import { useDebouncedValue } from "renderer/hooks/useDebouncedValue";
-import { getSlugColumnWidth } from "renderer/lib/slug-width";
-import {
-	StatusIcon,
-	type StatusType,
-} from "renderer/routes/_authenticated/_dashboard/tasks/components/TasksView/components/shared/StatusIcon";
-import { useHybridSearch } from "renderer/routes/_authenticated/_dashboard/tasks/components/TasksView/hooks/useHybridSearch";
-import { compareTasks } from "renderer/routes/_authenticated/_dashboard/tasks/components/TasksView/utils/sorting";
-import { navigateToV2Workspace } from "renderer/routes/_authenticated/_dashboard/utils/workspace-navigation";
-import type { WorkspaceHostTarget } from "renderer/routes/_authenticated/components/DashboardNewWorkspaceModal/components/DashboardNewWorkspaceForm/components/DevicePicker";
-import { useCollections } from "renderer/routes/_authenticated/providers/CollectionsProvider";
-import { useDashboardNewWorkspaceDraft } from "../../../../DashboardNewWorkspaceDraftContext";
-import { useCreateDashboardWorkspace } from "../../../../hooks/useCreateDashboardWorkspace";
-
-interface IssuesGroupProps {
-	projectId: string | null;
-	hostTarget: WorkspaceHostTarget;
-}
-
-export function IssuesGroup({ projectId, hostTarget }: IssuesGroupProps) {
-	const collections = useCollections();
-	const navigate = useNavigate();
-	const { gateFeature } = usePaywall();
-	const { createWorkspace } = useCreateDashboardWorkspace();
-	const { draft, closeAndResetDraft, runAsyncAction } =
-		useDashboardNewWorkspaceDraft();
-
-	const { data: integrations } = useLiveQuery(
-		(q) =>
-			q
-				.from({
-					integrationConnections: collections.integrationConnections,
-				})
-				.select(({ integrationConnections }) => ({
-					...integrationConnections,
-				})),
-		[collections],
-	);
-
-	const isLinearConnected =
-		integrations?.some((i) => i.provider === "linear") ?? false;
-
-	const { data } = useLiveQuery(
-		(q) =>
-			q
-				.from({ tasks: collections.tasks })
-				.innerJoin({ status: collections.taskStatuses }, ({ tasks, status }) =>
-					eq(tasks.statusId, status.id),
-				)
-				.leftJoin({ assignee: collections.users }, ({ tasks, assignee }) =>
-					eq(tasks.assigneeId, assignee.id),
-				)
-				.select(({ tasks, status, assignee }) => ({
-					...tasks,
-					status,
-					assignee: assignee ?? null,
-				}))
-				.where(({ tasks }) => isNull(tasks.deletedAt)),
-		[collections],
-	);
-
-	// Check v2Workspaces for existing workspaces by branch
-	const { data: v2WorkspacesData } = useLiveQuery(
-		(q) =>
-			q
-				.from({ ws: collections.v2Workspaces })
-				.where(({ ws }) => eq(ws.projectId, projectId ?? ""))
-				.select(({ ws }) => ({ id: ws.id, branch: ws.branch })),
-		[collections, projectId],
-	);
-
-	const workspaceByBranch = useMemo(() => {
-		const map = new Map<string, string>();
-		for (const w of v2WorkspacesData ?? []) {
-			map.set(w.branch, w.id);
-		}
-		return map;
-	}, [v2WorkspacesData]);
-
-	const tasks = useMemo(() => data ?? [], [data]);
-	const sortedTasks = useMemo(() => [...tasks].sort(compareTasks), [tasks]);
-
-	const debouncedQuery = useDebouncedValue(draft.issuesQuery, 150);
-	const { search } = useHybridSearch(sortedTasks);
-
-	const visibleTasks = useMemo(() => {
-		const query = debouncedQuery.trim();
-		if (!query) {
-			return sortedTasks.slice(0, 100);
-		}
-		return search(query)
-			.slice(0, 100)
-			.map((result) => result.item);
-	}, [debouncedQuery, sortedTasks, search]);
-
-	const slugWidth = useMemo(
-		() => getSlugColumnWidth(visibleTasks.map((t) => t.slug)),
-		[visibleTasks],
-	);
-
-	if (!isLinearConnected) {
-		return (
-			<div className="flex flex-col items-center gap-3 py-8 px-4 text-center">
-				<SiLinear className="size-6 text-muted-foreground" />
-				<div className="space-y-1">
-					<p className="text-sm font-medium">Connect Linear</p>
-					<p className="text-xs text-muted-foreground">
-						Sync issues from Linear to create workspaces
-					</p>
-				</div>
-				<Button
-					size="sm"
-					variant="outline"
-					onClick={() => {
-						gateFeature(GATED_FEATURES.INTEGRATIONS, () => {
-							closeAndResetDraft();
-							navigate({ to: "/settings/integrations" });
-						});
-					}}
-				>
-					Connect
-				</Button>
-			</div>
-		);
-	}
-
-	return (
-		<CommandGroup>
-			<CommandEmpty>No issues found.</CommandEmpty>
-			{visibleTasks.map((task) => (
-				<CommandItem
-					key={task.id}
-					onSelect={() => {
-						if (!projectId) {
-							toast.error("Select a project first");
-							return;
-						}
-						const existingId = workspaceByBranch.get(task.slug.toLowerCase());
-						if (existingId) {
-							closeAndResetDraft();
-							navigateToV2Workspace(existingId, navigate);
-							return;
-						}
-						void runAsyncAction(
-							createWorkspace({
-								projectId,
-								name: task.title,
-								branch: task.slug.toLowerCase(),
-								hostTarget,
-							}),
-							{
-								loading: "Creating workspace...",
-								success: "Workspace created",
-								error: (err) =>
-									err instanceof Error
-										? err.message
-										: "Failed to create workspace",
-							},
-						);
-					}}
-					className="group h-12"
-				>
-					{workspaceByBranch.has(task.slug.toLowerCase()) ? (
-						<GoArrowUpRight className="size-4 shrink-0 text-muted-foreground" />
-					) : (
-						<StatusIcon
-							type={task.status.type as StatusType}
-							color={task.status.color}
-							progress={task.status.progressPercent ?? undefined}
-							className="size-4 shrink-0"
-						/>
-					)}
-					<span
-						className="text-muted-foreground shrink-0 text-xs tabular-nums truncate"
-						style={{ width: slugWidth }}
-					>
-						{task.slug}
-					</span>
-					<span className="truncate flex-1">{task.title}</span>
-					<span className="shrink-0 group-data-[selected=true]:hidden">
-						{task.assignee ? (
-							<Avatar
-								size="xs"
-								fullName={task.assignee.name}
-								image={task.assignee.image}
-							/>
-						) : (
-							<HiOutlineUserCircle className="size-5 text-muted-foreground" />
-						)}
-					</span>
-					<span className="text-xs text-muted-foreground shrink-0 hidden group-data-[selected=true]:inline">
-						{workspaceByBranch.has(task.slug.toLowerCase()) ? "Open" : "Create"}{" "}
-						↵
-					</span>
-				</CommandItem>
-			))}
-		</CommandGroup>
-	);
-}
diff --git a/apps/desktop/src/renderer/routes/_authenticated/components/DashboardNewWorkspaceModal/components/DashboardNewWorkspaceForm/components/IssuesGroup/index.ts b/apps/desktop/src/renderer/routes/_authenticated/components/DashboardNewWorkspaceModal/components/DashboardNewWorkspaceForm/components/IssuesGroup/index.ts
deleted file mode 100644
index c0762c8495d..00000000000
--- a/apps/desktop/src/renderer/routes/_authenticated/components/DashboardNewWorkspaceModal/components/DashboardNewWorkspaceForm/components/IssuesGroup/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { IssuesGroup } from "./IssuesGroup";
diff --git a/apps/desktop/src/renderer/routes/_authenticated/components/DashboardNewWorkspaceModal/components/DashboardNewWorkspaceForm/components/ProjectSelector/ProjectSelector.tsx b/apps/desktop/src/renderer/routes/_authenticated/components/DashboardNewWorkspaceModal/components/DashboardNewWorkspaceForm/components/ProjectSelector/ProjectSelector.tsx
deleted file mode 100644
index 2ed6690d260..00000000000
--- a/apps/desktop/src/renderer/routes/_authenticated/components/DashboardNewWorkspaceModal/components/DashboardNewWorkspaceForm/components/ProjectSelector/ProjectSelector.tsx
+++ /dev/null
@@ -1,139 +0,0 @@
-import { Button } from "@superset/ui/button";
-import {
-	Command,
-	CommandEmpty,
-	CommandGroup,
-	CommandInput,
-	CommandItem,
-	CommandList,
-	CommandSeparator,
-} from "@superset/ui/command";
-import { Popover, PopoverContent, PopoverTrigger } from "@superset/ui/popover";
-import { useLiveQuery } from "@tanstack/react-db";
-import { useMemo, useState } from "react";
-import { FaGithub } from "react-icons/fa";
-import { HiCheck, HiChevronUpDown } from "react-icons/hi2";
-import { env } from "renderer/env.renderer";
-import { ProjectThumbnail } from "renderer/routes/_authenticated/components/ProjectThumbnail";
-import { useCollections } from "renderer/routes/_authenticated/providers/CollectionsProvider";
-
-interface ProjectSelectorProps {
-	selectedProjectId: string | null;
-	onSelectProject: (projectId: string) => void;
-}
-
-export function ProjectSelector({
-	selectedProjectId,
-	onSelectProject,
-}: ProjectSelectorProps) {
-	const [open, setOpen] = useState(false);
-	const collections = useCollections();
-
-	const { data: v2Projects } = useLiveQuery(
-		(q) =>
-			q
-				.from({ projects: collections.v2Projects })
-				.select(({ projects }) => ({ ...projects })),
-		[collections],
-	);
-
-	const { data: githubRepositories } = useLiveQuery(
-		(q) =>
-			q.from({ repos: collections.githubRepositories }).select(({ repos }) => ({
-				id: repos.id,
-				owner: repos.owner,
-			})),
-		[collections],
-	);
-
-	const projects = useMemo(() => {
-		const ownerByRepoId = new Map(
-			(githubRepositories ?? []).map((repo) => [repo.id, repo.owner]),
-		);
-
-		return (v2Projects ?? []).map((project) => ({
-			id: project.id,
-			name: project.name,
-			owner: ownerByRepoId.get(project.githubRepositoryId) ?? null,
-		}));
-	}, [githubRepositories, v2Projects]);
-
-	const selectedProject = projects.find((p) => p.id === selectedProjectId);
-
-	return (
-		<Popover open={open} onOpenChange={setOpen}>
-			<PopoverTrigger asChild>
-				<Button variant="ghost" size="sm" className="h-7 px-2 text-xs gap-1">
-					{selectedProject ? (
-						<ProjectThumbnail
-							projectName={selectedProject.name}
-							githubOwner={selectedProject.owner}
-							className="size-4"
-						/>
-					) : null}
-					<span className="truncate max-w-[140px]">
-						{selectedProject?.name ?? "Select project"}
-					</span>
-					<HiChevronUpDown className="size-3" />
-				</Button>
-			</PopoverTrigger>
-			<PopoverContent align="end" className="w-60 p-0">
-				<Command>
-					<CommandInput placeholder="Search projects..." />
-					<CommandList className="max-h-72">
-						<CommandEmpty>No projects found.</CommandEmpty>
-						<CommandGroup>
-							{projects.map((project) => (
-								<CommandItem
-									key={project.id}
-									value={
-										project.owner
-											? `${project.owner}/${project.name}`
-											: project.name
-									}
-									onSelect={() => {
-										onSelectProject(project.id);
-										setOpen(false);
-									}}
-								>
-									<ProjectThumbnail
-										projectName={project.name}
-										githubOwner={project.owner}
-									/>
-									<div className="flex min-w-0 flex-col">
-										<span className="truncate">{project.name}</span>
-										{project.owner ? (
-											<span className="truncate text-xs text-muted-foreground">
-												{project.owner}
-											</span>
-										) : null}
-									</div>
-									{project.id === selectedProjectId && (
-										<HiCheck className="ml-auto size-4" />
-									)}
-								</CommandItem>
-							))}
-						</CommandGroup>
-					</CommandList>
-					<CommandSeparator />
-					<div className="p-1">
-						<Button
-							variant="ghost"
-							className="w-full justify-start gap-2 px-2 py-1.5 text-sm font-normal"
-							onClick={() => {
-								setOpen(false);
-								window.open(
-									`${env.NEXT_PUBLIC_WEB_URL}/integrations/github`,
-									"_blank",
-								);
-							}}
-						>
-							<FaGithub className="size-4" />
-							Add from GitHub
-						</Button>
-					</div>
-				</Command>
-			</PopoverContent>
-		</Popover>
-	);
-}
diff --git a/apps/desktop/src/renderer/routes/_authenticated/components/DashboardNewWorkspaceModal/components/DashboardNewWorkspaceForm/components/ProjectSelector/index.ts b/apps/desktop/src/renderer/routes/_authenticated/components/DashboardNewWorkspaceModal/components/DashboardNewWorkspaceForm/components/ProjectSelector/index.ts
deleted file mode 100644
index a524b03c166..00000000000
--- a/apps/desktop/src/renderer/routes/_authenticated/components/DashboardNewWorkspaceModal/components/DashboardNewWorkspaceForm/components/ProjectSelector/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { ProjectSelector } from "./ProjectSelector";
diff --git a/apps/desktop/src/renderer/routes/_authenticated/components/DashboardNewWorkspaceModal/components/DashboardNewWorkspaceForm/components/PromptGroup/PromptGroup.tsx b/apps/desktop/src/renderer/routes/_authenticated/components/DashboardNewWorkspaceModal/components/DashboardNewWorkspaceForm/components/PromptGroup/PromptGroup.tsx
deleted file mode 100644
index 40d1d127402..00000000000
--- a/apps/desktop/src/renderer/routes/_authenticated/components/DashboardNewWorkspaceModal/components/DashboardNewWorkspaceForm/components/PromptGroup/PromptGroup.tsx
+++ /dev/null
@@ -1,239 +0,0 @@
-import { Button } from "@superset/ui/button";
-import { Kbd, KbdGroup } from "@superset/ui/kbd";
-import { toast } from "@superset/ui/sonner";
-import { Textarea } from "@superset/ui/textarea";
-import { useNavigate } from "@tanstack/react-router";
-import { useEffect, useMemo, useRef, useState } from "react";
-import { PLATFORM } from "renderer/hotkeys";
-import { electronTrpc } from "renderer/lib/electron-trpc";
-import { resolveEffectiveWorkspaceBaseBranch } from "renderer/lib/workspaceBaseBranch";
-import type { WorkspaceHostTarget } from "renderer/routes/_authenticated/components/DashboardNewWorkspaceModal/components/DashboardNewWorkspaceForm/components/DevicePicker";
-import {
-	resolveBranchPrefix,
-	sanitizeBranchNameWithMaxLength,
-} from "shared/utils/branch";
-import { useDashboardNewWorkspaceDraft } from "../../../../DashboardNewWorkspaceDraftContext";
-import { useCreateDashboardWorkspace } from "../../../../hooks/useCreateDashboardWorkspace";
-import { PromptGroupAdvancedOptions } from "./components/PromptGroupAdvancedOptions";
-
-interface PromptGroupProps {
-	projectId: string | null;
-	localProjectId: string | null;
-	hostTarget: WorkspaceHostTarget;
-}
-
-export function PromptGroup({
-	projectId,
-	localProjectId,
-	hostTarget,
-}: PromptGroupProps) {
-	const navigate = useNavigate();
-	const modKey = PLATFORM === "mac" ? "⌘" : "Ctrl";
-	const textareaRef = useRef<HTMLTextAreaElement>(null);
-	const { closeModal, draft, runAsyncAction, updateDraft } =
-		useDashboardNewWorkspaceDraft();
-	const [compareBaseBranchOpen, setCompareBaseBranchOpen] = useState(false);
-	const {
-		compareBaseBranch,
-		branchName,
-		branchNameEdited,
-		branchSearch,
-		prompt,
-		showAdvanced,
-	} = draft;
-	const { createWorkspace, isPending } = useCreateDashboardWorkspace();
-
-	const trimmedPrompt = prompt.trim();
-
-	const hasLocalProject = !!localProjectId;
-
-	const { data: project } = electronTrpc.projects.get.useQuery(
-		{ id: localProjectId ?? "" },
-		{ enabled: hasLocalProject },
-	);
-	const {
-		data: localBranchData,
-		isLoading: isBranchesLoading,
-		isError: isBranchesError,
-	} = electronTrpc.projects.getBranchesLocal.useQuery(
-		{ projectId: localProjectId ?? "" },
-		{ enabled: hasLocalProject },
-	);
-	const { data: remoteBranchData } = electronTrpc.projects.getBranches.useQuery(
-		{ projectId: localProjectId ?? "" },
-		{ enabled: hasLocalProject },
-	);
-	const branchData = remoteBranchData ?? localBranchData;
-	const { data: gitAuthor } = electronTrpc.projects.getGitAuthor.useQuery(
-		{ id: localProjectId ?? "" },
-		{ enabled: hasLocalProject },
-	);
-	const { data: globalBranchPrefix } =
-		electronTrpc.settings.getBranchPrefix.useQuery();
-	const { data: gitInfo } = electronTrpc.settings.getGitInfo.useQuery();
-
-	const resolvedPrefix = useMemo(() => {
-		const projectOverrides = project?.branchPrefixMode != null;
-		return resolveBranchPrefix({
-			mode: projectOverrides
-				? project?.branchPrefixMode
-				: (globalBranchPrefix?.mode ?? "none"),
-			customPrefix: projectOverrides
-				? project?.branchPrefixCustom
-				: globalBranchPrefix?.customPrefix,
-			authorPrefix: gitAuthor?.prefix,
-			githubUsername: gitInfo?.githubUsername,
-		});
-	}, [project, globalBranchPrefix, gitAuthor, gitInfo]);
-
-	const filteredBranches = useMemo(() => {
-		if (!branchData?.branches) return [];
-		if (!branchSearch) return branchData.branches;
-		const searchLower = branchSearch.toLowerCase();
-		return branchData.branches.filter((branch) =>
-			branch.name.toLowerCase().includes(searchLower),
-		);
-	}, [branchData?.branches, branchSearch]);
-
-	const effectiveCompareBaseBranch = resolveEffectiveWorkspaceBaseBranch({
-		explicitBaseBranch: compareBaseBranch,
-		workspaceBaseBranch: project?.workspaceBaseBranch,
-		defaultBranch: branchData?.defaultBranch,
-		branches: branchData?.branches,
-	});
-
-	const branchSlug = branchNameEdited
-		? sanitizeBranchNameWithMaxLength(branchName, undefined, {
-				preserveFirstSegmentCase: true,
-			})
-		: sanitizeBranchNameWithMaxLength(trimmedPrompt);
-
-	const applyPrefix = !branchNameEdited;
-
-	const branchPreview =
-		branchSlug && applyPrefix && resolvedPrefix
-			? sanitizeBranchNameWithMaxLength(`${resolvedPrefix}/${branchSlug}`)
-			: branchSlug;
-
-	const previousProjectIdRef = useRef(localProjectId);
-
-	useEffect(() => {
-		if (previousProjectIdRef.current === localProjectId) {
-			return;
-		}
-		previousProjectIdRef.current = localProjectId;
-		updateDraft({
-			compareBaseBranch: null,
-			branchSearch: "",
-		});
-		setCompareBaseBranchOpen(false);
-	}, [localProjectId, updateDraft]);
-
-	const handleCreate = () => {
-		if (!projectId) {
-			toast.error("Select a project first");
-			return;
-		}
-		const name = branchSlug || trimmedPrompt || "workspace";
-		const branch = branchPreview || "workspace";
-		void runAsyncAction(
-			createWorkspace({
-				projectId,
-				name,
-				branch,
-				hostTarget,
-			}),
-			{
-				loading: "Creating workspace...",
-				success: "Workspace created",
-				error: (err) =>
-					err instanceof Error ? err.message : "Failed to create workspace",
-			},
-		);
-	};
-
-	const handleBranchNameChange = (value: string) => {
-		updateDraft({
-			branchName: value,
-			branchNameEdited: true,
-		});
-	};
-
-	const handleBranchNameBlur = () => {
-		if (!branchName.trim()) {
-			updateDraft({
-				branchName: "",
-				branchNameEdited: false,
-			});
-		}
-	};
-
-	const handleCompareBaseBranchSelect = (selectedBaseBranch: string) => {
-		updateDraft({
-			compareBaseBranch: selectedBaseBranch,
-			branchSearch: "",
-		});
-		setCompareBaseBranchOpen(false);
-	};
-
-	return (
-		<div className="px-4 py-4 space-y-3">
-			<Textarea
-				ref={textareaRef}
-				className="min-h-24 max-h-48 text-sm resize-y field-sizing-fixed"
-				placeholder="What do you want to do?"
-				value={prompt}
-				onChange={(e) => updateDraft({ prompt: e.target.value })}
-				onKeyDown={(e) => {
-					if (e.key === "Enter" && (e.metaKey || e.ctrlKey)) {
-						e.preventDefault();
-						handleCreate();
-					}
-				}}
-			/>
-
-			{hasLocalProject && (
-				<PromptGroupAdvancedOptions
-					showAdvanced={showAdvanced}
-					onShowAdvancedChange={(showAdvanced) => updateDraft({ showAdvanced })}
-					branchInputValue={branchNameEdited ? branchName : branchPreview}
-					onBranchInputChange={handleBranchNameChange}
-					onBranchInputBlur={handleBranchNameBlur}
-					onEditPrefix={() => {
-						closeModal();
-						navigate({ to: "/settings/behavior" });
-					}}
-					isBranchesError={isBranchesError}
-					isBranchesLoading={isBranchesLoading}
-					compareBaseBranchOpen={compareBaseBranchOpen}
-					onCompareBaseBranchOpenChange={setCompareBaseBranchOpen}
-					effectiveCompareBaseBranch={effectiveCompareBaseBranch}
-					defaultBranch={branchData?.defaultBranch}
-					branchSearch={branchSearch}
-					onBranchSearchChange={(branchSearch) => updateDraft({ branchSearch })}
-					filteredBranches={filteredBranches}
-					onSelectCompareBaseBranch={handleCompareBaseBranchSelect}
-					runSetupScript={false}
-					onRunSetupScriptChange={() => {}}
-					hideSetupScript
-				/>
-			)}
-
-			<Button
-				className="w-full h-8 text-sm"
-				onClick={handleCreate}
-				disabled={isPending}
-			>
-				Create Workspace
-				<KbdGroup className="ml-1.5 opacity-70">
-					<Kbd className="bg-primary-foreground/15 text-primary-foreground h-4 min-w-4 text-[10px]">
-						{modKey}
-					</Kbd>
-					<Kbd className="bg-primary-foreground/15 text-primary-foreground h-4 min-w-4 text-[10px]">
-						↵
-					</Kbd>
-				</KbdGroup>
-			</Button>
-		</div>
-	);
-}
diff --git a/apps/desktop/src/renderer/routes/_authenticated/components/DashboardNewWorkspaceModal/components/DashboardNewWorkspaceForm/components/PromptGroup/components/PromptGroupAdvancedOptions/PromptGroupAdvancedOptions.tsx b/apps/desktop/src/renderer/routes/_authenticated/components/DashboardNewWorkspaceModal/components/DashboardNewWorkspaceForm/components/PromptGroup/components/PromptGroupAdvancedOptions/PromptGroupAdvancedOptions.tsx
deleted file mode 100644
index 07abe01f111..00000000000
--- a/apps/desktop/src/renderer/routes/_authenticated/components/DashboardNewWorkspaceModal/components/DashboardNewWorkspaceForm/components/PromptGroup/components/PromptGroupAdvancedOptions/PromptGroupAdvancedOptions.tsx
+++ /dev/null
@@ -1,217 +0,0 @@
-import { Button } from "@superset/ui/button";
-import {
-	Collapsible,
-	CollapsibleContent,
-	CollapsibleTrigger,
-} from "@superset/ui/collapsible";
-import {
-	Command,
-	CommandEmpty,
-	CommandInput,
-	CommandItem,
-	CommandList,
-} from "@superset/ui/command";
-import { Input } from "@superset/ui/input";
-import { Label } from "@superset/ui/label";
-import { Popover, PopoverContent, PopoverTrigger } from "@superset/ui/popover";
-import { Switch } from "@superset/ui/switch";
-import { GoGitBranch } from "react-icons/go";
-import {
-	HiCheck,
-	HiChevronDown,
-	HiChevronUpDown,
-	HiOutlinePencil,
-} from "react-icons/hi2";
-import { formatRelativeTime } from "renderer/lib/formatRelativeTime";
-
-interface PromptGroupAdvancedOptionsProps {
-	showAdvanced: boolean;
-	onShowAdvancedChange: (open: boolean) => void;
-	branchInputValue: string;
-	onBranchInputChange: (value: string) => void;
-	onBranchInputBlur: () => void;
-	onEditPrefix: () => void;
-	runSetupScript: boolean;
-	onRunSetupScriptChange: (checked: boolean) => void;
-	shortcutHint?: string;
-	hideSetupScript?: boolean;
-	isBranchesError?: boolean;
-	isBranchesLoading?: boolean;
-	compareBaseBranchOpen?: boolean;
-	onCompareBaseBranchOpenChange?: (open: boolean) => void;
-	effectiveCompareBaseBranch?: string | null;
-	defaultBranch?: string;
-	branchSearch?: string;
-	onBranchSearchChange?: (search: string) => void;
-	filteredBranches?: Array<{ name: string; lastCommitDate: number }>;
-	onSelectCompareBaseBranch?: (branchName: string) => void;
-}
-
-export function PromptGroupAdvancedOptions({
-	showAdvanced,
-	onShowAdvancedChange,
-	branchInputValue,
-	onBranchInputChange,
-	onBranchInputBlur,
-	onEditPrefix,
-	runSetupScript,
-	onRunSetupScriptChange,
-	shortcutHint,
-	hideSetupScript,
-	isBranchesError,
-	isBranchesLoading,
-	compareBaseBranchOpen,
-	onCompareBaseBranchOpenChange,
-	effectiveCompareBaseBranch,
-	defaultBranch,
-	branchSearch,
-	onBranchSearchChange,
-	filteredBranches,
-	onSelectCompareBaseBranch,
-}: PromptGroupAdvancedOptionsProps) {
-	const showCompareBaseBranch = onCompareBaseBranchOpenChange != null;
-
-	return (
-		<Collapsible open={showAdvanced} onOpenChange={onShowAdvancedChange}>
-			<div className="flex items-center justify-between">
-				<CollapsibleTrigger className="flex items-center gap-1 text-xs text-muted-foreground hover:text-foreground transition-colors">
-					<HiChevronDown
-						className={`size-3 transition-transform ${showAdvanced ? "" : "-rotate-90"}`}
-					/>
-					Advanced options
-				</CollapsibleTrigger>
-				{shortcutHint && (
-					<span className="text-[11px] text-muted-foreground/50">
-						{shortcutHint}
-					</span>
-				)}
-			</div>
-			<CollapsibleContent className="pt-3 space-y-3">
-				<div className="space-y-1.5">
-					<div className="flex items-center justify-between">
-						<label htmlFor="branch" className="text-xs text-muted-foreground">
-							Branch name
-						</label>
-						<button
-							type="button"
-							onClick={onEditPrefix}
-							className="inline-flex items-center gap-1 text-xs text-muted-foreground hover:text-foreground transition-colors"
-						>
-							<HiOutlinePencil className="size-3" />
-							<span>Edit prefix</span>
-						</button>
-					</div>
-					<Input
-						id="branch"
-						className="h-8 text-sm font-mono"
-						placeholder="auto-generated"
-						value={branchInputValue}
-						onChange={(event) => onBranchInputChange(event.target.value)}
-						onBlur={onBranchInputBlur}
-					/>
-				</div>
-
-				{showCompareBaseBranch && (
-					<div className="space-y-1.5">
-						<span className="text-xs text-muted-foreground">Base branch</span>
-						{isBranchesError ? (
-							<div className="flex items-center gap-2 h-8 px-3 rounded-md border border-destructive/50 bg-destructive/10 text-destructive text-xs">
-								Failed to load branches
-							</div>
-						) : (
-							<Popover
-								open={compareBaseBranchOpen}
-								onOpenChange={onCompareBaseBranchOpenChange}
-								modal={false}
-							>
-								<PopoverTrigger asChild>
-									<Button
-										variant="outline"
-										size="sm"
-										className="w-full h-8 justify-between font-normal"
-										disabled={isBranchesLoading}
-									>
-										<span className="flex items-center gap-2 truncate">
-											<GoGitBranch className="size-3.5 shrink-0 text-muted-foreground" />
-											<span className="truncate font-mono text-sm">
-												{effectiveCompareBaseBranch || "Select branch..."}
-											</span>
-											{effectiveCompareBaseBranch === defaultBranch && (
-												<span className="text-[10px] text-muted-foreground bg-muted px-1.5 py-0.5 rounded">
-													default
-												</span>
-											)}
-										</span>
-										<HiChevronUpDown className="size-4 shrink-0 text-muted-foreground" />
-									</Button>
-								</PopoverTrigger>
-								<PopoverContent
-									className="w-[--radix-popover-trigger-width] p-0"
-									align="start"
-									onWheel={(event) => event.stopPropagation()}
-								>
-									<Command shouldFilter={false}>
-										<CommandInput
-											placeholder="Search branches..."
-											value={branchSearch}
-											onValueChange={onBranchSearchChange}
-										/>
-										<CommandList className="max-h-[200px]">
-											<CommandEmpty>No branches found</CommandEmpty>
-											{filteredBranches?.map((branch) => (
-												<CommandItem
-													key={branch.name}
-													value={branch.name}
-													onSelect={() =>
-														onSelectCompareBaseBranch?.(branch.name)
-													}
-													className="flex items-center justify-between"
-												>
-													<span className="flex items-center gap-2 truncate">
-														<GoGitBranch className="size-3.5 shrink-0 text-muted-foreground" />
-														<span className="truncate">{branch.name}</span>
-														{branch.name === defaultBranch && (
-															<span className="text-[10px] text-muted-foreground bg-muted px-1.5 py-0.5 rounded">
-																default
-															</span>
-														)}
-													</span>
-													<span className="flex items-center gap-2 shrink-0">
-														{branch.lastCommitDate > 0 && (
-															<span className="text-xs text-muted-foreground">
-																{formatRelativeTime(branch.lastCommitDate)}
-															</span>
-														)}
-														{effectiveCompareBaseBranch === branch.name && (
-															<HiCheck className="size-4 text-primary" />
-														)}
-													</span>
-												</CommandItem>
-											))}
-										</CommandList>
-									</Command>
-								</PopoverContent>
-							</Popover>
-						)}
-					</div>
-				)}
-
-				{!hideSetupScript && (
-					<div className="flex items-center justify-between">
-						<Label
-							htmlFor="run-setup-script"
-							className="text-xs text-muted-foreground"
-						>
-							Run setup script
-						</Label>
-						<Switch
-							id="run-setup-script"
-							checked={runSetupScript}
-							onCheckedChange={onRunSetupScriptChange}
-						/>
-					</div>
-				)}
-			</CollapsibleContent>
-		</Collapsible>
-	);
-}
diff --git a/apps/desktop/src/renderer/routes/_authenticated/components/DashboardNewWorkspaceModal/components/DashboardNewWorkspaceForm/components/PromptGroup/components/PromptGroupAdvancedOptions/index.ts b/apps/desktop/src/renderer/routes/_authenticated/components/DashboardNewWorkspaceModal/components/DashboardNewWorkspaceForm/components/PromptGroup/components/PromptGroupAdvancedOptions/index.ts
deleted file mode 100644
index 56182b77e11..00000000000
--- a/apps/desktop/src/renderer/routes/_authenticated/components/DashboardNewWorkspaceModal/components/DashboardNewWorkspaceForm/components/PromptGroup/components/PromptGroupAdvancedOptions/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { PromptGroupAdvancedOptions } from "./PromptGroupAdvancedOptions";
diff --git a/apps/desktop/src/renderer/routes/_authenticated/components/DashboardNewWorkspaceModal/components/DashboardNewWorkspaceForm/components/PullRequestsGroup/PullRequestsGroup.tsx b/apps/desktop/src/renderer/routes/_authenticated/components/DashboardNewWorkspaceModal/components/DashboardNewWorkspaceForm/components/PullRequestsGroup/PullRequestsGroup.tsx
deleted file mode 100644
index d462b7ad703..00000000000
--- a/apps/desktop/src/renderer/routes/_authenticated/components/DashboardNewWorkspaceModal/components/DashboardNewWorkspaceForm/components/PullRequestsGroup/PullRequestsGroup.tsx
+++ /dev/null
@@ -1,181 +0,0 @@
-import { CommandEmpty, CommandGroup, CommandItem } from "@superset/ui/command";
-import { toast } from "@superset/ui/sonner";
-import { eq } from "@tanstack/db";
-import { useLiveQuery } from "@tanstack/react-db";
-import { useNavigate } from "@tanstack/react-router";
-import Fuse from "fuse.js";
-import { useMemo } from "react";
-import {
-	GoArrowUpRight,
-	GoGitPullRequest,
-	GoGitPullRequestDraft,
-} from "react-icons/go";
-import { SiGithub } from "react-icons/si";
-import { useDebouncedValue } from "renderer/hooks/useDebouncedValue";
-import { navigateToV2Workspace } from "renderer/routes/_authenticated/_dashboard/utils/workspace-navigation";
-import type { WorkspaceHostTarget } from "renderer/routes/_authenticated/components/DashboardNewWorkspaceModal/components/DashboardNewWorkspaceForm/components/DevicePicker";
-import { useCollections } from "renderer/routes/_authenticated/providers/CollectionsProvider";
-import { useDashboardNewWorkspaceDraft } from "../../../../DashboardNewWorkspaceDraftContext";
-import { useCreateDashboardWorkspace } from "../../../../hooks/useCreateDashboardWorkspace";
-
-interface PullRequestsGroupProps {
-	projectId: string | null;
-	githubRepositoryId: string | null;
-	hostTarget: WorkspaceHostTarget;
-}
-
-export function PullRequestsGroup({
-	projectId,
-	githubRepositoryId,
-	hostTarget,
-}: PullRequestsGroupProps) {
-	const collections = useCollections();
-	const navigate = useNavigate();
-	const { createWorkspace } = useCreateDashboardWorkspace();
-	const { draft, closeAndResetDraft, runAsyncAction } =
-		useDashboardNewWorkspaceDraft();
-
-	// Query open PRs for this repository using the v2 project's githubRepositoryId directly
-	const { data: pullRequests } = useLiveQuery(
-		(q) =>
-			q
-				.from({ prs: collections.githubPullRequests })
-				.where(({ prs }) => eq(prs.repositoryId, githubRepositoryId ?? ""))
-				.select(({ prs }) => ({ ...prs })),
-		[collections, githubRepositoryId],
-	);
-
-	// Check v2Workspaces for existing workspaces by branch
-	const { data: v2WorkspacesData } = useLiveQuery(
-		(q) =>
-			q
-				.from({ ws: collections.v2Workspaces })
-				.where(({ ws }) => eq(ws.projectId, projectId ?? ""))
-				.select(({ ws }) => ({ id: ws.id, branch: ws.branch })),
-		[collections, projectId],
-	);
-
-	const workspaceByBranch = useMemo(() => {
-		const map = new Map<string, string>();
-		for (const w of v2WorkspacesData ?? []) {
-			map.set(w.branch, w.id);
-		}
-		return map;
-	}, [v2WorkspacesData]);
-
-	const allOpenPrs = useMemo(
-		() => (pullRequests ?? []).filter((pr) => pr.state === "open"),
-		[pullRequests],
-	);
-
-	const debouncedQuery = useDebouncedValue(draft.pullRequestsQuery, 150);
-
-	const prFuse = useMemo(
-		() =>
-			new Fuse(allOpenPrs, {
-				keys: [
-					{ name: "title", weight: 2 },
-					{ name: "authorLogin", weight: 1 },
-					{ name: "prNumber", weight: 1 },
-				],
-				threshold: 0.3,
-				includeScore: true,
-				ignoreLocation: true,
-			}),
-		[allOpenPrs],
-	);
-
-	const openPrs = useMemo(() => {
-		const query = debouncedQuery.trim();
-		if (!query) {
-			return allOpenPrs.slice(0, 100);
-		}
-		return prFuse
-			.search(query)
-			.slice(0, 100)
-			.map((result) => result.item);
-	}, [debouncedQuery, allOpenPrs, prFuse]);
-
-	if (!projectId) {
-		return (
-			<CommandGroup>
-				<CommandEmpty>Select a project to view pull requests.</CommandEmpty>
-			</CommandGroup>
-		);
-	}
-
-	if (!githubRepositoryId) {
-		return (
-			<div className="flex flex-col items-center gap-3 py-8 px-4 text-center">
-				<SiGithub className="size-6 text-muted-foreground" />
-				<div className="space-y-1">
-					<p className="text-sm font-medium">No GitHub repository linked</p>
-					<p className="text-xs text-muted-foreground">
-						This project needs a GitHub repository to show pull requests
-					</p>
-				</div>
-			</div>
-		);
-	}
-
-	return (
-		<CommandGroup>
-			<CommandEmpty>No pull requests found.</CommandEmpty>
-			{openPrs.map((pr) => (
-				<CommandItem
-					key={pr.id}
-					onSelect={() => {
-						if (!projectId) {
-							toast.error("Select a project first");
-							return;
-						}
-						const existingId = workspaceByBranch.get(pr.headBranch);
-						if (existingId) {
-							closeAndResetDraft();
-							navigateToV2Workspace(existingId, navigate);
-							return;
-						}
-						void runAsyncAction(
-							createWorkspace({
-								projectId,
-								name: pr.title,
-								branch: pr.headBranch,
-								hostTarget,
-							}),
-							{
-								loading: "Creating workspace from PR...",
-								success: "Workspace created",
-								error: (err) =>
-									err instanceof Error
-										? err.message
-										: "Failed to create workspace",
-							},
-						);
-					}}
-					className="group h-12"
-				>
-					{workspaceByBranch.has(pr.headBranch) ? (
-						<GoArrowUpRight className="size-4 shrink-0 text-muted-foreground" />
-					) : pr.isDraft ? (
-						<GoGitPullRequestDraft className="size-4 shrink-0 text-muted-foreground" />
-					) : (
-						<GoGitPullRequest className="size-4 shrink-0 text-emerald-500" />
-					)}
-					<span
-						className="text-muted-foreground shrink-0 text-xs tabular-nums truncate"
-						style={{ width: "2.8rem" }}
-					>
-						#{pr.prNumber}
-					</span>
-					<span className="truncate flex-1">{pr.title}</span>
-					<span className="text-xs text-muted-foreground shrink-0 group-data-[selected=true]:hidden">
-						{pr.authorLogin}
-					</span>
-					<span className="text-xs text-muted-foreground shrink-0 hidden group-data-[selected=true]:inline">
-						{workspaceByBranch.has(pr.headBranch) ? "Open" : "Create"} ↵
-					</span>
-				</CommandItem>
-			))}
-		</CommandGroup>
-	);
-}
diff --git a/apps/desktop/src/renderer/routes/_authenticated/components/DashboardNewWorkspaceModal/components/DashboardNewWorkspaceForm/components/PullRequestsGroup/index.ts b/apps/desktop/src/renderer/routes/_authenticated/components/DashboardNewWorkspaceModal/components/DashboardNewWorkspaceForm/components/PullRequestsGroup/index.ts
deleted file mode 100644
index 51ab880114f..00000000000
--- a/apps/desktop/src/renderer/routes/_authenticated/components/DashboardNewWorkspaceModal/components/DashboardNewWorkspaceForm/components/PullRequestsGroup/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { PullRequestsGroup } from "./PullRequestsGroup";
diff --git a/apps/desktop/src/renderer/routes/_authenticated/components/DashboardNewWorkspaceModal/components/DashboardNewWorkspaceForm/hooks/useBranchContext/index.ts b/apps/desktop/src/renderer/routes/_authenticated/components/DashboardNewWorkspaceModal/components/DashboardNewWorkspaceForm/hooks/useBranchContext/index.ts
new file mode 100644
index 00000000000..7e80de7c2ee
--- /dev/null
+++ b/apps/desktop/src/renderer/routes/_authenticated/components/DashboardNewWorkspaceModal/components/DashboardNewWorkspaceForm/hooks/useBranchContext/index.ts
@@ -0,0 +1 @@
+export { useBranchContext } from "./useBranchContext";
diff --git a/apps/desktop/src/renderer/routes/_authenticated/components/DashboardNewWorkspaceModal/components/DashboardNewWorkspaceForm/hooks/useBranchContext/useBranchContext.ts b/apps/desktop/src/renderer/routes/_authenticated/components/DashboardNewWorkspaceModal/components/DashboardNewWorkspaceForm/hooks/useBranchContext/useBranchContext.ts
new file mode 100644
index 00000000000..906be117bc2
--- /dev/null
+++ b/apps/desktop/src/renderer/routes/_authenticated/components/DashboardNewWorkspaceModal/components/DashboardNewWorkspaceForm/hooks/useBranchContext/useBranchContext.ts
@@ -0,0 +1,40 @@
+import { useQuery } from "@tanstack/react-query";
+import { env } from "renderer/env.renderer";
+import { getHostServiceClientByUrl } from "renderer/lib/host-service-client";
+import { useLocalHostService } from "renderer/routes/_authenticated/providers/LocalHostServiceProvider";
+import type { WorkspaceHostTarget } from "../../components/DevicePicker";
+
+/**
+ * Fetches branch data for the create-workspace composer via the host-service.
+ * Accepts a V2 project ID + host target directly.
+ */
+export function useBranchContext(
+	projectId: string | null,
+	hostTarget: WorkspaceHostTarget,
+) {
+	const { activeHostUrl } = useLocalHostService();
+	const hostUrl =
+		hostTarget.kind === "local"
+			? activeHostUrl
+			: `${env.RELAY_URL}/hosts/${hostTarget.hostId}`;
+
+	return useQuery({
+		queryKey: ["workspaceCreation", "searchBranches", projectId, hostUrl],
+		queryFn: async () => {
+			if (!hostUrl || !projectId) {
+				return {
+					defaultBranch: null as string | null,
+					branches: [] as Array<{
+						name: string;
+						lastCommitDate: number;
+						isLocal: boolean;
+						hasWorkspace: boolean;
+					}>,
+				};
+			}
+			const client = getHostServiceClientByUrl(hostUrl);
+			return client.workspaceCreation.searchBranches.query({ projectId });
+		},
+		enabled: !!projectId && !!hostUrl,
+	});
+}
diff --git a/apps/desktop/src/renderer/routes/_authenticated/components/DashboardNewWorkspaceModal/components/DashboardNewWorkspaceForm/hooks/useDashboardNewWorkspaceProjectSelection/index.ts b/apps/desktop/src/renderer/routes/_authenticated/components/DashboardNewWorkspaceModal/components/DashboardNewWorkspaceForm/hooks/useDashboardNewWorkspaceProjectSelection/index.ts
deleted file mode 100644
index 0119a16a1b6..00000000000
--- a/apps/desktop/src/renderer/routes/_authenticated/components/DashboardNewWorkspaceModal/components/DashboardNewWorkspaceForm/hooks/useDashboardNewWorkspaceProjectSelection/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { useDashboardNewWorkspaceProjectSelection } from "./useDashboardNewWorkspaceProjectSelection";
diff --git a/apps/desktop/src/renderer/routes/_authenticated/components/DashboardNewWorkspaceModal/components/DashboardNewWorkspaceForm/hooks/useDashboardNewWorkspaceProjectSelection/useDashboardNewWorkspaceProjectSelection.ts b/apps/desktop/src/renderer/routes/_authenticated/components/DashboardNewWorkspaceModal/components/DashboardNewWorkspaceForm/hooks/useDashboardNewWorkspaceProjectSelection/useDashboardNewWorkspaceProjectSelection.ts
deleted file mode 100644
index fcd87eb2a64..00000000000
--- a/apps/desktop/src/renderer/routes/_authenticated/components/DashboardNewWorkspaceModal/components/DashboardNewWorkspaceForm/hooks/useDashboardNewWorkspaceProjectSelection/useDashboardNewWorkspaceProjectSelection.ts
+++ /dev/null
@@ -1,102 +0,0 @@
-import { eq } from "@tanstack/db";
-import { useLiveQuery } from "@tanstack/react-db";
-import { useEffect, useMemo, useRef } from "react";
-import { useCollections } from "renderer/routes/_authenticated/providers/CollectionsProvider";
-
-interface UseDashboardNewWorkspaceProjectSelectionOptions {
-	isOpen: boolean;
-	preSelectedProjectId: string | null;
-	selectedProjectId: string | null;
-	onSelectProject: (projectId: string | null) => void;
-}
-
-export function useDashboardNewWorkspaceProjectSelection({
-	isOpen,
-	preSelectedProjectId,
-	selectedProjectId,
-	onSelectProject,
-}: UseDashboardNewWorkspaceProjectSelectionOptions) {
-	const collections = useCollections();
-
-	const { data: v2ProjectsData } = useLiveQuery(
-		(q) =>
-			q
-				.from({ projects: collections.v2Projects })
-				.select(({ projects }) => ({ ...projects })),
-		[collections],
-	);
-	const v2Projects = useMemo(() => v2ProjectsData ?? [], [v2ProjectsData]);
-	const areV2ProjectsReady = v2ProjectsData !== undefined;
-
-	const appliedPreSelectionRef = useRef<string | null>(null);
-
-	useEffect(() => {
-		if (!isOpen) {
-			appliedPreSelectionRef.current = null;
-		}
-	}, [isOpen]);
-
-	useEffect(() => {
-		if (!isOpen) return;
-
-		if (
-			preSelectedProjectId &&
-			preSelectedProjectId !== appliedPreSelectionRef.current
-		) {
-			if (!areV2ProjectsReady) return;
-			const hasPreSelectedProject = v2Projects.some(
-				(project) => project.id === preSelectedProjectId,
-			);
-			if (hasPreSelectedProject) {
-				appliedPreSelectionRef.current = preSelectedProjectId;
-				if (preSelectedProjectId !== selectedProjectId) {
-					onSelectProject(preSelectedProjectId);
-				}
-				return;
-			}
-		}
-
-		if (!areV2ProjectsReady) return;
-
-		const hasSelectedProject = v2Projects.some(
-			(project) => project.id === selectedProjectId,
-		);
-		if (!hasSelectedProject) {
-			const nextProjectId = v2Projects[0]?.id ?? null;
-			if (nextProjectId !== selectedProjectId) {
-				onSelectProject(nextProjectId);
-			}
-		}
-	}, [
-		selectedProjectId,
-		areV2ProjectsReady,
-		isOpen,
-		onSelectProject,
-		preSelectedProjectId,
-		v2Projects,
-	]);
-
-	const selectedProject =
-		v2Projects.find((project) => project.id === selectedProjectId) ?? null;
-	const githubRepositoryId = selectedProject?.githubRepositoryId ?? null;
-
-	const { data: githubRepoData } = useLiveQuery(
-		(q) =>
-			q
-				.from({ repos: collections.githubRepositories })
-				.where(({ repos }) => eq(repos.id, githubRepositoryId ?? ""))
-				.select(({ repos }) => ({
-					id: repos.id,
-					owner: repos.owner,
-					name: repos.name,
-				})),
-		[collections, githubRepositoryId],
-	);
-
-	return {
-		githubRepository: githubRepoData?.[0] ?? null,
-		githubRepositoryId,
-		selectedProject,
-		v2Projects,
-	};
-}
diff --git a/apps/desktop/src/renderer/routes/_authenticated/components/DashboardNewWorkspaceModal/components/DashboardNewWorkspaceForm/hooks/useResolvedLocalProject/index.ts b/apps/desktop/src/renderer/routes/_authenticated/components/DashboardNewWorkspaceModal/components/DashboardNewWorkspaceForm/hooks/useResolvedLocalProject/index.ts
deleted file mode 100644
index dfde2a3b4c3..00000000000
--- a/apps/desktop/src/renderer/routes/_authenticated/components/DashboardNewWorkspaceModal/components/DashboardNewWorkspaceForm/hooks/useResolvedLocalProject/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { useResolvedLocalProject } from "./useResolvedLocalProject";
diff --git a/apps/desktop/src/renderer/routes/_authenticated/components/DashboardNewWorkspaceModal/components/DashboardNewWorkspaceForm/hooks/useResolvedLocalProject/useResolvedLocalProject.ts b/apps/desktop/src/renderer/routes/_authenticated/components/DashboardNewWorkspaceModal/components/DashboardNewWorkspaceForm/hooks/useResolvedLocalProject/useResolvedLocalProject.ts
deleted file mode 100644
index f88ca411a3f..00000000000
--- a/apps/desktop/src/renderer/routes/_authenticated/components/DashboardNewWorkspaceModal/components/DashboardNewWorkspaceForm/hooks/useResolvedLocalProject/useResolvedLocalProject.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import { useMemo } from "react";
-import { electronTrpc } from "renderer/lib/electron-trpc";
-
-interface ResolvedGithubRepository {
-	owner: string;
-	name: string;
-}
-
-export function useResolvedLocalProject(
-	githubRepository: ResolvedGithubRepository | null,
-) {
-	const { data: localProjects = [] } =
-		electronTrpc.projects.getRecents.useQuery();
-
-	return useMemo(() => {
-		if (!githubRepository) return null;
-		const match = localProjects.find((localProject) => {
-			if (localProject.githubOwner !== githubRepository.owner) return false;
-			if (localProject.name === githubRepository.name) return true;
-
-			const directoryName = localProject.mainRepoPath?.split("/").pop();
-			return directoryName === githubRepository.name;
-		});
-
-		return match?.id ?? null;
-	}, [githubRepository, localProjects]);
-}
diff --git a/apps/desktop/src/renderer/routes/_authenticated/components/DashboardNewWorkspaceModal/components/DashboardNewWorkspaceForm/index.ts b/apps/desktop/src/renderer/routes/_authenticated/components/DashboardNewWorkspaceModal/components/DashboardNewWorkspaceForm/index.ts
deleted file mode 100644
index 5a7fbfd5e5e..00000000000
--- a/apps/desktop/src/renderer/routes/_authenticated/components/DashboardNewWorkspaceModal/components/DashboardNewWorkspaceForm/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { DashboardNewWorkspaceForm } from "./DashboardNewWorkspaceForm";
diff --git a/apps/desktop/src/renderer/routes/_authenticated/components/DashboardNewWorkspaceModal/components/DashboardNewWorkspaceModalContent/DashboardNewWorkspaceModalContent.tsx b/apps/desktop/src/renderer/routes/_authenticated/components/DashboardNewWorkspaceModal/components/DashboardNewWorkspaceModalContent/DashboardNewWorkspaceModalContent.tsx
new file mode 100644
index 00000000000..be033fa47d3
--- /dev/null
+++ b/apps/desktop/src/renderer/routes/_authenticated/components/DashboardNewWorkspaceModal/components/DashboardNewWorkspaceModalContent/DashboardNewWorkspaceModalContent.tsx
@@ -0,0 +1,123 @@
+import { useLiveQuery } from "@tanstack/react-db";
+import { useEffect, useMemo, useRef } from "react";
+import { useCollections } from "renderer/routes/_authenticated/providers/CollectionsProvider";
+import { useDashboardNewWorkspaceDraft } from "../../DashboardNewWorkspaceDraftContext";
+import { PromptGroup } from "../DashboardNewWorkspaceForm/PromptGroup";
+
+interface DashboardNewWorkspaceModalContentProps {
+	isOpen: boolean;
+	preSelectedProjectId: string | null;
+}
+
+/**
+ * Content pane for the Dashboard new-workspace modal.
+ *
+ * Resolves the project list from V2 collections (`v2Projects` +
+ * `githubRepositories`) and handles the initial project selection when the
+ * modal opens. Delegates the composer itself to PromptGroup.
+ */
+export function DashboardNewWorkspaceModalContent({
+	isOpen,
+	preSelectedProjectId,
+}: DashboardNewWorkspaceModalContentProps) {
+	const { draft, updateDraft } = useDashboardNewWorkspaceDraft();
+	const collections = useCollections();
+
+	const { data: v2Projects } = useLiveQuery(
+		(q) =>
+			q
+				.from({ projects: collections.v2Projects })
+				.select(({ projects }) => ({ ...projects })),
+		[collections],
+	);
+
+	const { data: githubRepositories } = useLiveQuery(
+		(q) =>
+			q.from({ repos: collections.githubRepositories }).select(({ repos }) => ({
+				id: repos.id,
+				owner: repos.owner,
+				name: repos.name,
+			})),
+		[collections],
+	);
+
+	const recentProjects = useMemo(() => {
+		const repoById = new Map(
+			(githubRepositories ?? []).map((repo) => [repo.id, repo]),
+		);
+		return (v2Projects ?? []).map((project) => {
+			const repo = project.githubRepositoryId
+				? (repoById.get(project.githubRepositoryId) ?? null)
+				: null;
+			return {
+				id: project.id,
+				name: project.name,
+				githubOwner: repo?.owner ?? null,
+				githubRepoName: repo?.name ?? null,
+			};
+		});
+	}, [githubRepositories, v2Projects]);
+
+	const areProjectsReady = v2Projects !== undefined;
+	const appliedPreSelectionRef = useRef<string | null>(null);
+
+	useEffect(() => {
+		if (!isOpen) {
+			appliedPreSelectionRef.current = null;
+		}
+	}, [isOpen]);
+
+	useEffect(() => {
+		if (!isOpen) return;
+
+		if (
+			preSelectedProjectId &&
+			preSelectedProjectId !== appliedPreSelectionRef.current
+		) {
+			if (!areProjectsReady) return;
+			const hasPreSelectedProject = recentProjects.some(
+				(project) => project.id === preSelectedProjectId,
+			);
+			if (hasPreSelectedProject) {
+				appliedPreSelectionRef.current = preSelectedProjectId;
+				if (preSelectedProjectId !== draft.selectedProjectId) {
+					updateDraft({ selectedProjectId: preSelectedProjectId });
+				}
+				return;
+			}
+		}
+
+		if (!areProjectsReady) return;
+
+		const hasSelectedProject = recentProjects.some(
+			(project) => project.id === draft.selectedProjectId,
+		);
+		if (!hasSelectedProject) {
+			updateDraft({ selectedProjectId: recentProjects[0]?.id ?? null });
+		}
+	}, [
+		draft.selectedProjectId,
+		areProjectsReady,
+		isOpen,
+		preSelectedProjectId,
+		recentProjects,
+		updateDraft,
+	]);
+
+	const selectedProject = recentProjects.find(
+		(project) => project.id === draft.selectedProjectId,
+	);
+
+	return (
+		<div className="flex-1 overflow-y-auto">
+			<PromptGroup
+				projectId={draft.selectedProjectId}
+				selectedProject={selectedProject}
+				recentProjects={recentProjects.filter((project) => Boolean(project.id))}
+				onSelectProject={(selectedProjectId) =>
+					updateDraft({ selectedProjectId })
+				}
+			/>
+		</div>
+	);
+}
diff --git a/apps/desktop/src/renderer/routes/_authenticated/components/DashboardNewWorkspaceModal/components/DashboardNewWorkspaceModalContent/index.ts b/apps/desktop/src/renderer/routes/_authenticated/components/DashboardNewWorkspaceModal/components/DashboardNewWorkspaceModalContent/index.ts
new file mode 100644
index 00000000000..67a1b5e21e5
--- /dev/null
+++ b/apps/desktop/src/renderer/routes/_authenticated/components/DashboardNewWorkspaceModal/components/DashboardNewWorkspaceModalContent/index.ts
@@ -0,0 +1 @@
+export { DashboardNewWorkspaceModalContent } from "./DashboardNewWorkspaceModalContent";
diff --git a/apps/desktop/src/renderer/routes/_authenticated/components/DashboardNewWorkspaceModal/hooks/useCreateDashboardWorkspace/useCreateDashboardWorkspace.ts b/apps/desktop/src/renderer/routes/_authenticated/components/DashboardNewWorkspaceModal/hooks/useCreateDashboardWorkspace/useCreateDashboardWorkspace.ts
index 734a4541260..4414f67eb1f 100644
--- a/apps/desktop/src/renderer/routes/_authenticated/components/DashboardNewWorkspaceModal/hooks/useCreateDashboardWorkspace/useCreateDashboardWorkspace.ts
+++ b/apps/desktop/src/renderer/routes/_authenticated/components/DashboardNewWorkspaceModal/hooks/useCreateDashboardWorkspace/useCreateDashboardWorkspace.ts
@@ -1,49 +1,62 @@
-import { useCallback, useState } from "react";
+import { useCallback } from "react";
 import { env } from "renderer/env.renderer";
 import { getHostServiceClientByUrl } from "renderer/lib/host-service-client";
-import { useDashboardSidebarState } from "renderer/routes/_authenticated/hooks/useDashboardSidebarState";
 import { useLocalHostService } from "renderer/routes/_authenticated/providers/LocalHostServiceProvider";
 import type { WorkspaceHostTarget } from "../../components/DashboardNewWorkspaceForm/components/DevicePicker";
 
-interface CreateDashboardWorkspaceInput {
+export interface CreateWorkspaceInput {
+	pendingId: string;
 	projectId: string;
-	name: string;
-	branch: string;
 	hostTarget: WorkspaceHostTarget;
+	names: {
+		workspaceName: string;
+		branchName: string;
+	};
+	composer: {
+		prompt?: string;
+		baseBranch?: string;
+		runSetupScript?: boolean;
+	};
+	linkedContext?: {
+		internalIssueIds?: string[];
+		githubIssueUrls?: string[];
+		linkedPrUrl?: string;
+		attachments?: Array<{
+			data: string;
+			mediaType: string;
+			filename?: string;
+		}>;
+	};
 }
 
+/**
+ * Thin wrapper around the host-service `workspaceCreation.create` mutation.
+ * The caller is responsible for pending state, toasts, and draft management.
+ */
 export function useCreateDashboardWorkspace() {
-	const [isPending, setIsPending] = useState(false);
 	const { activeHostUrl } = useLocalHostService();
-	const { ensureWorkspaceInSidebar } = useDashboardSidebarState();
 
-	const createWorkspace = useCallback(
-		async (input: CreateDashboardWorkspaceInput) => {
-			setIsPending(true);
-			try {
-				const hostUrl =
-					input.hostTarget.kind === "local"
-						? activeHostUrl
-						: `${env.RELAY_URL}/hosts/${input.hostTarget.hostId}`;
+	return useCallback(
+		async (input: CreateWorkspaceInput) => {
+			const hostUrl =
+				input.hostTarget.kind === "local"
+					? activeHostUrl
+					: `${env.RELAY_URL}/hosts/${input.hostTarget.hostId}`;
 
-				if (!hostUrl) {
-					throw new Error("Host service not available");
-				}
-
-				const client = getHostServiceClientByUrl(hostUrl);
-				const workspace = await client.workspace.create.mutate({
-					projectId: input.projectId,
-					name: input.name,
-					branch: input.branch,
-				});
-				ensureWorkspaceInSidebar(workspace.id, input.projectId);
-				return workspace;
-			} finally {
-				setIsPending(false);
+			if (!hostUrl) {
+				throw new Error("Host service not available");
 			}
+
+			const client = getHostServiceClientByUrl(hostUrl);
+
+			return client.workspaceCreation.create.mutate({
+				pendingId: input.pendingId,
+				projectId: input.projectId,
+				names: input.names,
+				composer: input.composer,
+				linkedContext: input.linkedContext,
+			});
 		},
-		[ensureWorkspaceInSidebar, activeHostUrl],
+		[activeHostUrl],
 	);
-
-	return { createWorkspace, isPending };
 }
diff --git a/apps/desktop/src/renderer/routes/_authenticated/providers/CollectionsProvider/collections.ts b/apps/desktop/src/renderer/routes/_authenticated/providers/CollectionsProvider/collections.ts
index 2c5b25bf2c8..2bfa3148808 100644
--- a/apps/desktop/src/renderer/routes/_authenticated/providers/CollectionsProvider/collections.ts
+++ b/apps/desktop/src/renderer/routes/_authenticated/providers/CollectionsProvider/collections.ts
@@ -41,6 +41,8 @@ import {
 	type DashboardSidebarSectionRow,
 	dashboardSidebarProjectSchema,
 	dashboardSidebarSectionSchema,
+	type PendingWorkspaceRow,
+	pendingWorkspaceSchema,
 	type V2TerminalPresetRow,
 	v2TerminalPresetSchema,
 	type WorkspaceLocalStateRow,
@@ -115,6 +117,13 @@ export interface OrgCollections {
 		typeof v2TerminalPresetSchema,
 		z.input<typeof v2TerminalPresetSchema>
 	>;
+	pendingWorkspaces: Collection<
+		PendingWorkspaceRow,
+		string,
+		LocalStorageCollectionUtils,
+		typeof pendingWorkspaceSchema,
+		z.input<typeof pendingWorkspaceSchema>
+	>;
 }
 
 // Per-org collections cache
@@ -541,6 +550,15 @@ function createOrgCollections(organizationId: string): OrgCollections {
 		}),
 	);
 
+	const pendingWorkspaces = createCollection(
+		localStorageCollectionOptions({
+			id: `pending_workspaces-${organizationId}`,
+			storageKey: `pending-workspaces-${organizationId}`,
+			schema: pendingWorkspaceSchema,
+			getKey: (item) => item.id,
+		}),
+	);
+
 	return {
 		tasks,
 		taskStatuses,
@@ -566,6 +584,7 @@ function createOrgCollections(organizationId: string): OrgCollections {
 		v2WorkspaceLocalState,
 		v2SidebarSections,
 		v2TerminalPresets,
+		pendingWorkspaces,
 	};
 }
 
diff --git a/apps/desktop/src/renderer/routes/_authenticated/providers/CollectionsProvider/dashboardSidebarLocal/schema.ts b/apps/desktop/src/renderer/routes/_authenticated/providers/CollectionsProvider/dashboardSidebarLocal/schema.ts
index 1ce5b8fba36..231518f89b6 100644
--- a/apps/desktop/src/renderer/routes/_authenticated/providers/CollectionsProvider/dashboardSidebarLocal/schema.ts
+++ b/apps/desktop/src/renderer/routes/_authenticated/providers/CollectionsProvider/dashboardSidebarLocal/schema.ts
@@ -75,6 +75,27 @@ export const v2TerminalPresetSchema = z.object({
 	createdAt: persistedDateSchema,
 });
 
+export const pendingWorkspaceSchema = z.object({
+	id: z.string().uuid(),
+	projectId: z.string().uuid(),
+	name: z.string(),
+	branchName: z.string(),
+	prompt: z.string(),
+	baseBranch: z.string().nullable().default(null),
+	runSetupScript: z.boolean().default(true),
+	linkedIssues: z.array(z.unknown()).default([]),
+	linkedPR: z.unknown().nullable().default(null),
+	hostTarget: z.unknown(),
+	attachmentCount: z.number().int().default(0),
+	status: z.enum(["creating", "failed", "succeeded"]).default("creating"),
+	error: z.string().nullable().default(null),
+	workspaceId: z.string().nullable().default(null),
+	initialCommands: z.array(z.string()).nullable().default(null),
+	createdAt: persistedDateSchema,
+});
+
+export type PendingWorkspaceRow = z.infer<typeof pendingWorkspaceSchema>;
+
 export type DashboardSidebarProjectRow = z.infer<
 	typeof dashboardSidebarProjectSchema
 >;
diff --git a/apps/desktop/src/renderer/stores/new-workspace-modal.ts b/apps/desktop/src/renderer/stores/new-workspace-modal.ts
index 22d6af20810..bd7175988f0 100644
--- a/apps/desktop/src/renderer/stores/new-workspace-modal.ts
+++ b/apps/desktop/src/renderer/stores/new-workspace-modal.ts
@@ -8,10 +8,25 @@ interface PendingWorkspace {
 	status: "preparing" | "generating-branch" | "creating";
 }
 
+/** Snapshot of the draft stashed before modal close, restored on failure. */
+export interface StashedDraft {
+	selectedProjectId: string | null;
+	prompt: string;
+	workspaceName: string;
+	workspaceNameEdited: boolean;
+	branchName: string;
+	branchNameEdited: boolean;
+	compareBaseBranch: string | null;
+	runSetupScript: boolean;
+	linkedIssues: unknown[];
+	linkedPR: unknown | null;
+}
+
 interface NewWorkspaceModalState {
 	isOpen: boolean;
 	preSelectedProjectId: string | null;
 	pendingWorkspace: PendingWorkspace | null;
+	stashedDraft: StashedDraft | null;
 	openModal: (projectId?: string) => void;
 	closeModal: () => void;
 	setPendingWorkspace: (workspace: PendingWorkspace | null) => void;
@@ -20,14 +35,18 @@ interface NewWorkspaceModalState {
 		id: string,
 		status: PendingWorkspace["status"],
 	) => void;
+	stashDraft: (draft: StashedDraft) => void;
+	clearStashedDraft: () => void;
+	restoreStashedDraft: () => StashedDraft | null;
 }
 
 export const useNewWorkspaceModalStore = create<NewWorkspaceModalState>()(
 	devtools(
-		(set) => ({
+		(set, get) => ({
 			isOpen: false,
 			preSelectedProjectId: null,
 			pendingWorkspace: null,
+			stashedDraft: null,
 
 			openModal: (projectId?: string) => {
 				set({ isOpen: true, preSelectedProjectId: projectId ?? null });
@@ -43,26 +62,40 @@ export const useNewWorkspaceModalStore = create<NewWorkspaceModalState>()(
 
 			clearPendingWorkspace: (id) => {
 				set((state) => {
-					if (state.pendingWorkspace?.id !== id) {
-						return {};
-					}
+					if (state.pendingWorkspace?.id !== id) return {};
 					return { pendingWorkspace: null };
 				});
 			},
 
 			setPendingWorkspaceStatus: (id, status) => {
 				set((state) => {
-					if (state.pendingWorkspace?.id !== id) {
-						return {};
-					}
+					if (state.pendingWorkspace?.id !== id) return {};
 					return {
-						pendingWorkspace: {
-							...state.pendingWorkspace,
-							status,
-						},
+						pendingWorkspace: { ...state.pendingWorkspace, status },
 					};
 				});
 			},
+
+			stashDraft: (draft: StashedDraft) => {
+				set({ stashedDraft: draft });
+			},
+
+			clearStashedDraft: () => {
+				set({ stashedDraft: null });
+			},
+
+			/** Pops the stash: returns it and clears. Also reopens the modal. */
+			restoreStashedDraft: () => {
+				const stashed = get().stashedDraft;
+				if (stashed) {
+					set({
+						stashedDraft: null,
+						isOpen: true,
+						preSelectedProjectId: stashed.selectedProjectId,
+					});
+				}
+				return stashed;
+			},
 		}),
 		{ name: "NewWorkspaceModalStore" },
 	),
@@ -84,3 +117,9 @@ export const useClearPendingWorkspace = () =>
 	useNewWorkspaceModalStore((state) => state.clearPendingWorkspace);
 export const useSetPendingWorkspaceStatus = () =>
 	useNewWorkspaceModalStore((state) => state.setPendingWorkspaceStatus);
+export const useStashDraft = () =>
+	useNewWorkspaceModalStore((state) => state.stashDraft);
+export const useClearStashedDraft = () =>
+	useNewWorkspaceModalStore((state) => state.clearStashedDraft);
+export const useRestoreStashedDraft = () =>
+	useNewWorkspaceModalStore((state) => state.restoreStashedDraft);
diff --git a/apps/desktop/src/shared/tabs-types.ts b/apps/desktop/src/shared/tabs-types.ts
index d02b081ba9c..d739cbaa635 100644
--- a/apps/desktop/src/shared/tabs-types.ts
+++ b/apps/desktop/src/shared/tabs-types.ts
@@ -151,6 +151,11 @@ export interface Pane {
 
 export type WorkspaceRunState = NonNullable<Pane["workspaceRun"]>["state"];
 
+// TODO: `initialFiles` stores base64 data URLs inline. This bloats
+// the pane layout state in localStorage (v2WorkspaceLocalState
+// collection). Migrate to IndexedDB blob storage — store file
+// references here, actual blobs in IndexedDB keyed by session/pane ID.
+// See renderer/lib/pending-attachment-store.ts for the IndexedDB pattern.
 export interface ChatLaunchConfig {
 	initialPrompt?: string;
 	draftInput?: string;
diff --git a/apps/desktop/src/shared/utils/branch.ts b/apps/desktop/src/shared/utils/branch.ts
index 46717b2cdba..cc993440eae 100644
--- a/apps/desktop/src/shared/utils/branch.ts
+++ b/apps/desktop/src/shared/utils/branch.ts
@@ -111,6 +111,59 @@ export function deduplicateBranchName(
 		: `${baseSegment}-${Date.now()}`;
 }
 
+const MAX_BRANCH_LENGTH = 100;
+
+/**
+ * Turns arbitrary text (a prompt, a title) into a branch-name-shaped slug.
+ * Lowercases, replaces spaces with dashes, strips special chars.
+ * Use this when the input is NOT a branch name — it's a sentence.
+ */
+export function slugifyForBranch(
+	text: string,
+	maxLength = MAX_BRANCH_LENGTH,
+): string {
+	const slug = text
+		.toLowerCase()
+		.trim()
+		.replace(/\s+/g, "-")
+		.replace(/[^a-z0-9._/-]/g, "")
+		.replace(/\.{2,}/g, ".")
+		.replace(/-+/g, "-")
+		.replace(/^[-.]|[-.]+$/g, "")
+		.replace(/\.lock$/g, "")
+		.slice(0, maxLength)
+		.replace(/[-.]+$/g, "");
+	return slug;
+}
+
+/**
+ * Strips only what git forbids from a user-typed branch name.
+ * Preserves case, slashes, underscores — respects user intent.
+ * Use this when the input IS a branch name the user explicitly typed.
+ *
+ * Git ref rules: no `..`, no ASCII control chars, no `~^:?*[\`,
+ * no trailing `.` or `.lock`, no leading `-`.
+ */
+export function sanitizeUserBranchName(
+	name: string,
+	maxLength = MAX_BRANCH_LENGTH,
+): string {
+	const cleaned = name
+		.trim()
+		.replace(/\.\./g, ".") // no ..
+		.replace(/[~^:?*[\]\\]/g, "") // no ~^:?*[\]
+		// biome-ignore lint/suspicious/noControlCharactersInRegex: stripping control chars intentionally
+		.replace(/[\x00-\x1f\x7f]/g, "") // no control chars
+		.replace(/@\{/g, "@") // no @{
+		.replace(/\.lock$/g, "") // no trailing .lock
+		.replace(/^-/, "") // no leading -
+		.replace(/\/+/g, "/") // collapse slashes
+		.replace(/^\/|\/$/g, "") // no leading/trailing slash
+		.slice(0, maxLength)
+		.replace(/[-./]+$/g, ""); // strip trailing .- / after truncation
+	return cleaned;
+}
+
 export function resolveBranchPrefix({
 	mode,
 	customPrefix,
diff --git a/apps/desktop/src/shared/utils/friendly-branch-name.ts b/apps/desktop/src/shared/utils/friendly-branch-name.ts
new file mode 100644
index 00000000000..2842bcaec72
--- /dev/null
+++ b/apps/desktop/src/shared/utils/friendly-branch-name.ts
@@ -0,0 +1,13 @@
+import friendlyWords from "friendly-words";
+
+/**
+ * Generates a friendly two-word branch name like "cheerful-umbrella".
+ * Uses the friendly-words word bag (predicate + object).
+ */
+export function generateFriendlyBranchName(): string {
+	const predicates = friendlyWords.predicates as string[];
+	const objects = friendlyWords.objects as string[];
+	const predicate = predicates[Math.floor(Math.random() * predicates.length)];
+	const object = objects[Math.floor(Math.random() * objects.length)];
+	return `${predicate}-${object}`;
+}
diff --git a/packages/host-service/src/trpc/router/router.ts b/packages/host-service/src/trpc/router/router.ts
index 4f481d52351..614284c3b00 100644
--- a/packages/host-service/src/trpc/router/router.ts
+++ b/packages/host-service/src/trpc/router/router.ts
@@ -10,6 +10,7 @@ import { projectRouter } from "./project";
 import { pullRequestsRouter } from "./pull-requests";
 import { terminalRouter } from "./terminal";
 import { workspaceRouter } from "./workspace";
+import { workspaceCreationRouter } from "./workspace-creation";
 
 export const appRouter = router({
 	health: healthRouter,
@@ -23,6 +24,7 @@ export const appRouter = router({
 	project: projectRouter,
 	terminal: terminalRouter,
 	workspace: workspaceRouter,
+	workspaceCreation: workspaceCreationRouter,
 });
 
 export type AppRouter = typeof appRouter;
diff --git a/packages/host-service/src/trpc/router/workspace-creation/index.ts b/packages/host-service/src/trpc/router/workspace-creation/index.ts
new file mode 100644
index 00000000000..426a3c4d36d
--- /dev/null
+++ b/packages/host-service/src/trpc/router/workspace-creation/index.ts
@@ -0,0 +1 @@
+export { workspaceCreationRouter } from "./workspace-creation";
diff --git a/packages/host-service/src/trpc/router/workspace-creation/utils/sanitize-branch.ts b/packages/host-service/src/trpc/router/workspace-creation/utils/sanitize-branch.ts
new file mode 100644
index 00000000000..c295d34b7bd
--- /dev/null
+++ b/packages/host-service/src/trpc/router/workspace-creation/utils/sanitize-branch.ts
@@ -0,0 +1,41 @@
+/**
+ * Branch name deduplication utility.
+ *
+ * Sanitization/slugification lives on the renderer — the host-service
+ * only deduplicates against existing branches.
+ */
+
+const MAX_BRANCH_LENGTH = 100;
+const SUFFIX_RESERVE = 6; // room for -99999
+
+/**
+ * Appends `-2`, `-3`, etc. until the name doesn't collide with
+ * any existing branch (case-insensitive).
+ *
+ * Truncates the base name upfront to reserve space for the suffix,
+ * so the result never exceeds MAX_BRANCH_LENGTH.
+ */
+export function deduplicateBranchName(
+	candidate: string,
+	existingBranchNames: string[],
+): string {
+	if (!candidate) return candidate;
+
+	const existingSet = new Set(existingBranchNames.map((b) => b.toLowerCase()));
+	if (!existingSet.has(candidate.toLowerCase())) return candidate;
+
+	// Truncate base to leave room for suffix
+	const base =
+		candidate.length > MAX_BRANCH_LENGTH - SUFFIX_RESERVE
+			? candidate
+					.slice(0, MAX_BRANCH_LENGTH - SUFFIX_RESERVE)
+					.replace(/[-.]+$/, "")
+			: candidate;
+
+	for (let suffix = 2; suffix < 10_000; suffix++) {
+		const deduplicated = `${base}-${suffix}`;
+		if (!existingSet.has(deduplicated.toLowerCase())) return deduplicated;
+	}
+
+	return `${base}-${Date.now().toString(36)}`;
+}
diff --git a/packages/host-service/src/trpc/router/workspace-creation/workspace-creation.ts b/packages/host-service/src/trpc/router/workspace-creation/workspace-creation.ts
new file mode 100644
index 00000000000..c6785f407fe
--- /dev/null
+++ b/packages/host-service/src/trpc/router/workspace-creation/workspace-creation.ts
@@ -0,0 +1,629 @@
+import { existsSync, mkdirSync } from "node:fs";
+import { dirname, join, resolve, sep } from "node:path";
+import { getDeviceName, getHashedDeviceId } from "@superset/shared/device-info";
+import { TRPCError } from "@trpc/server";
+import { eq } from "drizzle-orm";
+import simpleGit from "simple-git";
+import { z } from "zod";
+import { projects, workspaces } from "../../../db/schema";
+import type { HostServiceContext } from "../../../types";
+import { protectedProcedure, router } from "../../index";
+import { deduplicateBranchName } from "./utils/sanitize-branch";
+
+// ── In-memory create progress (polled by renderer) ──────────────────
+
+interface ProgressStep {
+	id: string;
+	label: string;
+	status: "pending" | "active" | "done";
+}
+
+interface ProgressState {
+	steps: ProgressStep[];
+	updatedAt: number;
+}
+
+const STEP_DEFINITIONS = [
+	{ id: "ensuring_repo", label: "Ensuring local repository" },
+	{ id: "creating_worktree", label: "Creating worktree" },
+	{ id: "registering", label: "Registering workspace" },
+] as const;
+
+const createProgress = new Map<string, ProgressState>();
+
+function setProgress(pendingId: string, activeStepId: string): void {
+	let reachedActive = false;
+	const steps: ProgressStep[] = STEP_DEFINITIONS.map((def) => {
+		if (def.id === activeStepId) {
+			reachedActive = true;
+			return { id: def.id, label: def.label, status: "active" as const };
+		}
+		if (!reachedActive) {
+			return { id: def.id, label: def.label, status: "done" as const };
+		}
+		return { id: def.id, label: def.label, status: "pending" as const };
+	});
+	createProgress.set(pendingId, { steps, updatedAt: Date.now() });
+}
+
+function clearProgress(pendingId: string): void {
+	createProgress.delete(pendingId);
+}
+
+function sweepStaleProgress(): void {
+	const cutoff = Date.now() - 5 * 60 * 1000;
+	for (const [id, entry] of createProgress) {
+		if (entry.updatedAt < cutoff) createProgress.delete(id);
+	}
+}
+
+// ── Helpers ──────────────────────────────────────────────────────────
+
+function safeResolveWorktreePath(repoPath: string, branchName: string): string {
+	const worktreesRoot = resolve(repoPath, ".worktrees");
+	const worktreePath = resolve(worktreesRoot, branchName);
+	if (
+		worktreePath !== worktreesRoot &&
+		!worktreePath.startsWith(worktreesRoot + sep)
+	) {
+		throw new TRPCError({
+			code: "BAD_REQUEST",
+			message: `Invalid branch name: path traversal detected (${branchName})`,
+		});
+	}
+	return worktreePath;
+}
+
+async function resolveGithubRepo(
+	ctx: HostServiceContext,
+	projectId: string,
+): Promise<{ owner: string; name: string }> {
+	const cloudProject = await ctx.api.v2Project.get.query({
+		organizationId: ctx.organizationId,
+		id: projectId,
+	});
+	const repo = cloudProject.githubRepository;
+	if (!repo?.owner || !repo?.name) {
+		throw new TRPCError({
+			code: "BAD_REQUEST",
+			message: "Project has no linked GitHub repository",
+		});
+	}
+	return { owner: repo.owner, name: repo.name };
+}
+
+async function listBranchNames(
+	ctx: HostServiceContext,
+	repoPath: string,
+): Promise<string[]> {
+	const git = await ctx.git(repoPath);
+	try {
+		const raw = await git.raw([
+			"for-each-ref",
+			"--sort=-committerdate",
+			"--format=%(refname:short)",
+			"refs/heads/",
+			"refs/remotes/origin/",
+		]);
+		const names = new Set<string>();
+		for (const line of raw.trim().split("\n").filter(Boolean)) {
+			let name = line;
+			if (name.startsWith("origin/")) name = name.slice("origin/".length);
+			if (name !== "HEAD") names.add(name);
+		}
+		return Array.from(names);
+	} catch {
+		return [];
+	}
+}
+
+// ── Router ───────────────────────────────────────────────────────────
+
+export const workspaceCreationRouter = router({
+	getContext: protectedProcedure
+		.input(z.object({ projectId: z.string() }))
+		.query(async ({ ctx, input }) => {
+			const localProject = ctx.db.query.projects
+				.findFirst({ where: eq(projects.id, input.projectId) })
+				.sync();
+
+			if (!localProject) {
+				return {
+					projectId: input.projectId,
+					hasLocalRepo: false,
+					defaultBranch: null as string | null,
+				};
+			}
+
+			const git = await ctx.git(localProject.repoPath);
+			let defaultBranch: string | null = null;
+			try {
+				const originHead = await git.raw([
+					"symbolic-ref",
+					"refs/remotes/origin/HEAD",
+					"--short",
+				]);
+				defaultBranch = originHead.trim().replace("origin/", "");
+			} catch {
+				defaultBranch = "main";
+			}
+
+			return {
+				projectId: input.projectId,
+				hasLocalRepo: true,
+				defaultBranch,
+			};
+		}),
+
+	searchBranches: protectedProcedure
+		.input(
+			z.object({
+				projectId: z.string(),
+				query: z.string().optional(),
+				limit: z.number().min(1).max(500).optional(),
+			}),
+		)
+		.query(async ({ ctx, input }) => {
+			const localProject = ctx.db.query.projects
+				.findFirst({ where: eq(projects.id, input.projectId) })
+				.sync();
+
+			if (!localProject) {
+				return {
+					defaultBranch: null as string | null,
+					branches: [] as Array<{
+						name: string;
+						lastCommitDate: number;
+						isLocal: boolean;
+						hasWorkspace: boolean;
+					}>,
+				};
+			}
+
+			const git = await ctx.git(localProject.repoPath);
+
+			let defaultBranch: string | null = null;
+			try {
+				const originHead = await git.raw([
+					"symbolic-ref",
+					"refs/remotes/origin/HEAD",
+					"--short",
+				]);
+				defaultBranch = originHead.trim().replace("origin/", "");
+			} catch {
+				defaultBranch = "main";
+			}
+
+			const localBranchNames = new Set<string>();
+			try {
+				const raw = await git.raw([
+					"branch",
+					"--list",
+					"--format=%(refname:short)",
+				]);
+				for (const name of raw.trim().split("\n").filter(Boolean)) {
+					localBranchNames.add(name);
+				}
+			} catch {
+				// ignore
+			}
+
+			type BranchInfo = {
+				name: string;
+				lastCommitDate: number;
+				isLocal: boolean;
+			};
+			const branchMap = new Map<string, BranchInfo>();
+			try {
+				const raw = await git.raw([
+					"for-each-ref",
+					"--sort=-committerdate",
+					"--format=%(refname:short)\t%(committerdate:unix)",
+					"refs/heads/",
+					"refs/remotes/origin/",
+				]);
+				for (const line of raw.trim().split("\n").filter(Boolean)) {
+					const [rawRef, ts] = line.split("\t");
+					if (!rawRef) continue;
+					let name = rawRef;
+					if (name.startsWith("origin/")) name = name.slice("origin/".length);
+					if (name === "HEAD") continue;
+					if (!branchMap.has(name)) {
+						branchMap.set(name, {
+							name,
+							lastCommitDate: Number.parseInt(ts ?? "0", 10),
+							isLocal: localBranchNames.has(name),
+						});
+					}
+				}
+			} catch {
+				// ignore
+			}
+
+			let branches = Array.from(branchMap.values());
+
+			if (input.query) {
+				const q = input.query.toLowerCase();
+				branches = branches.filter((b) => b.name.toLowerCase().includes(q));
+			}
+
+			branches = branches.slice(0, input.limit ?? 200);
+
+			const localWorkspaceBranches = new Set(
+				ctx.db
+					.select()
+					.from(workspaces)
+					.where(eq(workspaces.projectId, input.projectId))
+					.all()
+					.map((w) => w.branch),
+			);
+
+			return {
+				defaultBranch,
+				branches: branches.map((b) => ({
+					...b,
+					hasWorkspace: localWorkspaceBranches.has(b.name),
+				})),
+			};
+		}),
+
+	/**
+	 * Create a new workspace. Always creates — never opens an existing one.
+	 * Branch name is sanitized and deduplicated server-side.
+	 */
+	getProgress: protectedProcedure
+		.input(z.object({ pendingId: z.string() }))
+		.query(({ input }) => {
+			sweepStaleProgress();
+			const entry = createProgress.get(input.pendingId);
+			return entry ? { steps: entry.steps } : null;
+		}),
+
+	create: protectedProcedure
+		.input(
+			z.object({
+				pendingId: z.string(),
+				projectId: z.string(),
+				names: z.object({
+					workspaceName: z.string(),
+					branchName: z.string(),
+				}),
+				composer: z.object({
+					prompt: z.string().optional(),
+					baseBranch: z.string().optional(),
+					runSetupScript: z.boolean().optional(),
+				}),
+				linkedContext: z
+					.object({
+						internalIssueIds: z.array(z.string()).optional(),
+						githubIssueUrls: z.array(z.string()).optional(),
+						linkedPrUrl: z.string().optional(),
+						attachments: z
+							.array(
+								z.object({
+									data: z.string(),
+									mediaType: z.string(),
+									filename: z.string().optional(),
+								}),
+							)
+							.optional(),
+					})
+					.optional(),
+			}),
+		)
+		.mutation(async ({ ctx, input }) => {
+			const deviceClientId = getHashedDeviceId();
+			const deviceName = getDeviceName();
+			setProgress(input.pendingId, "ensuring_repo");
+
+			// 1. Resolve / ensure project locally
+			let localProject = ctx.db.query.projects
+				.findFirst({ where: eq(projects.id, input.projectId) })
+				.sync();
+
+			if (!localProject) {
+				const cloudProject = await ctx.api.v2Project.get.query({
+					organizationId: ctx.organizationId,
+					id: input.projectId,
+				});
+
+				if (!cloudProject.repoCloneUrl) {
+					throw new TRPCError({
+						code: "BAD_REQUEST",
+						message: "Project has no linked GitHub repository — cannot clone",
+					});
+				}
+
+				const homeDir = process.env.HOME || process.env.USERPROFILE || "/tmp";
+				const repoPath = join(homeDir, ".superset", "repos", input.projectId);
+
+				if (!existsSync(repoPath)) {
+					mkdirSync(dirname(repoPath), { recursive: true });
+					await simpleGit().clone(cloudProject.repoCloneUrl, repoPath);
+				}
+
+				localProject = ctx.db
+					.insert(projects)
+					.values({ id: input.projectId, repoPath })
+					.returning()
+					.get();
+			}
+
+			setProgress(input.pendingId, "creating_worktree");
+
+			// 2. Validate + deduplicate branch name
+			// Renderer already sanitized/slugified. Host-service only validates
+			// and deduplicates — doesn't re-sanitize (which would strip case,
+			// slashes, etc. the user intended).
+			if (!input.names.branchName.trim()) {
+				throw new TRPCError({
+					code: "BAD_REQUEST",
+					message: "Branch name is empty",
+				});
+			}
+
+			const existingBranches = await listBranchNames(
+				ctx,
+				localProject.repoPath,
+			);
+			const branchName = deduplicateBranchName(
+				input.names.branchName,
+				existingBranches,
+			);
+
+			// 3. Create worktree
+			const worktreePath = safeResolveWorktreePath(
+				localProject.repoPath,
+				branchName,
+			);
+
+			const git = await ctx.git(localProject.repoPath);
+			const baseBranch = input.composer.baseBranch || "HEAD";
+
+			// Always create a new branch — never check out an existing one.
+			// Checking out existing branches is a separate intent (e.g. createFromPr).
+			await git.raw([
+				"worktree",
+				"add",
+				"-b",
+				branchName,
+				worktreePath,
+				baseBranch,
+			]);
+
+			setProgress(input.pendingId, "registering");
+
+			// 4. Register cloud workspace row
+			const rollbackWorktree = async () => {
+				try {
+					await git.raw(["worktree", "remove", worktreePath]);
+				} catch (err) {
+					console.warn(
+						"[workspaceCreation.create] failed to rollback worktree",
+						{ worktreePath, err },
+					);
+				}
+			};
+
+			let host: { id: string };
+			try {
+				host = await ctx.api.device.ensureV2Host.mutate({
+					organizationId: ctx.organizationId,
+					machineId: deviceClientId,
+					name: deviceName,
+				});
+			} catch (err) {
+				console.error("[workspaceCreation.create] ensureV2Host failed", err);
+				clearProgress(input.pendingId);
+				await rollbackWorktree();
+				throw new TRPCError({
+					code: "INTERNAL_SERVER_ERROR",
+					message: `Failed to register host: ${err instanceof Error ? err.message : String(err)}`,
+				});
+			}
+
+			const cloudRow = await ctx.api.v2Workspace.create
+				.mutate({
+					organizationId: ctx.organizationId,
+					projectId: input.projectId,
+					name: input.names.workspaceName,
+					branch: branchName,
+					hostId: host.id,
+				})
+				.catch(async (err) => {
+					console.error(
+						"[workspaceCreation.create] v2Workspace.create failed",
+						err,
+					);
+					clearProgress(input.pendingId);
+					await rollbackWorktree();
+					throw err;
+				});
+
+			if (!cloudRow) {
+				clearProgress(input.pendingId);
+				await rollbackWorktree();
+				throw new TRPCError({
+					code: "INTERNAL_SERVER_ERROR",
+					message: "Cloud workspace create returned no row",
+				});
+			}
+
+			ctx.db
+				.insert(workspaces)
+				.values({
+					id: cloudRow.id,
+					projectId: input.projectId,
+					worktreePath,
+					branch: branchName,
+				})
+				.run();
+
+			// 5. Resolve setup commands (returned to renderer, not executed here)
+			let initialCommands: string[] | null = null;
+			if (input.composer.runSetupScript) {
+				const setupScriptPath = join(worktreePath, ".superset", "setup.sh");
+				if (existsSync(setupScriptPath)) {
+					initialCommands = [`bash "${setupScriptPath}"`];
+				}
+			}
+
+			clearProgress(input.pendingId);
+
+			return {
+				workspace: cloudRow,
+				initialCommands,
+				warnings: [] as string[],
+			};
+		}),
+
+	// ── GitHub endpoints for the link commands ────────────────────────
+
+	searchGitHubIssues: protectedProcedure
+		.input(
+			z.object({
+				projectId: z.string(),
+				query: z.string().optional(),
+				limit: z.number().min(1).max(100).optional(),
+			}),
+		)
+		.query(async ({ ctx, input }) => {
+			const repo = await resolveGithubRepo(ctx, input.projectId);
+			const octokit = await ctx.github();
+			const limit = input.limit ?? 30;
+
+			try {
+				if (input.query?.trim()) {
+					const q = `repo:${repo.owner}/${repo.name} is:issue is:open in:title,body ${input.query}`;
+					const { data } = await octokit.search.issuesAndPullRequests({
+						q,
+						per_page: limit,
+					});
+					return {
+						issues: data.items
+							.filter((item) => !item.pull_request)
+							.map((item) => ({
+								issueNumber: item.number,
+								title: item.title,
+								url: item.html_url,
+								state: item.state,
+								authorLogin: item.user?.login ?? null,
+							})),
+					};
+				}
+
+				const { data } = await octokit.issues.listForRepo({
+					owner: repo.owner,
+					repo: repo.name,
+					state: "open",
+					per_page: limit,
+				});
+				return {
+					issues: data
+						.filter((item) => !item.pull_request)
+						.map((item) => ({
+							issueNumber: item.number,
+							title: item.title,
+							url: item.html_url,
+							state: item.state,
+							authorLogin: item.user?.login ?? null,
+						})),
+				};
+			} catch (err) {
+				console.warn("[workspaceCreation.searchGitHubIssues] failed", err);
+				return { issues: [] };
+			}
+		}),
+
+	searchPullRequests: protectedProcedure
+		.input(
+			z.object({
+				projectId: z.string(),
+				query: z.string().optional(),
+				limit: z.number().min(1).max(100).optional(),
+			}),
+		)
+		.query(async ({ ctx, input }) => {
+			const repo = await resolveGithubRepo(ctx, input.projectId);
+			const octokit = await ctx.github();
+			const limit = input.limit ?? 30;
+
+			try {
+				if (input.query?.trim()) {
+					const q = `repo:${repo.owner}/${repo.name} is:pr in:title ${input.query}`;
+					const { data } = await octokit.search.issuesAndPullRequests({
+						q,
+						per_page: limit,
+					});
+					return {
+						pullRequests: data.items
+							.filter((item) => item.pull_request)
+							.map((item) => ({
+								prNumber: item.number,
+								title: item.title,
+								url: item.html_url,
+								state: item.state,
+								isDraft: item.draft ?? false,
+								authorLogin: item.user?.login ?? null,
+							})),
+					};
+				}
+
+				const { data } = await octokit.pulls.list({
+					owner: repo.owner,
+					repo: repo.name,
+					state: "open",
+					sort: "updated",
+					direction: "desc",
+					per_page: limit,
+				});
+				return {
+					pullRequests: data.map((pr) => ({
+						prNumber: pr.number,
+						title: pr.title,
+						url: pr.html_url,
+						state: pr.state,
+						isDraft: pr.draft ?? false,
+						authorLogin: pr.user?.login ?? null,
+					})),
+				};
+			} catch (err) {
+				console.warn("[workspaceCreation.searchPullRequests] failed", err);
+				return { pullRequests: [] };
+			}
+		}),
+
+	getGitHubIssueContent: protectedProcedure
+		.input(
+			z.object({
+				projectId: z.string(),
+				issueNumber: z.number().int().positive(),
+			}),
+		)
+		.query(async ({ ctx, input }) => {
+			const repo = await resolveGithubRepo(ctx, input.projectId);
+			const octokit = await ctx.github();
+			try {
+				const { data } = await octokit.issues.get({
+					owner: repo.owner,
+					repo: repo.name,
+					issue_number: input.issueNumber,
+				});
+				return {
+					number: data.number,
+					title: data.title,
+					body: data.body ?? "",
+					url: data.html_url,
+					state: data.state,
+					author: data.user?.login ?? null,
+					createdAt: data.created_at,
+					updatedAt: data.updated_at,
+				};
+			} catch (err) {
+				throw new TRPCError({
+					code: "INTERNAL_SERVER_ERROR",
+					message: `Failed to fetch issue #${input.issueNumber}: ${err instanceof Error ? err.message : String(err)}`,
+				});
+			}
+		}),
+});