Skip to content

base red: arch app_lines +1 from #33155 (the hub's comment rides on the hub's line) - #33610

Merged
lawrencecchen merged 2 commits into
feat-cmux-nextfrom
base-red/app-lines-33155
Nov 3, 2026
Merged

lawrencecchen merged 2 commits into
feat-cmux-nextfrom
base-red/app-lines-33155

Conversation

@lawrencecchen

@lawrencecchen lawrencecchen commented Nov 3, 2026 •

Copy link
Copy Markdown
Contributor

Fixes the +1 part of the arch-ratchet red: [app_lines] CmuxNextApp Swift lines: +1 at 41f05ff (judged over 6500d46). Culprit: #33155 (a848b28), the only commit in that range that adds an App line.

Takes back #33155: no code changes; a comment line joins a code line.

Cause

#33155 added AgentPaneTailCache.shared.resume() in CloudService's sign-in observer: +1 CmuxNextApp line.

Fix

The comment line under it ("Sign-out revoked the WireGuard peer and parked the hub.") now rides on the line it describes, await self.hub?.resume(), as #33019 did. The code is the same.

Red at the base, green at the head

Command: python3 scripts/cmux-next/arch-ratchet.py --base PARENT --head COMMIT

  • Red at a848b28 over its parent: +1 (CmuxNextApp +1).
  • This head over the current tip: app_lines -1 (CmuxNextApp -1), no count rises.

The tip is red again for a larger reason: e8fc118 (#33567) adds +74 App lines. That needs moves to packages and gets its own PR.

Changelog

none

Observed / Not run

Observed: the ratchet runs above; prepush-gate.py passed. Not run: no build (a comment move only).


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


Summary by cubic

Fixes the arch-ratchet red for CmuxNextApp App lines by merging a comment onto the code line it describes.

The +1 App line came from #33155, which added AgentPaneTailCache.shared.resume() and a comment on a separate line. This PR keeps the code identical and moves the comment onto the await self.hub?.resume() line, matching the pattern from #33019. Net result: app_lines -1, no other counts rise.

Written for commit 5ae962c. Summary will update on new commits.

View guided diff Turn on auto-fix

…s the comment line)

#33155 (a848b28) added one CmuxNextApp line in CloudService's sign-in
observer: AgentPaneTailCache.shared.resume(). Its comment line below now sits
on that call's line, as #33019 did; the code is the same. CmuxNextApp -1.
@lawrencecchen lawrencecchen added the risk:low Risk tier (docs/ci/risk-tiers.md) label Nov 3, 2026
@github-actions

github-actions Bot commented Nov 3, 2026 •

Copy link
Copy Markdown
Contributor

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

Review 5ae962c: 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=pr33610 -f ref=base-red/app-lines-33155 -f platform=macos -f backend_mode=local

Shipped in:

@github-actions github-actions Bot added risk:normal Risk tier (docs/ci/risk-tiers.md) and removed risk:low Risk tier (docs/ci/risk-tiers.md) labels Nov 3, 2026
@lawrencecchen

Copy link
Copy Markdown
Contributor Author

Review (independent subagent): SHIP at 5ae962c

What I checked:

  1. Code unchanged. git diff -w --word-diff e8fc11865f8...5ae962c090a shows only one change in CloudService.swift: the comment line // Sign-out revoked the WireGuard peer and parked the hub. moved to a trailing comment on await self.hub?.resume(). The tokens, their order and the indentation of that statement are the same. AgentPaneTailCache.shared.resume() (from perf: read persisted remote tails before the web connection #33155) and the lines after it are not changed.
  2. The comment still describes the correct line. It explains why the hub must resume on sign-in (sign-out parked it), and it is now on await self.hub?.resume(), the statement it was written for. It is not on the tail-cache line above it, where the first commit 0503228 had put it. The head commit corrects that.
  3. Line length. The new line is 106 characters. scripts/cmux-next/lint/swiftformat.conf only enables trailingSpace,consecutiveBlankLines,duplicateImports,semicolons,linebreakAtEndOfFile, and scripts/cmux-next/lint/swiftlint.yml uses only_rules with no line_length. Neither config has a width limit, and the same file already has lines of 160 to 241 characters.
  4. Ratchet.
    • arch-ratchet.py --base e8fc11865f8 --head HEAD (the PR's merge-base): app_lines -1 (CmuxNextApp -1), no count rises.
    • --base origin/feat-cmux-next (8f4516ba653) --head HEAD: app_lines -1, no count rises.
    • --base a848b28fded~1 --head a848b28fded: +1 (CmuxNextApp +1), which confirms the culprit.
    • --base a848b28fded --head HEAD gives +56. That comes from later commits on the base (for example Cloud legacy link: bound and log every start step, show the failing step with Retry #33567), not from this PR.
  5. Other checks.
    • prepush-gate.py --base e8fc11865f8 --head HEAD: no new violations.
    • The tip moved after the merge-base (5 commits), but none of those commits touches CloudService.swift, so there is no conflict.
    • The description has Takes back #33155: ... for the one-week take-back hold, and the PR has the risk:normal label.
    • Not run: no Swift build. The change only moves a comment.

@lawrencecchen lawrencecchen added the ready-to-land Reviewed at this head; next-autoland merges it into feat-cmux-next when its only reds are base reds label Nov 3, 2026
@blacksmith-sh

blacksmith-sh Bot commented Nov 3, 2026

Copy link
Copy Markdown

Found 1 test failure on Blacksmith runners:

Failure

Test View Logs
test_every_compile_job_names_its_warm_sources (main.ThisTree.test_every_compile_job
_names_its_warm_sources)/
test_every_compile_job_names_its_warm_sources (main.ThisTree.test_every_compile_job
_names_its_warm_sources)
View Logs

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

@lawrencecchen
lawrencecchen merged commit 40a367c into feat-cmux-next Nov 3, 2026
219 of 239 checks passed
@lawrencecchen
lawrencecchen deleted the base-red/app-lines-33155 branch November 3, 2026 10:56

This branch was previously deployed

1 inactive deployment
ci-routing-agent — 5ae962c0 Deployed Nov 3, 2026 by lawrencecchen via namespace autofix #13249
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

ready-to-land Reviewed at this head; next-autoland merges it into feat-cmux-next when its only reds are base reds risk:normal Risk tier (docs/ci/risk-tiers.md)

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant