* fix(#2914): never persist a spent emitted-drift ack on next tests/emitted-drift-ack.json held 34 spent #2834 entries merged via #2900. Every entry is scoped to the diff that introduced it (#2789), so once merged to next it is at the base by definition -- spent and inert. Its presence is still load-bearing though: each PR rewrites the paths map wholesale, making a persistent base copy a shared cell. Five of six conflicting PRs in the open queue collided on this file and nothing else. Deletes the stale document and adds a push-to-next guard asserting it stays absent. The guard is deliberately NOT wired into lint:ci -- a PR-lane check against the base is the #2768 shape #2789 exists to end. Closes #2914 Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> * chore(#2914): backfill changeset pr number Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> * fix(#2914): per-PR ack fragments instead of one shared mutable file The emitted-drift acknowledgment lived in a single tests/emitted-drift-ack.json whose paths map every PR rewrote wholesale. That is a shared mutable cell: any two PRs needing an ack edit the same lines and conflict. Five of six conflicting PRs in the open queue collided on this file and nothing else. Acks now live as per-PR fragments under tests/emitted-drift-acks/, the same shape .changeset/ already uses to solve this exact problem. Two PRs pick different filenames, so they cannot collide, and fragments lingering on next are harmless rather than toxic. The legacy file's 35 entries are MIGRATED into a fragment, not deleted. An earlier delete-only attempt failed verification twice: the ratchet lost the spec-phase.md acknowledgment from #2779 and reported a 10-byte growth with no ack. Relocating preserves every acknowledgment. The legacy single file is still READ (unioned with the fragments) because five open PRs carry it; dropping support would break all of them. A duplicate path key across sources is a hard error, never last-wins. The push-to-next guard is retargeted accordingly: it now asserts only that the legacy SHARED file never reappears on next. Fragments may persist harmlessly. Closes #2914 Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 5 <noreply@anthropic.com>
851 lines
40 KiB
JavaScript
851 lines
40 KiB
JavaScript
'use strict';
|
|
|
|
/**
|
|
* Differential emitted-artifact attribution — the conservation law (ADR-2719 §1,
|
|
* issue #2723, epic #2719 Phase 3).
|
|
*
|
|
* Given the emitted manifests at `next` HEAD and at PR HEAD, plus the repo paths the
|
|
* PR actually changed, decide which moved emitted paths are EXPLAINED by the diff and
|
|
* which are not. Unattributable deltas are a hard failure that names them; the only
|
|
* way through is a committed acknowledgment — a per-PR fragment under
|
|
* `tests/emitted-drift-acks/` (#2914), or, for branches predating that split, the
|
|
* legacy single `tests/emitted-drift-ack.json` — both are read and unioned (#2914).
|
|
*
|
|
* ── Why this module is pure ──────────────────────────────────────────────────
|
|
* No fs, no git, no installer, no clock. The naive shape — one integration test that
|
|
* builds 19 manifests at each end and asserts — cannot practically exercise the four
|
|
* failing-first criteria #2723 requires, so in practice they would not get written,
|
|
* which is precisely how a phase ships promised-but-not-built. Keeping the law pure
|
|
* makes every criterion a millisecond-scale table test, and makes the Stryker gate
|
|
* able to bite (a 20-branch pure function is mutation-testable; a 40-minute
|
|
* integration test is not).
|
|
*
|
|
* The expensive part — obtaining the manifests — lives in emitted-baseline.cjs.
|
|
*
|
|
* ── What this does NOT do ────────────────────────────────────────────────────
|
|
* It never re-derives a byte (ADR-2719 §1 is explicit that asserting
|
|
* `emitted == transform(source)` is the tautology ADR-2264's Amendment rejected).
|
|
* It constrains which keys may move. It also never mutates repo state: no
|
|
* regeneration, no auto-ack. `UPDATE_GOLDEN=1` is exactly the escape hatch this
|
|
* design removes.
|
|
*/
|
|
|
|
const { attributeEmittedPath } = require('./emitted-provenance.cjs');
|
|
|
|
/** Ack schema version. Pinned from day one: contributors hand-write this file, so its
|
|
* shape is public the moment it ships (Hyrum). Loosening later is easy; tightening is not. */
|
|
const ACK_VERSION = 1;
|
|
|
|
/**
|
|
* Key names that can never be a legitimate emitted path or bare workflow/agent filename,
|
|
* and that also happen to be the JS-object footguns (`__proto__`, `constructor`,
|
|
* `prototype`). Rejected LOUDLY by `parseAck` rather than silently dropped: a document
|
|
* naming one of these is always an authoring mistake (never a real path), and dropping it
|
|
* quietly would let the SAME document pass `scripts/lint-emitted-drift-ack.cjs`'s
|
|
* duplicate-detection (which excludes these keys for a different reason — see
|
|
* `declaredKeys`'s doc comment there) while erroring differently here — exactly the
|
|
* generative-fix-divergence class this repo's parity test exists to catch (#2914 review).
|
|
*/
|
|
const RESERVED_ACK_KEYS = new Set(['__proto__', 'constructor', 'prototype']);
|
|
|
|
/**
|
|
* The LEGACY acknowledgment file, named ONCE (#2778), still honored (#2914).
|
|
*
|
|
* This string was previously typed by hand in `formatReport`'s unattributable branch, in
|
|
* `parseAck`'s default `source`, and again as `ACK_PATH` in emitted-runtime.cjs. Adding a
|
|
* fourth copy for the growth branch is the *generative fix divergence* class this repo
|
|
* records: parallel surfaces reading one shared value must not be able to drift. One
|
|
* definition consumed by every branch is cheaper than a parity test over four literals.
|
|
*
|
|
* #2914 replaces this SINGLE SHARED FILE with per-PR fragments under `ACK_DIR` — a
|
|
* single mutable document whose `paths` map every PR rewrites wholesale is a guaranteed
|
|
* merge-conflict cell between any two PRs that both need an ack (5 of 6 conflicting PRs
|
|
* in the open queue collided on this file and nothing else). The legacy path is still
|
|
* read and unioned with the fragments directory so open PRs authored before the split
|
|
* (#2818, #2812, #2728, #2566, #2531) are not broken by this change.
|
|
*/
|
|
const ACK_FILE = 'tests/emitted-drift-ack.json';
|
|
|
|
/**
|
|
* The per-PR fragment directory (#2914) — the `.changeset/`-shaped fix to the same
|
|
* shared-mutable-file problem `.changeset/` already solves: every fragment is a
|
|
* separately-named file, so two PRs adding an ack can never conflict with each other,
|
|
* and a fragment left behind on `next` after merge is inert rather than a shared cell.
|
|
*/
|
|
const ACK_DIR = 'tests/emitted-drift-acks';
|
|
|
|
/**
|
|
* Distinguishes "caller omitted the base side" from "caller said there is none".
|
|
*
|
|
* A plain `null` default cannot tell those apart, and the difference is the whole point:
|
|
* omission would silently mean "inherit nothing", which is precisely how a dropped
|
|
* argument would restore #2768 with every unit test still green.
|
|
*/
|
|
const BASE_ACK_OMITTED = Symbol('baseAck omitted');
|
|
|
|
/**
|
|
* Characters that render as nothing: soft hyphen, the zero-width family, word joiner,
|
|
* BOM. Stripped before reasons are compared, so an invisible edit cannot re-arm a spent
|
|
* acknowledgment. Spelled as codepoints on purpose — a literal character class here
|
|
* would be invisible in review, which is the exact failure being defended against.
|
|
*/
|
|
const INVISIBLE = new RegExp(
|
|
`[${[0x00AD, 0x200B, 0x200C, 0x200D, 0x2060, 0xFEFF]
|
|
.map((c) => `\\u${c.toString(16).toUpperCase().padStart(4, '0')}`)
|
|
.join('')}]`,
|
|
'g',
|
|
);
|
|
|
|
/**
|
|
* A brand-new workflow/agent file — absent from the baseline, present now — must
|
|
* still stay under the Codex `project_doc_max_bytes` anchor (ADR-1610 Decision
|
|
* point 3, `NEW_FILE_CAP` in the pre-#2724 tests/workflow-size-budget.test.cjs).
|
|
*
|
|
* #2724 (ADR-2719 Phase 4) deleted the committed per-file baseline that cap used to
|
|
* key "not yet baselined" off of. The size ratchet below (ADR-2719 §4) already
|
|
* computes the exact same signal for a different reason — a name present in
|
|
* `sizeCurrent` but absent from `sizeBaseline` IS "new" by construction, the same
|
|
* definition ADR-1610 used — so no new baseline, git diff, or CI wiring is needed to
|
|
* revive the cap; it only needed a home once the old one was deleted.
|
|
*
|
|
* This is a HARD cap, not ack-able, matching the tier hard caps it sits beside
|
|
* (XL/LARGE/DEFAULT in tests/workflow-size-budget.test.cjs): the fix for exceeding it
|
|
* is extraction, never an acknowledgment entry. Not exempted by explicit XL/LARGE
|
|
* tiering the way the original test-file version was — this module is intentionally
|
|
* pure and has no access to that classification (tests/workflow-size-budget.test.cjs's
|
|
* XL_WORKFLOWS/LARGE_WORKFLOWS sets) — so a legitimately large NEW file must be split
|
|
* via the same lazy-extraction pattern the tier caps already require, one release
|
|
* earlier than an existing file would need to. Documented narrowing, not a silent one.
|
|
*/
|
|
const NEW_FILE_CAP = 32768;
|
|
|
|
/**
|
|
* Upper bound on how many fragment files a `readdirSync` of `ACK_DIR` (or its
|
|
* counterpart in `scripts/lint-emitted-drift-ack.cjs`) may return in one pass.
|
|
*
|
|
* 500 is ample headroom over any real repo's fragment count, which stays in the
|
|
* single digits between releases (fragments are deleted once spent). Exceeding it
|
|
* throws rather than silently truncating: a truncated listing would silently drop
|
|
* acknowledgments from the merged set, which is exactly the class of silent failure
|
|
* this whole ack seam exists to prevent — the fix for a directory this large is to
|
|
* prune spent fragments, never to read only some of them.
|
|
*
|
|
* Duplicated (not imported) in `scripts/lint-emitted-drift-ack.cjs`, which cannot
|
|
* require anything from `tests/` (it ships in the npm package; `tests/` does not).
|
|
* The two are held to the same value by the schema-parity test in
|
|
* `tests/emitted-attribution.test.cjs`.
|
|
*/
|
|
const MAX_ACK_FRAGMENTS = 500;
|
|
|
|
/**
|
|
* Render the minimal valid acknowledgment document for a set of entries (#2778).
|
|
*
|
|
* Built with `JSON.stringify` from `ACK_VERSION` rather than typed out, for two reasons: the
|
|
* printed document is guaranteed to be syntactically valid JSON, and it cannot fall out of
|
|
* step with the version `parseAck` enforces. A hand-typed `"version": 1` sitting beside a live
|
|
* `ACK_VERSION` is the drift this module warns about everywhere else.
|
|
*
|
|
* It teaches exactly ONE shape. `parseAck` is deliberately more liberal — it accepts a bare
|
|
* string as the reason and tolerates a missing `version` or `paths`. Be liberal in what you
|
|
* accept, conservative in what you send: advertising those tolerances would spread a quirk
|
|
* into hand-written contributor files and make the canonical form look optional.
|
|
*
|
|
* It takes ALL the entries at once and renders ONE document, which is not a convenience:
|
|
* a report can trip the hash branch and the size branch together (a feature PR that both
|
|
* ripples an emitted path and grows a workflow). Printing a complete document per branch
|
|
* made each look like "the file to create", so a contributor pasting the second over the
|
|
* first would silently lose the first acknowledgment — an ack-lost failure with no signal.
|
|
* One document, one file, one paste.
|
|
*/
|
|
function ackDocument(entries) {
|
|
// Null-prototype: `key` comes from repo/emitted paths, so a file literally named
|
|
// `__proto__` would otherwise SET THE PROTOTYPE instead of a property, and
|
|
// `JSON.stringify` would then emit `"paths":{}` — a remediation document that silently
|
|
// teaches the contributor to acknowledge nothing.
|
|
const paths = Object.create(null);
|
|
for (const { key, reason } of entries) paths[key] = { reason };
|
|
return JSON.stringify({ version: ACK_VERSION, paths });
|
|
}
|
|
|
|
/**
|
|
* Self-serve remediation, as data rather than prose scattered across branches (#2778).
|
|
*
|
|
* ADR-2719 §3 makes the acknowledgment a *conspicuous declaration a contributor makes
|
|
* deliberately*. That only works if the contributor can discover how to make it. Before this,
|
|
* the growth branch stated a requirement and withheld the means: it said "without an
|
|
* acknowledgment" without naming the file, saying the file does not exist yet, giving the
|
|
* schema, or saying which of the two key spaces applies — and it omitted the "do not
|
|
* regenerate" instruction too, so the likeliest guess was to go hunting for a baseline file
|
|
* #2724 deleted. Observed live on #2543.
|
|
*
|
|
* Exported as one frozen object rather than loose strings so the observable surface is
|
|
* deliberate (Hyrum), and so tests can assert on identity instead of prose — rewording the
|
|
* help text must not be a breaking change.
|
|
*/
|
|
const REMEDIATION = Object.freeze({
|
|
// Deliberately NOT a fixed filename (#2914): the remedy is a NEW fragment under
|
|
// `ACK_DIR`, and the whole point of a fragment directory is that its name is the
|
|
// contributor's to pick — a fixed suggestion here would tempt everyone back onto one
|
|
// shared filename, resurrecting the exact merge-conflict cell this design removes.
|
|
ackFile: `${ACK_DIR}/<a-name-nobody-else-will-use>.json`,
|
|
ackDir: ACK_DIR,
|
|
createIfAbsent:
|
|
`create a NEW file under ${ACK_DIR}/ — pick a name nobody else is using (include `
|
|
+ 'this issue or PR number, e.g. `2914-fix.json`), and never reuse an existing '
|
|
+ 'fragment\'s name',
|
|
doNotRegenerate:
|
|
'Do NOT regenerate anything to silence this — there is nothing left to regenerate.',
|
|
/** The size ratchet keys on `entry.name` from readdirSync (emitted-runtime.cjs `currentSizes`). */
|
|
growthKeyRule: 'Key on the BARE FILENAME as it appears under gsd-core/workflows/ or agents/',
|
|
/** The hash pass keys on the emitted manifest path, which always carries a `/`. */
|
|
rippleKeyRule: 'Key on the EMITTED PATH exactly as printed above',
|
|
rippleReason: '<why this ripple is deliberate>',
|
|
growthReason: '<why this growth is deliberate>',
|
|
staleAckFix:
|
|
`Delete those entries from your fragment under ${ACK_DIR}/, or correct them to name `
|
|
+ 'the ripple you actually made. If that leaves no entries, delete the file itself '
|
|
+ '— an empty one signals nothing.',
|
|
spentAckNote:
|
|
'These are inert, NOT a failure: the base already carries them, so their ripple is '
|
|
+ `absorbed and they can no longer clear anything. Delete them from your fragment `
|
|
+ `under ${ACK_DIR}/ whenever convenient.`,
|
|
ackDocument,
|
|
});
|
|
|
|
/**
|
|
* Does a changed repo path satisfy a provenance `sources` entry?
|
|
*
|
|
* A trailing `/` marks a PREFIX (Phase 2's SOURCE_PREFIX_SUFFIX contract) — e.g. Kimi's
|
|
* root agent aggregates all of `agents/`. Prefix matching is SEGMENT-AWARE on purpose:
|
|
* a bare `startsWith('agents/')` would also accept `agentsfoo/x.md` under a source of
|
|
* `agents`, and silently over-attribute. Exact entries compare exactly.
|
|
*/
|
|
function sourceSatisfiedBy(source, changedSet) {
|
|
if (source.endsWith('/')) {
|
|
for (const changed of changedSet) {
|
|
if (changed.startsWith(source)) return changed;
|
|
}
|
|
return null;
|
|
}
|
|
return changedSet.has(source) ? source : null;
|
|
}
|
|
|
|
/**
|
|
* Normalize + validate the acknowledgment document.
|
|
*
|
|
* Rejects a document that parses but is not a plain object. Treating `0` / `"s"` / `[]` /
|
|
* `null` / `true` as "no acks" would SILENTLY DISARM the gate — the single worst failure
|
|
* available here, because it looks identical to a healthy run.
|
|
*
|
|
* @returns {{ entries: Map<string, {reason: string, runtime?: string}>, errors: string[] }}
|
|
*/
|
|
function parseAck(doc, { source = 'emitted-drift-ack.json' } = {}) {
|
|
const errors = [];
|
|
const entries = new Map();
|
|
|
|
if (doc === null || doc === undefined) return { entries, errors }; // absent == no acks (legal)
|
|
|
|
if (typeof doc !== 'object' || Array.isArray(doc)) {
|
|
errors.push(
|
|
`${source}: must be a JSON object, got ${Array.isArray(doc) ? 'array' : typeof doc}`,
|
|
);
|
|
return { entries, errors };
|
|
}
|
|
|
|
if (doc.version !== undefined && doc.version !== ACK_VERSION) {
|
|
errors.push(`${source}: unsupported version ${JSON.stringify(doc.version)} (expected ${ACK_VERSION})`);
|
|
}
|
|
|
|
const paths = doc.paths;
|
|
if (paths === undefined) return { entries, errors }; // `{}` or `{version:1}` == no acks
|
|
if (paths === null || typeof paths !== 'object' || Array.isArray(paths)) {
|
|
errors.push(`${source}: "paths" must be an object of <emitted path> -> { reason }`);
|
|
return { entries, errors };
|
|
}
|
|
|
|
for (const [rel, value] of Object.entries(paths)) {
|
|
if (RESERVED_ACK_KEYS.has(rel)) {
|
|
// Reject loudly rather than silently drop. This is the fix for #2914 review: a
|
|
// document naming `__proto__`/`constructor`/`prototype` used to be silently
|
|
// accepted here (a genuine own key when the document comes from `JSON.parse`,
|
|
// per the production path) while the lint filtered it out of duplicate detection
|
|
// — two surfaces disagreeing about the SAME key is exactly the drift the parity
|
|
// test below exists to catch.
|
|
errors.push(
|
|
`${source}: ack key "${rel}" is reserved and can never be a valid emitted path `
|
|
+ 'or workflow/agent filename — remove it',
|
|
);
|
|
continue;
|
|
}
|
|
const reason = value && typeof value === 'object' ? value.reason : value;
|
|
if (typeof reason !== 'string' || reason.trim() === '') {
|
|
// "name them AND say why" is the contract (ADR-2719 §3). An ack with no reason
|
|
// is a silent regeneration wearing a declaration's clothes.
|
|
errors.push(`${source}: ack for "${rel}" has no non-empty "reason"`);
|
|
continue;
|
|
}
|
|
entries.set(rel, {
|
|
reason: reason.trim(),
|
|
runtime: value && typeof value === 'object' ? value.runtime : undefined,
|
|
});
|
|
}
|
|
|
|
return { entries, errors };
|
|
}
|
|
|
|
/**
|
|
* Union multiple ack SOURCES into ONE document (#2914).
|
|
*
|
|
* `docs` is an ordered list of `{ source, doc }`, where `doc` is a parsed ack document
|
|
* (or `null`) and `source` is a human label used only in error messages — a fragment's
|
|
* repo-relative path, or the legacy file's path. Each source is parsed with the SAME
|
|
* `parseAck` the single-document gate already uses, so the schema can never drift
|
|
* between "one file" and "many files" — there is exactly one definition of what a valid
|
|
* entry looks like, reused here rather than re-typed.
|
|
*
|
|
* ── The collision rule (#2914) ────────────────────────────────────────────────
|
|
* Two sources declaring the SAME emitted/growth key is an ERROR, never a silent
|
|
* last-wins merge. Two per-PR fragments are never supposed to name the same path — if
|
|
* they do, at least one of them is wrong, or the world has already changed under one of
|
|
* them since it was written — and silently letting the later source win would let a
|
|
* fragment quietly retire an earlier one's acknowledgment with zero signal in the diff.
|
|
* That is exactly the class of silent drift the acknowledgment seam (#2789 spent/live
|
|
* lifecycle) exists to end: an ack that stops explaining anything must be conspicuous,
|
|
* never invisible. Failing loudly, with both source names in the message, is the only
|
|
* reading consistent with the rest of this module's "unknown fails toward the strict
|
|
* side" law (see `readAckFileAtRef`'s doc comment for the base-side version of the same
|
|
* principle).
|
|
*
|
|
* @param {Array<{source: string, doc: object|null}>} docs
|
|
* @returns {{ merged: {version: number, paths: object}, errors: string[] }}
|
|
*/
|
|
function mergeAckSources(docs) {
|
|
const errors = [];
|
|
// Null-prototype for the same reason `ackDocument` uses one above: an ordinary `{}`
|
|
// would turn an assignment keyed `__proto__` into setting the prototype rather than a
|
|
// property. `parseAck` now rejects `RESERVED_ACK_KEYS` outright (#2914 review) so
|
|
// `entries` below can never actually carry one — this is belt-and-suspenders against
|
|
// the day that stops being true, not the current enforcement point.
|
|
const paths = Object.create(null);
|
|
const owner = new Map(); // rel -> source that already claimed it, for the error message
|
|
|
|
for (const { source, doc } of docs) {
|
|
const { entries, errors: parseErrors } = parseAck(doc, { source });
|
|
errors.push(...parseErrors);
|
|
for (const [rel, entry] of entries) {
|
|
if (owner.has(rel)) {
|
|
errors.push(
|
|
`duplicate ack for "${rel}": declared in both ${owner.get(rel)} and ${source}. `
|
|
+ 'Two ack sources may never name the same path — rename or merge the fragments.',
|
|
);
|
|
continue;
|
|
}
|
|
owner.set(rel, source);
|
|
paths[rel] = entry.runtime !== undefined
|
|
? { reason: entry.reason, runtime: entry.runtime }
|
|
: { reason: entry.reason };
|
|
}
|
|
}
|
|
|
|
return { merged: { version: ACK_VERSION, paths }, errors };
|
|
}
|
|
|
|
/**
|
|
* The conservation law.
|
|
*
|
|
* ── Ack lifecycle: an ack is scoped to the diff that introduced it (#2789) ───
|
|
*
|
|
* Every other input here is BASE-RELATIVE — `baseline` vs `current`, `changedPaths` from
|
|
* `git diff base...HEAD`. `ack` was the one ABSOLUTE input, read only from the working
|
|
* tree, and that mismatch was a real defect: `staleAcks` asks only "did a delta consume
|
|
* you?", which cannot tell "you never explained anything" (an authoring mistake) from
|
|
* "your ripple is now absorbed into the base" (the ack's SUCCESS condition). Merging an
|
|
* ack therefore made it look like a mistake, reddening `next` and every PR branching off
|
|
* it (#2768).
|
|
*
|
|
* `baseAck` supplies the missing side. An entry already present at the base is SPENT: it
|
|
* is not part of this diff, so it may no longer consume a delta and is never reported
|
|
* stale. Making it inert is also what finally closes ADR-2719's own named hazard — a
|
|
* leftover ack used to SILENTLY pre-clear the next ripple on its path; now that ripple
|
|
* must be explained on its own terms. Spent entries are still reported (`spentAcks`) so
|
|
* they can be tidied, but they gate nothing.
|
|
*
|
|
* `baseAck` is REQUIRED whenever `ack` is present — omitting it is an error, never a
|
|
* silent "nothing inherited". Same discipline as `changedPaths` above: a caller that
|
|
* cannot supply the base side must say `null` deliberately, so that dropping the
|
|
* argument fails loudly instead of quietly restoring #2768.
|
|
*
|
|
* @param {object} opts
|
|
* @param {object} opts.baseline { [runtime]: { [rel]: hash } } at `next` HEAD
|
|
* @param {object} opts.current { [runtime]: { [rel]: hash } } at PR HEAD
|
|
* @param {string[]} opts.changedPaths repo paths the PR changed (git diff --name-only)
|
|
* @param {object} [opts.ack] parsed emitted-drift-ack.json document (or null)
|
|
* @param {object} opts.baseAck the same document AT THE BASE REF (or null when
|
|
* absent there). Required once `ack` is non-null.
|
|
* @param {object} [opts.sizeBaseline] { [name]: bytes } workflow/agent sizes at next
|
|
* @param {object} [opts.sizeCurrent] { [name]: bytes } workflow/agent sizes at PR HEAD
|
|
* @param {string[]} [opts.mergeAckErrors] errors already discovered while UNIONING
|
|
* `ack` from multiple physical sources (`mergeAckSources`, #2914) — e.g. two fragments
|
|
* naming the same path. This module never touches the filesystem, so it cannot
|
|
* discover a cross-file collision on its own; the shell layer that reads the legacy
|
|
* file plus every fragment computes this and folds it in verbatim so a duplicate
|
|
* fails the gate exactly like any other ack schema error, rather than silently
|
|
* resolving via last-wins.
|
|
*
|
|
* @returns {{
|
|
* moved: number, attributed: Array, unattributable: Array, acked: Array,
|
|
* removed: Array, grown: Array, shrunk: Array, newFileCapExceeded: Array,
|
|
* staleAcks: string[], spentAcks: string[], errors: string[], ok: boolean
|
|
* }}
|
|
*/
|
|
function diffEmitted({
|
|
baseline,
|
|
current,
|
|
changedPaths,
|
|
ack = null,
|
|
baseAck = BASE_ACK_OMITTED,
|
|
sizeBaseline = null,
|
|
sizeCurrent = null,
|
|
mergeAckErrors = [],
|
|
} = {}) {
|
|
const errors = [];
|
|
|
|
if (!baseline || typeof baseline !== 'object' || Array.isArray(baseline)) {
|
|
errors.push('baseline manifest set must be an object keyed by runtime');
|
|
}
|
|
if (!current || typeof current !== 'object' || Array.isArray(current)) {
|
|
errors.push('current manifest set must be an object keyed by runtime');
|
|
}
|
|
if (!Array.isArray(changedPaths)) {
|
|
// NOT the same as an empty array. A failed `git diff` must never be read as
|
|
// "nothing changed" — that would make every moved hash unattributable and produce
|
|
// a failure storm that reads like a real finding.
|
|
errors.push('changedPaths must be an array (a failed git diff is an error, not an empty set)');
|
|
}
|
|
if (errors.length) {
|
|
return {
|
|
// `newFileCapExceeded` MUST be present here. formatReport reads
|
|
// `result.newFileCapExceeded.length` unconditionally, so omitting it made this
|
|
// early return throw a TypeError instead of rendering the errors it was built to
|
|
// report — and this is precisely the path taken when `git diff` failed or a
|
|
// manifest came back malformed, so the crash replaced the one message that would
|
|
// have explained the infrastructure problem (#2778).
|
|
moved: 0, attributed: [], unattributable: [], acked: [], removed: [],
|
|
grown: [], shrunk: [], newFileCapExceeded: [], staleAcks: [], spentAcks: [],
|
|
errors, ok: false,
|
|
};
|
|
}
|
|
|
|
const changedSet = new Set(changedPaths);
|
|
const { entries: declaredAcks, errors: ackErrors } = parseAck(ack);
|
|
errors.push(...ackErrors);
|
|
// Folded in verbatim, not re-derived: see `mergeAckErrors`'s doc comment above.
|
|
errors.push(...mergeAckErrors);
|
|
|
|
// Keyed on DECLARED ENTRIES, not on the document being non-null. `{}`, `{version:1}`
|
|
// and `{paths:{}}` all carry zero acks and `parseAck` calls them legal, so demanding a
|
|
// base side for them would fail a document the module elsewhere accepts. Protection is
|
|
// undiminished: an entry is the only thing that can be misclassified as spent or live,
|
|
// so the error still fires in exactly the situation where dropping `baseAck` would
|
|
// reintroduce #2768.
|
|
if (declaredAcks.size > 0 && baseAck === BASE_ACK_OMITTED) {
|
|
errors.push(
|
|
`${ACK_FILE}: baseAck was not supplied. The base side is not optional — without it `
|
|
+ 'a merged ack is indistinguishable from one that never explained anything, which '
|
|
+ 'is exactly the defect this parameter exists to close (#2789). Pass the document '
|
|
+ 'read at the base ref, or an explicit null when it is absent there.',
|
|
);
|
|
}
|
|
|
|
// Base-side SCHEMA errors are deliberately discarded, not surfaced. The base's validity
|
|
// is not this diff's to answer for, and a document we cannot read simply inherits
|
|
// nothing — which is the ARMED reading, since every entry then stays live and gated.
|
|
const resolvedBaseAck = baseAck === BASE_ACK_OMITTED ? null : baseAck;
|
|
const { entries: baseAcks } = parseAck(resolvedBaseAck);
|
|
|
|
/**
|
|
* Spent == the base already carries this entry's REASON, compared on prose alone.
|
|
*
|
|
* Re-arming a spent ack is legitimate — it is how a contributor says "this is a NEW
|
|
* ripple, and here is why" — but it must cost an actual explanation, because the
|
|
* reason is the entire artifact a reviewer reads. So the comparison is deliberately
|
|
* insensitive to everything that is not prose:
|
|
*
|
|
* - INTERNAL whitespace collapses. `parseAck` only trims the ends, so without this a
|
|
* doubled space re-arms an ack whose justification still describes the PREVIOUS
|
|
* ripple, and the ack file's diff shows a reviewer nothing new.
|
|
* - `runtime` is NOT compared. Nothing else in this module reads it (lookups key on
|
|
* `rel` alone), so including it would make an undocumented, schema-absent field the
|
|
* one thing that re-arms an ack — `+ "runtime": "claude"` beside a byte-identical
|
|
* reason, carrying no explanation at all.
|
|
*
|
|
* Both directions were live re-arm paths for a genuinely unattributable ripple.
|
|
*/
|
|
// `\s` covers NBSP and the ideographic space but NOT the zero-width family, so without
|
|
// this a U+200B (or a soft hyphen) re-arms a spent ack while being literally invisible
|
|
// in the diff — the purest form of "no new explanation". Stripped before the whitespace
|
|
// collapse so a zero-width char cannot glue two words into a different-looking string.
|
|
// Zero-information re-arm defence. `\s` covers NBSP and the ideographic space but NOT
|
|
// the zero-width family, so without this a U+200B or a soft hyphen re-arms a spent ack
|
|
// while being literally INVISIBLE in the diff — the purest form of "no new
|
|
// explanation". Built from codepoints rather than literal characters, because a
|
|
// literal class would itself be unreviewable in this file.
|
|
const prose = (reason) => reason.replace(INVISIBLE, '').replace(/\s+/g, ' ').trim();
|
|
const isSpent = (rel, entry) => {
|
|
const prior = baseAcks.get(rel);
|
|
return prior !== undefined && prose(prior.reason) === prose(entry.reason);
|
|
};
|
|
|
|
const ackEntries = new Map();
|
|
const spentAcks = [];
|
|
for (const [rel, entry] of declaredAcks) {
|
|
if (isSpent(rel, entry)) spentAcks.push(rel);
|
|
else ackEntries.set(rel, entry);
|
|
}
|
|
spentAcks.sort();
|
|
|
|
const attributed = [];
|
|
const unattributable = [];
|
|
const acked = [];
|
|
const removed = [];
|
|
const usedAcks = new Set();
|
|
let moved = 0;
|
|
|
|
const runtimes = new Set([...Object.keys(baseline), ...Object.keys(current)]);
|
|
|
|
for (const runtime of [...runtimes].sort()) {
|
|
const before = baseline[runtime] || {};
|
|
const after = current[runtime] || {};
|
|
const keys = new Set([...Object.keys(before), ...Object.keys(after)]);
|
|
|
|
for (const rel of [...keys].sort()) {
|
|
const had = Object.prototype.hasOwnProperty.call(before, rel);
|
|
const has = Object.prototype.hasOwnProperty.call(after, rel);
|
|
|
|
if (had && has && before[rel] === after[rel]) continue; // unchanged — ignored
|
|
|
|
const change = !had ? 'added' : (!has ? 'removed' : 'modified');
|
|
moved++;
|
|
|
|
let attribution;
|
|
try {
|
|
attribution = attributeEmittedPath(rel, runtime);
|
|
} catch (err) {
|
|
// A path the Phase 2 table cannot resolve is surfaced, never silently skipped —
|
|
// otherwise a table hole becomes a blind spot in the differential too.
|
|
errors.push(`${runtime}: ${rel}: ${err.message}`);
|
|
continue;
|
|
}
|
|
|
|
const record = { runtime, rel, change, ruleId: attribution.ruleId, kind: attribution.kind };
|
|
|
|
if (change === 'removed') removed.push(record);
|
|
|
|
// Synthesized paths carry no repo source by definition, so a delta in them can
|
|
// never be "unexplained by the diff" — exempt, but still counted and reported.
|
|
if (attribution.kind === 'synthesized') {
|
|
attributed.push({ ...record, via: '<synthesized: exempt>' });
|
|
continue;
|
|
}
|
|
|
|
// Sources are checked before transforms so `via` is deterministic when a moved
|
|
// path is explained by both at once — the SOURCE is the more specific, more
|
|
// legible story ("the agent file changed") and is what a reviewer expects to
|
|
// see first, not an accident of iteration order.
|
|
let via = null;
|
|
for (const source of attribution.sources) {
|
|
const hit = sourceSatisfiedBy(source, changedSet);
|
|
// `!== null`, not truthiness: an exact match returns the source string, and an
|
|
// empty-string source would return '' — falsy, so a real match would be
|
|
// silently discarded. Unreachable with today's rules (every source is a
|
|
// non-empty template) but it is a footgun for the next rule author.
|
|
if (hit !== null) { via = hit; break; }
|
|
}
|
|
// #2757: a `derived`/`code-derived` artifact's bytes can also move because the
|
|
// TRANSFORM code that generates them changed, not the source it derives from —
|
|
// `sources` alone cannot express that. Reuses `sourceSatisfiedBy` unchanged so
|
|
// exact/prefix semantics stay identical for both lists.
|
|
if (via === null) {
|
|
for (const transform of attribution.transforms) {
|
|
const hit = sourceSatisfiedBy(transform, changedSet);
|
|
if (hit !== null) { via = hit; break; }
|
|
}
|
|
}
|
|
|
|
if (via !== null) {
|
|
attributed.push({ ...record, via });
|
|
} else if (ackEntries.has(rel)) {
|
|
usedAcks.add(rel);
|
|
acked.push({ ...record, reason: ackEntries.get(rel).reason });
|
|
} else {
|
|
unattributable.push({
|
|
...record,
|
|
expectedSources: attribution.sources,
|
|
expectedTransforms: attribution.transforms,
|
|
});
|
|
}
|
|
}
|
|
}
|
|
|
|
// ── Size ratchet, folded into the same machine (ADR-2719 §4, must-have 6) ──
|
|
// NOTE: stale-ack detection is computed AFTER this block, not before. An ack may be
|
|
// consumed by either a hash move or a size growth, so computing it earlier would
|
|
// report a size-growth ack as stale.
|
|
const grown = [];
|
|
const shrunk = [];
|
|
const newFileCapExceeded = [];
|
|
if (sizeBaseline && sizeCurrent) {
|
|
for (const name of Object.keys(sizeCurrent).sort()) {
|
|
if (!Object.prototype.hasOwnProperty.call(sizeBaseline, name)) {
|
|
// No baseline entry: this file is NEW. No `from` to diff against, so the
|
|
// growth ratchet does not apply — but the absolute new-file cap does
|
|
// (ADR-1610 Decision point 3). Never ack-able; see NEW_FILE_CAP's doc comment.
|
|
const bytes = sizeCurrent[name];
|
|
if (bytes > NEW_FILE_CAP) newFileCapExceeded.push({ name, bytes, cap: NEW_FILE_CAP });
|
|
continue;
|
|
}
|
|
const from = sizeBaseline[name];
|
|
const to = sizeCurrent[name];
|
|
if (to > from) {
|
|
// Growth needs the SAME acknowledgment. Anti-creep survives without pinning a
|
|
// number: "verify-work.md grew 1,247 bytes" beats a number moving in a 93-line map.
|
|
const isAcked = ackEntries.has(name);
|
|
if (isAcked) usedAcks.add(name);
|
|
grown.push({ name, from, to, delta: to - from, acked: isAcked });
|
|
} else if (to < from) {
|
|
// Shrinkage is not creep — reported, never gated.
|
|
shrunk.push({ name, from, to, delta: from - to });
|
|
}
|
|
}
|
|
}
|
|
|
|
const unackedGrowth = grown.filter((g) => !g.acked);
|
|
|
|
// An ack that outlives the ripple it explained is future blindness: it would silently
|
|
// pre-clear a NEW ripple on the same path. It must be deleted when the ripple is.
|
|
// Computed here, once, after BOTH the hash pass and the size pass have consumed acks.
|
|
const staleAcks = [...ackEntries.keys()].filter((rel) => !usedAcks.has(rel)).sort();
|
|
|
|
const ok = errors.length === 0
|
|
&& unattributable.length === 0
|
|
&& unackedGrowth.length === 0
|
|
&& staleAcks.length === 0
|
|
&& newFileCapExceeded.length === 0;
|
|
|
|
return {
|
|
moved,
|
|
attributed,
|
|
unattributable,
|
|
acked,
|
|
removed,
|
|
grown,
|
|
shrunk,
|
|
newFileCapExceeded,
|
|
staleAcks,
|
|
spentAcks,
|
|
errors,
|
|
ok,
|
|
};
|
|
}
|
|
|
|
/**
|
|
* The report as a typed intermediate representation, before any rendering (#2778).
|
|
*
|
|
* `formatReport`'s output is the human-facing deliverable ADR-2719 §1 sells the design
|
|
* on — but CONTRIBUTING.md ("Prohibited: Raw Text Matching on Test Outputs") is explicit
|
|
* that a human formatter must expose a structured surface for tests to assert on, so a
|
|
* reworded sentence is never a failing test and a passing test never depends on prose.
|
|
* `formatReport` is a pure rendering of this; assert on this.
|
|
*
|
|
* @returns {{ blocks: Array<{kind: string} & object>, ackable: Array<{key: string, reason: string}> }}
|
|
*/
|
|
function buildReport(result, { sampleLimit = 20 } = {}) {
|
|
const blocks = [];
|
|
|
|
if (result.errors.length) {
|
|
blocks.push({
|
|
kind: 'errors',
|
|
count: result.errors.length,
|
|
items: result.errors.slice(0, sampleLimit),
|
|
});
|
|
}
|
|
|
|
const unackedGrowth = result.grown.filter((g) => !g.acked);
|
|
|
|
if (result.unattributable.length) {
|
|
blocks.push({
|
|
kind: 'unattributable',
|
|
count: result.unattributable.length,
|
|
items: result.unattributable.slice(0, sampleLimit),
|
|
truncated: Math.max(0, result.unattributable.length - sampleLimit),
|
|
keyRule: REMEDIATION.rippleKeyRule,
|
|
});
|
|
}
|
|
|
|
if (unackedGrowth.length) {
|
|
blocks.push({
|
|
kind: 'unacked-growth',
|
|
count: unackedGrowth.length,
|
|
items: unackedGrowth.slice(0, sampleLimit),
|
|
keyRule: REMEDIATION.growthKeyRule,
|
|
});
|
|
}
|
|
|
|
if (result.newFileCapExceeded.length) {
|
|
// Deliberately carries NO ack affordance: the new-file cap is not ack-able, and the
|
|
// fix is extraction. Offering a document here would teach an entry that cannot clear
|
|
// the gate — worse than the silence it replaced.
|
|
blocks.push({
|
|
kind: 'new-file-cap',
|
|
count: result.newFileCapExceeded.length,
|
|
items: result.newFileCapExceeded.slice(0, sampleLimit),
|
|
});
|
|
}
|
|
|
|
if (result.staleAcks.length) {
|
|
blocks.push({
|
|
kind: 'stale-acks',
|
|
count: result.staleAcks.length,
|
|
items: result.staleAcks.slice(0, sampleLimit),
|
|
fix: REMEDIATION.staleAckFix,
|
|
});
|
|
}
|
|
|
|
// Modelled here, not only rendered, so it can be asserted on identity like every other
|
|
// block — this file's stated contract is that `formatReport` is a pure rendering of
|
|
// this IR, and a section that exists only in prose would have to be tested by raw text
|
|
// matching, which CONTRIBUTING.md prohibits.
|
|
//
|
|
// Gated on `!result.ok` to KEEP that contract true. Spent acks are the one block whose
|
|
// emit-condition could drift from the renderer's, since a passing run must render
|
|
// nothing at all; without this, a JSON reporter built on the IR would announce spent
|
|
// acks for a green run while the text reporter stayed silent.
|
|
if (!result.ok && result.spentAcks && result.spentAcks.length) {
|
|
blocks.push({
|
|
kind: 'spent-acks',
|
|
count: result.spentAcks.length,
|
|
items: result.spentAcks.slice(0, sampleLimit),
|
|
fix: REMEDIATION.spentAckNote,
|
|
});
|
|
}
|
|
|
|
// ONE ack set for the whole report, not one per branch. A report can trip the hash
|
|
// branch and the size branch at once, and two complete documents each reading as "the
|
|
// file to create" invites pasting the second over the first — losing an acknowledgment
|
|
// with no signal. Capped at `sampleLimit` per branch so the document stays consistent
|
|
// with the lists above it rather than naming rows the report chose not to print.
|
|
const ackable = [
|
|
...result.unattributable.slice(0, sampleLimit)
|
|
.map((u) => ({ key: u.rel, reason: REMEDIATION.rippleReason })),
|
|
...unackedGrowth.slice(0, sampleLimit)
|
|
.map((g) => ({ key: g.name, reason: REMEDIATION.growthReason })),
|
|
];
|
|
|
|
return { blocks, ackable };
|
|
}
|
|
|
|
/**
|
|
* Render a report as the failure message ADR-2719 §1 specifies — it sells the whole
|
|
* design on this text, so it is a deliverable, not a detail. Pure rendering of
|
|
* `buildReport`; tests assert on that IR, not on these sentences.
|
|
*/
|
|
function formatReport(result, { sampleLimit = 20 } = {}) {
|
|
const parts = [];
|
|
|
|
if (result.errors.length) {
|
|
parts.push(`${result.errors.length} error(s):\n ${result.errors.slice(0, sampleLimit).join('\n ')}`);
|
|
}
|
|
|
|
if (result.unattributable.length) {
|
|
const list = result.unattributable.slice(0, sampleLimit)
|
|
.map((u) => {
|
|
// #2757: a rule may explain a moved path via its source OR its transform
|
|
// code; name whichever possibilities exist so the message tells the whole
|
|
// story, not just half of it.
|
|
const expected = [
|
|
u.expectedSources.length ? `a change under ${u.expectedSources.join(' or ')}` : null,
|
|
(u.expectedTransforms && u.expectedTransforms.length)
|
|
? `a transform change under ${u.expectedTransforms.join(' or ')}`
|
|
: null,
|
|
].filter(Boolean).join(', or ');
|
|
return ` ${u.runtime}: ${u.rel}\n rule ${u.ruleId}; expected ${expected}`;
|
|
});
|
|
parts.push(
|
|
`${result.unattributable.length} emitted path(s) changed that nothing in this diff explains:\n${list.join('\n')}` +
|
|
(result.unattributable.length > sampleLimit
|
|
? `\n …and ${result.unattributable.length - sampleLimit} more`
|
|
: '') +
|
|
`\n\n${REMEDIATION.rippleKeyRule}.`,
|
|
);
|
|
}
|
|
|
|
const unackedGrowth = result.grown.filter((g) => !g.acked);
|
|
if (unackedGrowth.length) {
|
|
const list = unackedGrowth.slice(0, sampleLimit)
|
|
.map((g) => ` ${g.name} grew ${g.delta} bytes (${g.from} -> ${g.to})`);
|
|
parts.push(
|
|
`${unackedGrowth.length} file(s) grew without an acknowledgment:\n${list.join('\n')}\n\n` +
|
|
`${REMEDIATION.growthKeyRule}.`,
|
|
);
|
|
}
|
|
|
|
if (result.newFileCapExceeded.length) {
|
|
const list = result.newFileCapExceeded.slice(0, sampleLimit)
|
|
.map((f) => ` ${f.name} is ${f.bytes} bytes — exceeds the ${f.cap}-byte new-file cap (ADR-1610)`);
|
|
parts.push(
|
|
`${result.newFileCapExceeded.length} new file(s) exceed the new-file cap (extract, not ack):\n${list.join('\n')}`,
|
|
);
|
|
}
|
|
|
|
if (result.staleAcks.length) {
|
|
parts.push(
|
|
`${result.staleAcks.length} stale acknowledgment(s) — written or reworded in THIS diff, ` +
|
|
'but nothing here needed them, so they explain nothing:\n ' +
|
|
result.staleAcks.slice(0, sampleLimit).join('\n ') +
|
|
`\n\n${REMEDIATION.staleAckFix}`,
|
|
);
|
|
}
|
|
|
|
// Informational, never gating, and rendered ONLY alongside a real failure. Spent
|
|
// entries are inert housekeeping, not a demand — surfacing them when a contributor is
|
|
// already in the file is free, but emitting them for an otherwise-clean run would make
|
|
// `formatReport` return prose for an `ok` result, which this module's callers read as
|
|
// "there is something wrong".
|
|
const spent = (result.spentAcks || []).slice(0, sampleLimit);
|
|
if (spent.length && !result.ok) {
|
|
parts.push(
|
|
`${result.spentAcks.length} spent acknowledgment(s):\n ` + spent.join('\n ') +
|
|
`\n\n${REMEDIATION.spentAckNote}`,
|
|
);
|
|
}
|
|
|
|
// The remedy, once, at the end — one file, one document, one paste.
|
|
const { ackable } = buildReport(result, { sampleLimit });
|
|
if (ackable.length) {
|
|
parts.push(
|
|
`To acknowledge, create ${REMEDIATION.ackFile}\n` +
|
|
`(${REMEDIATION.createIfAbsent})\n` +
|
|
'containing ONE document that names every path listed above and why:\n\n' +
|
|
` ${REMEDIATION.ackDocument(ackable)}\n\n` +
|
|
REMEDIATION.doNotRegenerate,
|
|
);
|
|
}
|
|
|
|
return parts.join('\n\n');
|
|
}
|
|
|
|
module.exports = {
|
|
ACK_VERSION,
|
|
ACK_FILE,
|
|
ACK_DIR,
|
|
NEW_FILE_CAP,
|
|
MAX_ACK_FRAGMENTS,
|
|
REMEDIATION,
|
|
sourceSatisfiedBy,
|
|
parseAck,
|
|
mergeAckSources,
|
|
diffEmitted,
|
|
buildReport,
|
|
formatReport,
|
|
};
|