apply-agentic-os-hooks: DEFAULT_HOOK_IDS drifted ahead of DEFAULT_REV (merge-conflicts) #187

New issue

Closed

opened 2026-06-06 23:09:18 +00:00 by coilysiren · 0 comments

coilysiren commented

2026-06-06 23:09:18 +00:00

Owner

DEFAULT_HOOK_IDS in scripts/apply-agentic-os-hooks.py lists merge-conflicts, but DEFAULT_REV = v0.14.0 and the v0.14.0 tag of .pre-commit-hooks.yaml does not ship that hook id (it was added after the tag, present only on HEAD / +21 commits).

Effect: running the apply script against any consumer writes a managed block that pre-commit then rejects:

[ERROR] `merge-conflicts` is not present in repository https://forgejo.coilysiren.me/coilyco-flight-deck/agentic-os. rev v0.14.0

Hit while bumping cli-guard from v0.11.1 to current. Worked around in cli-guard by dropping the merge-conflicts line from its managed block (it already runs the stock pre-commit-hooks check-merge-conflict).

Fix options: (a) cut v0.15.0 containing merge-conflicts and set DEFAULT_REV=v0.15.0; or (b) gate per-hook availability by rev.

Invariant to add: every id in DEFAULT_HOOK_IDS must exist in .pre-commit-hooks.yaml at DEFAULT_REV - a cheap CI assert would have caught this before rollout.

`DEFAULT_HOOK_IDS` in scripts/apply-agentic-os-hooks.py lists `merge-conflicts`, but `DEFAULT_REV = v0.14.0` and the v0.14.0 tag of `.pre-commit-hooks.yaml` does not ship that hook id (it was added after the tag, present only on HEAD / +21 commits). **Effect:** running the apply script against any consumer writes a managed block that pre-commit then rejects: ``` [ERROR] `merge-conflicts` is not present in repository https://forgejo.coilysiren.me/coilyco-flight-deck/agentic-os. rev v0.14.0 ``` Hit while bumping cli-guard from v0.11.1 to current. Worked around in cli-guard by dropping the `merge-conflicts` line from its managed block (it already runs the stock pre-commit-hooks `check-merge-conflict`). **Fix options:** (a) cut v0.15.0 containing `merge-conflicts` and set `DEFAULT_REV=v0.15.0`; or (b) gate per-hook availability by rev. **Invariant to add:** every id in `DEFAULT_HOOK_IDS` must exist in `.pre-commit-hooks.yaml` at `DEFAULT_REV` - a cheap CI assert would have caught this before rollout.

coilysiren referenced this issue from a commit

2026-06-06 23:20:26 +00:00

fix(hooks): guard DEFAULT_HOOK_IDS against DEFAULT_REV drift

coilysiren closed this issue

2026-06-06 23:20:26 +00:00

coilysiren referenced this issue

2026-06-06 23:23:29 +00:00

release.py: tag message taken from newest commit, can misdescribe the release #188