Problem. When a patch in the middle of the series changes or is removed, worktree.sh sync pops it and every patch after it, then pushes the new stack. Most popped files come back byte-identical but with new mtimes, so siso recompiles them. On the Chromium 156 base this blocks a needed change: Helium's lint rejects the empty rac/spaces/composited-transition.patch (which fails lint on every PR stacked on the sync branch), but dropping it mid-series would make every 156 clone recompile what the ~150 later patches touch.
Change.
cmd_sync runs worktree_state.py snapshot <keep>. It records the path, mtime and sha256 of every file the popped patches touch, plus a build marker: the mtimes of out/*/.siso_fs_state, .ninja_log, build.ninja and build.ninja.stamp.dev_names sub, restore puts the old mtime back on every file whose content is byte-identical. The restore runs in the same name state as the snapshot. Files whose content changed keep their new mtime.Verified.
test_worktree.py: 46 tests, including 7 new ones, all confirmed to fail on main:gn gen in between;test_dev_names.py: 19 tests.worktree.sh sync. It popped 149 patches and printed kept mtimes on 459 unchanged files (2 changed). The next build was 15 steps: 13 string steps (#35's job) and 2 compiles of the two files that really changed. Without the fix the same tree needs at least 1,107. Putting the line back gave 461 unchanged (0 changed) and 15 steps again.gn gen, which is a real wrong-build risk; a retry lost most of the savings; and symlink handling.Patch surface (D17): no change, because this PR touches no patches.
🤖 Generated with Claude Code
Note
Medium Risk Changes sync/build interaction and mtime restoration logic; incorrect restoration could hide real edits from siso, though build-marker and SHA256 checks mitigate that.
Overview
worktree.sh sync now snapshots file mtimes and content hashes before popping patches, then restores prior mtimes after the stack is pushed again for any file that ended up byte-identical—so siso does not treat harmless pop/push rewrites as edits.
worktree_state.py adds snapshot / restore and .rac_mtimes.json, recording paths touched by popped patches plus a build marker (e.g. out/*/.siso_fs_state, .ninja_log, build.ninja, build.ninja.stamp). If a build or gn gen ran between snapshot and restore, restoration is skipped to avoid stale outputs. Failed-sync retries can reuse an earlier snapshot; malformed records are warned and dropped; symlinks are ignored; interrupted restore leaves the record for a retry.
test_worktree.py adds coverage for identical rewrites, dropping empty patches, malformed JSON, build/gn between snapshot and restore, failed-push retry, build-after-failure, and interrupted restore.
Reviewed by Cursor Bugbot for commit 29dfe9dad368f80a99f531a0b6a175bc5fa965b5. Bugbot is set up for automated code reviews on this repo. Configure here.
Keeps the mtimes of files worktree.sh sync pops and pushes back, so siso doesn't rebuild files that come back byte-identical from a pop and push.
Bug Fixes
gn gen.Written for commit 29dfe9dad368f80a99f531a0b6a175bc5fa965b5. Summary will update on new commits.
Added 1 commit
Your OpenCode Zen account is out of credit. Top it up, then re-trigger Pullfrog.
| 1 | provider error: Upstream request failed: Insufficient account funds |
Pullfrog ｜ Rerun failed job ➔ ｜ View workflow run ｜ via Pullfrog ｜ Using kimi-k3
Deployment failed for project rac with the following error:
| 1 | Resource is limited - try again in 24 hours (more than 100, code: "api-deployments-free-per-day"). |
Learn More: https://vercel.com/knewton?upgradeToPro=build-rate-limit
Important
Auto reviews are disabled on this repository. 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.
a28c98d8-489f-4ec5-b82d-6119c7959863You 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:
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.
Comment @coderabbitai help to get the list of available commands.
Bugbot is counted against Cursor usage for this user or team, and this run hit a usage or spend limit.
A user or team admin can review and increase usage limits in the Cursor dashboard.
(requestId: 0d99c622-8761-4c1e-876c-10ee5812031f)
Not posted on this PR by your GitHub settings — view it in Devin Review. (Configure)
[Medium impact] The change affects patch syncing and rebuild work in local worktrees.
The PR appears safe to merge, with a non-blocking recovery issue if restore is interrupted.
| 1 | ### Issue 1 |
| 2 | devutils/rac/worktree_state.py:359 |
| 3 | `restore()` deletes the saved record before restoring any file times. If the user presses Ctrl-C during the loop, or a file read or `os.utime()` fails, the remaining saved times are lost. The patches have already been pushed and recorded, so retrying `sync` cannot recover those times. The remaining files trigger an avoidable rebuild. |
| 4 | |
| 5 | Keep the record until the loop finishes. Still delete it immediately when the build marker has changed. |
| 6 | |
| 7 | --- |
| 8 | |
| 9 | For each issue above, determine whether it is valid and should be fixed. If so, fix it directly. |
Preserves file times when sync pops and reapplies patches without changing file contents.
| 1 | %%{init: {'theme': 'neutral'}}%% |
| 2 | flowchart TD |
| 3 | A[Revert name passes] --> B[Save hashes, times, and build markers] |
| 4 | B --> C[Pop and push patches] |
| 5 | C --> D{Push succeeded?} |
| 6 | D -- No --> E[Keep record for retry] |
| 7 | D -- Yes --> F[Record applied patches] |
| 8 | F --> G{Build markers unchanged?} |
| 9 | G -- No --> H[Keep new file times] |
| 10 | G -- Yes --> I[Restore times where hashes match] |
| 11 | H --> J[Apply name passes] |
| 12 | I --> J |
Reviews (1) · Last reviewed commit: "fix(devutils): keep mtimes of files sync..." · Reviewed by Greptile
| … | … | @@ -258,6 +265,115 @@ def produces_tree(data): | |
| 356 | + | record = read_mtimes(tree) | |
| 357 | + | if record is None: | |
| 358 | + | return | |
| 359 | + | path.unlink() | |
P2 Interrupted restore loses saved times
restore() deletes the saved record before restoring any file times. If the user presses Ctrl-C during the loop, or a file read or os.utime() fails, the remaining saved times are lost. The patches have already been pushed and recorded, so retrying sync cannot recover those times. The remaining files trigger an avoidable rebuild.
Keep the record until the loop finishes. Still delete it immediately when the build marker has changed.
| 1 | This is a comment left during a code review. |
| 2 | Path: devutils/rac/worktree_state.py |
| 3 | Line: 359 |
| 4 | |
| 5 | Comment: |
| 6 | **Interrupted restore loses saved times** |
| 7 | |
| 8 | `restore()` deletes the saved record before restoring any file times. If the user presses Ctrl-C during the loop, or a file read or `os.utime()` fails, the remaining saved times are lost. The patches have already been pushed and recorded, so retrying `sync` cannot recover those times. The remaining files trigger an avoidable rebuild. |
| 9 | |
| 10 | Keep the record until the loop finishes. Still delete it immediately when the build marker has changed. |
| 11 | |
| 12 | --- |
| 13 | |
| 14 | For each issue above, determine whether it is valid and should be fixed. If so, fix it directly. |
Added 1 commit
Deployment failed for project rac with the following error:
| 1 | Resource is limited - try again in 1 day (more than 100, code: "api-deployments-free-per-day"). |
Learn More: https://vercel.com/knewton?upgradeToPro=build-rate-limit
Bugbot is counted against Cursor usage for this user or team, and this run hit a usage or spend limit.
A user or team admin can review and increase usage limits in the Cursor dashboard.
(requestId: c18e15ad-ed33-4334-89f1-3a9212209faa)
Your OpenCode Zen account is out of credit. Top it up, then re-trigger Pullfrog.
| 1 | provider error: Upstream request failed: Insufficient account funds |
Pullfrog ｜ Rerun failed job ➔ ｜ View workflow run ｜ via Pullfrog ｜ Using kimi-k3
