[teamleaderleo]

Summary

Open a chat that already runs on another machine (cmux16, huge-blue; for example one cmux agent open huge-blue/NAME started) as a sidebar workspace bound to that machine's daemon.

• Daemon (cmux-tui): new agent-session-adopt {surface, session} (agent-session-adopt-v1). It binds a session of this machine's own acpmux to an unbound agent tab of this store.
  • Gates: the same as agent-session-start (a trusted local non-remote client, the host gate that refuses team VMs and unverified Cloud VMs, and a tab of this store with no session yet).
  • It refuses with agent_session.unknown_session any id that this machine's _acpmux/sessions does not list as its own: a peer's mirrored chat, the Home Chief's, or an unknown id.
  • It answers {surface, session, conversation, family, mode, asking}.
• Policy (b), per the coordinator: a chat in a mode that does not ask (bypass) is adopted, but only on enrolled or trusted hosts (the start's host gate), and the workspace shows a visible "bypass" badge.
• App (Swift): follows in this PR.

Risk: high. This adds a new socket verb that binds sessions and lets a non-asking session open on a trusted host.

Takes back #23163: nothing is taken back. This PR moves AgentTabRemoteClient (with #23163's children()) unchanged from CmuxNextApp/AgentTabRemoteHost.swift to CmuxNextAgentPane/AgentTabRemoteClient.swift, so the agent pane can use it.

Changelog

Added: open an agent chat running on another machine as a sidebar workspace.

Observed / Not run

No capture: the only new visual is the "Bypass" warning on the row of a chat adopted from another machine's acpmux. A capture mini has no second machine with a running non-asking chat to adopt, so no tour reaches it. AgentBypassBadgeTests covers the row content.

Head 211a40356ce919dea9a7771a2dc2498b1a3bdff8: two fixes, test first.

• Adopt refuses without the agent page. cmux agent open S --host <machine> took the adopt path, which skipped the canHostChat check that the local open makes. In a build with no agent page it made a workspace on that machine and bound the session into a tab that could not show it. Adopt and open now share one check (requireChatPage), which refuses before any workspace is made. A Debug-only CMUX_NEXT_AGENT_PANE_NONE=1 makes the agent tabs resolve no page, so a test can run as such a build.
• The unknown-session refusal names the session id. It said "Check the session name with acpmux ls", but adopt matches the exact session id only. It now says session id in English and in all 20 translations of the catalog (21 locales), each marked translated.

Command: cmux-ci run --class light --script scripts/ci/package-test-lane.sh --arg=suite --arg=Packages/macOS/CmuxNext --arg=AgentSessionAdoptNoPageTests,AgentBypassBadgeTests --env CMUX_CI_XCODE_APP=/Applications/Xcode_26.6.app

• Red on the test head 5d87ec570ee584bf138073cc77723011cfce9ad7, job 22e656453201c8696521bccd: anotherMachinesChatIsRefusedWithoutTheAgentPageAndMakesNoWorkspace failed with no refusal, a started work item ("The agent service on Move VM did not start.") and a workspace made on the other machine. anAdoptsOwnRefusalsSayWhatHappened failed because the text said "session name". (An earlier run at b5122f739d9a, job 3da86b8af641d14e631e6cdf, showed that the fleet's test build carries the bundled page, which is why the seam was added.)
• Green on 211a40356ce9, job b7ffea143d44bd85549928fe: both suites passed, 7 of 7 tests, none skipped.
• cmux-ci compile-check --app on 211a40356ce9, job faa4a6d49cb59a9e93882737: ok.
• cmux-tui spec inventory / clippy (changed cmux-tui packages) (run 39630147344) is red only on two "redundant clone" errors at cmux-tui-core/src/server/rows_tests.rs:373 and :416. This PR does not touch that file. It is a base red, fixed on base by rows_tests: drop two redundant clones (clippy base red) #23557.

Head 169626f5634d10b51b859852f46fcb31b85da827: one merge of feat-cmux-next e323f77325da, then a test-only fix.

Merge conflicts, with both sides kept:

• AgentSessionWorkspace: the remote adopt path plus acpmux new: one launcher for agents (worktree, prompt file, report-to, sidebar group, reuse) #22809's group argument, which now also goes to the local open. The listed-key reuse now applies to adopt too. Base's DaemonStore.firstPane(mirroring:) replaces this branch's duplicate mirroredPane(of:) in AgentSessionWorkspace, CloudMove and CloudBringBack, and the duplicate file is deleted.
• AgentTabRemoteClient: this branch moved it to CmuxNextAgentPane. It now carries cmux-next: wire explicit read-only remote agent observation #21258's observe mode and isReadOnly, and cmux NEXT: show and open a Cloud VM chat's child chats #23163's children().
• AgentSessionAttachClient: attach sends mode.command (attach or observe) with mode_events and the bypass notes. The private mode read is renamed chatMode() so it does not clash with the mode property. Adopt is refused in observe mode.
• DaemonEndpoint capability list: agentSessionAdopt plus base's observe, children, cloudAttachments and cloudSelfHost.
• cmux-tui agent_session_attach/agent_session_stream: the adopt and children modules, the mode-read fields and the children set. A session_changed of the session or of a followed descendant streams. Only the session's own mode change re-reads its mode.

Fleet, on the merged head e0f0a4808e44 unless noted:

• cmux-ci compile-check --app, job 9f4181e7d0cd8737d040c953: ok (app compiled and linked).
• Swift suites, step 99113f1332b59dff06e1a59f (the fleet coalesced the per-suite keys r22871-<Suite>-e0f0a4808e44 into one build): passed for AgentBypassBadgeTests (6), AgentTabHostRefusalTests (4), AgentSessionAttachClientObserverTests (2), RemoteChildSessionsTests (4), RemoteAcpmuxObserverTests (1), CloudMoveTests and CloudBringBackTests (12).
• cmux-tui test agent_session, step 7ad611affb284732b92a9baf: red. 15 agent_session_attach_tests failed because the attach's new mode read (_acpmux/web_modes) went unanswered by the tests' fake acpmux and showed up as the next frame. Fixed in 169626f5634d: the fake answers the read and skips it like the watch.
• cmux-tui test agent_session on 169626f5634d, step 9cec0891204f1fa16b33ef79: 94 of 96 passed, including every adopt, start, attach, observe and children test. Two did not pass:
  • terminal_respawn::a_respawned_terminal_resumes_its_agent_session fails the same way on base e323f77325da (step 9da1003cc84a96e2051d2360), so it is not this PR's.
  • agent_input_hint::terminal_input_into_an_agent_suggests_agent_message failed in the full run and passed alone, so the gate marked it flaky.

PR checks on 169626f5634d:

• cmux-next guards / defaults-snapshot is red at "Menu rows run registered actions" over FileExplorer files this PR does not touch. It fails the same way on the feat-cmux-next push run 39617831647, so it is a base red.
• pr-capture-check failed because the description had no capture line. The note above addresses it.

Not run: no live adopt of a real remote chat end to end, and no capture.

Agent session: cosmic-gray

🤖 Generated with Claude Code

---

^{Need help on this PR? Tag @codesmith-bot with what you need.}

---

Summary by cubic

Opens a chat that already runs on another machine's acpmux as a sidebar workspace bound to that machine's daemon, via the new agent-session-adopt verb in the cmux-tui daemon and the cmux-next app.

• Binds a session only when that machine's own acpmux lists it at the moment of the call; refuses peer-mirrored chats, the Home Chief's, and unknown or vanished ids, and never starts acpmux for an adopt. --host NAME --group G opens into that machine's group of that name, joining any same-named group that can hold the row and making it when missing; a host that names none or more than one machine is refused before the workspace is made, and the refusal says why.
• The merge with feat-cmux-next keeps adopt and the base's observe, children, and group features, reusing base's AgentSessionWorkspace.join for the group (the branch's duplicate SidebarEdits.group/joinGroup are removed) and base's is_chief; an adopt in observe mode is refused, and the attached client carries the observe mode and children support.
• Adopts bypass-mode sessions only on enrolled or trusted hosts (same host gate as agent-session-start), reporting asking: false for the app's bypass badge.
• Non-asking chats show a "Bypass: acts without asking" warning first on their workspace row, which no reporter's entry can drop or hide. The badge follows the chat: a new agent-session-mode verb reads a bound tab's mode, the attach reply carries it, and an attachment with mode_events hears pushes when the mode changes. Mode reads are bounded and run only while the connection serves them; a stale connection's read is dropped, and the re-read lock uses acquire-release ordering so a concurrent mode change is never lost.
• Moves mirroredPane and AgentTabRemoteClient into CmuxNextBridge and CmuxNextAgentPane to keep the App target flat. Adopt shares the local open's agent-page check, so without the page it is refused before any workspace is made on the other machine; the unknown-session refusal names the exact session id.
• Any failed adopt closes the workspace it made outright, kept out of Recently Closed: the workspace, its terminal, and the agent tab are created before agent-session-adopt runs, and a timeout, closed connection, malformed reply, or failed agent-tab request would otherwise leave them on the other machine. The close retries through later drops until the daemon answers (or the machine leaves the app), re-asking a late reply only within the late-reply budget, retrying a lost link only on a new connection, and ending on a timeout past the budget so it always terminates; it closes the terminal too, so a daemon without batch-close-v1 does not keep the PTY. The whole create runs under the workspace-repair claim, the close runs only after that claim fails and releases the key with endClosing, so no key is left settling, and the tab request is sent under a fixed mutation id so a late reply replays.
• Adds CLI tests covering binding, refusals (peer, chief, unknown, team VM), the dual-adopt error, the host-name gates, mode reads and updates, and the failed-adopt cleanup, plus app tests for the bypass badge and the no-page refusal (a Debug-only CMUX_NEXT_AGENT_PANE_NONE key simulates a build without the page).

^{Written for commit 80236be. Summary will update on new commits.}

[teamleaderleo]

owner: 01a15ba7-3152-78b2-bfdf-bb6eb0d5a053

[teamleaderleo]

Bead cx-2b1z3 created for this PR by the cmux coordinator.

[github-actions]

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

Review 92bc138: 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=pr22871 -f ref=cmux/remote-session-adopt -f platform=macos -f backend_mode=local

Passes: CI passes on 92bc138fc7.

CI passes on 92bc138fc7 (run 39961577441 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.

red: cmux-next checks (god files, concurrency, crash safety, l10n); NEW: red check: Daemon capabilities export is fresh (+6 more) is not red on the base e1429af; do not merge until green; see lane-rules

CI fast guards passes on 1b9b30075e (run). This covers only the fast guards, not CI: CI's result is ci-status.

Tour of 211a40356c (run): no media. The tour job failed before the tour ran (build or setup); the run log has the output.

[teamleaderleo]

cmux-next guards / defaults-snapshot is red on 21 of 22 fresh feat-cmux-next PR heads in the last 2:00:00, so it is most likely a base red, not this PR's. The base-reds lane has it; a base merge picks up the fix once it lands.

[cursor]

Bugbot needs on-demand usage enabled

Bugbot uses usage-based billing for this team and requires on-demand usage to be enabled.

A team admin can enable on-demand usage in the Cursor dashboard.

[cursor]

Bugbot needs on-demand usage enabled

Bugbot uses usage-based billing for this team and requires on-demand usage to be enabled.

A team admin can enable on-demand usage in the Cursor dashboard.

[teamleaderleo]

rust workspaces / rust workspaces is red on 19 of 19 fresh feat-cmux-next PR heads in the last 2:00:00, so it is most likely a base red, not this PR's. The base-reds lane has it; a base merge picks up the fix once it lands.

[teamleaderleo]

cmux-next guards / nightly-guards / workflow-guard-tests / release-notary is red on 16 of 19 fresh feat-cmux-next PR heads in the last 2:00:00, so it is most likely a base red, not this PR's. The base-reds lane has it; a base merge picks up the fix once it lands.

[cursor]

Bugbot needs on-demand usage enabled

Bugbot uses usage-based billing for this team and requires on-demand usage to be enabled.

A team admin can enable on-demand usage in the Cursor dashboard.

[teamleaderleo]

cmux-next / cmux-next checks (god files, concurrency, crash safety, l10n) › Checks job structure is red on 12 of 13 fresh feat-cmux-next PR heads in the last 2:00:00, so it is most likely a base red, not this PR's. The base-reds lane has it; a base merge picks up the fix once it lands.

[teamleaderleo]

cmux-next / cmux-next checks (god files, concurrency, crash safety, l10n) › No new SwiftUI (macOS UI is AppKit) is red on 12 of 13 fresh feat-cmux-next PR heads in the last 2:00:00, so it is most likely a base red, not this PR's. The base-reds lane has it; a base merge picks up the fix once it lands.

[teamleaderleo]

cmux-next / cmux-next checks (god files, concurrency, crash safety, l10n) › Script tests (pin-cmux-tui, embed-cef, ensure-cef store) is red on 12 of 13 fresh feat-cmux-next PR heads in the last 2:00:00, so it is most likely a base red, not this PR's. The base-reds lane has it; a base merge picks up the fix once it lands.

[cursor]

Bugbot needs on-demand usage enabled

Bugbot uses usage-based billing for this team and requires on-demand usage to be enabled.

A team admin can enable on-demand usage in the Cursor dashboard.

[teamleaderleo]

Closing the umbrella. p0-machines adopted it after its lane died. The split went this way:

• cmux-tui: agent-session-adopt binds another chat of this machine to an agent tab (1/3 of #22871) #24554 (agent-session-adopt) and cmux-tui: agent-session-mode and the attach mode reads for adopted chats #24559 (agent-session-mode): closed. feat-cmux-next opens a peer's chat as the session this Mac's acpmux mirrors (cmux NEXT: agent.openSessionTab --host <peer> opens that machine's chat (as this Mac's acpmux mirrors it) #25027, d62504b) and never binds a tab to another machine's daemon, so nothing would call them.
• cmux-next: open another machine's running agent chat as a sidebar workspace there (3/3 of #22871) #24556 (open another machine's chat as a workspace) and cmux-next: another machine's chat that acts without asking shows a Bypass warning on its row (2/3 of #22871) #24555 (Bypass badge): closed, because they depend on those verbs. The remaining ideas are --host on agent.openSessionWorkspace via AgentPeerSession.resolve, and a Bypass warning read from the mirrored chat's mode on this Mac. Both are noted on those PRs as fresh, small follow-ups.
  The goal, "open a remote machine's agent chat from the sidebar", is met on base by cmux NEXT: agent.openSessionTab --host <peer> opens that machine's chat (as this Mac's acpmux mirrors it) #25027 together with the remote chat rows (db98601), and the per-machine groups in cmux NEXT sidebar: group restored Cloud machines #25121.