You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
{{ message }}
Repository navigation
Commit c46714d
Browse filesBrowse the repository at this point in the historyBrowse files
Merge upstream/main (e487cd7) into feat/guarded-write-s4b
Brings in #2343 (apply_diff auto-approves edits outside the workspace), #2283 (task
abort/abortReason run-state latches), #2324 (Turbo cache input contracts), #2327
(CSS transitions for visual themes) and #2277 (aimock 1.47.0), so the required arms
judge this branch against the content they actually check out.
The merge is textually clean and ApplyDiffTool.ts lands as main's content with this
branch's hunks applied on top, which is the composition the arms need. The only
reconciliation needed was in main's new applyDiffTool.outsideWorkspace.spec.ts: its
diff-view double stubbed open() as a no-op and left originalContent at "", which is
the fixture shape applyDiffTool.failureReporting.spec.ts warns about. The stale-base
guard added on this branch reads open()'s re-read as the save baseline, so that
double reported a stale base that never happened and execute returned before asking
for approval - nine failures in CI's windows lane. The double now re-reads through
the same fs mock and provides the stat the tool takes around its read; main's
c assertions and expectations are untouched.
0 commit comments