Skip to content

Revert accidental CodeRouter handoff merge - #18950

Merged
azooz2003-bit merged 1 commit into
mainfrom
codex/revert-coderouter-handoff
Oct 10, 2026
Merged

azooz2003-bit merged 1 commit into
mainfrom
codex/revert-coderouter-handoff

Conversation

@azooz2003-bit

@azooz2003-bit azooz2003-bit commented Oct 10, 2026 •

Copy link
Copy Markdown
Collaborator

This immediately reverts the accidental merge of PR #10194 into main.

PR #10194 belongs to Lawrence; the merge was performed while preparing a separate fix branch. This revert restores main to its pre-#10194 state so the original work can be reviewed and merged independently.


View with [code]smith Autofix with [code]smith
Need help on this PR? Tag @codesmith-bot with what you need. Autofix is disabled.


Summary by cubic

Reverts the accidental merge of PR #10194, which landed the native CodeRouter handoff on main. This restores main to its pre-merge state so the handoff work can be reviewed and merged independently.

  • Removes the CodeRouter socket handoff, the bundled Rust CLI and its CI/publish workflows, and related tests; cmux coderouter and cmux cr return to the exec passthrough path.

Written for commit 608722c. Summary will update on new commits.

View guided diff Turn on auto-fix


Note

Medium Risk
Reverts a large auth/socket integration; restores simpler exec passthrough but removes secure handoff and release automation that depended on the reverted code.

Overview
Reverts the accidental merge of PR #10194, restoring main to the pre-handoff state.

CI / packaging: Deletes the in-repo CodeRouter GitHub workflows (CI, release, npm/PyPI publish, verify-release) and trims unused self-hosted runner labels from actionlint.yaml. The coderouter/.gitignore entry is removed with the rest of that packaging surface.

CLI: cmux cr and passthrough cmux coderouter verbs again exec the separately installed CodeRouter binary (resolve → optional bootstrap → execve) with no cmux socket, capability probe, or signed native handoff. Routed-agent socket verbs (status, machines, claude, etc.) are unchanged.

Control socket: Removes the CodeRouter handoff stack—audit-token peer identity, coderouter.handoff.* framing limits, HMAC arm/proof codecs, launch policy, and authorization helpers used for credential writes during handoff. sendV2 is simplified (no sendV2Envelope / single-frame / capability-bypass paths). Event mapping no longer special-cases coderouter.handoff.complete.

Reviewed by Cursor Bugbot for commit 608722c. Bugbot is set up for automated code reviews on this repo. Configure here.

…tive-handoff"

This reverts commit 5cca480, reversing
changes made to 16ae2a6.
@github-actions

Copy link
Copy Markdown
Contributor

All contributors have signed the CLA ✍️ ✅
Posted by the CLA Assistant Lite bot.

@coderabbitai

coderabbitai Bot commented Oct 10, 2026

Copy link
Copy Markdown

Review in Change Stack →Review in Change Stack →

Note

Currently processing new changes in this PR. This may take a few minutes, please wait...

⚙️ Run configuration
  • Configuration used: Repository: manaflow-ai/cmux/.coderabbit.yaml
  • Review profile: ASSERTIVE
  • Plan: Advanced
  • Run ID: 247c7aa3-7889-425a-900a-b98af3edc347

📥 Commits

Reviewing files that changed from the base of the PR and between 5cca480 and 608722c.


