sync system_prompt.md from #326 (drift check red on every PR) - #1427
Conversation
…ck red Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
| After you're done, decide: is <SESSION_NAME> finished, with no work left to do? | ||
| - Yes: call setReadyForMerge() — required, the work is never merged without it | ||
| - No: don't call it; say what's left instead | ||
| After you're done, consider whether <SESSION_NAME> is finished and there isn't any work left to do — if that's the case then call setReadyForMerge() |
There was a problem hiding this comment.
Yes, I think its mistake
There was a problem hiding this comment.
Smells like a bug though... do agents always make sure their work on top of origin/main after git fetch?
Btw. the whole commit that commits uncommitted changes isn't needed anymore since we have worktrees. (This is the kind of bugs we should manage to fix without much discussion. Such major bug (a blocker really) should always be fixed.)
There was a problem hiding this comment.
Root cause found, and it's not an agent-rebase bug: issue #326 hadn't been edited since Jul 27 — #1392 tightened the wording in the repo file only, so the repo was ahead of the issue, and this PR's first sync followed the drift check's "issue is the source of truth" instruction backwards into a revert. Fixed properly now: the issue is updated (tightened wording restored, your <TODO_FILE> suggestion, and the uncommitted-changes step removed per your comment — worktree runs start clean, the step only made junk commits), and the branch re-synced to it. Drift green, suite 1650/0.
There was a problem hiding this comment.
Hm, I still consider it a bug (maybe a merge conflict bug), but let's see if this occurs again.
Co-authored-by: Rom <git@brillout.com>
…p the obsolete uncommitted-changes step Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
Issue #326's system-prompt block was edited today (~15:26), so the
driftcheck now fails on every PR (first seen on #1426; the #1425 merge CI at 15:17 was still green). This is the documented fix: copy block 1 intoprompts/system_prompt.mdverbatim.What the issue edit changed (all followed verbatim here):
TODO_FILE: \TODO_AGENTS.md`` glossary line restored<TODO_FILE>/<SHOW_MD>placeholders again@brillout flagging that last one for visibility: if the softening was deliberate, nothing to do (the merge gate itself is code —
withheldMergestill blocks a merge without the signal, so the worst case is more withheld draft PRs on weaker models, per the #1334 tier table). If it was an accidental restore of an older block, edit the issue and this file can be re-synced.Drift check passes locally against the live issue; suite 1650/0.
🤖 Generated with Claude Code