[teamleaderleo]

This moves base autofix's push step on feat-cmux-next into scripts/cmux-next/base-autofix-push.sh and tightens what it lands on a moved tip. It no longer fixes the settings-export livelock by itself (see Not fixed here).

Background: base already stops cancelling runs in progress (#22038), and it already re-applies a repair file by file when the tip has moved (#22474). When the newer tip changed any input of a repaired file, the "Push the repairs" step leaves that file out and fails the run. That is the right thing to do: an export made at the old head could be wrong at the tip (a revert in between, say). This PR keeps that rule.

What changes

• "Push the repairs" calls scripts/cmux-next/base-autofix-push.sh. It reads the same input areas (autofix-areas.sh) and holds every file whose areas BASE..tip touched, along with any output no area is known to build. A file that comes from a moved input never lands as it was made.
• A file is also held when a newer commit wrote it: a PR's own regeneration, or a base autofix repair made from a newer tree. An older autofix commit is overwritten instead of blocking the file, as the old rule did when the tip had edited it at all.
• Exports land whole or not at all: the schema, docs/mdm and the stamp go together, and so do the three action exports. Strings, docs shortcuts and app-host files built from an export that waits wait with it.
• The defaults snapshot is never copied from the old tree. It is re-made on the tip with defaults_guard.py snapshot, and only when nothing else waits.
• If the commits since BASE can't be read (a bad fetch, say), the run stops. Before, that read as "no newer writes".
• A push that is refused while the branch didn't move fails at once. A lost race is retried up to CMUX_BASE_AUTOFIX_PUSH_ATTEMPTS times (5). If the tip already has the repair, nothing is pushed.
• The script is in the workflow's push paths, and its test runs in cmux-next.yml.

Not fixed here: the settings inputs include CmuxNextSettings/Localizable.xcstrings, which changes with almost every merge, and the Mac export plus autofix take about 18 minutes. So most runs still hold the settings exports, as on base (for example, run 39553409406 left them out after the tip moved to 3e0b1c2). The way out is to regenerate on the newest tip, or to have the settings area stop counting string-catalog-only changes. That is follow-up work.

Tests

• python3 tests/test_cmux_next_base_autofix_finishes.py is base's suite from ci(cmux-next): base autofix lets a running repair finish and re-applies it on a moved base #22038/ci(base autofix): land the files of untouched areas when another area moved #22474, now driving the script instead of slicing the inline loop. Three of its cases were reworded:
  • Two retry cases expect attempt 2 of where the old loop reached attempt 3, because the script reads the tip before its first push.
  • The "conflict" case is now "a newer write of the file fails without pushing and names it", because the script applies no patch.
  • Every hold case is unchanged, including "a repair whose inputs changed meanwhile is left to the newer run".
  • Red against the previous head's script: 7 failures, including that inputs-moved case. Green at the head: 16 OK.
• bash scripts/cmux-next/tests/base-autofix-push.test.sh runs in a shallow bot clone. Its cases:
  • 1–6: plain push, moved tip, a newer edit of the file, an older autofix replaced, already landed, a deleted directory.
  • 7: moved settings inputs hold the exports.
  • 8: the workflow pushes through the script.
  • 9: one file waits and the rest lands.
  • 10: exports land whole.
  • 11: an older run never overwrites a newer one.
  • 12: the snapshot is re-made on the tip.
  • 13: bounded retries.
  • 14: a rejection with no move.
  • 15: unreadable history fails closed.
  • Green at the head: "PASS: base autofix lands its repair on a moved feat-cmux-next; files whose inputs moved or that a newer commit wrote wait".

Observed / Not run

• Observed: both suites red on the previous script, then green. actionlint on the base autofix workflow is clean. prepush-gate.py reports no new violations.
• Not run: the new push path hasn't run on GitHub yet; the first base run after the merge is the real check. The real defaults_guard.py snapshot on a moved tip is covered only by a stand-in. shellcheck isn't installed on huge-blue.

Changelog

none

Agent session: huge-blue

🤖 Generated with Claude Code

[coderabbitai]

Important

Review skipped

Auto reviews are disabled on base/target branches other than the default branch.

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

• Configuration used: Repository: manaflow-ai/cmux/.coderabbit.yaml
• Review profile: ASSERTIVE
• Plan: Advanced
• Run ID: 20e9ee60-e171-4b65-853d-d3eb8ca143b3

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

• 🔍 Trigger review

• 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

• X
• Mastodon
• Reddit
• LinkedIn

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

[teamleaderleo]

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

[teamleaderleo]

Review findings addressed in d078080, with the failing tests committed first (42dbd9e):

• High: the next queued run checked out a tip that didn't have the previous run's replayed repair, regenerated the same files, and was refused by that bot commit. Earlier chore(next): base autofix at commits now don't count as newer edits. The script writes the repaired files onto the tip instead of cherry-picking them, and it pushes nothing when the tip already holds the repair.
• Low: it refuses a file the repair adds in a directory that a newer commit removed.
• Low: the script's errors now reach the step summary (2>&1).

All 6 test cases pass, and actionlint is clean.

[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.

[github-actions]

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

Review 9f1ec6a: 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=pr22004 -f ref=claude/base-autofix-lands-on-moved-tip -f platform=macos -f backend_mode=local

Pending: CI is running on 9f1ec6a4e0 (run); the result below was for 651fdd1339 and no longer applies.

Last result: Passes: CI passes on 651fdd1339.

Written by scripts/ci/classify_failures.py (ci-failure-attribution.yml); it is rewritten when this head's CI completes.

web and size checks: green

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

[teamleaderleo]

Orphaned: no activity for 14 h, and no lane holds a lease on it. The orphan sweep could not merge feat-cmux-next in: conflicts in .github/workflows/cmux-next-base-autofix.yml, webviews/src/agent-session/acpmux/replyHref.ts, webviews/src/pages/markdown/links.ts. Listed for a lane to resolve.

[teamleaderleo]

Owned by land-and-ci-a8 on huge-blue · session

[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]

merge-audit: #22004 merged at 9f1ec6a without no SHIP review receipt on the head. #23227 reverts it. To keep this change, add the missing evidence for 9f1ec6a here; the next audit pass then closes #23227. Otherwise review and land #23227.

[teamleaderleo]

Review (subagent, correctness first): SHIP at 9f1ec6a

scripts/cmux-next/base-autofix-push.sh follows the hold rules in the body and fails when history can't be read. The push step runs under set -euo pipefail, so the script's exit code survives the tee. It is conservative: a newer bot repair that writes an export counts as a moved input, so more files wait than strictly need to, but nothing wrong lands. Not high-risk: it adds no trigger, credential or permission.

Agent session: huge-blue

[github-actions]

Shipped in:

• cmux NEXT nightly 1.0.0-nightly.3958372135301 (bc661dae0e)