Defame1297
c5f754d3ad
The ADR-0020 boundary resolver (boundary_targets()/unresolved_targets()) only ever read a SKILL.md's description. A target named in the BODY -- a dispatch table row, a "run X" step, both routine in a 900-word procedure -- was checked by nothing. Two real instances shipped before either was caught by reading rather than by a gate: bin/write-docs routed twice to a deleted `to-prd` skill, and bin/triage told an agent to run a nonexistent `/setup-matt-pocock-skills` (both fixed in 03abcff; that fix was the symptom, this gate is the actual ask per #124). Added a separate, narrower extractor -- body_targets() / unresolved_body_targets() in the shared lib-boundary-resolver.sh -- rather than reusing the description resolver at wider scope. The description gate's sentence-level heuristics (BOUNDARY_MARKER, the follower test, in-sentence corroboration) are tuned for a one-to-three-sentence routing clause and misfire on dispatch-table/procedure prose in both directions, so the body gate reads only explicit route notation (`/name`, backticked-or-slash-prefixed `-> name` / `-> name`), already the description gate's own unconditionally-blocking tier. Three guards were added after running the extractor over the real 39-skill corpus and reading every hit rather than assuming the design was correct: - a target must be hyphenated, even in notation -- single-word citations like `/fork` (forge, citing Claude Code's own /fork command) and `/name` (skill-author, a placeholder) are not routes. - a bare hyphenated word after any arrow is not notation -- only ARROW_MARKED (backticked/slash-prefixed) is used, not NOTATION_ARROW's bare form, so ordinary process-chain prose ("prop -> new ref -> re-render", caveman) is not read as a route. - a name immediately preceded by `<` is a closing tag (`</what-to-do>`, grill-with-docs), not /name notation. Wired into both consumers that must agree by contract: scripts/ skill-size-check.sh (the pre-commit hook) and factory-audit's lib-checks-skill.sh (the audit). Verified identical findings across both over the whole corpus. tests/test-adr0020-targets.sh gains a dedicated section pinning the two live true positives and all three guards. docs/spec/gates.md and ADR-0020 get a matching amendment. Fixes: #124 ADR: 0020 Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01EGHFJextYtVQseaHPDDhxB
1243 lines
64 KiB
Bash
Executable File
1243 lines
64 KiB
Bash
Executable File
#!/usr/bin/env bash
|
||
# lib-boundary-resolver.sh — SOURCED, never executed.
|
||
#
|
||
# The ADR-0020 shared boundary resolver — the ONE copy in the repo. Both of
|
||
# validate.sh's modes compose it into the Python program they run, and so does
|
||
# the repo-root hook scripts/skill-size-check.sh, so the audit and the commit
|
||
# hook resolve boundary targets through the same code rather than through
|
||
# copies that can drift apart.
|
||
#
|
||
# The resolver is Python, and bash cannot source Python, so the block is held
|
||
# in a shell variable filled from a QUOTED here-doc: nothing inside it is
|
||
# expanded, substituted or rewritten, and every consumer runs exactly the text
|
||
# between the two markers below. The markers stay on lines of their own, at
|
||
# column 0, exactly once each: tests/test-adr0020-contract.sh extracts the span
|
||
# with `sed -n '/^BEGIN$/,/^END$/p'`, and asserts no other file carries them.
|
||
#
|
||
# The here-doc is consumed by the `read` BUILTIN rather than by `$(cat <<...)`.
|
||
# This file is sourced by validate.sh before the mode-specific python3/PyYAML
|
||
# preflight runs, so a `cat` here made coreutils a hard dependency ahead of
|
||
# python3: on a PATH with neither, the script exited 127 naming `cat` instead of
|
||
# reaching the preflight that names python3. `read -r -d ''` reads to a NUL that
|
||
# never arrives and so returns non-zero at EOF — hence the `|| true` — and it
|
||
# keeps the last line's newline, which the joining newline in the caller would
|
||
# otherwise double — hence the single strip after the delimiter. It removes
|
||
# exactly ONE newline, never a run: blank lines at the end of a chunk are part
|
||
# of the program text the entry script reassembles, and stripping every
|
||
# trailing newline deleted them. The here-doc itself is unchanged: still
|
||
# QUOTED, still verbatim between its markers.
|
||
#
|
||
# Self-containment (agentskills.io, skill-author/references/deployment-modes.md)
|
||
# binds BETWEEN skills, not within one: a cache-installed plugin copies each
|
||
# skill's own directory whole, so a sibling file in this same scripts/ directory
|
||
# travels with the skill and is always readable. That is why this is sourced
|
||
# here and duplicated across skill boundaries elsewhere.
|
||
#
|
||
# Consumed by: validate.sh (both modes) and scripts/skill-size-check.sh, via
|
||
# $KYBERFORGE_RESOLVER_PY. The root hook reaches into this plugin by path, which
|
||
# is safe only because it runs solely inside this repo — 4de5b6b retired the
|
||
# published hook manifest that once made it run elsewhere (ADR-0014).
|
||
# shellcheck shell=bash
|
||
# shellcheck disable=SC2034
|
||
|
||
IFS='' read -r -d '' KYBERFORGE_RESOLVER_PY <<'KYBERFORGE_ADR0020_RESOLVER_PY' || true
|
||
# ===== BEGIN ADR-0020 SHARED BOUNDARY RESOLVER =====
|
||
# ONE resolver, and this is its only copy. Sourced from this file by:
|
||
# plugins/kyberforge/.apm/skills/factory-audit/scripts/validate.sh (both modes)
|
||
# scripts/skill-size-check.sh (the repo-root commit hook)
|
||
# ADR-0025 retired the copies in the two pre-merge audit skills, and the
|
||
# 2026-09-16 change retired the copy embedded in the root hook, which had been
|
||
# kept only while that hook was also exported through a published hook manifest
|
||
# (retired by 4de5b6b; ADR-0014). Edit it here; there is nothing to paste over.
|
||
#
|
||
# Requires: glob, os, re, yaml (imported by the host script; PyYAML is a hard
|
||
# dependency, preflighted in bash before the interpreter starts).
|
||
|
||
# --- Input ----------------------------------------------------------------
|
||
# Every file this resolver's callers read goes through read_text(), which pins
|
||
# UTF-8 explicitly instead of inheriting locale.getpreferredencoding(). Under
|
||
# LC_ALL=C that inherited encoding is ASCII, so a perfectly ordinary em dash in
|
||
# a SKILL.md aborted the run with a bare UnicodeDecodeError traceback — loud,
|
||
# but pointing at the interpreter rather than at the file or the fix. A file
|
||
# that genuinely is not UTF-8 still fails; it just says so.
|
||
|
||
|
||
class EncodingError(Exception):
|
||
pass
|
||
|
||
|
||
def read_text(path):
|
||
"""File contents as text, UTF-8, with a diagnostic instead of a traceback."""
|
||
try:
|
||
with open(path, encoding='utf-8') as fh:
|
||
return fh.read()
|
||
except UnicodeDecodeError as exc:
|
||
raise EncodingError(
|
||
"not valid UTF-8 (%s at byte %d) — re-save the file as UTF-8; "
|
||
"this gate does not guess at other encodings"
|
||
% (exc.reason, exc.start))
|
||
|
||
|
||
# --- Universe ------------------------------------------------------------
|
||
# The set of names a boundary clause may resolve against is derived from an
|
||
# AUTHORING ROOT found by walking up FROM THE TARGET FILE. It is NEVER derived
|
||
# from this script's own location: deriving it from ${BASH_SOURCE} leaked
|
||
# holocron's whole skill universe into every consumer repo that ran this hook
|
||
# through pre-commit, so a consumer skill routing to a holocron skill such as
|
||
# `factory-audit` resolved against a plugin it had never installed.
|
||
#
|
||
# An authoring root is the nearest ancestor holding plugins/*/.apm/skills/ or
|
||
# plugins/*/.apm/agents/ (a plugin monorepo), falling back to the nearest
|
||
# ancestor holding .git. When one is found the universe is:
|
||
# 1. every skill and agent under <root>/plugins/*/ — sibling plugins resolve,
|
||
# which is what a monorepo means,
|
||
# 2. the target's own apm package,
|
||
# 3. the packages that package DECLARES in apm.yml dependencies.apm.
|
||
# Deployed .claude/ and .agents/ trees are deliberately NOT consulted when the
|
||
# root came from the plugins/ probe. They are `apm install` output, gitignored,
|
||
# and present only on a machine that has run it: four cross-plugin targets in
|
||
# this repo (gitea-branches -> git-branches, gitea-branches -> git-history,
|
||
# gitea-issues -> git-branches, gitea-workflow -> git-workflow) resolved through
|
||
# .claude/skills/ alone, so the same commit measured 2 dangling targets on a
|
||
# developer machine and 6 on a fresh clone. A gate shipping hot with no baseline
|
||
# cannot give two answers.
|
||
#
|
||
# Deployed trees ARE used when no plugin monorepo was found — whether the walk
|
||
# landed on a bare .git ancestor or on nothing at all. That is the consumer
|
||
# case: the file being checked lives in or beside a deployed tree, inside an
|
||
# ordinary git repo, with no monorepo to read. The two cases are told apart by
|
||
# which probe matched, never by how many names a root contributed; see
|
||
# known_targets().
|
||
|
||
|
||
def _is_fs_root(path):
|
||
return os.path.dirname(path) == path
|
||
|
||
|
||
def _collect_package(pkg_dir, names):
|
||
"""Add every skill/agent name a package directory exposes, any layout."""
|
||
# glob.escape() the DIRECTORY only. A checkout path containing `[`, `]`,
|
||
# `*` or `?` — a worktree named `feature[2]`, say — otherwise turns the
|
||
# whole pattern into a character class that matches nothing, and the
|
||
# resolver degrades to the "DID NOT RUN" INFO with rc=0 across every file
|
||
# in the tree. The wildcards in `sub` are the intended ones and stay raw.
|
||
safe_dir = glob.escape(pkg_dir)
|
||
for sub in ('.apm/skills/*/', 'skills/*/'):
|
||
for path in glob.glob(os.path.join(safe_dir, sub)):
|
||
# A directory is a skill only if it HOLDS a SKILL.md. An empty
|
||
# leftover — a deleted skill whose directory survived, a scaffolding
|
||
# stub, an editor's stray mkdir — is untracked by git, so it exists
|
||
# on the machine that made it and nowhere else. Counting it made a
|
||
# boundary target resolve locally and dangle in a fresh clone: the
|
||
# same install-dependence the deployed-tree rule above exists to
|
||
# remove, arriving through a different door.
|
||
if os.path.isfile(os.path.join(path, 'SKILL.md')):
|
||
names.add(os.path.basename(path.rstrip('/')).lower())
|
||
for sub in ('.apm/agents/*.md', 'agents/*.md'):
|
||
for path in glob.glob(os.path.join(safe_dir, sub)):
|
||
# The same rule one directory over, which until now had no
|
||
# counterpart here at all: the skills branch above tests for a
|
||
# SKILL.md, the agents branch took every glob hit on trust. A
|
||
# DIRECTORY named `ghost-agent.md` matches `*.md` and glob does not
|
||
# tell the two apart, so a leftover of that shape resolved a routing
|
||
# target on the machine holding it and dangled everywhere else —
|
||
# identical install-dependence, arriving through the one door
|
||
# nobody guarded.
|
||
if not os.path.isfile(path):
|
||
continue
|
||
base = os.path.basename(path)
|
||
if base.endswith('.agent.md'):
|
||
base = base[:-len('.agent.md')]
|
||
else:
|
||
base = base[:-len('.md')]
|
||
names.add(base.lower())
|
||
|
||
|
||
def _apm_package_root(start_dir):
|
||
"""Nearest ancestor that is an apm package root (apm.yml or .apm/).
|
||
|
||
The filesystem root is never a candidate: a stray /.apm/skills/ — a
|
||
scaffolding test's leftover, say, and one really does exist on at least one
|
||
machine here — would otherwise become the package root of every path on it.
|
||
Capped at ten levels so a pathological path can't become a filesystem
|
||
crawl; that covers every real layout by a wide margin.
|
||
"""
|
||
current = os.path.abspath(start_dir)
|
||
for _ in range(10):
|
||
if _is_fs_root(current):
|
||
return None
|
||
if (os.path.isfile(os.path.join(current, 'apm.yml'))
|
||
or os.path.isdir(os.path.join(current, '.apm'))):
|
||
return current
|
||
current = os.path.dirname(current)
|
||
return None
|
||
|
||
|
||
def _authoring_root(start_dir):
|
||
"""Nearest ancestor that is a plugin monorepo, else the nearest .git tree.
|
||
|
||
Returns (root, matched_plugins_probe). The flag reports WHICH probe
|
||
matched: True for the plugins/*/.apm/{skills,agents} glob, False for the
|
||
.git fallback and for no match at all. known_targets() needs that
|
||
distinction — only a real plugins/ root makes the deployed trees
|
||
redundant, and a name-count delta cannot tell the two apart.
|
||
|
||
Two passes, not one interleaved walk: a nested .git (a submodule, a
|
||
worktree of a sub-package) must not win over a real plugins/ root further
|
||
up. Both passes stop before the filesystem root for the same reason
|
||
_apm_package_root does.
|
||
"""
|
||
probes = (
|
||
lambda d: bool(glob.glob(os.path.join(glob.escape(d), 'plugins', '*', '.apm', 'skills'))
|
||
or glob.glob(os.path.join(glob.escape(d), 'plugins', '*', '.apm', 'agents'))),
|
||
lambda d: os.path.exists(os.path.join(d, '.git')))
|
||
for index, probe in enumerate(probes):
|
||
current = os.path.abspath(start_dir)
|
||
for _ in range(12):
|
||
if _is_fs_root(current):
|
||
break
|
||
if probe(current):
|
||
return current, index == 0
|
||
current = os.path.dirname(current)
|
||
return None, False
|
||
|
||
|
||
def _collect_authoring_root(root, names):
|
||
"""Every plugin in the monorepo contributes its names."""
|
||
for pkg in glob.glob(os.path.join(glob.escape(root), 'plugins', '*')):
|
||
if os.path.isdir(pkg):
|
||
_collect_package(pkg, names)
|
||
|
||
|
||
def _declared_dependency_dirs(pkg_dir):
|
||
"""Directories of the apm packages pkg_dir's manifest DECLARES.
|
||
|
||
Reads dependencies.apm and resolves each entry to a directory on disk:
|
||
a monorepo-relative `path:` (against the package root and the nearest
|
||
ancestor manifest, which is the monorepo root) or an installed
|
||
apm_modules/<name>/. Entries that resolve to nothing are skipped — an
|
||
undeployed dependency contributes no names rather than an error.
|
||
"""
|
||
manifest = os.path.join(pkg_dir, 'apm.yml')
|
||
if not os.path.isfile(manifest):
|
||
return []
|
||
try:
|
||
data = yaml.safe_load(read_text(manifest)) or {}
|
||
except Exception:
|
||
return []
|
||
if not isinstance(data, dict):
|
||
return []
|
||
deps = data.get('dependencies')
|
||
deps = deps.get('apm') if isinstance(deps, dict) else None
|
||
if not isinstance(deps, list):
|
||
return []
|
||
|
||
roots = [pkg_dir]
|
||
ancestor = os.path.dirname(os.path.abspath(pkg_dir))
|
||
for _ in range(10):
|
||
if _is_fs_root(ancestor):
|
||
break
|
||
if os.path.isfile(os.path.join(ancestor, 'apm.yml')):
|
||
roots.append(ancestor)
|
||
break
|
||
ancestor = os.path.dirname(ancestor)
|
||
|
||
found = []
|
||
for entry in deps:
|
||
candidates = []
|
||
if isinstance(entry, dict):
|
||
rel = entry.get('path')
|
||
name = entry.get('name')
|
||
if not name and rel:
|
||
name = os.path.basename(str(rel).rstrip('/'))
|
||
if rel:
|
||
candidates.extend(os.path.join(r, str(rel)) for r in roots)
|
||
if name:
|
||
candidates.append(os.path.join(pkg_dir, 'apm_modules', str(name)))
|
||
elif isinstance(entry, str):
|
||
name = re.split(r'[#@]', entry)[0].strip().rstrip('/').split('/')[-1]
|
||
if name:
|
||
candidates.append(os.path.join(pkg_dir, 'apm_modules', name))
|
||
candidates.extend(os.path.join(r, 'plugins', name) for r in roots)
|
||
for candidate in candidates:
|
||
if os.path.isdir(candidate):
|
||
found.append(candidate)
|
||
return found
|
||
|
||
|
||
def _deployed_roots(start_dir):
|
||
""".claude/ and .agents/ trees above start_dir — what a host really sees.
|
||
|
||
Consulted ONLY when no plugin monorepo root was found; see the header. The
|
||
filesystem root is skipped for the same reason _apm_package_root skips it:
|
||
a stray /.claude/skills/ must not join every path's universe.
|
||
"""
|
||
found = []
|
||
current = os.path.abspath(start_dir)
|
||
for _ in range(10):
|
||
if _is_fs_root(current):
|
||
break
|
||
for name in ('.claude', '.agents'):
|
||
base = os.path.join(current, name)
|
||
if os.path.isdir(base):
|
||
found.append(base)
|
||
current = os.path.dirname(current)
|
||
return found
|
||
|
||
|
||
def known_targets(start_dir):
|
||
"""Every skill/agent name a boundary clause in start_dir may name."""
|
||
names = set()
|
||
start = os.path.abspath(start_dir)
|
||
|
||
# Siblings: a cache-installed plugin and a deployed .claude/skills/ tree
|
||
# both put peers one level up, with no plugins/ directory above them. The
|
||
# grandparent is guarded against the filesystem root exactly like the two
|
||
# walk-up loops above — for a start dir of /skills/<x> the grandparent is
|
||
# `/`, and collecting there picks up this machine's stray /.apm/skills/.
|
||
parent = os.path.dirname(start)
|
||
grandparent = os.path.dirname(parent)
|
||
if (os.path.basename(parent) in ('skills', 'agents')
|
||
and os.path.isdir(parent) and not _is_fs_root(grandparent)):
|
||
_collect_package(grandparent, names)
|
||
|
||
package = _apm_package_root(start)
|
||
if package:
|
||
_collect_package(package, names)
|
||
for dep_dir in _declared_dependency_dirs(package):
|
||
_collect_package(dep_dir, names)
|
||
|
||
# A .git ancestor is an authoring root only if it actually holds plugins.
|
||
# _authoring_root() falls back to the nearest .git, so it is truthy in ANY
|
||
# git repo; without the distinction that fallback wins in every consumer
|
||
# checkout, _collect_authoring_root() contributes nothing, and the deployed
|
||
# branch below is dead code in the exact case it exists for. So condition
|
||
# on WHICH probe matched, which _authoring_root() reports directly. A
|
||
# name-count delta looks equivalent and is not: _collect_authoring_root()
|
||
# re-collects the checked file's own plugin, whose names the blocks above
|
||
# already added, so a one-plugin monorepo shows a delta of zero and would
|
||
# wrongly reach for the deployed trees — including the user's global
|
||
# ~/.claude/skills, making the verdict depend on what happens to be
|
||
# installed (ADR-0020 lines 118-127).
|
||
root, root_has_plugins = _authoring_root(start)
|
||
if root:
|
||
_collect_authoring_root(root, names)
|
||
if not root_has_plugins:
|
||
for base in _deployed_roots(start):
|
||
_collect_package(base, names)
|
||
return names
|
||
|
||
|
||
# --- Extraction -----------------------------------------------------------
|
||
# False positives are the design constraint here, not recall. The rules:
|
||
# * A BARE target must be hyphenated AND sit in a boundary sentence (one
|
||
# carrying "do not"/"instead"/"rather than"/"not for"). Without the second
|
||
# condition, pc-run's "run pre-commit hooks" reads as a route to a
|
||
# non-existent `pre-commit` skill.
|
||
# * A BARE arrow target counts only in ADR-0020's compressed boundary form,
|
||
# `Not <thing> -> <skill-name>`. The example that motivated it is gone:
|
||
# diagnose's process chain "fix -> regression-test", which without the
|
||
# gate read as a route to a non-existent `regression-test` skill, was cut
|
||
# when issue #99 retrofitted that description. So the gate is currently
|
||
# UNEXERCISED — gating and not gating produce the same verdict corpus-wide.
|
||
# Keep it anyway. It is a false-positive guard against prose no one has
|
||
# written yet, and any new process chain re-arms it. Unexercised is not the
|
||
# same as unnecessary, and the branch it guards is still load-bearing: the
|
||
# bare-arrow rule is the sole extractor for three real targets in
|
||
# kyberforge (factory-audit -> skill-author, factory-audit ->
|
||
# agent-author, apm-orchestrate -> apm-install), all written unbackticked.
|
||
# * A backticked hyphenated token counts only inside a boundary sentence.
|
||
# Unconditionally, `pre-push` or `commit-msg` in a TRIGGER clause is a hard
|
||
# FAIL with no escape hatch. Gating it costs nothing (measured over this
|
||
# corpus: 54 targets before and after); DELETING it costs 7 real targets
|
||
# across three gitea skills, so it is gated, not removed.
|
||
# * SINGLE-WORD targets are deliberately NOT matchable bare — `research`,
|
||
# `triage`, `forge`, `prototype` and `tdd` are all real skill names and all
|
||
# ordinary English, so a bare-word rule would flag most of the corpus. A
|
||
# single-word target must be written `` `forge` `` or /forge to be seen.
|
||
# That is a known recall limitation, accepted over the false positives.
|
||
# Tool names (Read/Write/Edit) are excluded by the lowercase-only pattern; MCP
|
||
# tool names (issue_write) by its rejection of underscores; file names by its
|
||
# rejection of dots and slashes.
|
||
#
|
||
# ATTRIBUTIVE USE. The boundary-sentence gate above does NOT solve the
|
||
# `pre-commit` false positive, and the comment that claimed it did was wrong:
|
||
# "instead", "rather than", "do not" and "not for" are exactly the words a
|
||
# boundary clause uses, so the gate is open precisely where the risk is. All of
|
||
# these were hard dangling FAILs with no suppression:
|
||
# Use pre-commit hooks instead of ad-hoc scripts.
|
||
# Invoke the pull-request template instead of writing one by hand.
|
||
# Use conventional-commits formatting rather than free-form messages.
|
||
# Composes label-resolution logic instead of duplicating it.
|
||
# Do not use for X — run the `pre-push` hooks instead.
|
||
# What separates every one of them from a real route is grammar, not marking:
|
||
# the hyphenated token is a compound MODIFIER of the noun that follows it
|
||
# ("pre-commit hooks", "pull-request template"), where a route target is
|
||
# terminal — followed by punctuation, a conjunction, or a boundary word. So a
|
||
# target whose next token is an ordinary lowercase noun is CONFIRM-ONLY: it
|
||
# still resolves and still counts as a route when the name exists, but it can
|
||
# never raise a dangling error on its own.
|
||
#
|
||
# This is deliberately NOT the simpler "only marked targets may dangle" rule,
|
||
# which would have been wrong here: BOTH live true positives in this corpus are
|
||
# BARE — research's "(use neuledge-context)" and gitea-issues' "Composes
|
||
# gitea-labels-\n milestones", where the `>` fold yields "gitea-labels-
|
||
# milestones" and the trailing hyphen is what keeps it terminal. Marking is a
|
||
# poor proxy, so the follower token is the signal, and it is applied to
|
||
# backticked targets too.
|
||
#
|
||
# TERMINAL IS NOT ENOUGH — IN-SENTENCE CORROBORATION. The follower test clears
|
||
# `pre-push` in the example above only because that example happens to be
|
||
# followed by the noun "hooks". Move the same token into terminal position and
|
||
# it was a hard FAIL again, with no suppression mechanism anywhere in this gate:
|
||
# Do not use for running hooks — run `pre-commit` instead.
|
||
# Do not use for the commit message — see `commit-msg`.
|
||
# Do not use for type errors — run `type-check` first.
|
||
# Instead, use `semantic-release`.
|
||
# Do not use for the old flow — use the clean-up instead.
|
||
# Do not run end-to-end, run unit-tests.
|
||
# Every one of those is grammatically identical to a genuinely broken route:
|
||
# "route verb + hyphenated name + terminal" is also exactly how prose cites a
|
||
# tool, a hook, a file format or an English compound. Nothing local separates
|
||
# them, and the skills most exposed are the ones this contract sends authors
|
||
# back to rewrite first — pc-run, pc-author, vale-run, vale-config and the apm-*
|
||
# family are all ABOUT hyphenated tools.
|
||
#
|
||
# So the confidence to BLOCK a commit comes from the sentence, not the token: a
|
||
# prose-form target may raise a hard error only when its own sentence names at
|
||
# least one OTHER target that RESOLVES. A routing sentence proves itself by
|
||
# routing somewhere real; a lone unresolvable name proves nothing. That is not a
|
||
# rule fitted to the fixtures — it is the shape of both live true positives,
|
||
# which sit beside `write-docs` and `gitea-labels-milestones` respectively, and
|
||
# it changes this corpus's verdict by exactly nothing.
|
||
#
|
||
# An uncorroborated unresolvable target is NOT discarded: every caller reports
|
||
# it at its SUGGESTION tier, naming the target. The finding stays visible on
|
||
# every run; only the power to block a commit is withdrawn, which is the part
|
||
# that had no escape hatch.
|
||
#
|
||
# EXPLICIT ROUTE NOTATION is exempt from corroboration and always blocks:
|
||
# ADR-0020's compressed arrow (`Not <thing> -> <name>`) and Claude Code's
|
||
# invocation form (`/<name>`). Neither is ever how English cites a tool — nobody
|
||
# writes `-> pre-commit` or `/pre-commit` to mean the hook — so there is no
|
||
# ambiguity to resolve, and an author who wants a route checked unconditionally
|
||
# has two ways to say so.
|
||
#
|
||
# BOTH FORMS ARE SWEPT FOR ON THEIR OWN, and that is a repair of the promise
|
||
# above rather than a widening of it. Until the sweeps existed, notation was
|
||
# only ever seen as the OBJECT OF A ROUTE VERB (`use
|
||
# /name`) or as the tail of a `not ... ->` clause with no `;` or sentence end in
|
||
# between. Every one of these therefore exited 0 in total silence — no ERROR, no
|
||
# SUGGESTION, not even the target's name:
|
||
# Do not use for Y — /no-such-skill instead.
|
||
# Do not use for Y; /no-such-skill handles that.
|
||
# Do not use for Y (/no-such-skill covers it).
|
||
# Do not use for Y — that is /no-such-skill's job.
|
||
# Do not use for Y — defer to /no-such-skill.
|
||
# Do not use for Y — /no-such-skill.
|
||
# Do not use for Y; -> no-such-skill covers it.
|
||
# For W, /no-such-skill is the right entry point.
|
||
# The target was never EXTRACTED, so the notation-first rule in _add() had
|
||
# nothing to apply itself to and the "always blocks" promise was false for the
|
||
# ordinary way an author writes the thing. The SUGGESTION tier made it worse
|
||
# than a gap: its printed remedy tells the author to "write it as `/name` or
|
||
# `-> name` and it will be checked properly", and taking that advice turned a
|
||
# visible SUGGESTION into silence — the gate teaching the one edit that blinds
|
||
# it.
|
||
#
|
||
# THE TWO SWEEPS ARE GATED DIFFERENTLY, and the asymmetry is the whole point.
|
||
# `/name` is Claude Code's invocation syntax and nothing else — no English
|
||
# sentence contains one by accident — so the ADR-0020 amendment and
|
||
# docs/spec/gates.md both promise it blocks UNCONDITIONALLY, for any name. So
|
||
# NOTATION_SLASH is swept over every sentence, boundary marker or not. Gating it
|
||
# on BOUNDARY_MARKER made that promise false for the last sentence of
|
||
# Do not use for Z — use /real-skill instead.
|
||
# For W, /no-such-skill is the right entry point.
|
||
# which exited 0 in total silence: the boundary clause is one sentence up, so
|
||
# the sweep never looked at the sentence carrying the broken route. Extraction is
|
||
# per-sentence by design (corroboration is scoped to one sentence), which is
|
||
# exactly what made the gap invisible.
|
||
#
|
||
# NOTATION_ARROW stays gated on BOUNDARY_MARKER, and so does the backtick sweep.
|
||
# Neither form is unambiguous: `-> name` is also how a process chain is written
|
||
# ("reproduce -> minimise -> regression-test") and a code span is how a tool, a
|
||
# file and a skill are all cited. Ungating either would fire on prose that
|
||
# carries no routing intent at all — the false-positive class this whole
|
||
# extractor is tuned against.
|
||
#
|
||
# BOTH `/name` PATTERNS REFUSE A TOKEN THAT IS PART OF A PATH: a following `/`,
|
||
# or a `.` followed by a non-space, means `references/foo.md`, `docs/a/b.md` or
|
||
# `https://x/y`, not a route. A sentence's closing `.` is not followed by a
|
||
# non-space, so `— /no-such-skill.` still counts.
|
||
#
|
||
# THAT GUARD IS WRITTEN `(?![\w-])` AND NOT `\b`, because `\b` is not a guard at
|
||
# all here: it holds after a hyphen, so when the trailing lookahead rejected the
|
||
# full segment the engine simply backtracked to a shorter hyphen-terminated
|
||
# prefix and reported THAT as a route. Every one of these was a hard blocking
|
||
# ERROR naming a skill nobody had written:
|
||
# the config lives at /opt-tools/bin/thing. -> 'opt'
|
||
# see /api-docs/v2.md for the schema. -> 'api' AND 'api-docs'
|
||
# the file /no-such-skill.md documents it. -> 'no-such'
|
||
# `(?![\w-])` forbids the shortened prefix outright, so the whole segment is
|
||
# rejected as the path it is. MARKED_TARGET carries the same guard: it had no
|
||
# trailing lookahead whatsoever, so `see /api-docs/v2.md` raised the second of
|
||
# the two errors above through the route-verb path rather than the sweep.
|
||
#
|
||
# NAMESPACE: `plugin:skill` is live in this repo (native user-scope installs
|
||
# still resolve `gitea:gitea-prs`), so the patterns admit an optional
|
||
# `<plugin>:` prefix and normalize_target() strips it before resolution.
|
||
NS = r"(?:[a-z0-9]+(?:-[a-z0-9]+)*:)?"
|
||
NAME_ANY = NS + r"[a-z0-9]+(?:-[a-z0-9]+)*"
|
||
NAME_HYPH = NS + r"[a-z0-9]+(?:-[a-z0-9]+)+"
|
||
ROUTE_VERB = (r"(?:use|uses|using|run|runs|invoke|invokes|invoking|try|see"
|
||
r"|that'?s|compose|composes|call|calls"
|
||
r"|routes?\s+to|delegates?\s+to|prefers?|switch(?:es)?\s+to"
|
||
r"|hands?\s+off\s+to)")
|
||
MARKED_TARGET = (r"(?:`/?(%s)`|(?<![\w./*-])/(%s)(?![\w-])(?!/|\.\S))"
|
||
% (NAME_ANY, NAME_ANY))
|
||
ANY_TARGET = r"(?:%s|(%s)\b)" % (MARKED_TARGET, NAME_HYPH)
|
||
ROUTE_MARKED = re.compile(r"\b%s\s+(?:the\s+|an?\s+)?%s" % (ROUTE_VERB, MARKED_TARGET), re.I)
|
||
ROUTE_ANY = re.compile(r"\b%s\s+(?:the\s+|an?\s+)?%s" % (ROUTE_VERB, ANY_TARGET), re.I)
|
||
# re.I on ALL of them, uniformly. The patterns are built from the same
|
||
# lowercase NAME_* fragments, so half of them carrying the flag and half not
|
||
# meant `Skill-Audit` at the start of a boundary sentence was extracted by
|
||
# ROUTE_ANY but invisible to BACKTICK — contradicting normalize_target()'s own
|
||
# docstring, which exists precisely because extraction is case-insensitive and
|
||
# the universe is not.
|
||
CONT_MARKED = re.compile(r"\s*(?:or|and|/|,)\s*%s" % MARKED_TARGET, re.I)
|
||
CONT_ANY = re.compile(r"\s*(?:or|and|/|,)\s*%s" % ANY_TARGET, re.I)
|
||
ARROW_MARKED = re.compile(r"(?:->|→)\s*%s" % MARKED_TARGET, re.I)
|
||
# The two EXPLICIT ROUTE NOTATION sweeps. NOTATION_SLASH runs over EVERY
|
||
# sentence; NOTATION_ARROW is scoped to a boundary sentence by its caller (see
|
||
# the asymmetry note in the header). NOTATION_SLASH is deliberately not a reuse
|
||
# of MARKED_TARGET's `/name` alternative: that one only ever runs behind a route
|
||
# verb or an arrow, and it may match a namespaced or path-adjacent token in
|
||
# positions this free-standing sweep must refuse.
|
||
# NOTATION_ARROW is ARROW_BOUNDARY minus its leading `\bnot\b%s*?`, which is
|
||
# what made `Do not use for Y; -> no-such-skill covers it.` invisible:
|
||
# CLAUSE_BODY cannot cross the `;`, so the clause's own punctuation disarmed the
|
||
# check. Dropping that prefix costs the one false positive the bare-arrow bullet
|
||
# above names — a process chain ending in a hyphenated word, `Instead, reproduce
|
||
# -> minimise -> regression-test.` — and costs it only in a sentence that already
|
||
# carries a BOUNDARY_MARKER. That exposure is neither new nor larger: the same
|
||
# chain written `Do not use for X — reproduce -> regression-test.` was already a
|
||
# hard ERROR under ARROW_BOUNDARY, so this changes which boundary words reach the
|
||
# arrow, not whether prose can. An author who means the chain and not a route
|
||
# writes it in its own sentence, where neither pattern looks.
|
||
NOTATION_SLASH = re.compile(
|
||
r"(?<![\w./*-])/(%s)(?![\w-])(?!/|\.\S)" % NAME_ANY, re.I)
|
||
NOTATION_ARROW = re.compile(r"(?:->|→)\s*(%s)\b" % NAME_HYPH, re.I)
|
||
# CLAUSE_BODY is what may sit between `Not` and the arrow, and it is NOT
|
||
# `[^.;]`. That class cannot cross a `.`, so every boundary clause naming a
|
||
# DOTTED FILENAME between the two — `.pre-commit-config.yaml`, `AGENTS.md`,
|
||
# `.vale.ini` — was invisible to both patterns below, and the two resulting
|
||
# failures were different sizes (issue #110):
|
||
# * with a BACKTICKED target the clause was MISDIAGNOSED. The backtick sweep
|
||
# still extracted the target, so the route was checked, but the gate
|
||
# reported "no boundary clause" on a clause that was present and working.
|
||
# Three authors in two retrofit waves reworded a correct clause to satisfy
|
||
# the regex, one of them stripping the very filename that discriminates the
|
||
# skill from its neighbour.
|
||
# * with a BARE target the clause was UNCHECKED. ARROW_BOUNDARY is the only
|
||
# extractor for a bare arrow target, so `Not AGENTS.md -> no-such-skill`
|
||
# produced no target, no dangling report and no missing-clause SUGGESTION.
|
||
# Silence, not noise — the worse of the two failure modes.
|
||
# A dot inside a filename is followed by a non-space; a sentence-ending dot is
|
||
# followed by whitespace or by end of string. So the class admits a `.` only
|
||
# when the next character is not whitespace, which crosses `AGENTS.md` and
|
||
# still stops at a real sentence end.
|
||
CLAUSE_BODY = r"(?:[^.;]|\.(?=\S))"
|
||
ARROW_BOUNDARY = re.compile(
|
||
r"\bnot\b%s*?(?:->|→)\s*(%s)\b" % (CLAUSE_BODY, NAME_HYPH), re.I)
|
||
BACKTICK = re.compile(r"`(%s)`" % NAME_HYPH, re.I)
|
||
# A boundary clause takes two shapes and BOTH count: the prose markers, and
|
||
# ADR-0020's compressed arrow form `Not <thing> -> <name>`.
|
||
BOUNDARY_MARKER = re.compile(r"\b(?:do\s+not|instead|rather\s+than|not\s+for)\b", re.I)
|
||
BOUNDARY_ARROW = re.compile(r"\bnot\b%s*?(?:->|→)" % CLAUSE_BODY, re.I)
|
||
# Sentence boundaries decide the CORROBORATION scope above, so getting one wrong
|
||
# is not cosmetic — it moves a target between SUGGESTION and blocking ERROR. Two
|
||
# shapes common in these descriptions defeat the naive "period, space, capital"
|
||
# rule, in OPPOSITE directions:
|
||
# OVER-SPLIT. `e.g. "set up the manifest"` ends no sentence, but the quote
|
||
# looks like one starting. The clause is cut in half, the corroborating
|
||
# target lands on the far side of the cut, and a genuinely dangling target
|
||
# silently demotes to SUGGESTION — the gate takes a measurement and then
|
||
# throws it away, which is the vacuous-green shape this file exists to stop.
|
||
# UNDER-SPLIT. A real sentence opening with a code span or a lowercase skill
|
||
# name ("... Composes it. `gitea-prs` also uses it.") is not seen as a start
|
||
# at all, so two sentences merge and a resolving target vouches for an
|
||
# unresolvable one it never stood beside — a hard FAIL with no escape hatch,
|
||
# which is exactly the failure the corroboration rule was added to prevent.
|
||
# Both are closed here: the five abbreviations that actually occur in routing
|
||
# prose are excluded as sentence ends, and the opener class admits a backtick or
|
||
# a lowercase letter. Verified zero-delta on the current corpus (37 ERROR / 58
|
||
# SUGGESTION / 2 dangling before and after) — this protects the descriptions
|
||
# issue #99 is about to rewrite, not the ones already measured.
|
||
# re.I here too, and NOT as a tidy-up: this was the one pattern in the file
|
||
# built without it, contradicting the uniformity note on CONT_*/ARROW_* above.
|
||
# Without the flag `E.g.` and `I.e.` — the sentence-initial spellings, which is
|
||
# where an abbreviation most often lands — matched none of the lookbehinds, so
|
||
# the clause split at the abbreviation, the corroborating target was stranded on
|
||
# the far side of the cut, and a genuinely dangling target silently demoted from
|
||
# blocking ERROR to SUGGESTION. That is the OVER-SPLIT failure described
|
||
# directly above, still live for exactly the capitalised half of the input.
|
||
SENTENCE_SPLIT = re.compile(
|
||
u'(?<!\\be\\.g\\.)(?<!\\bi\\.e\\.)(?<!\\betc\\.)(?<!\\bvs\\.)(?<!\\bcf\\.)'
|
||
u'(?<=[.!?])\\s+(?=[A-Za-z`"“(])', re.I)
|
||
|
||
# The token that may follow a route target without turning it into a compound
|
||
# modifier: punctuation, end of sentence, a conjunction, a boundary word, or a
|
||
# head noun that names the artifact itself ("the git-workflow skill"). Anything
|
||
# else — `hooks`, `template`, `formatting`, `logic` — is attributive prose.
|
||
FOLLOWER = re.compile(r"[`\s]*([a-z][a-z0-9]*)")
|
||
FOLLOWER_OK = frozenset("""
|
||
and or nor but for to when if unless while after before with from in on at by
|
||
of as than then instead rather directly first only always never also even
|
||
both either neither so because since per via plus alone here there this that
|
||
these those it its they them is are was were be been being has have had will
|
||
would can could should must may might does do did
|
||
skill skills agent agents plugin plugins command commands
|
||
""".split())
|
||
|
||
|
||
def normalize_target(target):
|
||
"""Comparison key: namespace stripped, lowercased.
|
||
|
||
Extraction is case-insensitive (re.I) but the universe is built from
|
||
lowercase directory names, so `Git-Commits` at the start of a sentence
|
||
resolved to nothing until this normalization existed.
|
||
"""
|
||
return target.split(':')[-1].lower()
|
||
|
||
|
||
def has_boundary_clause(description):
|
||
return bool(BOUNDARY_MARKER.search(description)
|
||
or BOUNDARY_ARROW.search(description))
|
||
|
||
|
||
def _first(match):
|
||
"""(name, start, end) offsets for the first group that matched."""
|
||
for index in range(1, (match.re.groups or 0) + 1):
|
||
if match.group(index):
|
||
return match.group(index), match.start(index), match.end(index)
|
||
return None, None, None
|
||
|
||
|
||
def _terminal(text, pos):
|
||
"""True if the token at pos does not make the preceding name a modifier."""
|
||
follower = FOLLOWER.match(text, pos)
|
||
return not follower or follower.group(1) in FOLLOWER_OK
|
||
|
||
|
||
def _notation(text, start, arrow):
|
||
"""True if the name is written in route NOTATION rather than in prose.
|
||
|
||
Two forms qualify: `/name` (Claude Code's invocation syntax, detected from
|
||
the character before the name) and `-> name` (ADR-0020's compressed boundary
|
||
form, passed in by the caller that matched the arrow). A backticked name
|
||
does NOT qualify — a code span is how a tool, a file and a skill are all
|
||
cited, so it carries no intent the follower test hasn't already read.
|
||
"""
|
||
return arrow or (start > 0 and text[start - 1] == '/')
|
||
|
||
|
||
def _add(out, text, name, start, end, strict=None, arrow=False):
|
||
"""Record one target as (name, may_dangle, notation).
|
||
|
||
NOTATION IS DECIDED FIRST, and when it is set the follower test is skipped.
|
||
The header above promises that route notation "always blocks", and for the
|
||
`/name` form that was false: `-> name` reached this function with
|
||
strict=True from its two call sites, but `/name` did not, so it fell to
|
||
_terminal() and a follower outside FOLLOWER_OK set may_dangle=False. The
|
||
target then reached unresolved_targets() unblockable — and, before the
|
||
companion fix there, unreported as well. `... use /no-such-skill
|
||
afterwards.` exited 0 in total silence, on the one form ADR-0020 offers an
|
||
author who wants a route checked unconditionally.
|
||
"""
|
||
if not name:
|
||
return
|
||
notation = _notation(text, start, arrow)
|
||
if strict is None and notation:
|
||
strict = True
|
||
out.append((name,
|
||
_terminal(text, end) if strict is None else strict,
|
||
notation))
|
||
|
||
|
||
def _scan(text, route_re, cont_re, out):
|
||
for match in route_re.finditer(text):
|
||
name, start, end = _first(match)
|
||
if not name:
|
||
continue
|
||
_add(out, text, name, start, end)
|
||
# "use git-history or git-branches instead" / "use gitea-issues /
|
||
# gitea-prs" — keep consuming conjoined targets after the first.
|
||
pos = match.end()
|
||
while True:
|
||
cont = cont_re.match(text, pos)
|
||
if not cont:
|
||
break
|
||
_add(out, text, *_first(cont))
|
||
pos = cont.end()
|
||
|
||
|
||
def _extract_sentence(sentence):
|
||
"""[(name, may_dangle, notation)] for the routing targets in ONE sentence.
|
||
|
||
Kept separate from _extract() because corroboration is scoped to a single
|
||
sentence: a target's evidence is what stands beside it, not what the rest of
|
||
the description happens to mention.
|
||
"""
|
||
out = []
|
||
boundary = bool(BOUNDARY_MARKER.search(sentence))
|
||
_scan(sentence,
|
||
ROUTE_ANY if boundary else ROUTE_MARKED,
|
||
CONT_ANY if boundary else CONT_MARKED,
|
||
out)
|
||
for match in ARROW_MARKED.finditer(sentence):
|
||
# `-> name` and `-> /name` are route notation, not prose: nothing
|
||
# reads as a compound modifier after an arrow, so no follower test.
|
||
_add(out, sentence, *_first(match), strict=True, arrow=True)
|
||
for match in ARROW_BOUNDARY.finditer(sentence):
|
||
_add(out, sentence, match.group(1), match.start(1), match.end(1),
|
||
strict=True, arrow=True)
|
||
# `/name` wherever it sits, in ANY sentence — not only where a route verb or
|
||
# an arrow happens to precede it, and NOT only inside a boundary sentence.
|
||
# See the EXPLICIT ROUTE NOTATION note in the header for the eight phrasings
|
||
# this recovers and for why silence was the failure mode. The sweep takes no
|
||
# follower test: _add() reads the notation first and marks it.
|
||
for match in NOTATION_SLASH.finditer(sentence):
|
||
_add(out, sentence, match.group(1), match.start(1), match.end(1))
|
||
if boundary:
|
||
# The arrow and backtick forms are ambiguous in ordinary prose, so they
|
||
# stay scoped to a sentence that carries a boundary marker.
|
||
for match in NOTATION_ARROW.finditer(sentence):
|
||
_add(out, sentence, match.group(1), match.start(1), match.end(1),
|
||
strict=True, arrow=True)
|
||
for match in BACKTICK.finditer(sentence):
|
||
_add(out, sentence, match.group(1), match.start(1), match.end(1))
|
||
return out
|
||
|
||
|
||
def _extract(description):
|
||
"""[(name, may_dangle, notation)] for every routing target."""
|
||
out = []
|
||
for sentence in SENTENCE_SPLIT.split(description):
|
||
out.extend(_extract_sentence(sentence))
|
||
return out
|
||
|
||
|
||
def boundary_targets(description):
|
||
"""Every routing target, for reporting and for confirming a route."""
|
||
return sorted({name for name, _, _ in _extract(description)})
|
||
|
||
|
||
def _clause_end(description, pos):
|
||
"""Where CLAUSE_BODY stops scanning forward from `pos`.
|
||
|
||
The same two stops the class itself encodes: a `;`, or a `.` that is not
|
||
followed by a non-space character (a sentence end rather than a dot inside
|
||
`AGENTS.md`).
|
||
"""
|
||
for index in range(pos, len(description)):
|
||
char = description[index]
|
||
if char == ';':
|
||
return index
|
||
if char == '.' and not description[index + 1:index + 2].strip():
|
||
return index
|
||
return len(description)
|
||
|
||
|
||
def _arrow_clause_spans(description):
|
||
"""(start, end) for EACH ADR-0020 arrow clause, one span per clause.
|
||
|
||
A clause runs from its `Not` to whichever comes first: the start of the
|
||
NEXT arrow clause, or the end of the clause body. Bounding on the next
|
||
clause is what keeps two clauses joined by a comma inside one sentence
|
||
apart — a sentence-scoped span would merge them and let the second clause's
|
||
target vouch for the first.
|
||
"""
|
||
starts = [match.start() for match in BOUNDARY_ARROW.finditer(description)]
|
||
spans = []
|
||
for index, start in enumerate(starts):
|
||
limit = starts[index + 1] if index + 1 < len(starts) else len(description)
|
||
spans.append((start, min(limit, _clause_end(description, start))))
|
||
return spans
|
||
|
||
|
||
def _arrow_clause_parses(clause):
|
||
"""True when either arrow extractor reads a target out of ONE clause.
|
||
|
||
Kept apart from boundary_targets() because the arrow form is the one shape
|
||
that ALWAYS names a target: ADR-0020's `Not <thing> -> <name>`. A clause
|
||
written that way from which nothing could be extracted is a parse failure
|
||
that deserves its own message, and telling it apart needs the arrow targets
|
||
alone rather than every target in the description.
|
||
"""
|
||
for match in ARROW_MARKED.finditer(clause):
|
||
name, _, _ = _first(match)
|
||
if name:
|
||
return True
|
||
return bool(ARROW_BOUNDARY.search(clause))
|
||
|
||
|
||
def boundary_clause_status(description):
|
||
"""'absent', 'unparsed' or 'present' — three outcomes, not two.
|
||
|
||
Issue #110's standing request: the gate must distinguish "no boundary
|
||
clause" from "boundary clause I could not parse". Reporting the first for
|
||
the second sends the author hunting for a problem that is not there, and
|
||
three of them reworded a correct clause to satisfy a regex instead.
|
||
|
||
'unparsed' is the narrow, certain case: an ADR-0020 arrow clause was
|
||
detected and NO target came out of IT. The arrow form always names one, so
|
||
zero targets means the name is written in a shape the extractor cannot see
|
||
— a single-word bare target (`Not X -> forge`, which has to be written
|
||
`` `forge` `` or `/forge`) is the live example, since single-word names are
|
||
deliberately not matchable bare.
|
||
|
||
The test is PER CLAUSE, and that is the whole point of the span walk. Both
|
||
operands used to take the whole description, so ONE arrow clause that
|
||
parsed suppressed the diagnostic for every other clause beside it: a
|
||
backticked hyphenated target wrapped across a line break inside a `>`
|
||
folded scalar — `` `git-`` / ``commits` `` — went unchecked with no ERROR
|
||
and no SUGGESTION, while the same wrap written bare was reported correctly.
|
||
26 of this corpus's 38 skill descriptions carry more than one arrow clause,
|
||
so the suppression covered most of it. This is the issue #100 regression
|
||
class, and a whole-description test cannot see it by construction.
|
||
|
||
A PROSE clause yielding no target is NOT reported: "Do not use for anything
|
||
else" is a complete and legitimate boundary clause that names nowhere to go.
|
||
"""
|
||
spans = _arrow_clause_spans(description)
|
||
if spans and not all(_arrow_clause_parses(description[start:end])
|
||
for start, end in spans):
|
||
return 'unparsed'
|
||
if has_boundary_clause(description):
|
||
return 'present'
|
||
return 'absent'
|
||
|
||
|
||
def multi_target_arrow_clauses(description):
|
||
"""[(first, second)] for arrow clauses naming more than one target.
|
||
|
||
Issue #107: only the FIRST target after an arrow is resolved. The
|
||
conjunction continuation (CONT_*) is wired to the prose route verbs and
|
||
never to arrows, so `Not X -> a or b` resolved `a`, left `b` neither
|
||
resolved nor reported, and then printed "1 of 1 boundary target(s) resolve"
|
||
on a clause naming two — a gate under-reporting its own coverage, which is
|
||
the one failure mode ADR-0020 says a gate must not have.
|
||
|
||
The clause is REJECTED rather than the arrow scan extended. Extending it
|
||
would widen the resolver's deliberately conservative false-positive tuning
|
||
across every arrow in the corpus; rejecting costs nothing and makes the
|
||
one-arrow-per-target convention — already what every retrofitted gitea
|
||
skill does in practice — explicit instead of folkloric. The caller emits a
|
||
SUGGESTION telling the author to split.
|
||
"""
|
||
hits = []
|
||
for sentence in SENTENCE_SPLIT.split(description):
|
||
matches = (list(ARROW_MARKED.finditer(sentence))
|
||
+ list(ARROW_BOUNDARY.finditer(sentence)))
|
||
for match in matches:
|
||
first, _, _ = _first(match)
|
||
if not first:
|
||
continue
|
||
cont = CONT_ANY.match(sentence, match.end())
|
||
if not cont:
|
||
continue
|
||
second, _, _ = _first(cont)
|
||
if second:
|
||
hits.append((first, second))
|
||
return hits
|
||
|
||
|
||
def unresolved_targets(description, known):
|
||
"""Targets resolving to nothing, split into (blocking, reported).
|
||
|
||
`blocking` earns a hard error; `reported` is SUGGESTION tier — named on
|
||
every run, never fatal. Three conditions gate the promotion, and all of them
|
||
are documented at length in the ATTRIBUTIVE USE and CORROBORATION notes
|
||
above:
|
||
|
||
1. the target must be terminal, not a compound modifier ("pre-commit
|
||
hooks" is prose about a tool, not a route),
|
||
2. it must be written in route notation (`/name`, `-> name`), OR
|
||
3. its own sentence must name another target that DOES resolve.
|
||
|
||
Everything else is reported and left alone. `known` is the resolved
|
||
universe from known_targets(); passing an empty set is not meaningful —
|
||
callers check for that first and decline out loud instead.
|
||
|
||
A NON-TERMINAL target is reported, never dropped. FOLLOWER_OK is a closed
|
||
whitelist of maybe eighty words, so the follower rule says "this token is
|
||
outside a list I keep" and not "this is prose" — and the old `continue`
|
||
turned that into invisibility at every tier. The gate then failed OPEN on
|
||
its own unfamiliarity: any target followed by a word nobody thought to
|
||
enumerate was neither blocked nor mentioned, so the check that did not run
|
||
said nothing about not running. The follower rule may withdraw the power to
|
||
BLOCK a commit — that is what it was added for, and the ATTRIBUTIVE USE note
|
||
above is the argument for it — but it may not withdraw visibility, which is
|
||
the same rule the corroboration tier already follows.
|
||
"""
|
||
blocking, reported = set(), set()
|
||
for sentence in SENTENCE_SPLIT.split(description):
|
||
found = _extract_sentence(sentence)
|
||
resolved = {normalize_target(name) for name, _, _ in found
|
||
if normalize_target(name) in known}
|
||
for name, may_dangle, notation in found:
|
||
key = normalize_target(name)
|
||
if key in known:
|
||
continue
|
||
if not may_dangle:
|
||
reported.add(name)
|
||
continue
|
||
if notation or (resolved - {key}):
|
||
blocking.add(name)
|
||
else:
|
||
reported.add(name)
|
||
return sorted(blocking), sorted(reported - blocking)
|
||
|
||
|
||
# --- Body-level routing targets (issue #124) -------------------------------
|
||
# boundary_targets()/unresolved_targets() above are tuned for a description:
|
||
# one to three sentences, where BOUNDARY_MARKER, the follower test and
|
||
# in-sentence corroboration all exist to tell a routing sentence apart from
|
||
# ordinary prose about a hyphenated tool. A SKILL.md body is a different
|
||
# genre — up to 900 words of procedure and dispatch tables — where those same
|
||
# heuristics would misfire in both directions: a dispatch table rarely reads
|
||
# as a "boundary sentence" (under-fire), and a procedure step naming a file, a
|
||
# CLI verb or a config key looks exactly like a route (over-fire). Retuning
|
||
# the sentence-level heuristics for that genre is the hard half of this gate
|
||
# and is deliberately NOT attempted here — see the issue for why.
|
||
#
|
||
# So the body extractor takes the narrow route instead: only two EXPLICIT
|
||
# ROUTE NOTATION forms count, and each is measured against the real corpus
|
||
# (39 SKILL.md bodies) rather than assumed correct from the description gate's
|
||
# behaviour — a body is dense with prose that LOOKS like this notation and
|
||
# genuinely is not, in ways a one-to-three-sentence description never is:
|
||
#
|
||
# * ARROW_MARKED — `-> name` / `→ name` where the target is BACKTICKED or
|
||
# slash-prefixed (MARKED_TARGET). NOT NOTATION_ARROW, which matches a bare
|
||
# hyphenated word after any arrow: the corpus's own process-chain prose
|
||
# ("Inline obj prop -> new ref -> re-render.", caveman/SKILL.md) reads as
|
||
# a route under that pattern and does not under this one, because a
|
||
# process chain is never itself backticked or slash-prefixed. The one
|
||
# live true positive this was filed over, write-docs' "-> `to-prd`", IS
|
||
# backticked (03abcff's diff shows the original), so ARROW_MARKED still
|
||
# catches it losslessly.
|
||
# * NOTATION_SLASH — free-standing `/name`, unconditionally, the same
|
||
# pattern the description gate sweeps with. Two guards narrow it for body
|
||
# text specifically, each one measured against a real corpus false
|
||
# positive rather than hypothesised:
|
||
# - a name with NO hyphen is discarded. A real dispatch entry in this
|
||
# corpus always names a multi-word skill (`to-prd`,
|
||
# `setup-matt-pocock-skills`); a single bare or backticked word after
|
||
# a `/` is prose citing a CLI command, a Claude Code built-in or a
|
||
# placeholder — `` `/fork` `` (forge/SKILL.md, contrasting
|
||
# `context: fork` with Claude Code's own /fork subagent command) and
|
||
# `` `/name` `` (skill-author/SKILL.md, "the user types `/name`" —
|
||
# `name` is a placeholder for the skill's OWN name, not a route) are
|
||
# both real corpus hits this guard removes. This is a real recall
|
||
# loss — `/forge`, `/triage` and other single-word skill names are
|
||
# unreachable through this extractor — accepted deliberately, the
|
||
# same "start narrow" trade the issue itself recommends.
|
||
# - a name immediately preceded by `<` is discarded. An XML/HTML-style
|
||
# closing tag used as a prompt section delimiter — `</what-to-do>`,
|
||
# `</supporting-info>` (grill-with-docs/SKILL.md) — is indistinguishable
|
||
# from `/what-to-do` notation by every other rule in this pattern; no
|
||
# route is ever written directly after `<` in this corpus, so the
|
||
# guard costs nothing else.
|
||
#
|
||
# Every surviving hit is unconditionally blocking: both forms are explicit
|
||
# notation with the ambiguous single-word and closing-tag readings already
|
||
# removed, so there is no SUGGESTION tier here — that tier exists to soften
|
||
# an ambiguous prose form, and none is admitted at this point.
|
||
#
|
||
# No conjunction continuation (CONT_*) either: `-> \`to-prd\` or \`grill-me\``
|
||
# resolves only `to-prd`, the same one-arrow-one-target convention
|
||
# multi_target_arrow_clauses() already enforces on descriptions (issue #107),
|
||
# applied here by construction instead of by a second SUGGESTION.
|
||
def body_targets(body):
|
||
"""Every /name or -> `name` routing target named in a SKILL.md body.
|
||
|
||
Fenced code blocks are masked first, the same way gotcha_stats() and
|
||
missing_reference_pointers() mask them: a ```-fenced example quoting
|
||
`/some-skill` or `-> \`some-skill\`` as illustration is not a live
|
||
dispatch entry, and skill-author/factory-audit — which document this
|
||
very notation — are exactly the skills most likely to carry one.
|
||
"""
|
||
masked = mask_fenced(body)
|
||
names = set()
|
||
for match in NOTATION_SLASH.finditer(masked):
|
||
if match.start() > 0 and masked[match.start() - 1] == '<':
|
||
continue # </closing-tag>, not /route-notation
|
||
name = match.group(1)
|
||
if '-' in name:
|
||
names.add(name)
|
||
for match in ARROW_MARKED.finditer(masked):
|
||
name, _, _ = _first(match)
|
||
if name and '-' in name:
|
||
names.add(name)
|
||
return sorted(names)
|
||
|
||
|
||
def unresolved_body_targets(body, known):
|
||
"""Body routing targets (notation only) that resolve to nothing.
|
||
|
||
Unlike unresolved_targets(), this has one outcome, not two: every name
|
||
body_targets() finds is already route notation, and notation always
|
||
blocks. `known` is the resolved universe from known_targets(); passing an
|
||
empty set is not meaningful — callers check for that first and decline
|
||
out loud instead, exactly as they do for the description gate.
|
||
"""
|
||
return sorted(name for name in body_targets(body)
|
||
if normalize_target(name) not in known)
|
||
|
||
|
||
# --- Frontmatter ----------------------------------------------------------
|
||
# Tolerant on the way in, HARD-FAILING on the way out. A UTF-8 BOM, a leading
|
||
# blank line, trailing whitespace after either `---`, or CRLF line endings all
|
||
# defeated the old `^---\n(.*?)\n---`, and the miss was SILENT: every ADR-0020
|
||
# check was skipped and the file reported green (measured: a 550-character
|
||
# description with a 1,000-word body exited 0 behind a BOM). A file that cannot
|
||
# be measured must never report green, so every caller of these two ERRORs on a
|
||
# miss instead of moving on.
|
||
#
|
||
# The CLOSING marker is anchored at column 0 — deliberately NOT `[ \t]*---`.
|
||
# YAML block-scalar content must be indented deeper than its key, so an
|
||
# indented `---` inside a folded description is CONTENT; letting it close the
|
||
# frontmatter truncated the description mid-value and silently reclassified the
|
||
# rest as body, which is a vacuous green in both directions at once. Leading
|
||
# whitespace is still tolerated on the OPENING marker, where no such content
|
||
# can exist.
|
||
FRONTMATTER_RE = re.compile(
|
||
r'^[ \t\r\n]*---[ \t]*\r?\n(.*?)\r?\n---[ \t]*(?:\r?\n|\Z)', re.DOTALL)
|
||
|
||
|
||
def strip_bom(text):
|
||
return text[1:] if text.startswith(u'') else text
|
||
|
||
|
||
class FrontmatterError(Exception):
|
||
pass
|
||
|
||
|
||
def description_value(fm_text):
|
||
"""The description VALUE, with YAML folding resolved.
|
||
|
||
PyYAML is a HARD requirement, preflighted in bash. The hand-rolled fallback
|
||
this replaced diverged from a real parser across the FAIL boundary — one
|
||
corpus description measured 270 characters parsed and 412 unparsed, and a
|
||
quoted `"description"` key or an explicit `description: null` returned empty
|
||
from it, silently skipping the description AND routing checks. A gate that
|
||
disagrees with itself depending on which reader ran is worse than no gate.
|
||
|
||
This is the ONLY reader any of the three scripts may use to decide whether a
|
||
description is present. A line regex cannot: `description:` with no value
|
||
followed by `model: sonnet` lets `\\s*` cross the newline and captures the
|
||
NEXT key, which reads as a non-empty description, skips the "missing or
|
||
empty" failure, and then early-returns out of every ADR-0020 gate on the
|
||
genuinely empty folded value. That combination exited 0 with zero output on
|
||
a BLOCKING pre-push gate.
|
||
"""
|
||
try:
|
||
data = yaml.safe_load(fm_text)
|
||
except Exception as exc:
|
||
# Every FrontmatterError message is a COMPLETE clause, never a detail a
|
||
# caller wraps in one. Callers used to prefix a hard-coded "frontmatter
|
||
# is not valid YAML (...)", which is true only of this branch: the two
|
||
# type failures below come from frontmatter that parsed fine, and
|
||
# telling their author the YAML is invalid sends them hunting for a
|
||
# syntax error that is not there — on a blocking gate with no baseline.
|
||
raise FrontmatterError('frontmatter is not valid YAML (%s)'
|
||
% re.sub(r'\s+', ' ', str(exc)).strip())
|
||
if not isinstance(data, dict):
|
||
raise FrontmatterError('frontmatter is not a YAML mapping')
|
||
value = data.get('description')
|
||
if value is None:
|
||
return ''
|
||
if not isinstance(value, str):
|
||
# NOT str()-coerced. `description: true` became the 4-character "True"
|
||
# and sailed through the 400-character gate; a list or mapping was
|
||
# measured as its Python repr. Neither is a description a host can
|
||
# preload, so this is a parse failure, reported as one.
|
||
raise FrontmatterError(
|
||
'description is a %s, not a string' % type(value).__name__)
|
||
return re.sub(r'\s+', ' ', value).strip()
|
||
|
||
|
||
def hand_invoked(fm_text):
|
||
"""True when the frontmatter marks this file as reached only by hand.
|
||
|
||
`disable-model-invocation: true` removes a skill from the model-visible
|
||
listing entirely — it is not preloaded, and the Skill tool refuses to call
|
||
it — so its description is never matched against user intent. ADR-0020 and
|
||
skill-author's contract give such a skill ONE plain human-facing sentence:
|
||
no trigger list, no boundary clause. No validator knew the field existed
|
||
(issue #108), so the boundary-clause SUGGESTION fired on exactly the shape
|
||
the contract mandates, and its remedy — "add a boundary clause so the router
|
||
knows where NOT to send this skill" — was addressed to a router that cannot
|
||
see the skill at all. An author who followed the advice made the file worse.
|
||
|
||
Only the ROUTING rules are lifted. The body word budget still applies: the
|
||
body is loaded on invocation like any other, and competes with the caller's
|
||
live conversation the same way. So does the 400-character description FAIL —
|
||
a hand-invoked description is not preloaded, but it is still the one line
|
||
the user reads when choosing from the `/` menu, and the ceiling is the
|
||
outlier stop rather than the style target.
|
||
|
||
A parse failure returns False rather than raising. This is a MODIFIER on
|
||
other checks, not a check of its own: the frontmatter's validity is decided,
|
||
and failed, by description_value() on the same text, and raising a second
|
||
exception here would report one broken file twice with two different
|
||
diagnoses.
|
||
"""
|
||
try:
|
||
data = yaml.safe_load(fm_text)
|
||
except Exception:
|
||
return False
|
||
if not isinstance(data, dict):
|
||
return False
|
||
value = data.get('disable-model-invocation')
|
||
if isinstance(value, str):
|
||
# PyYAML already resolves the unquoted YAML 1.1 booleans, so this only
|
||
# catches a QUOTED "true" — which a host reads as truthy and which no
|
||
# gate should treat as opting back in to the routing rules.
|
||
return value.strip().lower() in ('true', 'yes', 'on')
|
||
return value is True
|
||
|
||
|
||
# --- Body-shape checks (skills only; agents have no references/ dir) -------
|
||
# Deterministic and countable, so they are enforced here. Whether a given
|
||
# gotcha is WARRANTED is semantic and stays the auditor's judgment, which is why
|
||
# both gotcha checks are SUGGESTION tier. A missing reference file is not a
|
||
# style opinion — it is a broken pointer — so that one is ERROR tier.
|
||
#
|
||
# Both read a FENCE-MASKED copy of the body. Scanning the raw body made a
|
||
# ```-fenced example a hard ERROR — and the skills most likely to carry one are
|
||
# skill-author and factory-audit, which DOCUMENT the references/ convention — and
|
||
# let a `## Gotchas` heading inside a fenced block stand in for the real
|
||
# section. Masking preserves every byte offset (content becomes spaces,
|
||
# newlines stay), so a span found in the mask slices the original.
|
||
GOTCHA_MAX_ENTRIES = 5
|
||
GOTCHA_MAX_BODY_FRACTION = 0.25
|
||
# The heading has to BE "Gotchas", not merely contain the word: `## Gotcha
|
||
# handling` and `## Why gotchas matter` are prose sections, and treating one as
|
||
# the Gotchas section measured a span that was never a gotcha list.
|
||
GOTCHA_HEADING = re.compile(r'^(#{1,6})[ \t]+(?:[^\n]*?[ \t])?gotchas?[ \t]*:?[ \t]*$',
|
||
re.I | re.M)
|
||
# Column 0 only. `^[ \t]{0,3}` counted a two-space-indented CHILD bullet as a
|
||
# top-level entry, so a five-entry section with sub-bullets reported nine.
|
||
GOTCHA_ENTRY = re.compile(r'^(?:[-*+]|\d+[.)])[ \t]+', re.M)
|
||
FENCE_OPEN = re.compile(r'^[ \t]{0,3}(`{3,}|~{3,})')
|
||
REFERENCE_POINTER = re.compile(
|
||
r'(?<![\w./-])(?:\./)?references/([A-Za-z0-9][A-Za-z0-9._/-]*\.md)')
|
||
# A pointer named in a sentence that says the file is GONE is a historical
|
||
# mention, not a dispatch entry: "the old `references/legacy.md` was removed in
|
||
# v2" is prose and must not be a hard ERROR. Narrow on purpose — a live
|
||
# dispatch table never describes its own target as removed, so this costs no
|
||
# recall.
|
||
REFERENCE_PAST = re.compile(
|
||
r'\b(?:removed|deleted|renamed|superseded|replaced|obsolete|deprecated'
|
||
r'|former|formerly|gone|no longer|used to)\b', re.I)
|
||
# A pointer QUALIFIED by another skill's name — "factory-audit's
|
||
# references/skill-validation-scripts.md" — names a file that is deliberately NOT in
|
||
# this skill's directory. Requiring it on the local disk left NO legal spelling
|
||
# for a cross-skill reference at all: the only alternative, a full repo path
|
||
# (`plugins/kyberforge/.apm/skills/factory-audit/references/...`), is itself a
|
||
# FAIL under factory-audit's own file-structure rubric, because a path climbing
|
||
# out of the skill directory stops resolving once the plugin is cache-installed.
|
||
# The possessive form is the sanctioned spelling, and it is skipped here. It is
|
||
# not checked further — this function has no way to locate another skill's
|
||
# directory, and inventing one would reintroduce exactly the cross-plugin path
|
||
# assumption the rubric forbids.
|
||
REFERENCE_QUALIFIER = re.compile(u"[A-Za-z0-9][A-Za-z0-9._-]*`?['’]s[ \t]+`?$")
|
||
|
||
|
||
def mask_fenced(text):
|
||
"""Body with fenced code blocks blanked out, byte offsets preserved."""
|
||
out = []
|
||
fence = None
|
||
for line in text.splitlines(keepends=True):
|
||
stripped = line.rstrip('\r\n')
|
||
opener = FENCE_OPEN.match(stripped)
|
||
marker = opener.group(1) if opener else None
|
||
if fence is None:
|
||
if marker:
|
||
fence = marker
|
||
out.append(' ' * len(stripped) + line[len(stripped):])
|
||
continue
|
||
out.append(line)
|
||
else:
|
||
out.append(' ' * len(stripped) + line[len(stripped):])
|
||
if (marker and marker[0] == fence[0] and len(marker) >= len(fence)
|
||
and not stripped.strip()[len(marker):].strip()):
|
||
fence = None
|
||
# An UNCLOSED fence has no cost-free answer, only a choice of which way to
|
||
# be wrong. Masking to end-of-body blanks the rest of the body, silently
|
||
# disabling the ERROR-tier references/ check and the gotcha counts.
|
||
# Returning the raw text instead exposes the unclosed example's own
|
||
# content, so a fenced example naming a nonexistent references/ file
|
||
# becomes a hard ERROR it would not have been had the fence been closed —
|
||
# confirmed, not hypothetical. The loud-false-positive direction is the one
|
||
# chosen: this script's rule is that a file it cannot measure must never
|
||
# report green, and masking-onward is exactly that failure. Both outcomes
|
||
# need an already-malformed file, and the false positive costs one fence.
|
||
if fence is not None:
|
||
return text
|
||
return ''.join(out)
|
||
|
||
|
||
def gotcha_stats(body):
|
||
"""(entry count, section word count) for the first Gotchas section, or None.
|
||
|
||
The section runs to the next heading at the same level or shallower.
|
||
Entries are top-level list items; a section written as subheadings instead
|
||
of a list counts those. Headings and entries are read from the fence mask;
|
||
the word count is taken from the original slice, because fenced lines are
|
||
real body words and the fraction is measured against the whole body.
|
||
"""
|
||
masked = mask_fenced(body)
|
||
match = GOTCHA_HEADING.search(masked)
|
||
if not match:
|
||
return None
|
||
level = len(match.group(1))
|
||
rest = masked[match.end():]
|
||
nxt = re.search(r'^#{1,%d}[ \t]+' % level, rest, re.M)
|
||
end = match.end() + (nxt.start() if nxt else len(rest))
|
||
section = masked[match.end():end]
|
||
entries = len(GOTCHA_ENTRY.findall(section))
|
||
if entries == 0 and level < 6:
|
||
entries = len(re.findall(r'^#{%d,6}[ \t]+' % (level + 1), section, re.M))
|
||
return entries, len(body[match.end():end].split())
|
||
|
||
|
||
def missing_reference_pointers(body, skill_dir):
|
||
"""references/<file>.md named in the body but absent from disk."""
|
||
masked = mask_fenced(body)
|
||
missing = set()
|
||
for match in REFERENCE_POINTER.finditer(masked):
|
||
start = masked.rfind('\n', 0, match.start()) + 1
|
||
end = masked.find('\n', match.end())
|
||
if end < 0:
|
||
end = len(masked)
|
||
# The pointer's OWN SPAN is excised before the sweep. Run over the
|
||
# whole line, the past-tense test matched the very path it was judging,
|
||
# so a file exempted itself by its NAME: `references/deprecated-api.md`,
|
||
# `references/removed-flags.md` and `references/gone.md` produced no
|
||
# ERROR at all, while `references/missing.md` — an identical break —
|
||
# errored. The exemption is about what the SENTENCE says about the
|
||
# pointer, never about what the pointer is called.
|
||
line = masked[start:match.start()] + masked[match.end():end]
|
||
if REFERENCE_PAST.search(line):
|
||
continue
|
||
if REFERENCE_QUALIFIER.search(masked[start:match.start()]):
|
||
continue
|
||
if not os.path.isfile(os.path.join(skill_dir, 'references', match.group(1))):
|
||
missing.add('references/' + match.group(1))
|
||
return sorted(missing)
|
||
# ===== END ADR-0020 SHARED BOUNDARY RESOLVER =====
|
||
KYBERFORGE_ADR0020_RESOLVER_PY
|
||
KYBERFORGE_RESOLVER_PY="${KYBERFORGE_RESOLVER_PY%$'\n'}"
|