Repository navigation
Conversation
gering
force-pushed
the
task/summarize-merge-delta-ack
branch
2 times, most recently
from
October 26, 2026 15:51
4dc5b77 to
cf4404e
Compare
- /merge step 6b and /land read the full delta and show a plain-language per-file summary (kind, size, reviewed-logic impact) instead of the diff - Prompt: [a]cknowledge (merge without a re-review) / [d]iff / [r]e-review / [s]top; the ack no longer claims the user read the diff - mandate.sh delta prints delta_file= lines (lane vs. context lines, versions_only) above delta_begin, outside the acked text; ack_id and all refusals are unchanged - Tests for the file list and prose assertions for the four options Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_013pcrPYhUMWQ1gkrrqtSmic
gering
force-pushed
the
task/summarize-merge-delta-ack
branch
from
October 26, 2026 16:12
cf4404e to
1776842
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Why
On #91
/mergestep 6b printed a ~278-line diff-of-diffs and asked "[a]cknowledge — I have read this delta". Nobody reads that; the ack recorded something that did not happen (follow-up F9).What
/mergestep 6b and/land: the model reads the full delta itself and shows a plain-language summary, one line per file: kind of change (version renumbering,from main,agreed review fix,new code,unclear), size, and whether it touches code the review saw. The raw diff is shown only on[d].[a]cknowledge — merge this change without a re-review / [d]iff — show the raw delta / [r]e-review — stop; run a review round instead / [s]top.lane=0; "agreed fix" only withincludes_agreed_fixes=yesand only for hunks the text shows to be one.mandate.sh deltaprintsdelta_files=+delta_file=<new|gone|changed> lane= context= versions_only= path=abovedelta_begin, computed per file from the two raw lane diffs. A diff-of-diffs hunk often has its file header outside its context, so the counts don't depend on reading hunks. Header/body lines are tagged while splitting, so a lane line-- xis never taken for a file header, and a mode change counts as lane content.acknowledged --ack-id(the list sits outside the hashed text), the diff-changed refusal, user-only answers, and theapproximate/binary/unreadable/truncatedrefusals.Tests
test_mandate.py: the file list, versions-only, context-only (main moved the lines around a lane hunk), new file, header-lookalike line, mode change.test_land.py: prose assertions for the four options, the ack wording (no "I have read"), summary rules, refusals.main's Structure Checks already fail on the Ubuntu runner (test_close_request.py/test_landing.pysymlinkFileExistsErroron/binvs/usr/bin). Locally,swarm/test_codex_models.pytimes out under load, onmaintoo.🤖 Generated with Claude Code
https://claude.ai/code/session_013pcrPYhUMWQ1gkrrqtSmic