[teamleaderleo]

Fixes #34408
Fixes #34403
Fixes #34527

Follow-ups from the reviews of #33242 (receipt, receipt at 4cbbf49).

• Folder popover (Composer folder popover: outside dismiss leaves Add folder mode on, so the next project pick adds a folder #34408): the popover's non-Escape close (an outside click) cleared only the query, so Add folder… mode stayed on and the next project pick added a folder instead of changing the project. Every close now resets the query, the expanded repositories and Add folder… mode. FolderPopover.tsx.
• Cloud and Sandboxed (Composer: Add folder is offered in Cloud run mode but Cloud chats drop the extra folders #34403): those starts don't go through startSession, so they carry no extra folders. In those run modes the composer hides Add folder… and the +N, and the client gets no extra folders for its next start (ComposerContext.tsx, App.tsx). The draft is kept, so it comes back when the person switches back to This Mac. Wiring folders into Cloud chats is separate work.
• Starting Cloud machine (Composer: picking a starting Cloud machine keeps the previous machine's extra folders (+N) #34527): a pick of an account Cloud machine that isn't linked yet returned before the draft was cleared, so the previous machine's +N stayed while it started, or after it failed. The pick now drops the draft at once (ComposerContext.tsx pickCloudMachine).

Tests

webviews/test/composer-extra-folders.test.tsx: an outside dismiss after Add folder… leaves the next pick changing the project; Cloud and Sandboxed modes offer no Add folder… and show no +N; picking a starting Cloud machine drops the draft at once. All four failed before the fix and pass after it.

Changelog

• Fixed: closing the composer's folder menu by clicking outside no longer leaves it adding folders, and Cloud and Sandboxed chats no longer offer extra folders they can't use.

Agent session: agent session

🤖 Generated with Claude Code

---

^{Open in [code]smith · Need help on this PR? Tag @codesmith-bot with what you need.}

---

Summary by cubic

Fixes three composer extra-folder follow-ups from the review of #33242: dismissing the folder menu by clicking outside no longer leaves Add folder mode on, Cloud and Sandboxed chats no longer offer or send extra folders, and picking a starting Cloud machine drops the current folders at once.

• Outside dismiss of FolderPopover now resets the query, expanded repositories, and Add folder mode, so the next pick changes the project instead of adding a folder.
• Cloud and Sandboxed runs carry no extra folders, so the composer hides Add folder and the +N; the draft is kept and returns on switching back to This Mac.
• Picking a Cloud machine that isn't linked yet clears the draft immediately rather than when — or if — the machine arrives.
• The test suite covers all three regressions; each failed before the fix.

^{Written for commit 364daf4. Summary will update on new commits.}

[github-actions]

cmux status _{(one comment, edited in place; each line is updated by the job that owns it)}

Review 61a536c: HQ feed card · gallery before/after runs · checks

App of this head (app.zip, kept 1 day)

gh workflow run reload-build.yml -R manaflow-ai/cmux --ref feat-cmux-next -f tag=pr34584 -f ref=lane/extra-folders-followups -f platform=macos -f backend_mode=local

Gallery before/after for 364daf4: 16 states rendered, 0 images differ, 1465 more touched states not rendered. Images are in the run's artifact, not on this public PR; the independent review of this head reads them on its own, so the PR needs no hand-made screenshots of these states.

gh run download 41772905827 -R manaflow-ai/cmux -n gallery-advisory-34584-364daf420b4dc4310a1fbac839a2b9d0c4b34c83 (then read gallery-review.json)

States

State	Theme	Status	Diff	Picked by
agent-pane.chat-width/standard	Apple System Colors Light	unchanged	0%	own App.tsx
agent-pane.chat-width/standard	Apple System Colors	unchanged	0%	own App.tsx
agent-pane.chat-width/wide	Apple System Colors Light	unchanged	0%	own App.tsx
agent-pane.chat-width/wide	Apple System Colors	unchanged	0%	own App.tsx
agent-pane.chat-width/wide-blocks	Apple System Colors Light	unchanged	0%	own App.tsx
agent-pane.chat-width/wide-blocks	Apple System Colors	unchanged	0%	own App.tsx
agent-pane.composer/font-size-chat-14	Apple System Colors Light	unchanged	0%	own ComposerContext.tsx
agent-pane.composer/font-size-chat-14	Apple System Colors	unchanged	0%	own ComposerContext.tsx
agent-pane.composer/font-size-new-chat-14	Apple System Colors Light	unchanged	0%	own ComposerContext.tsx
agent-pane.composer/font-size-new-chat-14	Apple System Colors	unchanged	0%	own ComposerContext.tsx
agent-pane.composer/font-size-new-tab-14	Apple System Colors Light	unchanged	0%	own ComposerContext.tsx
agent-pane.composer/font-size-new-tab-14	Apple System Colors	unchanged	0%	own ComposerContext.tsx
agent-pane.composer/font-size-chat-21	Apple System Colors Light	unchanged	0%	own ComposerContext.tsx
agent-pane.composer/font-size-chat-21	Apple System Colors	unchanged	0%	own ComposerContext.tsx
agent-pane.composer/font-size-new-chat-21	Apple System Colors Light	unchanged	0%	own ComposerContext.tsx
agent-pane.composer/font-size-new-chat-21	Apple System Colors	unchanged	0%	own ComposerContext.tsx
agent-pane.composer/font-size-new-tab-21	Apple System Colors Light	unchanged	0%	own ComposerContext.tsx
agent-pane.composer/font-size-new-tab-21	Apple System Colors	unchanged	0%	own ComposerContext.tsx
agent-pane.composer/font-size-chat-28	Apple System Colors Light	unchanged	0%	own ComposerContext.tsx
agent-pane.composer/font-size-chat-28	Apple System Colors	unchanged	0%	own ComposerContext.tsx
agent-pane.composer/font-size-new-chat-28	Apple System Colors Light	unchanged	0%	own ComposerContext.tsx
agent-pane.composer/font-size-new-chat-28	Apple System Colors	unchanged	0%	own ComposerContext.tsx
agent-pane.composer-context/closed	Apple System Colors Light	unchanged	0%	own ComposerContext.tsx
agent-pane.composer-context/closed	Apple System Colors	unchanged	0%	own ComposerContext.tsx
agent-pane.composer-context/folder-menu	Apple System Colors Light	unchanged	0%	own ComposerContext.tsx
agent-pane.composer-context/folder-menu	Apple System Colors	unchanged	0%	own ComposerContext.tsx
agent-pane.composer-context/folder-menu-hover	Apple System Colors Light	unchanged	0%	own ComposerContext.tsx
agent-pane.composer-context/folder-menu-hover	Apple System Colors	unchanged	0%	own ComposerContext.tsx
agent-pane.composer-context/folder-menu-keyboard	Apple System Colors Light	unchanged	0%	own ComposerContext.tsx
agent-pane.composer-context/folder-menu-keyboard	Apple System Colors	unchanged	0%	own ComposerContext.tsx
agent-pane.composer-context/menu-grid-legacy	Apple System Colors Light	unchanged	0%	own ComposerContext.tsx
agent-pane.composer-context/menu-grid-legacy	Apple System Colors	unchanged	0%	own ComposerContext.tsx

_{Pick other states with a Gallery: entry.id, entry.id/variant line in the PR body.}

Passes: CI passes on 364daf420b.

CI passes on 364daf420b (run 41772906132 attempt 1).

Written by scripts/ci/classify_failures.py (ci-failure-attribution.yml); signatures are its SIGNATURES table. A machine verdict is the runner's fault, not this PR's; yours means the failing file is one this PR changes, also red on main that main's latest full suite fails the same way, seen on other PRs that it failed on another pull request's run lately.

web and size checks: green

Shipped in:

• cmux NEXT nightly 1.0.0-nightly.4182499138501 (e0aa712b3b)
• cmux NEXT nightly 1.0.0-nightly.4184087390301 (08052d331e)
• cmux NEXT nightly 1.0.0-nightly.4184224384601 (a3abfc4160)
• cmux NEXT nightly 1.0.0-nightly.4184409870901 (78ee0e108e)

[teamleaderleo]

Review (subagent opus-5.5 medium): SHIP at 61a536c

Visual verdict: no images; Leo tries the build

Checked: the three source hunks and their surroundings. sandbox.mode re-renders through the pane's useSyncExternalStore. The hiding covers FolderPopover, LocationPicker's +N and the New Tab composer. "Run on This Mac" switches back to persistent and re-sends the kept draft. The four new tests drive the three bugs.

Follow-ups:

• [follow-up] Guard the pickCloudMachine clear with draft.machine !== id, as pickComputer does. That path can't hold a draft for its own machine today.
• [follow-up] Optional hint that hidden folders come back on This Mac.

[teamleaderleo]

Review (subagent opus-5.5 medium, carried): SHIP at 364daf4

Visual verdict: no images; Leo tries the build

This head only merges feat-cmux-next into 61a536c, which got SHIP above. The PR's diff against base is byte-identical, hunk headers aside. The merge picks up #34577, which fixes the base red in test/transcript-spacing-kinds.test.ts (ReferenceError: after is not defined). That red failed webview shard 2 at the old head, and it failed in that shard's base phase too. 123 tests pass at this head across composer-extra-folders, extraFolders, environment-picker and environment-picker-cloud-machines.

Follow-ups: #34783.