* enhance(#4139): Phase 7 — the agent-skill seam picks the payload in code ADR-4139 stream 2. The non-Claude `#2454` persona fallback in cmdAgentSkills (src/init.cts) now selects between a canonical agents/<name>.md and a token-minimized agents/<name>.compact.md sibling based on workflow.compact_content, resolved in code (a real function call with a real exit code) rather than a prose config-get gate — the same precedent stream 1's spine/detail split established for a load-bearing seam, applied here because this seam already runs through TypeScript instead of an eager @-include. A missing compact sibling falls back to the canonical persona and discloses the fallback in the served payload itself (a leading HTML-comment provenance line), so the Done-when contract — compact when on, canonical when off, never silent or empty — holds even for an agent nobody has compacted yet. Authored a .compact.md sibling for all 35 shipped agents (agents/gsd-*.md), each an independent, complete rewrite (not an extraction — nothing is "moved" the way spine/detail moves text) that preserves frontmatter, every @-include, every output-format contract, and every guardrail verbatim while cutting restatement and verbose framing. Verified mechanically: every pair registers (a canonical sibling exists), every compact file is strictly smaller, and the full @-include set matches canonical's — including which references are standalone eager-load lines versus inline prose mentions, since demoting one to inline changes what the host actually substitutes. Traced the install path before writing any code (.gsd/phase/.../40-design.md): stageAgentsForRuntimeWithConverter glob-copies every agents/*.md file with no stem filtering under the default full profile, so the new .compact.md files install for free with zero installer changes — matching issue #4407's stated scope. A tiered agent profile that doesn't stage a compact sibling degrades through the same fallback-with-provenance path already required for an unauthored one, so no installer change is needed there either. Extends tests/helpers/compact-content-variant.cjs with an AGENTS_ROOT export (deliberately not folded into DEFAULT_VARIANT_ROOTS, since agent variants are reached by a generic code construction rather than a literal path in prose, and checkReachability's markdown-search shape has nothing to find there). Reachability is instead proven behaviorally: tests/agent-skills.test.cjs's new "#4407 compact payload selection" describe block spawns gsd_run agent-skills against real compact/canonical fixture pairs and asserts on the served payload, which can only pass if the seam genuinely wires through. Fixed a pre-existing test whose agents/*.md glob incidentally matched the new .compact.md siblings (tests/agent-skills.test.cjs's Skill-frontmatter drift guard) and added the 35 new agents/*.compact.md entries to docs/INVENTORY.md's roster, both real, unrelated-to-content defects the new files' mere existence surfaced. Regenerated: install-tree fixtures (19 runtimes now ship 35 more agent files under the full profile), INVENTORY-MANIFEST.json, and the variant-swap token benchmark baseline (npm run benchmark:compact-content-variants --write). Closes #4407. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com> * fix(#4407): apply orthogonal review findings from the compact-payload seam Standards axis of /code-review: extracted readNonEmptyFileOrNull(filePath) to collapse the duplicated read-and-empty-check shape between the compact and canonical branches in cmdAgentSkills, and updated the adjacent comment enumerating flat JSON extras to name agent_payload_variant alongside source/degraded (added by the prior commit, comment left stale). Security review and the Spec axis found no defects requiring a code change; their non-blocking observations (a pre-existing, unmodified path-construction pattern; the reasoned, documented substitution of a behavioral test for the literal reachability check) are recorded in .gsd/phase/enhance-4407-agent-skill-seam/60-review.json. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com> * fix(#4407): repo-wide roster/cap fixes surfaced by shipping .compact.md agents Root-caused via a real gsd-test run (93 failures) rather than guessing which tests glob agents/ naively. Two classes of defect, both genuine: 1. Identity-roster confusion (11 files/areas): many tests and one production script derive "the set of GSD agents" from `readdirSync(agentsDir).filter(f => f.endsWith('.md'))`, which incidentally matched the new .compact.md variant siblings too — a compact file is a rendering of an EXISTING agent identity, not a new one. Fixed at the shared root (tests/helpers/agent-roster.cjs's listAgentFiles, which several tests already consolidated on) and at each independent glob that didn't use it: agent-size-budget.test.cjs (tier-cap lookup now strips the .compact suffix before checking XL/LARGE membership, so a compact file inherits its canonical sibling's tier instead of silently falling through to DEFAULT), agent-skills-bootstrap.test.cjs, check-contract-drift.test.cjs (the actual script, not just its test), codex-config.test.cjs (confirmed directly against generateCodexAgentToml that a compact role's derived sandbox_mode is byte-identical to its canonical sibling's before excluding it — not assumed), and copilot-install.test.cjs (two counts that legitimately DO need both files — an installed-file count and a full-conversion smoke test — fixed to expect 70, not stay pinned to 35). no-bare-gsd-tools-command-position.test.cjs needed the opposite kind of fix: two compact files reproduce descriptive prose already allowlisted at their canonical file's line number; added matching entries at the compact files' own line numbers rather than excluding them from the scan (a genuine bare gsd-tools command-position bug in a compact file would be as real a defect as in canonical). 2. A hard, non-ackable cap (found via emitted-attribution.test.cjs's real-tree run): six agents' compact renditions (gsd-debugger, gsd-executor, gsd-phase-researcher, gsd-plan-checker, gsd-planner, gsd-verifier) exceed the 32,768-byte NEW_FILE_CAP (ADR-1610) even after aggressive compaction — confirmed structural, not a compaction-quality gap: each is dominated by content this phase's own rules require verbatim (the ~2.6 KB gsd_run bootstrap preamble runtime-launcher-parity.test.cjs requires inlined in every agent that calls gsd_run, output-format contracts, guardrails). ADR-4139's prescribed remedy (spine + lazily-read parts) has no landing spot in cmdAgentSkills's single-file synchronous read. Removed these 6 compact files rather than ship an over-cap file or invent a multi-part read mechanism out of scope for this phase; recorded by name with the reason in .gsd/phase/enhance-4407-agent-skill-seam/40-design.md and 50-test-matrix.md, per #4407's own "or explicitly recorded as not worth covering" allowance. Their canonical personas are served correctly today via the fallback-with-disclosed-provenance path this phase's own Done-when #2 already requires — 29 of 35 agents now have a compact variant. Also fixes an unrelated, genuinely pre-existing defect this gsd-test run surfaced: gsd-core/workflows/execute-plan.md sat 21 bytes over its own DEFAULT-tier hard cap (40,960 bytes) at the branch point, before any change in this PR touched it — confirmed via `git show <merge-base>:...execute-plan.md | wc -c`. Per CLAUDE.md's no-deferral rule, fixed inline rather than filed: two meaning-preserving trims in the <success_criteria> block (a repeated parenthetical replaced with a same-exception reference; one redundant qualifier dropped) bring it to 40,940 bytes. Regenerated install-tree fixtures, INVENTORY-MANIFEST.json, and the variant benchmark baseline to reflect the 6 removed files. Docs/INVENTORY.md's 6 now-orphaned roster rows removed alongside them. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com> * fix(#4407): make .compact.md-aware roster checks resilient to partial coverage Round 2 of the gsd-test-driven roster fixes: two checks assumed every agent has a compact sibling (true for 29 of 35 after the NEW_FILE_CAP exception), breaking once 6 stems legitimately have none. - tests/agent-classification-parity.test.cjs: the INVENTORY.md parser was picking up the "### Compact Payload Variants" subsection's rows as phantom/uncounted entries in the primary/advanced/inventory-only classification this test validates — a compact row documents an existing agent's alternate rendition and never gets its own AGENTS.md heading, so it was never meant to participate in that classification. Excluded at the parser, not per-assertion. - tests/copilot-install.test.cjs: the derived expected-file-list generator assumed every listAgentFiles() stem has a .compact.md source sibling; checks disk per stem now instead. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com> * docs(#4407): backfill changeset PR number Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com> --------- Co-authored-by: sim <sim@local> Co-authored-by: Claude Sonnet 5 <noreply@anthropic.com>
315 lines
13 KiB
JavaScript
315 lines
13 KiB
JavaScript
'use strict';
|
|
|
|
/**
|
|
* Shared library for the compact-content VARIANT guard (ADR-4139, epic #4139,
|
|
* Phase 6 #4406). See `gsd-core/references/compact-content-gate.md` §"Streams
|
|
* 1b and 4 — variant resolution" for the operational rule this module checks;
|
|
* this file is the mechanics, not the source of truth for behavior.
|
|
*
|
|
* This is a DIFFERENT shape from `compact-content-split.cjs` (Phase 3, stream
|
|
* 1's spine+detail partition). A partition is one document split into two
|
|
* halves that must never overlap (disjointness) and whose union must equal
|
|
* the original (completeness). A variant pair is two INDEPENDENT, complete
|
|
* documents that are EXPECTED to overlap heavily — the compact file is a
|
|
* hand-terser rewrite of the same content, not an extracted remainder. So
|
|
* this module has no disjointness check and no completeness-at-split-time
|
|
* check; it has the five checks `40-design.md` (Phase 6) describes instead:
|
|
*
|
|
* 1. Registration — `discoverRegisteredVariants` (a `.compact.md`
|
|
* file with no canonical sibling is not a registered pair; the guard
|
|
* test reports it as an orphan).
|
|
* 2. Reachability — `checkReachability` (a registered pair whose
|
|
* compact path is never named by any spine's "Read ... variant
|
|
* resolution" call site is unwired dead weight).
|
|
* 3. Protected content preserved — `checkProtectedContentPreserved` (a
|
|
* `<!-- gsd:protected -->` block's lines must appear verbatim in BOTH
|
|
* files, since nothing is "moved" in a variant pair — it is duplicated).
|
|
* 4. Size smaller — `checkSizeSmaller`.
|
|
* 5. Template consumer parity — NOT implemented here; it needs a real
|
|
* artifact-generation + real-parser round trip per template, which is
|
|
* the domain of `tests/compact-content-template-variant-parity.test.cjs`
|
|
* directly, not a generic file-shape check.
|
|
*
|
|
* This module only reads (filesystem + a search of markdown source for
|
|
* literal path substrings). No writes, no network, no git.
|
|
*
|
|
* `agents/*.compact.md` (Phase 7, #4407, ADR-4139 stream 2) is a THIRD shape
|
|
* layered onto this module's roots: registration, protected-content and
|
|
* size checks apply unchanged, but reachability does not — an agent variant
|
|
* is reached by a generic, config-driven code construction in
|
|
* `cmdAgentSkills` (`src/init.cts`), not by a literal path substring named in
|
|
* markdown prose. `checkReachability`'s markdown-search shape has nothing to
|
|
* find there, so callers scanning `agents/` skip it and instead assert the
|
|
* code seam exists once (see `tests/agent-skills-compact-variant.test.cjs`).
|
|
*/
|
|
|
|
const fs = require('node:fs');
|
|
const path = require('node:path');
|
|
|
|
const { extractProtectedBlocks, normalizeNonTrivialLines } = require('./compact-content-split.cjs');
|
|
|
|
/** Default scan roots: everywhere a `.compact.md` sibling can legally live. */
|
|
const DEFAULT_VARIANT_ROOTS = [
|
|
path.join(__dirname, '..', '..', 'gsd-core', 'workflows'),
|
|
path.join(__dirname, '..', '..', 'gsd-core', 'templates'),
|
|
];
|
|
|
|
/** Every markdown-source root a spine/fragment might name a variant path from. */
|
|
const DEFAULT_SEARCH_ROOTS = [
|
|
path.join(__dirname, '..', '..', 'gsd-core', 'workflows'),
|
|
];
|
|
|
|
/**
|
|
* `agents/*.compact.md` root (Phase 7, #4407). Deliberately NOT folded into
|
|
* `DEFAULT_VARIANT_ROOTS` — `checkReachability`'s markdown-literal-search shape
|
|
* has nothing to find for an agent variant (reached by a generic code
|
|
* construction in `cmdAgentSkills`, not a named path in prose), so a caller
|
|
* that discovers agent pairs through the shared default and then runs
|
|
* `checkReachability` on them would report false violations. Callers that want
|
|
* agent pairs pass `[AGENTS_ROOT]` explicitly to `discoverRegisteredVariants`.
|
|
*/
|
|
const AGENTS_ROOT = path.join(__dirname, '..', '..', 'agents');
|
|
|
|
const COMPACT_SUFFIX = '.compact.md';
|
|
|
|
/**
|
|
* Recursively list every file under `dir` whose name ends with `suffix`.
|
|
* Shared by both file-discovery needs this module has — `.compact.md` files
|
|
* (`findCompactFiles`) and general `.md` files to search for reachability
|
|
* (`findMarkdownFiles`) — which otherwise duplicated the same walk with only
|
|
* the extension predicate differing.
|
|
* @param {string} dir
|
|
* @param {string} suffix
|
|
* @returns {string[]} absolute paths
|
|
*/
|
|
function findFilesWithSuffix(dir, suffix) {
|
|
const results = [];
|
|
let entries;
|
|
try {
|
|
entries = fs.readdirSync(dir, { withFileTypes: true });
|
|
} catch {
|
|
return results;
|
|
}
|
|
for (const entry of entries) {
|
|
const full = path.join(dir, entry.name);
|
|
if (entry.isDirectory()) {
|
|
results.push(...findFilesWithSuffix(full, suffix));
|
|
} else if (entry.isFile() && entry.name.endsWith(suffix)) {
|
|
results.push(full);
|
|
}
|
|
}
|
|
return results;
|
|
}
|
|
|
|
/**
|
|
* Recursively list every `*.compact.md` file under `dir`.
|
|
* @param {string} dir
|
|
* @returns {string[]} absolute paths
|
|
*/
|
|
function findCompactFiles(dir) {
|
|
return findFilesWithSuffix(dir, COMPACT_SUFFIX);
|
|
}
|
|
|
|
/**
|
|
* Discover every registered compact/canonical variant pair under `roots`.
|
|
*
|
|
* A pair is registered by a `<dir>/<stem>.compact.md` file existing on disk —
|
|
* there is no separate registry. Its canonical sibling is `<dir>/<stem>.md`
|
|
* in the SAME directory. A `.compact.md` file with no canonical sibling is
|
|
* still returned (with `canonicalExists: false`) so the registration check
|
|
* can report it as an orphan by name, rather than silently skipping it.
|
|
*
|
|
* @param {string[]} roots
|
|
* @returns {{compactPath: string, canonicalPath: string, canonicalExists: boolean}[]}
|
|
*/
|
|
function discoverRegisteredVariants(roots = DEFAULT_VARIANT_ROOTS) {
|
|
const pairs = [];
|
|
for (const root of roots) {
|
|
for (const compactPath of findCompactFiles(root)) {
|
|
const dir = path.dirname(compactPath);
|
|
const stem = path.basename(compactPath, COMPACT_SUFFIX);
|
|
const canonicalPath = path.join(dir, `${stem}.md`);
|
|
pairs.push({
|
|
compactPath,
|
|
canonicalPath,
|
|
canonicalExists: fs.existsSync(canonicalPath),
|
|
});
|
|
}
|
|
}
|
|
return pairs.sort((a, b) => a.compactPath.localeCompare(b.compactPath));
|
|
}
|
|
|
|
/**
|
|
* Check 1 — registration. A `.compact.md` file must have a canonical sibling.
|
|
* @param {ReturnType<typeof discoverRegisteredVariants>} pairs
|
|
*/
|
|
function checkRegistration(pairs) {
|
|
const violations = [];
|
|
for (const pair of pairs) {
|
|
if (!pair.canonicalExists) {
|
|
violations.push({ kind: 'orphan_compact_file', compactPath: pair.compactPath });
|
|
}
|
|
}
|
|
return violations;
|
|
}
|
|
|
|
/**
|
|
* Check 2 — reachability. A registered pair's compact path must be named by
|
|
* at least one markdown file under `searchRoots` (a spine's "Read ... variant
|
|
* resolution" call site). Three needle forms, matched differently, because
|
|
* this corpus has two live conventions for naming these paths (found by
|
|
* walking up from the compact file itself to its nearest `gsd-core` ancestor,
|
|
* so this works the same way against the real repo and against a fixture
|
|
* that builds its own `<tmp>/gsd-core/...` tree):
|
|
*
|
|
* - The `gsd-core/<rest>` form (e.g. `gsd-core/workflows/autonomous/steps/
|
|
* converge-fail-fast.md`'s own convention) is unambiguous on its own — a
|
|
* different, longer path coincidentally ending in this exact multi-segment
|
|
* suffix is not a realistic false positive, so a plain substring match is
|
|
* sufficient without the "unprefixed" guard below.
|
|
* - The `<rest>` form without the leading `gsd-core/` (e.g. `workflows/help/
|
|
* modes/full.compact.md`, `help.md`'s own dispatch-table convention) is
|
|
* equally unambiguous for the same reason.
|
|
* - The bare `<stem>.compact.md` form has no such guarantee — a same-named
|
|
* file under an unrelated nested directory (the exact class of bug already
|
|
* hit once this phase: `discuss-phase/templates/context.md` vs. the root
|
|
* `templates/context.md`) could grant it a false reachability. This form
|
|
* keeps the `isUnprefixedMatch` guard from `namesFragmentAsEntryPoint`
|
|
* (`scripts/lint-response-language-coverage.cjs`): a path character
|
|
* immediately before the match means this is the tail of some longer,
|
|
* different path, not the fragment itself.
|
|
*
|
|
* @param {ReturnType<typeof discoverRegisteredVariants>} pairs
|
|
* @param {string[]} searchRoots
|
|
*/
|
|
function checkReachability(pairs, searchRoots = DEFAULT_SEARCH_ROOTS) {
|
|
const violations = [];
|
|
const haystacks = [];
|
|
for (const root of searchRoots) {
|
|
for (const file of findMarkdownFiles(root)) {
|
|
haystacks.push(fs.readFileSync(file, 'utf8'));
|
|
}
|
|
}
|
|
for (const pair of pairs) {
|
|
if (!pair.canonicalExists) continue; // already reported by checkRegistration
|
|
const gsdCoreRelative = relativeToNearestGsdCore(pair.compactPath);
|
|
const stem = path.basename(pair.compactPath, COMPACT_SUFFIX);
|
|
const bareNeedle = `${stem}${COMPACT_SUFFIX}`;
|
|
const reached = haystacks.some((text) => {
|
|
if (gsdCoreRelative && (text.includes(`gsd-core/${gsdCoreRelative}`) || text.includes(gsdCoreRelative))) {
|
|
return true;
|
|
}
|
|
return isUnprefixedMatch(text, bareNeedle);
|
|
});
|
|
if (!reached) {
|
|
violations.push({ kind: 'unreachable_compact_file', compactPath: pair.compactPath });
|
|
}
|
|
}
|
|
return violations;
|
|
}
|
|
|
|
/**
|
|
* Walk up from `filePath` to the nearest ancestor directory literally named
|
|
* `gsd-core`, and return the path from there to `filePath` (POSIX-separated).
|
|
* Returns `null` if no such ancestor exists. Anchoring on the literal
|
|
* `gsd-core` segment — rather than a hardcoded repo-root constant — is what
|
|
* lets this match both the real repo and a fixture built under its own
|
|
* `<tmp>/gsd-core/...` tree the same way.
|
|
* @param {string} filePath
|
|
* @returns {string | null}
|
|
*/
|
|
function relativeToNearestGsdCore(filePath) {
|
|
const segments = filePath.split(path.sep);
|
|
const idx = segments.lastIndexOf('gsd-core');
|
|
if (idx === -1) return null;
|
|
return segments.slice(idx + 1).join('/');
|
|
}
|
|
|
|
/** Is `needle` present in `text` with no path character immediately before it (any line)? */
|
|
function isUnprefixedMatch(text, needle) {
|
|
return text.split(/\r?\n/).some((line) => {
|
|
const at = line.indexOf(needle);
|
|
if (at === -1) return false;
|
|
const before = at > 0 ? line[at - 1] : '';
|
|
return !/[A-Za-z0-9_\-./]/.test(before);
|
|
});
|
|
}
|
|
|
|
function findMarkdownFiles(dir) {
|
|
return findFilesWithSuffix(dir, '.md');
|
|
}
|
|
|
|
/**
|
|
* Check 3 — protected content preserved. Every protected block's non-trivial
|
|
* lines in the canonical file must also appear (verbatim, after the same
|
|
* normalization the partition guard uses) somewhere in the compact sibling.
|
|
* Unlike the partition guard, this is NOT a sentinel-presence check on the
|
|
* compact file itself — the compact file need not carry `<!-- gsd:protected -->`
|
|
* markers of its own, since it is not itself audited for content it might
|
|
* shed later; it only must not have DROPPED the protected wording.
|
|
*
|
|
* @param {ReturnType<typeof discoverRegisteredVariants>} pairs
|
|
*/
|
|
function checkProtectedContentPreserved(pairs) {
|
|
const violations = [];
|
|
for (const pair of pairs) {
|
|
if (!pair.canonicalExists) continue;
|
|
const canonical = fs.readFileSync(pair.canonicalPath, 'utf8');
|
|
const compact = fs.readFileSync(pair.compactPath, 'utf8');
|
|
const { blocks } = extractProtectedBlocks(canonical);
|
|
if (blocks.length === 0) continue;
|
|
const compactLines = new Set(normalizeNonTrivialLines(compact));
|
|
for (const block of blocks) {
|
|
const missing = block.lines
|
|
.map((l) => l.trim())
|
|
.filter((l) => l.length > 0)
|
|
.filter((l) => !compactLines.has(l));
|
|
if (missing.length > 0) {
|
|
violations.push({
|
|
kind: 'protected_content_dropped',
|
|
canonicalPath: pair.canonicalPath,
|
|
compactPath: pair.compactPath,
|
|
missing,
|
|
});
|
|
}
|
|
}
|
|
}
|
|
return violations;
|
|
}
|
|
|
|
/**
|
|
* Check 4 — size smaller. The compact file must be strictly smaller than its
|
|
* canonical sibling; a same-size-or-larger "compact" file is not one.
|
|
* @param {ReturnType<typeof discoverRegisteredVariants>} pairs
|
|
*/
|
|
function checkSizeSmaller(pairs) {
|
|
const violations = [];
|
|
for (const pair of pairs) {
|
|
if (!pair.canonicalExists) continue;
|
|
const canonicalSize = fs.statSync(pair.canonicalPath).size;
|
|
const compactSize = fs.statSync(pair.compactPath).size;
|
|
if (!(compactSize < canonicalSize)) {
|
|
violations.push({
|
|
kind: 'compact_not_smaller',
|
|
canonicalPath: pair.canonicalPath,
|
|
compactPath: pair.compactPath,
|
|
canonicalSize,
|
|
compactSize,
|
|
});
|
|
}
|
|
}
|
|
return violations;
|
|
}
|
|
|
|
module.exports = {
|
|
DEFAULT_VARIANT_ROOTS,
|
|
DEFAULT_SEARCH_ROOTS,
|
|
AGENTS_ROOT,
|
|
COMPACT_SUFFIX,
|
|
discoverRegisteredVariants,
|
|
checkRegistration,
|
|
checkReachability,
|
|
checkProtectedContentPreserved,
|
|
checkSizeSmaller,
|
|
};
|