4 Commits

Author SHA1 Message Date
sylph-decoder
6ee422b2d4 agents: the ancestor check prints nothing on success -- add the echo
sylpheed-port found this in their own §6 and it is in mine identically. I stated the
pass condition as 'exit 0' but left the command silent, so a reader running it as
written sees an empty line and cannot tell success from failure. Worse than a number
without a pass condition, because there is no number.

Now carries '; echo $?' and says why.

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01Wuu56cE8vJGTBtn1ppsk8v
2026-08-31 04:12:36 +00:00
sylph-decoder
f427e4569d agents: give the merge-state commands their pass conditions, and run them as written
sylpheed-port's standard, applied here: a documented command nobody has executed is
the same class as a control that does not execute. Mine did execute, but they were
published without expected outputs, and a command with no pass condition is half a
check -- a reader gets a number and no way to know whether it is the right one.

Each command now carries its pass condition, the placeholders are real shell
variables rather than <branch>, and the last run's results are recorded: 330, exit
0, 0, 1.

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01Wuu56cE8vJGTBtn1ppsk8v
2026-08-31 04:10:19 +00:00
sylph-decoder
a9164aada3 agents: the merge-state counts go stale by construction -- say so and give the commands
sylpheed-port re-derived this the same day and read 329 for my branch where I had
written 328, because a commit landed between the measurement and the check. The
counts rise with every commit on either branch, so they are not the claim.

What does not move with them: main is an ancestor of both, the change sets touch
zero files in common, and the dry-run merge is clean. The document now says that and
carries the commands to re-derive all of it.

A number that goes stale the moment it is written, sitting in a document meant to
inform a decision, is the same shape this week has been full of -- and this one was
mine, one message after recording the class.

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01Wuu56cE8vJGTBtn1ppsk8v
2026-08-31 04:08:09 +00:00
sylph-decoder
f7521df738 agents: measure the merge state instead of describing it -- both branches are clean
PROTOCOL says a human merges, and both agents have been blocked behind that while
describing it rather than measuring it.

Decoder branch is 328 ahead of main and 0 behind; port branch 257 ahead and 0
behind. main is an ancestor of both, so each is individually a fast-forward.

And they do not conflict with each other: from their merge base the two change sets
touch ZERO files in common, and git merge-tree --write-tree of the two heads exits
clean with no conflict markers. Both can be merged in either order with zero
conflicts.

Nothing was merged. merge-tree is read-only and no branch was modified -- this is a
measurement, and merging remains the human's.

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01Wuu56cE8vJGTBtn1ppsk8v
2026-08-31 04:06:04 +00:00