feat: port upstream #2460 (combine workspace project stack) onto main-fluke

[f1uke]

Ports upstream PR AgentWrapper#2460 – "combine workspace project stack" (7a87caae, ~3,500 lines) onto main-fluke (on top of the batch-1 sync / PR #45). AgentWrapper#2460 adds the workspace-project-stack capability: a project can be a multi-repo workspace whose sessions materialise a root worktree plus one worktree per child repo — all on a shared branch — with SCM observation of child repos, workspace-aware lifecycle teardown, and a desktop import UI.

Every conflict was resolved to keep main-fluke behavior while adding AgentWrapper#2460's capability — reconciled, not one-sided.

Verification

Check	Result
go build ./... / go vet ./...	✅ clean
golangci-lint run	✅ 0 issues
go test ./...	✅ green in every package the port touches
tsc --noEmit (frontend)	✅ clean
vitest run (frontend)	✅ 661/661
Sidebar import UI	✅ demoed via ao preview (screenshots below)

Two backend failures are pre-existing/environmental in packages this port never touches: internal/cli e2e give the documented spurious HTTP 404 when run inside a live AO session (real daemon AO_* env leaks in — confirmed present), and one kilocode auth test context deadline exceeded that passes on isolated re-run (transient timeout).

Conflict hot-spots & reconciliations

manager.go (spawn / kill / restore rewrite, +737 upstream — 5 conflicts)

• Spawn branch naming — kept main-fluke's AI branch-naming + per-project git-convention prefix (applyConventionPrefix) + auto-named-collision retry; routed provisioning through feat: combine workspace project stack AgentWrapper/agent-orchestrator#2460's createSessionWorkspace and the workspace-aware defaultSpawnBranch (delegates to main-fluke's defaultSessionBranch → ao/<id>/root for regular projects).
• --base override — createSessionWorkspace hardcoded the project default branch; threaded main-fluke's cfg.BaseBranch back through it (both the regular and workspace paths).
• Restore — the extracted relaunchRestoredSession dropped RuntimeConfig.ProjectID/Branch; restored them (they feed tmux.SessionNameFor, i.e. the per-project branch naming), using the in-scope rec.ID.
• reconcileLive — kept main-fluke's idle-close-TTL fast-path; delegated the not-idle capture to feat: combine workspace project stack AgentWrapper/agent-orchestrator#2460's workspace-aware saveAndTeardownOne (behaviorally equivalent to the old inline stash+marker+destroy, and multi-repo aware).
• System prompt — kept prompts.ConfidentialityGuard + effectiveBase (main-fluke's prompts-package refactor) and added feat: combine workspace project stack AgentWrapper/agent-orchestrator#2460's workspaceProjectPrompt injection; dropped upstream's re-introduced local systemPromptGuard const (verbatim duplicate of ConfidentialityGuard) and the now-dead orchestratorPrompt.

observe/scm/observer.go (PR attribution)

• Kept main-fluke's live-branch PR attribution (a restored/continued session's new-branch PR is auto-claimed) and subjectRepoForPR Owner/Name hydration; added feat: combine workspace project stack AgentWrapper/agent-orchestrator#2460's workspace child-repo scanning (workspaceSCMSessionRepos) + multi-repo repoForTrackedPR selection.
• Composed the two: repoForTrackedPR selects the owning repo among the session's repos, then subjectRepoForPR hydrates Owner/Name — so fix(scm): hydrate tracked PR repo owner and name AgentWrapper/agent-orchestrator#2510 is redundant (see below). On no-match, favored main-fluke's non-drop: attribute via the PR's recorded repo instead of dropping it.
• Extended live-branch attribution to workspace child repos (they share the session's one branch).

Sidebar.tsx (+464 upstream — 8 conflicts)

• main-fluke had inlined CreateProjectFlow into the sidebar and deleted the standalone CreateProjectFlow.tsx → kept it deleted.
• Ported feat: combine workspace project stack AgentWrapper/agent-orchestrator#2460's full multi-step import flow (mode picker → folder picker + repo scan/validation → agents) into the inlined component; all supporting infra (preload/bridge scanImportFolder/chooseDirectory(title), _shell asWorkspace wiring, API) was already present via clean auto-merge.
• Dropped the create-flow sr-only error span (a minor main-fluke a11y touch): it duplicated the error text and is incompatible with upstream's multi-dialog flow + tests, which surface errors visibly in both dialogs. The unrelated project-removal sr-only span is untouched.

_shell.tsx — kept main-fluke's throw on orchestrator-startup failure; upstream's setOrchestratorStartupError state path isn't wired in main-fluke's shell (undefined reference).

Lockfile — package-lock.json is secondary (pnpm is primary); took AgentWrapper#2460's transitive @emnapi bump. pnpm install churn on pnpm-lock.yaml was reverted to the merged state.

Related PRs

• fix(scm): hydrate tracked PR repo owner and name AgentWrapper/agent-orchestrator#2510 (Owner/Name hydration) — not taken. Redundant: subjectRepoForPR already hydrates, and this port composes it with repoForTrackedPR so the refresh target always carries Owner/Name.
• Refactor Kimi and Qwen agent adapters for improved prompt delivery an… AgentWrapper/agent-orchestrator#2497 (Kimi/Qwen prompt-delivery refactor) — recommended as a follow-up, not folded in. It's an independent concern (interactive-TUI prompt delivery via a new GetPromptDeliveryStrategy), 670 lines across 13 files that re-touch manager.go (+87) / manager_test.go (+215) — the same spawn/prompt path just reconciled here against main-fluke's AI-naming and convention customizations. Keeping it separate keeps this PR reviewable and revertable, and Refactor Kimi and Qwen agent adapters for improved prompt delivery an… AgentWrapper/agent-orchestrator#2497 is cleanly portable now that feat: combine workspace project stack AgentWrapper/agent-orchestrator#2460 (its blocker) has landed.

Demo

ao preview of the new import flow (mock-data renderer):

1. "Import to Agent Orchestrator" mode dialog — Workspace (multi-repo) vs Project (single-repo).
2. "Import workspace" folder dialog — folder picker + detected-repo validation.

Both render with main-fluke's design system.

🤖 Generated with Claude Code