Thanks for this — isolating desktop sessions by workspace is a good improvement. Rebasing against the latest main-v2 hits conflicts in desktop/app.go (3 hunks) and a large ~68-line one in internal/boot/boot_test.go, since session path handling and its tests have changed since this was opened (e.g. legacy session import landed via #3247). Could you rebase onto the latest main-v2 and reconcile the session path logic? Thank you!

Rebased onto the latest main-v2 and reconciled the session path changes with the legacy session import path from #3247.

Summary:

• Global/imported topics now resolve an existing known session directory before booting the tab controller, so imported legacy sessions continue in place instead of starting a fresh workspace-scoped transcript.
• Trash, restore, purge, and preview now resolve paths across known session dirs while still rejecting paths outside those dirs.
• Added a shutdown fix for background lazy MCP startup so Windows teardown does not leave workspace temp directories locked during tests.

Validation:

• go test ./internal/boot -run TestBuildMigratesLegacySessionsFromConfigSessionDir -count=50
• go test ./internal/plugin -run TestLazyBackgroundCloseCancelsInFlightKick -count=50
• go test ./... -p 1 -count=1
• cd desktop && go test ./... -count=1
• go vet ./...
• cd desktop && go vet ./...
• desktop benchmarks: ListSessionsScoped 12.0-13.3ms/op for the fixture, desktopSessionDir 1.84-1.95us/op
• CI run 27063762931 is green, including windows-latest and race

Thanks for this — workspace-scoped session isolation is a solid improvement. main-v2 has moved on quite a bit and this now conflicts in a few files, including core boot wiring, so it needs a rebase before we can take it:

desktop/app.go
desktop/sessions.go
desktop/tabs.go
desktop/workspace_test.go
internal/boot/boot.go
internal/boot/boot_test.go

Could you rebase onto the latest main-v2 and resolve those? The boot.go / boot_test.go conflicts are the ones to look at most carefully since that path changed recently. Once it's rebased and CI is green I'll review and merge. Thanks!

Sorry for the churn — main-v2 moved again after your rebase (a few session-display and bash-process changes landed), so this conflicts once more. Most of it is mechanical (struct fields in boot.go, the sessions.go import block), but two spots overlap with a recent refactor and are worth your eyes since they touch your feature:

• app.go SubmitDisplayToTab: display recording was refactored to a SetDisplayRecorder callback (bindControllerDisplayRecorder) that already reads ctrl.SessionDir(). Your inline recordSessionDisplay(controllerSessionDir(ctrl), …) likely becomes redundant once your SessionDir plumbing feeds ctrl.SessionDir() — please reconcile so recording stays workspace-scoped without double-recording.
• app.go ResumeSessionForTab: HEAD now calls a.rememberTabSessionPath(tab, path) after ctrl.Resume; keep that but feed it your validated sessionPath.

Could you rebase onto the latest main-v2 once more and resolve those two? Everything else is just keep-both. CI was green on your last push, so it should be quick. Thanks for sticking with it.

Rebased onto the latest main-v2 (1fe5f2c6) and force-pushed the branch.

I reconciled the two overlapping spots you called out:

• SubmitDisplayToTab now keeps the upstream ctrl.SubmitDisplay(...) path and relies on bindControllerDisplayRecorder, so display recording stays tied to ctrl.SessionDir() without double-recording.
• ResumeSessionForTab now validates the requested path against the controller session dir, resumes with that sessionPath, and stores the validated sessionPath via rememberTabSessionPath.

Validation:

• go test ./internal/boot -run TestBuildMigratesLegacySessionsFromConfigSessionDir -count=50
• go test ./internal/plugin -run TestLazyBackgroundCloseCancelsInFlightKick -count=50
• go test ./... -p 1 -count=1
• go vet ./...
• cd desktop && go test . -run "TestDesktopSessionAPIsUseControllerSessionDir|TestResumeSessionRejectsPathOutsideControllerSessionDir|TestDesktopSessionDirIsScopedByWorkspace|TestOpenProjectTabUsesWorkspaceSessionDir|TestWorkspace" -count=1
• cd desktop && go vet ./...

PR checks are green now, including desktop, windows-latest, and race.