SKILL.md is the NOW.md problem again: 182 of 293 commits touch one 865 KB file, and every concurrent PR conflicts on it - #4728
Merged
Merged
Conversation
The turn ended with these files edited and never committed. Uncommitted work is invisible to the review - it reads the branch - so the attempt would have been released as empty and the next bee would have started beside this work rather than from it. This commit is not a claim that the work is correct. It is the bee's work, committed on its behalf, and it is judged exactly like any other: the adversarial reviewer reads it, the compiler runs on it, and the issue's own criteria are measured against it. Issue: #3236 Turn: ee8b09c7-7f54-4ece-aadd-be7eb102b500 Ending: finished (the turn closed) Committed: 1 path(s) Left uncommitted: 1 path(s) outside the declared boundary
A pull request must add exactly one docs/now entry and a bee has no way to know that: its brief names a boundary file and acceptance criteria, and docs/now/ is neither. The publisher adds it rather than failing the gate. Closes #3236 Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
gHashTag
enabled auto-merge (squash)
September 24, 2026 03:16
This was referenced Sep 24, 2026
Contributor
Contributor
|
📓 NotebookLM Notebook linked to this PR
This notebook contains session context, decisions, and artifacts for this work. |
dmitrii-f-t27
added a commit
that referenced
this pull request
Oct 2, 2026
#5482) (#5488) scripts/ci/now-sync-gate-diff.sh ended every pass with setup_skill_merge_driver (#4728). It appended `.claude/skills/ci-gates/SKILL.md merge=union` to .gitattributes and set merge.union.name/driver in the shared .git/config. `tri gates preview` and `tri hooks pre-push` run the script in contributors' clones. There the configured driver replaced git's built-in `union`, which .trinity/experience/*.jsonl relies on. Its command used unset shell variables instead of git's %O %A %B, so every union merge of those logs failed with `bash: $REMOTE: ambiguous redirect`. The writer is removed. scripts/ci/test_now_gate_writes_nothing.py runs each caller in its own scratch repository, on a range the gate passes. The callers are the script's three arms and, with --tri, `tri gates preview` and `tri hooks pre-push`. For each, .git/config, .gitattributes, .git/info/attributes and git status must be byte-identical before and after, and a union merge must still work. A planted copy of the old writer must be caught, and must break the merge. Against the unfixed script all five callers fail on both counts. Wired into untrusted-input-gate.yml, and into cli-tri.yml with the binary that job builds. .gitattributes: its header pointed to .git/config "for implementations"; it uses built-in drivers only. Census: `shell` moved, run: steps 280 -> 282 and "the runner does" 259 -> 261. These are the two new steps. Re-blessed with `tri census pin --bless`. Clean an affected clone with git config --unset merge.union.driver git config --unset merge.union.name git checkout -- .gitattributes (if the appended line is still there) Refs #5482 Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
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
2 participants
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.
Closes #3236
Written by a bee on
queen-3236and published bytools/queen/publish.py. The branch itself is the bee's; the second commit is the coordination entry every pull request must add, which a bee has no way to know about.🤖 Generated with Claude Code