⛔ Files ignored due to path filters (1)
  • coderouter/Cargo.lock is excluded by !**/*.lock

📒 Files selected for processing (70)
  • .github/actionlint.yaml
  • .github/workflows/coderouter-ci.yml
  • .github/workflows/coderouter-publish-npm.yml
  • .github/workflows/coderouter-publish-pypi.yml
  • .github/workflows/coderouter-release.yml
  • .github/workflows/coderouter-verify-release.yml
  • CLI/CMUXCLI+Coderouter.swift
  • CLI/CMUXCLI+CoderouterPassthrough.swift
  • CLI/SocketClient+V2.swift
  • CLI/cmux.swift
  • Packages/macOS/CmuxControlSocket/Sources/CmuxControlSocket/Model/SocketPeerAuditToken.swift
  • Packages/macOS/CmuxControlSocket/Sources/CmuxControlSocket/Server/ControlClientAsyncTransport.swift
  • Packages/macOS/CmuxControlSocket/Sources/CmuxControlSocket/Server/ControlClientLineReader.swift
  • Packages/macOS/CmuxControlSocket/Sources/CmuxControlSocket/Server/ControlConnection.swift
  • Packages/macOS/CmuxControlSocket/Sources/CmuxControlSocket/Server/SocketConnectionAuthorizationState.swift
  • Packages/macOS/CmuxControlSocket/Sources/CmuxControlSocket/Server/SocketControlServer+AcceptSource.swift
  • Packages/macOS/CmuxControlSocket/Sources/CmuxControlSocket/Server/SocketControlServer.swift
  • Packages/macOS/CmuxControlSocket/Sources/CmuxControlSocket/Transport/CodeRouterDebugServerIdentityPolicy.swift
  • Packages/macOS/CmuxControlSocket/Sources/CmuxControlSocket/Transport/CodeRouterHandoffProtocol.swift
  • Packages/macOS/CmuxControlSocket/Sources/CmuxControlSocket/Transport/CodeRouterLaunchPolicy.swift
  • Packages/macOS/CmuxControlSocket/Sources/CmuxControlSocket/Transport/SocketClientCapabilityAuthority.swift
  • Packages/macOS/CmuxControlSocket/Sources/CmuxControlSocket/Transport/SocketClientCapabilityProof.swift
  • Packages/macOS/CmuxControlSocket/Sources/CmuxControlSocket/Transport/SocketTransport+Peer.swift
  • Packages/macOS/CmuxControlSocket/Sources/CmuxControlSocket/Wire/ControlCommandExecutionPolicy.swift
  • Packages/macOS/CmuxControlSocket/Tests/CmuxControlSocketTests/CodeRouterAsyncLineReaderTests.swift
  • Packages/macOS/CmuxControlSocket/Tests/CmuxControlSocketTests/CodeRouterHandoffProtocolTests.swift
  • Packages/macOS/CmuxControlSocket/Tests/CmuxControlSocketTests/ControlClientLineReaderTests.swift
  • Packages/macOS/CmuxControlSocket/Tests/CmuxControlSocketTests/ControlCommandExecutionPolicyTests.swift
  • Packages/macOS/CmuxControlSocket/Tests/CmuxControlSocketTests/SocketClientCapabilityProofTests.swift
  • Packages/macOS/CmuxControlSocket/Tests/CmuxControlSocketTests/SocketControlServerConfigurationTests.swift
  • Packages/macOS/CmuxControlSocket/Tests/CmuxControlSocketTests/SocketControlServerTests.swift
  • Packages/macOS/CmuxControlSocket/Tests/CmuxControlSocketTests/SocketTransportPeerTests.swift
  • Packages/macOS/CmuxFoundation/Sources/CmuxFoundation/Date/CmuxRFC3339DateParser.swift
  • Packages/macOS/CmuxFoundation/Tests/CmuxFoundationTests/CmuxRFC3339DateParserTests.swift
  • Resources/Localizable.xcstrings
  • Sources/Cloud/CodeRouterHandoffArmGrantStore.swift
  • Sources/Cloud/CodeRouterHandoffClient.swift
  • Sources/Cloud/CodeRouterSocketPeerVerifier.swift
  • Sources/CmuxSocketEventMapper.swift
  • Sources/TerminalController+SocketClientCapability.swift
  • Sources/TerminalController.swift
  • cmux.xcodeproj/project.pbxproj
  • cmuxTests/CLIAuthAliasTests.swift
  • cmuxTests/CmuxSocketEventMapperTests.swift
  • cmuxTests/CodeRouterHandoffArmGrantStoreTests.swift
  • coderouter/.gitignore
  • coderouter/Cargo.toml
  • coderouter/LICENSE
  • coderouter/README.md
  • coderouter/npm/LICENSE
  • coderouter/npm/README.md
  • coderouter/npm/bin/coderouter.js
  • coderouter/npm/package.json
  • coderouter/pyproject.toml
  • coderouter/scripts/check-version.mjs
  • coderouter/scripts/verify-macos-signature.sh
  • coderouter/src/bin/cr.rs
  • coderouter/src/cli.rs
  • coderouter/src/config.rs
  • coderouter/src/control_plane.rs
  • coderouter/src/handoff.rs
  • coderouter/src/lib.rs
  • coderouter/src/loading.rs
  • coderouter/src/main.rs
  • coderouter/src/oauth.rs
  • coderouter/src/process.rs
  • coderouter/src/status.rs
  • coderouter/src/telemetry.rs
  • coderouter/src/tui.rs
  • coderouter/tests/cli.rs

 ___________________________________________
< Crossing the tensor streams to find bugs. >
 -------------------------------------------
  \
   \   \
        \ /\
        ( )
      .( o ).
✨ Finishing Touches
📝 Generate docstrings
  • Commit to this branch
  • Create a new PR

🧪 Generate unit tests (beta)
  • Commit to this branch
  • Create a new PR

  • Autofix · Keep fixing CodeRabbit findings and required CI, and resolving merge conflicts

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands.

@azooz2003-bit
azooz2003-bit merged commit edfc09c into main Oct 10, 2026
67 of 70 checks passed
@azooz2003-bit
azooz2003-bit deleted the codex/revert-coderouter-handoff branch October 10, 2026 05:01
@github-actions

Copy link
Copy Markdown
Contributor

Merge receipt for 608722c9e2, merged 2026-10-10 05:01:53 UTC

  • Not verified at merge: ci-status (not reported), macOS compile admission (in progress), CI fast guards (in progress), guards (18) (in progress), swift-package-tests (in progress)
  • Verified: backend migrations applied, catalog-structure, detect-ios-changes, Fast static checks, GhosttyKit release check, ios-tests, package-conventions-lint, plan, runner, web-validation
  • Skipped by policy: admission-placement, apply-production, apply-staging, browser, Claude wrapper regressions, Dogfood build #​${{ github.event.pull_request.number }}, ios-simulator, ios-simulator-build, mobile-core-package, remote-daemon, suite-coverage, web, and 3 more
  • Full suite: runs on main after merge.

Labeled merged-unverified: if main breaks near this merge, look here first.

@github-actions github-actions Bot added the merged-unverified A judging check was not green at merge; see the merge receipt comment label Oct 10, 2026

@cursor cursor Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cursor Bugbot has reviewed your changes using default effort and found 1 potential issue.

Fix All in Cursor

❌ Bugbot Autofix is OFF. To automatically fix reported issues with cloud agents, enable autofix in the Cursor dashboard.

Reviewed by Cursor Bugbot for commit 608722c. Configure here.

Comment thread .github/actionlint.yaml
# self-hosted runner. See check_no_self_hosted_fleet_runners.
# Linux: Blacksmith primary (LINUX_RUNNER), WarpBuild overflow fallback.
- blacksmith-4vcpu-ubuntu-2404
- blacksmith-4vcpu-ubuntu-2404-arm

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actionlint loses in-use runner labels

Medium Severity

This revert removes blacksmith-4vcpu-ubuntu-2404-arm and blacksmith-4vcpu-windows-2025 from the actionlint allowlist, but remaining workflows still use those labels in runs-on fallbacks. Actionlint can reject those workflows even though the CodeRouter release jobs that originally needed the labels are gone.

Fix in Cursor Fix in Web

Reviewed by Cursor Bugbot for commit 608722c. Configure here.

rustybret pushed a commit to rustybret/bmux that referenced this pull request Oct 10, 2026
e63ec95 fix(build): drop the app import from the remote tmux CLI test (manaflow-ai#18945)
edfc09c Merge pull request manaflow-ai#18950 from manaflow-ai/codex/revert-coderouter-handoff
608722c Revert "Merge pull request manaflow-ai#10194 from manaflow-ai/task/coderouter-native-handoff"
5cca480 Merge pull request manaflow-ai#10194 from manaflow-ai/task/coderouter-native-handoff
c867c77 fix: preserve CodeRouter peer context through async loop
7bb42ac Merge origin/main into CodeRouter handoff
16ae2a6 feat: open CodeRouter guide as a pane
5f98c98 feat: open CodeRouter guide as a pane
c7dd9ea feat: add CodeRouter help guide
1f026c7 CodeRouter handoff: meet current CI and package conventions
e231560 Merge remote-tracking branch 'origin/main' into native-handoff-merge
0f273d5 Merge main into the CodeRouter native handoff
f60f20e Merge main and preserve CodeRouter and Cloud diagnostic strings
b193fb8 Merge current main and preserve CodeRouter handoff transport
cf6a2a4 Merge main into CodeRouter native handoff
39f48e8 Move CodeRouter launch contract into shared package
e6f9d38 Fix CodeRouter release and naked alias contracts
b0ce78a Harden CodeRouter dogfood and OAuth callbacks
94e0a6d Make CodeRouter probe timeout test deterministic
d06b73d Fix CodeRouter Linux clippy gate
db4a2ec Fix CodeRouter workflow runner policy
7edbfcd Merge remote-tracking branch 'origin/main' into task/coderouter-native-handoff
4131be6 Publish CodeRouter source and release workflows
a9f05c7 Add 'coderouter/' from commit '6f63614e36ddf91b457eb3c25d8430a7875c750d'
6f63614 Fix interactive login terminal lifecycle
09b1462 Add secure native CodeRouter handoff
130ff4e Add secure CodeRouter handoff v2
cebaf60 Fix CodeRouter release test coverage
757897c Harden handoff descriptor and origin trust
c98aac3 Set coordinated handoff exchange timeout
6a7b9ba Harden handoff expiry and credential isolation
da6f3b2 Require EOF for handoff frames
46d7273 Tighten handoff child environment
311d27a Disable redirects during handoff exchange
f4dde33 Reject closed-pipe handoff trailing bytes
672f5b0 Add hosted CodeRouter handoff client
e3b205d Harden CodeRouter handoff authorization boundaries
2bb80ab Add native CodeRouter handoff from cmux
6da3e94 Add credential-free capabilities contract (manaflow-ai#50)
4910fde Use coderouter in CLI help and errors (manaflow-ai#49)
169be31 Add privacy-safe CodeRouter CLI analytics (manaflow-ai#48)
64da26c Add durable CodeRouter organization switching (manaflow-ai#46)
3dae4f0 Align public package provenance metadata (manaflow-ai#44)
2799924 Fix stable clippy and cut 0.2.1 (manaflow-ai#42)
d0e1915 Prepare verified public CLI distribution (manaflow-ai#41)
e15c881 Record live annual Pro and Team validation (manaflow-ai#39)
efe2d10 Snapshot CLI fault guidance matrix (manaflow-ai#34)
e9a1bc0 Harden coderouter retries and diagnostics (manaflow-ai#32)
fd00e47 Support self-hosted servers and TUI cancellation (manaflow-ai#24)
ea6b259 Use Codex-compatible Pi serialization safely (manaflow-ai#22)
7d0aa73 Force cr opencode through routed models (manaflow-ai#21)
c4748bc Fix Pi model discovery and cache wording (manaflow-ai#20)
f75d9e7 Complete coderouter private beta CLI and runbooks (manaflow-ai#19)
ada2d5a Use the coderouter tagline consistently (manaflow-ai#14)
931a79b Use route tokens for fast lowercase coderouter status (manaflow-ai#13)
a589857 Show progress throughout remote operations (manaflow-ai#12)
0c60e61 Show delayed status spinner and Spark usage (manaflow-ai#11)
47d0755 Render CodeRouter status like Subrouter (manaflow-ai#10)
ad75b92 Use the official Codex OAuth callback ports (manaflow-ai#9)
197345c Match Codex OAuth percent encoding exactly (manaflow-ai#8)
bc1c8e8 Match the official Codex OAuth request (manaflow-ai#7)
e782840 Add an interactive enter-code login flow (manaflow-ai#6)
19a479a Keep timing diagnostics out of CodeRouter output (manaflow-ai#5)
9e73f49 Use Ratatui and route directly through Vercel (manaflow-ai#4)
e386396 Isolate CodeRouter auth and agent state (manaflow-ai#3)
828751b Make bare CodeRouter show quota usage (manaflow-ai#2)
70c631c Focus CodeRouter on hosted Codex subscriptions (manaflow-ai#1)
@github-actions

Copy link
Copy Markdown
Contributor

Unclear: macos / macOS compile admission failed: no known signature; failed step: Compile app-host test product. This PR merged before its CI finished: fix forward on main.

CI failed on 608722c9e2 (run 38026012774 attempt 1): 1 code, 1 unknown.

Job Verdict Why
macos / swift-package-tests code a test failed
macos / macOS compile admission unknown no known signature; failed step: Compile app-host test product

Failures:

  • seen on other PRs CommandPaletteFocusStealingTests.swift:55 doesNotReadTextViewDelegateForClassification(): Expectation failed: (textView.delegateReadCount → 4) == 0 (job)
  • seen on other PRs crash Fatal error: interpreter worker test crash sentinel at RenderInterpreterRunner.swift:29 (job)
  • seen on other PRs crash Fatal error: render fixture crash sentinel at main.swift:76 (job)
Matched log lines
macos / swift-package-tests: ✘ Test doesNotReadTextViewDelegateForClassification() recorded an issue at CommandPaletteFocusStealingTests.swift:55:9: Expectation failed: (textView.delegateReadCount → 4) == 0

Not re-run automatically: macos / swift-package-tests, macos / macOS compile admission are not machine failures.

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

merged-unverified A judging check was not green at merge; see the merge receipt comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant