refactor(kyberforge)!: merge skill-audit and agent-audit into factory-audit
Why The two audit skills carried 1,724 lines of byte-identical duplication: the ADR-0020 boundary resolver (1,061), vale-wrap.sh (526), the Vale style rules (44) and the Contributing-files parser (93). Nothing shared them — they were held in sync by a 413-line pre-push gate and its 797-line test suite. Sync-by-gate had already failed once: at484357athe two parser copies drifted into different spellings of the bullet loop while a docstring asserted they were identical. That drift was behaviour-neutral and was re-unified by hand at598a7c3, so the copies were identical at merge time — but nothing had caught it, and the next drift need not be neutral. Implementation Notes Self-containment binds BETWEEN skills, not within one. The agentskills.io spec forbids reaching across skill directories, which is why two separate skills needed embedded copies; two files inside ONE skill may source a third. That is the whole reason the merge removes duplication rather than relocating it. The union of both bodies measured 1,532 words against BODY_MAX_WORDS=900, and only 211 of those words were shared, so SKILL.md is a dispatch body. Step 0 resolves the flow from the target path before any validation, and its table mirrors validate.sh's detection exactly: a directory holding SKILL.md or a SKILL.md file (skill); a *.agent.md, or a .md directly under an agents/ directory (agent); anything else stops without running a validator. Steps 1-3 live in references/skill-flow.md and references/agent-flow.md, and gotchas that apply to one flow live in that flow's file, since it is loaded on every invocation anyway. If validate.sh reports on the other artifact type, the body restarts at Step 0. Named factory-audit rather than forge-audit because forge is a live skill, and a family prefix that matches a live sibling reads as ownership rather than membership. The description carries one arrow per boundary target, because ADR-0020 resolves only the first target after an arrow. It drops the quoted "audit this skill"-style phrases, which restated "audited" in a second register (ADR-0020's duplicate-register rule). 241 characters, Gotchas 16% of the body: no size SUGGESTIONs. The boundary resolver stays embedded in two files rather than imported: a cache-installed plugin cannot read outside its own directory, and the repo-root hook resolves via .pre-commit-hooks.yaml where entry[0] is the only token pre-commit rewrites, so no single file is reachable by both. tests/test-adr0020-contract.sh hashes both copies for byte-identity, and asserts validate.sh sources the resolver and that no third copy exists. The entry scripts classify the target from its resolved parent directory, so a bare agent filename typed inside agents/ works; resolve SCRIPT_DIR CDPATH-safely; and exit 2 when a lib-*.sh is missing, rather than dying with exit 1, the tier the flows relay as real findings. The provenance run functions stash their findings code in KYBERFORGE_PROV_RC and return 0, so validate-provenance.sh calls them UNTESTED. Testing a function's status (`f || RC=$?`) disables errexit for its entire body, and no subshell or `set -e` inside can re-arm it once the call sits in a condition context (measured, both spellings). Their error paths use `exit`, which is unaffected either way; this keeps errexit armed for anything added later. Case 0's readability guard reads the file instead of asking `[[ -r ]]`. `-r` is access(2), which answers yes for uid 0 even on a mode-000 file, and this repo's dev environment is root -- so the guard could never fire where it exists to fire. A read attempt is also the stricter question, catching EIO. This is the reasoning scripts/check-vale-style-sync.sh carried before this commit deleted it; the hazard did not go with it. All three entry scripts are CDPATH-safe, vale-wrap.sh included: both of its cd sites are cleared, the --config resolution and the directory-mirror walk, where an exported CDPATH would otherwise print a decoy path into the -print0 stream and build the mirror from the decoy's files. The two remaining bare cd calls take absolute paths, which CDPATH is never consulted for. Impact BREAKING: skill-audit and agent-audit no longer exist as invocable skills. kyberforge goes to 2.0.0 (catalog 0.4.7). Check logic is unchanged: differential runs of the old and new validators across every skill and agent produced byte-identical stdout, stderr and exit codes, and the reconstructed Python payloads differ only in comments and the references/field-inventory.md -> agent-field-inventory.md rename. One doctrine governs the tiers: exit 0 is audited and clean, exit 1 is audited with findings OR a target present but unreadable, exit 2 is that nothing was audited at all. Edge paths DID change, deliberately (full table in ADR-0025): - a missing target exits 2 (never ran), not 1, under its own "does not exist" message; detection is by path shape, so a shape-matching path that is simply absent used to reach the validator and come back as a FAIL against a file that never existed; - an unshaped target exits 2 under the generic "matches neither" message, and a directory with no SKILL.md under a third, distinct one -- three exit-2 messages, not one; - a dangling symlink or a symlink loop stays exit 1: it is present but broken, which is a finding about the artifact rather than a usage error; - a SKILL.md file path is audited as its skill directory instead of refused; - a .md agent outside an agents/ directory is refused rather than audited; - a missing script library, a missing python3, a missing PyYAML, and no argument at all each exit 2. validate-provenance.sh already exited 2 for the last two; validate.sh now matches it. .pre-commit-hooks.yaml is a published contract consumed by external repos. Both hook IDs and both files: regexes are unchanged; only entry: and description: moved. scripts/check-vale-style-sync.sh (413), scripts/sync-vale-styles.sh (21), tests/test-check-vale-style-sync.sh (797) and agent-audit/scripts/README.md (47) are deleted. The checker made 17 assertions: 6 compared the two Vale copies and are moot; 10 are rehomed into tests/test-vale-wrap.sh (case 0, cases 28-31, and the suite's Vale-absent skip); and the cross-manifest files: agreement check, which selected hooks by entry: and so could not survive both hooks sharing one, is ported as case 33 pairing hooks by id:. Cases 28, 30 and 33 carry mutation self-tests; narrowing the local skill prefilter to 6 of 38 SKILL.md files now fails the suite. Skills go 39 to 38. Pre-push goes 9 repo-authored hooks to 8. ADR: 0025 BREAKING-CHANGE: the skill-audit and agent-audit skills are removed. Both flows are served by factory-audit, which auto-detects whether it was handed a skill directory or an agent file. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01YR2CjVumUbEGWcMikcoXBD
This commit is contained in:
@@ -10,15 +10,23 @@
|
||||
# routing targets.
|
||||
#
|
||||
# The constant-agreement block below is the load-bearing part: all three copies
|
||||
# (this hook, skill-audit's validate.sh, agent-audit's validate.sh) are
|
||||
# (this hook, the auditor's skill flow, the auditor's agent flow) are
|
||||
# hand-duplicated because a cache-installed plugin cannot read outside its own
|
||||
# directory, and nothing but these assertions stops them drifting.
|
||||
#
|
||||
# ADR-0025 merged skill-audit and agent-audit into factory-audit, which moved two
|
||||
# of those copies but did not reduce them to one: the constants live in the two
|
||||
# mode libraries validate.sh sources, and the two libraries still declare them
|
||||
# separately. So the comparisons below read lib-checks-skill.sh and
|
||||
# lib-checks-agent.sh directly rather than the entry point, which declares none
|
||||
# of them — grepping validate.sh would find nothing and report every constant as
|
||||
# <unset>, or worse, silently agree that two empty values match.
|
||||
set -euo pipefail
|
||||
|
||||
REPO_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
|
||||
SCRIPT="$REPO_ROOT/scripts/skill-size-check.sh"
|
||||
VALIDATE="$REPO_ROOT/plugins/kyberforge/.apm/skills/skill-audit/scripts/validate.sh"
|
||||
AGENT_VALIDATE="$REPO_ROOT/plugins/kyberforge/.apm/skills/agent-audit/scripts/validate.sh"
|
||||
VALIDATE="$REPO_ROOT/plugins/kyberforge/.apm/skills/factory-audit/scripts/lib-checks-skill.sh"
|
||||
AGENT_VALIDATE="$REPO_ROOT/plugins/kyberforge/.apm/skills/factory-audit/scripts/lib-checks-agent.sh"
|
||||
PASS=0
|
||||
FAIL=0
|
||||
|
||||
@@ -81,26 +89,26 @@ fi
|
||||
MAX_WORDS="$(grep -oE '^MAX_WORDS=[0-9]+' "$SCRIPT" | cut -d= -f2)"
|
||||
MAX_LINES="$(grep -oE '^MAX_LINES=[0-9]+' "$SCRIPT" | cut -d= -f2)"
|
||||
|
||||
# The audit (skill-audit/scripts/validate.sh) duplicates both ceilings, because
|
||||
# The audit (factory-audit's lib-checks-skill.sh) duplicates both ceilings, because
|
||||
# a cache-installed plugin's scripts cannot read files outside the plugin
|
||||
# directory. Nothing but this assertion stops the copies drifting, and drift
|
||||
# means a SKILL.md passes its own audit and is then rejected by the commit hook.
|
||||
echo ""
|
||||
echo "--- the hook and skill-audit's validate.sh agree on both ceilings ---"
|
||||
echo "--- the hook and factory-audit's skill checks agree on both ceilings ---"
|
||||
if [[ ! -f "$VALIDATE" ]]; then
|
||||
fail "skill-audit validate.sh not found at $VALIDATE"
|
||||
fail "factory-audit lib-checks-skill.sh not found at $VALIDATE"
|
||||
else
|
||||
V_MAX_WORDS="$(grep -oE '^MAX_WORDS = [0-9]+' "$VALIDATE" | grep -oE '[0-9]+')"
|
||||
V_MAX_LINES="$(grep -oE '^MAX_LINES = [0-9]+' "$VALIDATE" | grep -oE '[0-9]+')"
|
||||
if [[ "$V_MAX_WORDS" == "$MAX_WORDS" ]]; then
|
||||
pass "both enforce MAX_WORDS=$MAX_WORDS"
|
||||
else
|
||||
fail "MAX_WORDS drift: hook says $MAX_WORDS, validate.sh says ${V_MAX_WORDS:-<unset>}"
|
||||
fail "MAX_WORDS drift: hook says $MAX_WORDS, lib-checks-skill.sh says ${V_MAX_WORDS:-<unset>}"
|
||||
fi
|
||||
if [[ "$V_MAX_LINES" == "$MAX_LINES" ]]; then
|
||||
pass "both enforce MAX_LINES=$MAX_LINES"
|
||||
else
|
||||
fail "MAX_LINES drift: hook says $MAX_LINES, validate.sh says ${V_MAX_LINES:-<unset>}"
|
||||
fail "MAX_LINES drift: hook says $MAX_LINES, lib-checks-skill.sh says ${V_MAX_LINES:-<unset>}"
|
||||
fi
|
||||
fi
|
||||
|
||||
@@ -108,11 +116,11 @@ fi
|
||||
# ADR-0020 constants
|
||||
# ---------------------------------------------------------------------------
|
||||
# Three hand-maintained copies, for the same cache-isolation reason as
|
||||
# MAX_WORDS/MAX_LINES above. skill-audit carries all four; agent-audit carries
|
||||
# MAX_WORDS/MAX_LINES above. The skill flow carries all four; the agent flow carries
|
||||
# only the two description constants, because ADR-0020 deliberately gives
|
||||
# agents NO body word gate (a skill body competes with the caller's live
|
||||
# conversation; an agent body becomes the system prompt of a fresh context).
|
||||
# The absence of BODY_* in agent-audit is asserted below so a well-meaning
|
||||
# The absence of BODY_* in the agent flow is asserted below so a well-meaning
|
||||
# "consistency" edit that adds them fails here rather than contradicting the
|
||||
# ADR silently.
|
||||
DESC_SUGGEST_CHARS="$(grep -oE '^DESC_SUGGEST_CHARS=[0-9]+' "$SCRIPT" | cut -d= -f2)"
|
||||
@@ -132,21 +140,21 @@ for pair in "DESC_SUGGEST_CHARS:$DESC_SUGGEST_CHARS" "DESC_MAX_CHARS:$DESC_MAX_C
|
||||
done
|
||||
|
||||
echo ""
|
||||
echo "--- the hook and skill-audit's validate.sh agree on all four ADR-0020 constants ---"
|
||||
echo "--- the hook and factory-audit's skill checks agree on all four ADR-0020 constants ---"
|
||||
for const in DESC_SUGGEST_CHARS DESC_MAX_CHARS BODY_SUGGEST_WORDS BODY_MAX_WORDS; do
|
||||
hook_value="$(grep -oE "^${const}=[0-9]+" "$SCRIPT" | cut -d= -f2)"
|
||||
audit_value="$(grep -oE "^${const} = [0-9]+" "$VALIDATE" | grep -oE '[0-9]+' || true)"
|
||||
if [[ -n "$hook_value" && "$hook_value" == "$audit_value" ]]; then
|
||||
pass "both enforce $const=$hook_value"
|
||||
else
|
||||
fail "$const drift: hook says ${hook_value:-<unset>}, skill-audit validate.sh says ${audit_value:-<unset>}"
|
||||
fail "$const drift: hook says ${hook_value:-<unset>}, lib-checks-skill.sh says ${audit_value:-<unset>}"
|
||||
fi
|
||||
done
|
||||
|
||||
echo ""
|
||||
echo "--- the hook and agent-audit's validate.sh agree on the description constants ---"
|
||||
echo "--- the hook and factory-audit's agent checks agree on the description constants ---"
|
||||
if [[ ! -f "$AGENT_VALIDATE" ]]; then
|
||||
fail "agent-audit validate.sh not found at $AGENT_VALIDATE"
|
||||
fail "factory-audit lib-checks-agent.sh not found at $AGENT_VALIDATE"
|
||||
else
|
||||
for const in DESC_SUGGEST_CHARS DESC_MAX_CHARS; do
|
||||
hook_value="$(grep -oE "^${const}=[0-9]+" "$SCRIPT" | cut -d= -f2)"
|
||||
@@ -154,15 +162,15 @@ else
|
||||
if [[ -n "$hook_value" && "$hook_value" == "$agent_value" ]]; then
|
||||
pass "both enforce $const=$hook_value"
|
||||
else
|
||||
fail "$const drift: hook says ${hook_value:-<unset>}, agent-audit validate.sh says ${agent_value:-<unset>}"
|
||||
fail "$const drift: hook says ${hook_value:-<unset>}, lib-checks-agent.sh says ${agent_value:-<unset>}"
|
||||
fi
|
||||
done
|
||||
echo ""
|
||||
echo "--- agent-audit declares NO body word gate (ADR-0020 is explicit about this) ---"
|
||||
echo "--- the agent flow declares NO body word gate (ADR-0020 is explicit about this) ---"
|
||||
if grep -qE '^BODY_(SUGGEST|MAX)_WORDS = ' "$AGENT_VALIDATE"; then
|
||||
fail "agent-audit validate.sh declares a body word gate — ADR-0020 gives agents the description gates and NO body word gate"
|
||||
fail "lib-checks-agent.sh declares a body word gate — ADR-0020 gives agents the description gates and NO body word gate"
|
||||
else
|
||||
pass "agent-audit validate.sh declares no BODY_*_WORDS constant"
|
||||
pass "lib-checks-agent.sh declares no BODY_*_WORDS constant"
|
||||
fi
|
||||
fi
|
||||
|
||||
@@ -188,7 +196,7 @@ make_line_fixture() {
|
||||
|
||||
# The line ceiling is inclusive of the limit itself, enforced via `>` — so
|
||||
# exactly $MAX_LINES must pass and $((MAX_LINES + 1)) must fail. This matches
|
||||
# skill-audit/scripts/validate.sh's `line_count <= 500` pass condition; the two
|
||||
# factory-audit's lib-checks-skill.sh `line_count <= 500` pass condition; the two
|
||||
# previously disagreed at exactly $MAX_LINES lines, so a SKILL.md could pass its
|
||||
# own audit and still be blocked by the commit hook.
|
||||
echo ""
|
||||
@@ -514,7 +522,7 @@ fi
|
||||
# A skill carrying `disable-model-invocation: true` is removed 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, skill-author Step 2 and skill-audit's own Step 0 all give it ONE
|
||||
# ADR-0020, skill-author Step 2 and factory-audit's own Gotchas all give it ONE
|
||||
# plain human-facing sentence: no trigger list, no boundary clause. No validator
|
||||
# knew the field existed, so the boundary-clause SUGGESTION fired on exactly the
|
||||
# shape the contract mandates, and its remedy — "so the router knows where NOT
|
||||
|
||||
Reference in New Issue
Block a user