decisions-validate: [decisions-edit] is a bare substring match — a commit that merely *describes* the token disarms the guard
#609
Closed
opened 2026-07-25 15:31:22 +02:00 by timothy
·
2 comments
No Branch/Tag Specified
main
renovate/dotnet-monorepo
renovate/meziantou.analyzer-3.x
renovate/lucene.net
renovate/sqlitepclraw.bundle_e_sqlite3-3.x
renovate/cliwrap-3.x
913-scripted-playout-401
release/v26.15.0-notes
issue-806-guard-populations
scratch/767b-poisoned
scratch/767b-control
release/v26.14.0-notes
release/v26.14.0
docs/510-skill-logo-bug-policy
fix/510-watermark-resolution-policy
fix/629-verdict-classifier-falseopens
fix/609-decisions-edit-token-scope
issue-135-clear-to-none
release/v26.12.0-notes
fix/409b-lastscan-api-parity
fix/401-updatechannel-mirror-422
fix/327-playlist-rename-validation
fix/410-scancancel-log-level
fix/409-447-librariesscreen-neverscanned
fix/338-zap-exit-code
fix/367-plex-budget-message
fix/310-debom-legacy-cs
ci/604-lane-rebalance
feat/388-design-mirror
feat/247-test-ownership
feat/247-primary-action
feat/357-player-owned-playback
feat/357-jellyfin-plugin-poc
fix/289-mcp-hardening
issue58-mcp
feat/244-channels-extract
ci/auto-bump-prod-compose
feat/multi-rerun-collections-api
feat/collections-api
feat/quick-wins
feat/185-docs-part2
feat/140-collections-screen
feat/146-channel-edit
feat/147-classic-ui-link
issue22-renovate-dashboard
feat/91-cutover
feat/63-composite-create
feat/65-library-browse
feat/85-epg
feat/86-schedule-editor
feat/109-dashboard-data
feat/99-session-tracking
fix/dockerfile-node-tag
feat/59-spa-foundation
docs/59-ui-redesign-brief
feat/102-json-guide
feat/111-schedule-durations
feat/104-artwork-upload
feat/103-media-sources-api
feat/playouts-read-api
feat/108-health-api
feat/105-picker-list-endpoints
issue-97-channel-state-api
issue42-jellyfin-musicvideos
issue46-rest-api-error-contract
dependabot/nuget/ErsatzTV.FFmpeg.Tests/multi-d307a2e06f
qsv-improvements
hdr-vulkan-cuda-test
v26.16.0
v26.15.0
v26.14.0
v26.13.0
v26.12.0
v26.11.0
v26.10.0
v26.9.0
v26.8.0
v26.7.0
blazor-final
v26.6.0
v26.5.0
v26.4.0
v26.3.1
v26.3.0
v26.2.0
v26.1.1
v26.1.0
v25.9.0
v25.8.0
v25.7.1
v25.7.0
v25.6.0
v25.5.0
v25.4.0
v25.3.1
v25.3.0
v25.2.0
v25.1.0
v0.8.8-beta
v0.8.7-beta
v0.8.6-beta
v0.8.5-beta
v0.8.4-beta
v0.8.3-beta
v0.8.2-beta
v0.8.1-beta
v0.8.0-beta
v0.7.9-beta
v0.7.8-beta
v0.7.7-beta
v0.7.6-beta
v0.7.5-beta
v0.7.4-beta
v0.7.3-beta
v0.7.2-beta
v0.7.1-beta
v0.7.0-beta
v0.6.9-beta
v0.6.8-beta
v0.6.7-beta
v0.6.6-beta
v0.6.5-beta
v0.6.4-beta
v0.6.3-beta
v0.6.2-beta
v0.6.1-beta
v0.6.0-beta
v0.5.8-beta
v0.5.7-beta
v0.5.6-beta
v0.5.5-beta
v0.5.4-beta
v0.5.3-beta
v0.5.2-beta
v0.5.1-beta
v0.5.0-beta
v0.4.5-alpha
v0.4.4-alpha
v0.4.3-alpha
v0.4.2-alpha
v0.4.1-alpha
v0.4.0-alpha
v0.3.8-alpha
v0.3.7-alpha
develop
v0.3.6-alpha
v0.3.5-alpha
v0.3.4-alpha
v0.3.3-alpha
v0.3.2-alpha
v0.3.1-alpha
v0.3.0-alpha
v0.2.5-alpha
v0.2.4-alpha
v0.2.3-alpha
v0.2.2-alpha
v0.2.1-alpha
v0.2.0-alpha
v0.1.5-alpha
v0.1.4-alpha
v0.1.3-alpha
v0.1.2-alpha
v0.1.1-alpha
v0.1.0-alpha
v0.0.62-alpha
v0.0.61-alpha
v0.0.60-alpha
v0.0.59-alpha
v0.0.58-alpha
v0.0.57-alpha
v0.0.56-alpha
v0.0.55-alpha
v0.0.54-alpha
v0.0.53-alpha
v0.0.52-alpha
v0.0.51-alpha
v0.0.50-alpha
v0.0.49-prealpha
v0.0.48-prealpha
v0.0.47-prealpha
v0.0.46-prealpha
v0.0.45-prealpha
v0.0.44-prealpha
v0.0.43-prealpha
v0.0.42-prealpha
v0.0.41-prealpha
v0.0.40-prealpha
v0.0.39-prealpha
v0.0.38-prealpha
v0.0.37-prealpha
v0.0.36-prealpha
v0.0.35-prealpha
v0.0.34-prealpha
v0.0.33-prealpha
v0.0.32-prealpha
v0.0.31-prealpha
v0.0.30-prealpha
v0.0.29-prealpha
v0.0.28-prealpha
v0.0.27-prealpha
v0.0.26-prealpha
v0.0.25-prealpha
v0.0.24-prealpha
v0.0.23-prealpha
v0.0.22-prealpha
v0.0.21-prealpha
v0.0.20-prealpha
v0.0.19-prealpha
v0.0.18-prealpha
v0.0.17-prealpha
v0.0.16-prealpha
v0.0.15-prealpha
v0.0.14-prealpha
v0.0.13-prealpha
v0.0.12-prealpha
v0.0.11-prealpha
v0.0.10-prealpha
v0.0.9-prealpha
v0.0.8-prealpha
v0.0.7-prealpha
v0.0.6-prealpha
v0.0.5-prealpha
v0.0.4-prealpha
v0.0.3-prealpha
v0.0.2-prealpha
v0.0.1-prealpha
Labels
Clear labels
ad-hoc
api
bug
ci-cd
content
dependencies
enhancement
frontend
in-progress
jellyfin
parked
priority: high
priority: low
priority: medium
review
security
One-off / ad-hoc work not tracked by a dedicated issue
REST API / HTTP endpoints
Something isn't working
Build, test, deploy pipeline
Channel content / schedules / playlists
Dependency updates (Renovate)
New feature or improvement
ChicoryTV React SPA frontend
Claimed by an active session — do not pick up
Jellyfin tuner / IPTV integration
Excluded from automatic queue pickup; work only when explicitly selected
Adversarial review finding
Security / vulnerability fix
Milestone
No items
No Milestone
Projects
Clear projects
No projects
No Assignees
Notifications
Due Date
No due date set.
Dependencies
No dependencies set.
Reference: timothy/ersatztv#609
Reference in New Issue
Block a user
Blocking a user prevents them from interacting with repositories, such as opening or commenting on pull requests or issues. Learn more about blocking a user.
The defect
scripts/decisions_validate.py(~L264) arms the edit token with a bare substring test over the whole commit range:So any commit message containing the literal string anywhere — including prose about the mechanism — sets
token = Trueand suppresses the entireif not token:block: all three rationale-rewrite comparisons (active survivors, active→archive laundering, archive survivors).removedanddemotedstill run; onlyrewrittenis silenced.How it was found
Live, in PR #605. A commit message explaining why no token was needed contained the bracketed token, which armed it. The result was a green
--base/--headrun that was vacuous on the body-diff dimension — in the one PR that hand-resolved a merge conflict inside the corpus that guard exists to police. The safety net was off during exactly the operation it protects against.No content was actually damaged (verified by re-running the guard with
tokenforcedFalse→ clean, and afterwards by a positive control confirming the guard fires on a real prose edit). The bug is that the gate can no-op while reporting success.This is the "a gate can merge green yet be a no-op" class — a CI-behavior change has to be verified by measuring the effect, not by observing a green check.
Suggested fix
Require the token with some discipline rather than as a free-floating substring. Options, roughly in order of preference:
Decisions-Edit: yesas a git trailer, parsed withgit log --format=%(trailers:key=Decisions-Edit). Unambiguous, conventional, and impossible to trip in prose.^\s*\[decisions-edit\]\s*$per commit message line).Whichever is chosen, keep the fail-open posture on git errors, and add a regression test that a message mentioning the token in prose does not arm it — plus a positive control that the guard genuinely fires on a rationale-prose edit when the token is absent.
Related
stale-afterfindings in #603: an optional/soft check that silently never fires is worse than no check, because it reads as coverage.Done-when
no+yes, forge-composed merge body), all mutation-verified red against the unfixed matcherdocs/decisions.mdheader text updated if the token's spelling/form changes — header, new recordci.decisions-edit-trailer, regenerated catalog,ci-cd.md,pr-checks.yml, hook shimReview-verdict: MERGEABLE @ f49556b6PR: #618
Claiming this — working in
fix/609-decisions-edit-tokenofforigin/main.Sequencing note: #610 rewrites
decisions_validate.py/decisions_lib.pywholesale, so this lands first and #610 carries the disciplined matcher forward rather than the two colliding.Closing record
Outcome: Shipped in #618 (merged to
main). The body-diff exemption is now an affirmativeDecisions-Edit:git trailer (yes/true/1, case-insensitive), read with--no-mergesandunfold, replacing the bare substring test overgit log --format=%B. The retired[decisions-edit]substring arms nothing and gets a::warning::nudge so the old habit fails loudly rather than confusingly.Root cause: The marker was tested as a substring anywhere in the commit range, so the guard could be disarmed by being described. Any commit message containing the literal string — including one explaining why no marker was needed — set
token = Trueand suppressed all three rationale comparisons (active survivors, active→archive laundering, archive survivors) while the job still reported success. The deeper cause is that the exemption was expressed in a medium with no grammar: free commit-message text, where a mention and an instruction are indistinguishable. A git trailer has a grammar, so the two are structurally different things.Decisions/conventions changed: Added
ci.decisions-edit-trailer(active).docs.decision-lifecycleprose amended to point at it — the marker's scope is unchanged (still only rationale-prose edits), only its form.Reusable knowledge:
Decisions-Edit: yesline quoted mid-body followed by more prose parses as nothing — which is why the trailer, not an own-line match, is the right fix: this repo's docs commits routinely quote example commit messages, and an own-line matcher arms on the example. Verified against git 2.55.%(trailers:key=X,valueonly)splits folded values into separate lines, soDecisions-Edit: no+ continuationyeslets the continuation arm the exemption on its own — inverting the author's explicit refusal. Always passunfold.prepush-rebase-check.shdoes not forbid merging main into a PR branch. It refuses a branch that is behindorigin/main, and a merge makesorigin/mainan ancestor, so the push is allowed. Merging main in is discouraged by convention only. (I asserted the opposite in a code comment and review caught it.)Verification: 59 python tests. Every negative control mutation-verified red against the unfixed matcher (and specifically against the matcher without
unfold/ without--no-merges) — a green suite that cannot fail proves nothing. Guard measured on the PR's own range: with the trailer →OK; with the marker forced off → it flags thedocs.decision-lifecyclerecord whose rationale the PR edits, i.e. the body-diff dimension is genuinely armed here, the inverse of the vacuous #605 run. CI onf49556b6: 8 green, 1 skipped (image push, PR-irrelevant), combined success — includingdecisions lifecycle, the job whose behavior changed. ruff/format clean on touched files. No.cstouched → BOM/format gate n/a; no write-path handler → live-E2E not required.Deferred: None blocking. Two residuals are documented in the record rather than fixed, both deliberate: (a) a quoted example that is the final paragraph of a non-merge commit is a trailer by git's grammar and will arm the guard — inherent to any trailer scheme; (b)
--no-mergescosts a narrow false negative if an author marks ONLY a conflict-resolving merge commit — a loud failure costing one extra commit, preferred over the silent guard-disabling the alternative would reintroduce.Docs updated:
docs/decisions.md(header contract + newci.decisions-edit-trailerrecord +docs.decision-lifecycleprose),docs/decisions/README.md(regenerated catalog),docs/ci-cd.md(3 mentions),.gitea/workflows/pr-checks.yml,.claude/hooks/decisions-guard.sh.Note for #610: that issue rewrites
decisions_validate.py/decisions_lib.pywholesale. It must carry the disciplined matcher forward — re-deriving a substring test would silently reintroduce this bug.