testguard-cli 0.1.2 → 0.2.0

package/CHANGELOG.md

@@ -7,6 +7,68 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.2.0] - 2026-09-17
+
+### Added
+
+- **`testguard scaffold <file>`** — mechanical fault producer (#6). Proposes
+  the five shapes both field reports found behind ~80% of hand-written
+  faults: guard forced false, single-line guard or state change removed,
+  `return <check>` → `return true`, security literal weakened, check call
+  removed. Every proposal is an exact-line anchor with `expectHits` and
+  `occurrence` computed from the file (verifiable by construction; anything
+  `locate()` would reject is never emitted), `producedBy: derived`,
+  `defendedBy` prefilled from the tests that import the module, grouped
+  under a preceding `@claim` annotation or by enclosing function.
+  Statements are `TODO:` placeholders; the output is a draft under
+  `.testguard/`, never the claims file. `--claim <ID>` puts everything under
+  one claim and copies it if it exists; `--json` prints instead.
+- Self-claim `TG-SCAFFOLD-ANCHORS-HIT`; install smoke exercises `scaffold`.
+
+## [0.1.3] - 2026-09-17
+
+From a second field report on a real codebase (456 tests, 27 claims, 35
+faults; 13 survived on the first run, two critical claims with zero coverage).
+
+### Fixed
+
+- **Worktree mode probed HEAD while reading the claims file from the working
+  tree**, so uncommitted defender changes were silently ignored — the same
+  survivors came back with no hint why. `probe` now refuses (exit 2) when any
+  resolved defender or fault target has uncommitted changes, naming the files
+  and the commit it would have probed. Every summary names the commit probed.
+- `killed-by-undeclared-tests` never said which tests killed the fault; the
+  author could not fix `defendedBy` without grepping the suite. Evidence now
+  carries `detail.undeclaredKillers` and the CLI names the files.
+- `anchor-ambiguous` did not say how many hits; `detail.anchor { hits,
+  expected }` is recorded and printed.
+- A replacement with an unbalanced paren was `suite-failed-to-load`, not
+  `replacement-does-not-compile`: esbuild/vitest wording is now matched.
+- The claims schema promised defender discovery for an absent `defendedBy`;
+  the tool answered `nocover`. Discovery is implemented: the test files that
+  import the fault's target (relative or alias), recorded as
+  `defenders.discovered`. `nocover` now means exactly "no test file imports
+  this source".
+- `baseline.json` records `dirty`, as evidence already did.
+
+### Added
+
+- `--include-dirty`: snapshot the working tree (tracked edits and untracked,
+  non-ignored files) into a throwaway commit and probe that. HEAD, index and
+  the user's tree are never touched; `run.repo.snapshot` records the commit.
+- A one-line progress indicator on stderr (TTY only) so a minute of silence
+  is not mistaken for a hang.
+- Fixture: a claim with no `defendedBy` whose defender is discovered.
+
+### Changed
+
+- **Default output shows only unproven faults plus a killed count.**
+  `--verbose` restores the full stream.
+- The `survived` hint reminds the author to check that the fault is
+  observable at all before writing a test for it.
+- README: `$schema` path for consumers, `min-release-age` note, the
+  worktree-vs-working-tree rule, `brief` writes `brief.json` by default.
+
 ## [0.1.2] - 2026-09-17
 
 From a field report on a real codebase (63 test files, 458 tests, 39 faults).

package/README.md

@@ -52,9 +52,13 @@ tests were written against the survivors, 39/39 were killed.
 | npm | `npm i -D testguard-cli` then `npx testguard probe` |
 | pip | `pip install testguard-cli` then `testguard probe` (needs Node ≥ 20) |
 | Homebrew | `brew tap raccioly/tap && brew install testguard` |
-| GitHub Action | `uses: raccioly/testguard@v0.1.2` — see [`action.yml`](./action.yml) |
+| GitHub Action | `uses: raccioly/testguard@v0.2.0` — see [`action.yml`](./action.yml) |
 | pre-commit | `repo: https://github.com/raccioly/testguard`, hooks `testguard-claims`, `testguard-probe` |
 
+Projects that set `min-release-age` in `.npmrc` cannot see a version published
+less than that many days ago (`ENOVERSIONS`); install that one with
+`npm i -D testguard-cli --min-release-age=0`.
+
 ## How it works
 
 ```bash
@@ -62,11 +66,14 @@ npx testguard-cli claims      # what does this project claim, and is every claim
 npx testguard-cli probe       # try to falsify each claim; report what the tests missed
 npx testguard-cli baseline    # freeze today's unproven findings; from now on only new ones gate
 npx testguard-cli brief       # tell the agent where the suite is blind, before it writes
+npx testguard-cli scaffold src/x.ts   # propose faults for a file, as a draft to keep or drop
 ```
 
-1. **Claims** live in `testguard.claims.json`: a statement, where it comes
-   from, which tests supposedly defend it, and one or more *faults* — each a
-   deterministic source change that would make the statement false. Every
+1. **Claims** live in `testguard.claims.json` (editors validate it against
+   `"$schema": "./node_modules/testguard-cli/spec/schemas/claims.schema.json"`):
+   a statement, where it comes from, which tests supposedly defend it, and
+   one or more *faults* — each a deterministic source change that would make
+   the statement false. Every
    claim and every fault records who produced it. `testguard claims`
    validates the file and reports drift against `@claim <ID>` annotations in
    source. Test files are deliberately not scanned — a claim asserted by a test is the authorship trap the tool exists for — and annotation ids must contain a hyphen so prose is never mistaken for one.
@@ -91,10 +98,23 @@ npx testguard-cli brief       # tell the agent where the suite is blind, before
    written to `.testguard/evidence.json` — validated against the spec before
    it is written.
 
+   Worktree mode probes a **commit**. If a defender or target file has
+   uncommitted changes, `probe` refuses and says so — otherwise your new
+   tests would be silently absent and the same survivors would come back
+   with no hint why. `--include-dirty` snapshots the working tree (tracked
+   edits and new files) into a throwaway commit and probes that; your tree,
+   HEAD and index are never touched. Every summary names the commit probed.
+
+   A claim with no `defendedBy` has its defenders **discovered**: the test
+   files that import the fault's target, by relative path or resolved alias.
+   `NOCOVER` then means exactly "no test file imports this source".
+
    Practical loop: first pass `--no-escalate` (escalation re-runs the whole
-   suite N times per survivor); iterate on one claim with
-   `--claim <ID> --in-place` — only the files faults are applied to must be
-   committed, test files may be dirty; final pass with defaults. A custom
+   suite N times per survivor); iterate on one claim with `--claim <ID>` and
+   either `--include-dirty` or `--in-place` (only fault target files must be
+   clean there; test files may be dirty); final pass with defaults. By default
+   the stream shows only unproven faults plus a killed count — `--verbose`
+   shows every fault. A custom
    runner (`pnpm --filter`, a specific config) goes in
    `--runner-cmd "<cmd> {files} … {out}"`; if the scratch worktree cannot
    see your `node_modules`, pass `--node-modules <dir>`.
@@ -103,7 +123,8 @@ npx testguard-cli brief       # tell the agent where the suite is blind, before
    source and defenders are unchanged reuse their prior verdict, so a probe
    in CI costs only what changed.
 4. **Brief** turns evidence plus baseline into a ranked, capped
-   `## TEST BLINDSPOT CONTEXT` block. Wire it into an agent's session start
+   `## TEST BLINDSPOT CONTEXT` block, printed and also written to
+   `.testguard/brief.json` (`--text` prints only). Wire it into an agent's session start
    — for Claude Code, in `.claude/settings.json`:
 
    ```json
@@ -115,6 +136,34 @@ npx testguard-cli brief       # tell the agent where the suite is blind, before
    `--text` prints only, and exits 0 silently when there is no evidence yet,
    so the hook can never break a session.
 
+### Authoring faults mechanically
+
+Writing faults by hand means reading the code to find exact anchors. Two
+field reports found that ~80% of hand-written faults are one of five shapes,
+so `scaffold` proposes them for you:
+
+```bash
+npx testguard-cli scaffold src/auth.ts          # → .testguard/scaffold-auth.json (a draft, never your claims file)
+npx testguard-cli scaffold src/auth.ts --claim AUTH-ADMIN   # every proposal under one claim; copies it if it exists
+```
+
+| Shape | What it proposes |
+|---|---|
+| `condition-forced` | `if (<guard>) {` → `if (false) {` — a guard is a `!…` condition or one whose body returns, throws or 4xx-es |
+| `statement-deleted` | a single-line guard (`if (…) return …;`) or a state change (`x = …;`) removed |
+| `return-altered` | `return <check>;` (`===`, `.includes(`, `&&`, …) → `return true;` |
+| `literal-changed` | `httpOnly`/`secure` flipped, `sameSite` → `none`, a cost/rounds → `1`, a ttl/tolerance/window/limit ×1000 |
+| `call-removed` | a bare `verify…()` / `validate…()` / `check…()` / `authorize…()` call removed |
+
+Every proposal's `find` is the exact line with `expectHits`/`occurrence`
+computed from the file, so it is verifiable by construction; provenance is
+`producer: derived`; `defendedBy` is prefilled from the tests that import
+the module; proposals are grouped under a preceding `@claim <ID>` annotation
+or by enclosing function. Statements are `TODO:` placeholders — a proposal
+becomes a claim only when a human states what it defends. Deterministic
+heuristics, no AST, no LLM; a proposal the tool cannot anchor is never
+emitted.
+
 **Commit `.testguard/baseline.json`; ignore `evidence.json` and `brief.json`.**
 The baseline is the frozen contract; the other two are regenerated per run.
 
@@ -140,13 +189,14 @@ through every verdict.
 
 ## Status
 
-**v0.1.** Four commands, vitest runner, hand-authored faults. The contract
+**v0.2.** Five commands, vitest runner, hand-authored faults plus a
+mechanical scaffold for the five common shapes. The contract
 spine — six JSON Schemas shared with the other Guard tools — is under
 [`spec/`](spec/). One exact-pinned runtime dependency (`ajv`, for schema validation); Node ≥ 20.
 
 Not yet: test generation (the two-gate acceptance loop), other runners,
-mechanical fault producers, and calibration of fault classes against real
-escaped bugs. Each is designed for; none is claimed.
+AST-aware producers, and calibration of fault classes against real escaped
+bugs. Each is designed for; none is claimed.
 
 ## Licence
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "testguard-cli",
-  "version": "0.1.2",
+  "version": "0.2.0",
   "description": "Proves a test suite defends the claims a project makes: injects the faults those claims forbid and reports every one the tests fail to detect.",
   "type": "module",
   "license": "MIT",

package/spec/GATE-SEMANTICS.md

@@ -35,10 +35,16 @@ Rules that follow from the table:
    reporting `survived` would be wrong the other way. It is `flaky-defender`.
 5. **Escalation never upgrades a verdict.** A fault that survives its declared
    defenders may be re-run against the whole suite. If the wider suite kills
-   it, the verdict stays `survived` with reason `killed-by-undeclared-tests`:
-   the claim's stated evidence chain is broken even though the suite is not
-   blind. It gates, and ranks below a true survivor.
-6. **Never a single global score.** Output is per claim, ranked. Blindness is
+   it, the verdict stays `survived` with reason `killed-by-undeclared-tests`
+   and `detail.undeclaredKillers` names the tests, so the author can fix
+   `defendedBy`. The claim's stated evidence chain is broken even though the
+   suite is not blind. It gates, and ranks below a true survivor.
+6. **A verdict names the commit it is about.** Evidence records `repo.head`;
+   when the working tree was probed instead, `repo.snapshot` holds the
+   throwaway commit that captured it. A tool must refuse to probe a commit
+   while defenders or targets have uncommitted changes, unless told to
+   snapshot the working tree — otherwise the answer looks right and is not.
+7. **Never a single global score.** Output is per claim, ranked. Blindness is
    concentrated, and one number hides where.
 
 ## Baseline and delta

package/spec/lib/validate.mjs

@@ -72,6 +72,9 @@ const semantic = {
       if (r.verdict === 'nocover' && !r.defenders.nocover) {
         errors.push({ path: `${p}/defenders/nocover`, message: 'nocover verdict requires defenders.nocover = true' });
       }
+      if (r.detail.undeclaredKillers && r.detail.reason !== 'killed-by-undeclared-tests') {
+        errors.push({ path: `${p}/detail/undeclaredKillers`, message: 'undeclaredKillers is only meaningful with reason killed-by-undeclared-tests' });
+      }
       if (r.verdict === 'unverifiable' && !r.detail.reason) {
         errors.push({ path: `${p}/detail/reason`, message: 'unverifiable requires a reason (e.g. anchor-missing, anchor-ambiguous)' });
       }

package/spec/schemas/baseline.schema.json

@@ -11,6 +11,10 @@
     "tool": { "$ref": "urn:guard-spec:v1:common#/$defs/tool" },
     "createdAt": { "$ref": "urn:guard-spec:v1:common#/$defs/isoDateTime" },
     "head": { "$ref": "urn:guard-spec:v1:common#/$defs/gitSha" },
+    "dirty": {
+      "description": "Whether the working tree had uncommitted changes when the evidence behind this baseline was taken.",
+      "type": "boolean"
+    },
     "fingerprints": {
       "type": "object",
       "propertyNames": { "pattern": "^[a-f0-9]{64}$" },

package/spec/schemas/claims.schema.json

@@ -42,7 +42,7 @@
         "severity": { "$ref": "urn:guard-spec:v1:common#/$defs/severity" },
         "producedBy": { "$ref": "urn:guard-spec:v1:common#/$defs/provenance" },
         "defendedBy": {
-          "description": "Globs (repo-relative) for the test files that supposedly defend this claim. Empty or absent means: let the runner discover related tests. If the globs resolve to zero files the verdict is `nocover`.",
+          "description": "Globs (project-relative) for the test files that supposedly defend this claim. Empty or absent means: discover defenders as the test files that import each fault's target file (relative paths and resolved aliases). If nothing resolves, the verdict is `nocover`.",
           "type": "array",
           "items": { "type": "string", "minLength": 1 },
           "uniqueItems": true

package/spec/schemas/evidence.schema.json

@@ -21,7 +21,11 @@
           "required": ["head", "dirty"],
           "properties": {
             "head": { "$ref": "urn:guard-spec:v1:common#/$defs/gitSha" },
-            "dirty": { "type": "boolean" }
+            "dirty": { "type": "boolean" },
+            "snapshot": {
+              "description": "When the working tree was probed instead of `head`: the dangling commit that captured it. Not a ref; may be garbage-collected.",
+              "$ref": "urn:guard-spec:v1:common#/$defs/gitSha"
+            }
           },
           "additionalProperties": false
         },
@@ -149,6 +153,22 @@
             "escalationRuns": {
               "type": "array",
               "items": { "$ref": "#/$defs/testRun" }
+            },
+            "undeclaredKillers": {
+              "description": "With reason `killed-by-undeclared-tests`: the tests (as `file::name`) that failed in every escalation run. Names what to add to `defendedBy`.",
+              "type": "array",
+              "minItems": 1,
+              "items": { "type": "string", "minLength": 1, "maxLength": 1024 }
+            },
+            "anchor": {
+              "description": "With an anchor-related reason: how many times `find` occurred versus how many were expected.",
+              "type": "object",
+              "required": ["hits", "expected"],
+              "properties": {
+                "hits": { "type": "integer", "minimum": 0 },
+                "expected": { "type": "integer", "minimum": 1 }
+              },
+              "additionalProperties": false
             }
           },
           "additionalProperties": false
@@ -159,7 +179,11 @@
           "properties": {
             "requested": { "type": "array", "items": { "type": "string" } },
             "resolved": { "type": "array", "items": { "$ref": "urn:guard-spec:v1:common#/$defs/repoPath" } },
-            "nocover": { "type": "boolean" }
+            "nocover": { "type": "boolean" },
+            "discovered": {
+              "description": "True when no defenders were declared and `resolved` was found by static import of the subject's file.",
+              "type": "boolean"
+            }
           },
           "additionalProperties": false
         },

package/src/baseline/baseline.mjs

@@ -7,7 +7,7 @@ export function buildBaseline(evidence, { createdAt = new Date().toISOString() }
     if (r.verdict === 'killed') continue;
     fingerprints[r.fingerprint] = (fingerprints[r.fingerprint] ?? 0) + 1;
   }
-  return { schemaVersion: 1, tool: evidence.tool, createdAt, head: evidence.run.repo.head, fingerprints };
+  return { schemaVersion: 1, tool: evidence.tool, createdAt, head: evidence.run.repo.head, dirty: evidence.run.repo.dirty, fingerprints };
 }
 
 /**

package/src/brief/brief.mjs

@@ -11,7 +11,7 @@ export function hintFor(r) {
     case 'survived':
       return r.detail.reason === 'killed-by-undeclared-tests'
         ? `Only tests outside its declared defenders (${defenders}) catch this; fix the claim's defendedBy or move the assertion.`
-        : `${defenders} stayed green with this fault applied; add an assertion that fails on it and passes on HEAD.`;
+        : `${defenders} stayed green with this fault applied; add an assertion that fails on it and passes on HEAD. If no test's outcome can change, first check the fault is observable at all.`;
     case 'nocover':
       return `No test file matches ${r.defenders.requested.join(', ') || '(no defenders declared)'}; nothing defends this claim.`;
     case 'unverifiable':

package/src/cli.mjs

@@ -10,6 +10,7 @@ import { probeCommand } from './commands/probe.mjs';
 import { claimsCommand } from './commands/claims.mjs';
 import { baselineCommand } from './commands/baseline.mjs';
 import { briefCommand } from './commands/brief.mjs';
+import { scaffoldCommand } from './commands/scaffold.mjs';
 
 const VERSION = JSON.parse(readFileSync(join(fileURLToPath(import.meta.url), '..', '..', 'package.json'), 'utf8')).version;
 
@@ -19,6 +20,7 @@ const USAGE = `testguard ${VERSION} — proves a test suite defends the claims a
   testguard probe [dir]      inject each claim's faults, run its defenders, report what survived
   testguard baseline [dir]   freeze today's unproven findings so only new ones gate
   testguard brief [dir]      emit the blind-spot block for an agent's session-start context
+  testguard scaffold <file>  propose faults mechanically for one source file, as a draft claims document
 
 probe
   --claims <path>      claims file             (default: <dir>/testguard.claims.json)
@@ -29,6 +31,8 @@ probe
   --severity <level>   gate only at or above   (default: low)
   --ref <commit>       probe this commit in the scratch worktree (default: HEAD)
   --claim <ID,ID>      probe only these claims; writes .testguard/evidence-partial.json
+  --include-dirty      probe the working tree (a snapshot commit) instead of HEAD; uncommitted tests count
+  --verbose            also print each killed fault (default: only unproven ones, plus a count)
   --runner-cmd "<cmd>" custom runner; must contain {files} and {out}, e.g. "pnpm vitest run {files} --reporter=json --outputFile={out}"
   --node-modules <dir> node_modules to link into the scratch worktree (or TESTGUARD_NODE_MODULES)
   --in-place           mutate the working tree instead of a scratch worktree
@@ -36,6 +40,9 @@ probe
   --no-reuse           re-probe claims whose inputs have not changed
   --quiet              suppress the per-fault stream and ranked block; print only the summary and evidence path
 
+scaffold   --claim <ID> (put every proposal under this claim; copies it if it exists)  --out <path>  --json
+           shapes: if-guard → if (false) · single-line guard/mutation removed · return <check> → return true
+                   · security flag/window/cost literal weakened · verify/validate/check call removed
 claims     --json
 baseline   --evidence <path>  --out <path>
 brief      --evidence <path>  --baseline <path>  --max <n>  --text (print only; safe for hooks)
@@ -43,7 +50,7 @@ brief      --evidence <path>  --baseline <path>  --max <n>  --text (print only;
 exit codes: 0 nothing new to prove · 1 unproven claims (or claim drift) · 2 precondition failed · 3 usage
 `;
 
-const COMMANDS = { probe: probeCommand, claims: claimsCommand, baseline: baselineCommand, brief: briefCommand };
+const COMMANDS = { probe: probeCommand, claims: claimsCommand, baseline: baselineCommand, brief: briefCommand, scaffold: scaffoldCommand };
 
 export async function main(argv, io = { out: (s) => process.stdout.write(s + '\n'), err: (s) => process.stderr.write(s + '\n') }) {
   let parsed;
@@ -62,6 +69,8 @@ export async function main(argv, io = { out: (s) => process.stdout.write(s + '\n
         max: { type: 'string', default: '20' },
         ref: { type: 'string', default: 'HEAD' },
         claim: { type: 'string' },
+        'include-dirty': { type: 'boolean', default: false },
+        verbose: { type: 'boolean', default: false },
         'runner-cmd': { type: 'string' },
         'node-modules': { type: 'string' },
         'in-place': { type: 'boolean', default: false },
@@ -100,7 +109,8 @@ export async function main(argv, io = { out: (s) => process.stdout.write(s + '\n
     return 3;
   }
   try {
-    return await handler({ projectDir: resolve(dirArg ?? '.'), values, version: VERSION }, io);
+    const projectDir = command === 'scaffold' ? resolve('.') : resolve(dirArg ?? '.');
+    return await handler({ projectDir, file: dirArg, values, version: VERSION }, io);
   } catch (e) {
     if (e instanceof ClaimsError || e instanceof PreconditionError || e instanceof GitError || e instanceof SpecDocError) {
       io.err(`error: ${e.message}`);

package/src/commands/baseline.mjs

@@ -15,7 +15,7 @@ export async function baselineCommand({ projectDir, values }, io) {
   const outPath = values.out ? resolve(values.out) : baselinePath(projectDir);
   writeSpecDoc('baseline', outPath, baseline);
   const n = Object.values(baseline.fingerprints).reduce((a, b) => a + b, 0);
-  io.out(`baseline: ${n} unproven finding${n === 1 ? '' : 's'} frozen at ${baseline.head.slice(0, 12)} → ${outPath}`);
+  io.out(`baseline: ${n} unproven finding${n === 1 ? '' : 's'} frozen at ${baseline.head.slice(0, 12)}${baseline.dirty ? ' (working tree was dirty)' : ''} → ${outPath}`);
   io.out('Commit this file; from now on only new findings gate. Ignore the regenerated ones — add to .gitignore:');
   io.out('  .testguard/evidence.json');
   io.out('  .testguard/brief.json');

package/src/commands/claims.mjs

@@ -2,6 +2,7 @@ import { resolve } from 'node:path';
 import { loadClaims, defaultClaimsPath } from '../claims/load.mjs';
 import { scanAnnotations, reconcile } from '../claims/annotations.mjs';
 import { resolveDefenders } from '../probe/runner-vitest.mjs';
+import { discoverDefenders } from '../probe/discover.mjs';
 
 export async function claimsCommand({ projectDir, values }, io) {
   const path = values.claims ? resolve(values.claims) : defaultClaimsPath(projectDir);
@@ -16,8 +17,9 @@ export async function claimsCommand({ projectDir, values }, io) {
     io.out(`${claims.claims.length} claims in ${path} — ${annotated.size} carry a @claim annotation in source (test files are not scanned)`);
     io.out('');
     for (const c of claims.claims) {
-      const defenders = resolveDefenders(projectDir, c.defendedBy);
-      const cover = defenders.length ? `${defenders.length} defender${defenders.length === 1 ? '' : 's'}` : 'NO DEFENDER';
+      const declared = c.defendedBy?.length > 0;
+      const defenders = declared ? resolveDefenders(projectDir, c.defendedBy) : [...new Set(c.faults.flatMap((f) => discoverDefenders(projectDir, f.file)))];
+      const cover = defenders.length ? `${defenders.length} ${declared ? 'defender' : 'discovered'}${defenders.length === 1 ? '' : 's'}` : 'NO DEFENDER';
       io.out(`${annotated.has(c.id) ? '@ ' : '  '}${c.id.padEnd(14)} ${c.severity.padEnd(8)} ${c.source.kind.padEnd(10)} ${String(c.faults.length).padStart(2)} fault${c.faults.length === 1 ? ' ' : 's'}  ${cover.padEnd(12)}  ${c.statement}`);
     }
     if (drift.undeclared.length || drift.stale.length) io.out('');

package/src/commands/probe.mjs

@@ -41,7 +41,12 @@ export async function probeCommand({ projectDir, values, version }, io) {
     only,
     escalate: !values['no-escalate'],
     toolVersion: version,
-    onProgress: values.quiet ? undefined : (r) => io.out(renderRecord(r) + (r.reusedFrom ? '  (reused)' : '')),
+    includeDirty: values['include-dirty'],
+    onStage: !values.quiet && process.stderr.isTTY ? ({ claimId, faultId, stage, i, n }) => process.stderr.write(`\r\x1b[K  … ${claimId}/${faultId} ${stage} ${i}/${n}`) : undefined,
+    onProgress: values.quiet ? undefined : (r) => {
+      if (process.stderr.isTTY) process.stderr.write('\r\x1b[K');
+      if (values.verbose || r.verdict !== 'killed') io.out(renderRecord(r) + (r.reusedFrom ? '  (reused)' : ''));
+    },
   });
   writeSpecDoc('evidence', outPath, evidence);
 
@@ -52,7 +57,11 @@ export async function probeCommand({ projectDir, values, version }, io) {
     for (const r of sortForReport(evidence.records).filter((x) => x.verdict !== 'killed')) io.out('  ' + tag(r) + renderRecord(r));
   }
   io.out('');
-  io.out(renderSummary(evidence.records) + (baseline ? ` ${g.new.length} new since baseline, ${g.baselined.length} baselined.` : ' No baseline.'));
+  if (!values.quiet && !values.verbose) {
+    const killed = evidence.records.filter((r) => r.verdict === 'killed').length;
+    if (killed) io.out(`  ${killed} killed (not listed; --verbose to see them)`);
+  }
+  io.out(renderSummary(evidence.records, evidence.run) + (baseline ? ` ${g.new.length} new since baseline, ${g.baselined.length} baselined.` : ' No baseline.'));
   io.out(`evidence: ${outPath}${only ? ` (partial: --claim ${only.join(',')}; not the canonical evidence file)` : ''}`);
   return g.new.length > 0 ? 1 : 0;
 }

package/src/commands/scaffold.mjs

@@ -0,0 +1,34 @@
+import { existsSync } from 'node:fs';
+import { join, resolve, relative, basename, extname } from 'node:path';
+import { scaffoldFile } from '../scaffold/scaffold.mjs';
+import { loadClaims, defaultClaimsPath } from '../claims/load.mjs';
+import { writeSpecDoc } from '../evidence/writer.mjs';
+import { PreconditionError } from '../probe/worktree.mjs';
+
+export async function scaffoldCommand({ projectDir, file, values, version }, io) {
+  if (!file) {
+    io.err('usage: testguard scaffold <source-file> [--claim <ID>] [--out <path>] [--json]');
+    return 3;
+  }
+  const abs = resolve(file);
+  if (!existsSync(abs)) throw new PreconditionError(`no such file: ${file}`);
+  const rel = relative(projectDir, abs);
+  if (rel.startsWith('..')) throw new PreconditionError(`${file} is outside the project directory ${projectDir}`);
+
+  const claimsPath = values.claims ? resolve(values.claims) : defaultClaimsPath(projectDir);
+  const existingClaims = existsSync(claimsPath) ? loadClaims(claimsPath) : undefined;
+  const { doc, stats } = scaffoldFile({ projectDir, file: rel, claimId: values.claim, existingClaims, toolVersion: version });
+
+  if (values.json) {
+    io.out(JSON.stringify(doc, null, 2));
+    return 0;
+  }
+  const outPath = values.out ? resolve(values.out) : join(projectDir, '.testguard', `scaffold-${basename(rel, extname(rel))}.json`);
+  writeSpecDoc('claims', outPath, doc);
+  const shapes = Object.entries(stats.byClass).map(([k, v]) => `${v} ${k}`).join(', ');
+  io.out(`${stats.proposals} proposed fault${stats.proposals === 1 ? '' : 's'} in ${stats.claims} draft claim${stats.claims === 1 ? '' : 's'} for ${rel}${shapes ? ` — ${shapes}` : ''}`);
+  io.out(stats.defendedBy.length ? `defendedBy prefilled from imports: ${stats.defendedBy.join(', ')}` : 'no test file imports this module; probing the draft as-is will report NOCOVER');
+  io.out(`draft: ${outPath}`);
+  io.out('Next: replace each TODO statement, drop proposals that are not claims, then move the claims into testguard.claims.json.');
+  return 0;
+}

package/src/git.mjs

@@ -1,10 +1,13 @@
 import { spawnSync } from 'node:child_process';
 import { rmSync } from 'node:fs';
+import { tmpdir } from 'node:os';
+import { join } from 'node:path';
+import { randomBytes } from 'node:crypto';
 
 export class GitError extends Error {}
 
-export function git(args, cwd) {
-  const r = spawnSync('git', args, { cwd, encoding: 'utf8' });
+export function git(args, cwd, env) {
+  const r = spawnSync('git', args, { cwd, encoding: 'utf8', env: env ? { ...process.env, ...env } : process.env });
   if (r.status !== 0) throw new GitError(`git ${args.join(' ')}: ${(r.stderr || r.stdout).trim()}`);
   return r.stdout.trim();
 }
@@ -25,6 +28,29 @@ export const isDirty = (dir, paths = []) => git(['status', '--porcelain', '--',
 
 export const addWorktree = (repo, dest, ref = 'HEAD') => git(['worktree', 'add', '--detach', dest, ref], repo);
 
+/**
+ * A dangling commit holding the working tree exactly as it is — tracked
+ * changes AND untracked (non-ignored) files — without touching HEAD, the
+ * index, or any ref. Built through a temporary index so the user's staging
+ * area is never read or written.
+ */
+export function snapshotWorkingTree(repo) {
+  const index = join(tmpdir(), `testguard-index-${randomBytes(6).toString('hex')}`);
+  const env = {
+    GIT_INDEX_FILE: index,
+    GIT_AUTHOR_NAME: 'testguard', GIT_AUTHOR_EMAIL: 'testguard@localhost',
+    GIT_COMMITTER_NAME: 'testguard', GIT_COMMITTER_EMAIL: 'testguard@localhost',
+  };
+  try {
+    git(['read-tree', 'HEAD'], repo, env);
+    git(['add', '-A', '--', '.'], repo, env);
+    const tree = git(['write-tree'], repo, env);
+    return git(['commit-tree', tree, '-p', 'HEAD', '-m', 'testguard: working-tree snapshot (not a ref)'], repo, env);
+  } finally {
+    rmSync(index, { force: true });
+  }
+}
+
 export function removeWorktree(repo, dest) {
   spawnSync('git', ['worktree', 'remove', '--force', dest], { cwd: repo });
   rmSync(dest, { recursive: true, force: true });

package/src/probe/classify.mjs

@@ -15,7 +15,8 @@ export function classify({ defenders, anchor, baselineRuns, probeRuns, confirmRu
   }
   const loadError = probeRuns.find((r) => r.outcome === 'error');
   if (loadError) {
-    const parseError = /syntax|parse/i.test(loadError.loadMessage ?? '');
+    // esbuild/vitest wording: "Transform failed with 1 error", `Expected ")" but found ";"`, "Unexpected token"
+    const parseError = /syntax|parse|transform failed|expected .+ but found|unexpected token/i.test(loadError.loadMessage ?? '');
     return { verdict: 'fault-invalid', reason: parseError ? 'replacement-does-not-compile' : 'suite-failed-to-load' };
   }
   if (probeRuns.some((r) => r.outcome === 'timeout' || r.timeouts > 0)) return { verdict: 'timeout', reason: 'test-timed-out' };

package/src/probe/discover.mjs

@@ -0,0 +1,12 @@
+import { join } from 'node:path';
+import { listTestFiles } from './runner-vitest.mjs';
+import { fileImports } from './rank.mjs';
+
+/**
+ * When a claim declares no defenders: the test files that import the fault's
+ * target file, directly, by relative path or through a resolved alias. This
+ * is what `nocover` measures against — no test file even imports the source.
+ */
+export function discoverDefenders(projectDir, targetRel) {
+  return listTestFiles(projectDir).filter((t) => fileImports(projectDir, join(projectDir, t), targetRel));
+}

package/src/probe/probe.mjs

@@ -1,7 +1,9 @@
-import { existsSync, readFileSync } from 'node:fs';
+import { existsSync, readFileSync, realpathSync } from 'node:fs';
+import { git } from '../git.mjs';
 import { createRequire } from 'node:module';
 import { join, relative, resolve } from 'node:path';
-import { repoRoot as gitRoot, headSha, isDirty } from '../git.mjs';
+import { repoRoot as gitRoot, headSha, isDirty, snapshotWorkingTree } from '../git.mjs';
+import { discoverDefenders } from './discover.mjs';
 import { createScratch, inPlace, PreconditionError } from './worktree.mjs';
 import { applyFault, locate } from './inject.mjs';
 import * as vitest from './runner-vitest.mjs';
@@ -34,13 +36,17 @@ export async function probe({
   runnerCommand,
   nodeModules,
   only,
+  includeDirty = false,
+  onStage = () => {},
   escalate = true,
   scratchBase,
   toolVersion = '0.0.0',
   previous,
   onProgress = () => {},
 }) {
-  projectDir = resolve(projectDir);
+  // realpath: git reports the repository root by its real path (/private/var
+  // on macOS, not /var); every relative() below must start from the same place.
+  projectDir = realpathSync(resolve(projectDir));
   const root = gitRoot(projectDir);
   if (mode === 'in-place' && ref !== 'HEAD') throw new PreconditionError('--ref needs a scratch worktree; drop --in-place');
   const head = headSha(root, ref);
@@ -50,6 +56,8 @@ export async function probe({
   if (mode === 'in-place' && isDirty(root, targets)) {
     throw new PreconditionError(`uncommitted changes in fault target files (${targets.join(', ')}); commit or stash them, or drop --in-place. Only the files faults are applied to must be clean — test files may be dirty, which is what makes --in-place usable while writing tests.`);
   }
+  if (includeDirty && mode !== 'worktree') throw new PreconditionError('--include-dirty applies to worktree mode; drop --in-place');
+  if (includeDirty && ref !== 'HEAD') throw new PreconditionError('--include-dirty snapshots the working tree; it cannot be combined with --ref');
   const selected = only ? new Set(only) : null;
   if (selected) {
     const known = new Set(claims.claims.map((c) => c.id));
@@ -57,8 +65,28 @@ export async function probe({
     if (unknown.length) throw new PreconditionError(`--claim: unknown claim id(s) ${unknown.join(', ')}`);
   }
 
+  // Worktree mode probes a commit, not the working tree. Uncommitted defender
+  // or target edits would be silently absent — the same survivors, no hint why.
+  let snapshot;
+  if (mode === 'worktree') {
+    if (includeDirty) {
+      if (isDirty(root)) snapshot = snapshotWorkingTree(root);
+    } else if (ref === 'HEAD') {
+      const watched = new Set(targets);
+      for (const claim of claims.claims) {
+        if (selected && !selected.has(claim.id)) continue;
+        const declared = claim.defendedBy?.length ? vitest.resolveDefenders(projectDir, claim.defendedBy) : claim.faults.flatMap((f) => discoverDefenders(projectDir, f.file));
+        for (const d of declared) watched.add(relative(root, join(projectDir, d)));
+        for (const g of claim.defendedBy ?? []) if (!g.includes('*')) watched.add(relative(root, join(projectDir, g)));
+      }
+      const dirty = git(['status', '--porcelain', '--', ...watched], root).split('\n').filter(Boolean).map((l) => l.replace(/^[ MADRCU?!]{1,2}\s+/, '').replace(/^.* -> /, ''));
+      if (dirty.length) {
+        throw new PreconditionError(`${dirty.length} defender/target file${dirty.length === 1 ? ' has' : 's have'} uncommitted changes (${dirty.join(', ')}); worktree mode probes HEAD (${head.slice(0, 7)}), so those changes would be silently ignored. Commit them, run with --include-dirty to probe the working tree, or use --in-place.`);
+      }
+    }
+  }
   const startedAt = new Date().toISOString();
-  const iso = mode === 'worktree' ? createScratch({ repoRoot: root, projectDir, ref, scratchBase, nodeModules }) : inPlace({ repoRoot: root, projectDir });
+  const iso = mode === 'worktree' ? createScratch({ repoRoot: root, projectDir, ref: snapshot ?? ref, scratchBase, nodeModules }) : inPlace({ repoRoot: root, projectDir });
   const records = [];
   let runnerVersion;
   try {
@@ -81,9 +109,11 @@ export async function probe({
 
     for (const claim of claims.claims) {
       if (selected && !selected.has(claim.id)) continue;
-      const defenders = vitest.resolveDefenders(iso.projectDir, claim.defendedBy);
+      const declared = claim.defendedBy?.length ? vitest.resolveDefenders(iso.projectDir, claim.defendedBy) : null;
       for (const fault of claim.faults) {
-        const record = await probeOne({ claim, fault, defenders, allTests, iso, confirmRuns, escalate, baselineCache, runDefenders, prior: prior.get(`${claim.id}/${fault.id}`), priorRunId: previous?.run.id });
+        const defenders = declared ?? discoverDefenders(iso.projectDir, fault.file);
+        const stage = (name, i, n) => onStage({ claimId: claim.id, faultId: fault.id, stage: name, i, n });
+        const record = await probeOne({ claim, fault, defenders, discovered: declared === null, allTests, iso, confirmRuns, escalate, baselineCache, runDefenders, stage, prior: prior.get(`${claim.id}/${fault.id}`), priorRunId: previous?.run.id });
         records.push(record);
         onProgress(record);
       }
@@ -99,7 +129,7 @@ export async function probe({
       id: `run-${startedAt.replace(/[-:.]/g, '').slice(0, 15)}`,
       startedAt,
       finishedAt: new Date().toISOString(),
-      repo: { head, dirty: isDirty(root) },
+      repo: { head, dirty: isDirty(root), ...(snapshot ? { snapshot } : {}) },
       runner: { name: vitest.name, ...((runnerVersion ?? readRunnerVersion(projectDir)) ? { version: runnerVersion ?? readRunnerVersion(projectDir) } : {}) },
       confirmRuns,
       mode,
@@ -108,7 +138,7 @@ export async function probe({
   };
 }
 
-async function probeOne({ claim, fault, defenders, allTests, iso, confirmRuns, escalate, baselineCache, runDefenders, prior, priorRunId }) {
+async function probeOne({ claim, fault, defenders, discovered, allTests, iso, confirmRuns, escalate, baselineCache, runDefenders, stage, prior, priorRunId }) {
   const targetPath = join(iso.projectDir, fault.file);
   const targetExists = existsSync(targetPath);
   const inputs = {
@@ -134,6 +164,7 @@ async function probeOne({ claim, fault, defenders, allTests, iso, confirmRuns, e
         const runs = [];
         let loadMessage;
         for (let i = 0; i < confirmRuns; i++) {
+          stage('baseline', i + 1, confirmRuns);
           const res = await runDefenders(defenders);
           runs.push(res.run);
           if (res.run.outcome !== 'pass') {
@@ -156,6 +187,7 @@ async function probeOne({ claim, fault, defenders, allTests, iso, confirmRuns, e
         try {
           const probeRuns = rawProbeRuns;
           for (let i = 0; i < confirmRuns; i++) {
+            stage('probe', i + 1, confirmRuns);
             const { run, timeouts, loadMessage } = await runDefenders(defenders);
             probeRuns.push({ ...run, timeouts, loadMessage });
             if (shouldStopEarly(probeRuns)) break;
@@ -171,6 +203,7 @@ async function probeOne({ claim, fault, defenders, allTests, iso, confirmRuns, e
             const runs = [];
             let killers = null;
             for (let i = 0; i < confirmRuns; i++) {
+              stage('escalation', i + 1, confirmRuns);
               const { run, failedTests } = await runDefenders(allTests);
               runs.push(run);
               killers = killers === null ? new Set(failedTests) : new Set(failedTests.filter((t) => killers.has(t)));
@@ -178,7 +211,10 @@ async function probeOne({ claim, fault, defenders, allTests, iso, confirmRuns, e
             }
             detail.escalated = true;
             detail.escalationRuns = runs;
-            if (killers.size > 0 && runs.length === confirmRuns && runs.every(isKill)) detail.reason = 'killed-by-undeclared-tests';
+            if (killers.size > 0 && runs.length === confirmRuns && runs.every(isKill)) {
+              detail.reason = 'killed-by-undeclared-tests';
+              detail.undeclaredKillers = [...killers].sort();
+            }
           }
         } finally {
           mutation.restore();
@@ -189,6 +225,7 @@ async function probeOne({ claim, fault, defenders, allTests, iso, confirmRuns, e
 
   const { verdict, reason } = classify({ defenders, anchor, baselineRuns: detail.baselineRuns, probeRuns: rawProbeRuns, confirmRuns });
   if (reason && !detail.reason) detail.reason = reason;
+  if (anchor && anchor.status !== 'ok' && anchor.status !== 'file-missing' && anchor.status !== 'defenders-failed-to-load') detail.anchor = { hits: anchor.hits, expected: anchor.expected };
 
   const blast = targetExists ? blastRadius(iso.projectDir, fault.file) : 0;
 
@@ -198,7 +235,7 @@ async function probeOne({ claim, fault, defenders, allTests, iso, confirmRuns, e
     subject: { kind: 'fault', id: fault.id, description: fault.description, file: fault.file, faultClass: fault.faultClass, producedBy: fault.producedBy },
     verdict,
     detail,
-    defenders: { requested: claim.defendedBy ?? [], resolved: defenders, nocover: defenders.length === 0 },
+    defenders: { requested: claim.defendedBy ?? [], resolved: defenders, nocover: defenders.length === 0, ...(discovered ? { discovered: true } : {}) },
     inputs,
     rank: rank({ severity: claim.severity, sourceKind: claim.source.kind, blast }),
   };

package/src/probe/rank.mjs

@@ -94,6 +94,20 @@ function resolvesTo(fromFile, specifier, targetAbs, aliases) {
   return bases.some((b) => expandBase(b).includes(targetAbs));
 }
 
+/** Does the file at `absFile` import `targetRel` (relative or alias-resolved)? */
+export function fileImports(projectDir, absFile, targetRel) {
+  const targetAbs = resolve(projectDir, targetRel);
+  const aliases = loadAliases(projectDir);
+  let src;
+  try {
+    src = readFileSync(absFile, 'utf8');
+  } catch {
+    return false;
+  }
+  for (const m of src.matchAll(IMPORT_RE)) if (resolvesTo(absFile, m[1], targetAbs, aliases)) return true;
+  return false;
+}
+
 /**
  * Number of non-test source files that import `targetRel`: relative specifiers,
  * tsconfig/jsconfig `paths` aliases and package.json `imports` are resolved;

package/src/render.mjs

@@ -5,7 +5,16 @@ export const formatVerdict = (v) => (v === 'killed' ? 'killed' : v.toUpperCase()
 
 export function renderRecord(r) {
   const head = `${formatVerdict(r.verdict).padEnd(15)} ${r.claim.id}/${r.subject.id}`.padEnd(38);
-  const why = r.detail.reason ? `  [${r.detail.reason}]` : '';
+  let why = '';
+  if (r.detail.reason === 'killed-by-undeclared-tests' && r.detail.undeclaredKillers?.length) {
+    const files = [...new Set(r.detail.undeclaredKillers.map((k) => k.split('::')[0]))];
+    why = `  [killed-by-undeclared-tests: ${files.join(', ')}]`;
+  } else if (r.detail.reason === 'anchor-ambiguous' && r.detail.anchor) {
+    why = `  [anchor-ambiguous: ${r.detail.anchor.hits} hits, expected ${r.detail.anchor.expected}]`;
+  } else if (r.detail.reason) {
+    why = `  [${r.detail.reason}]`;
+  }
+  if (r.defenders.discovered) why += '  (defenders discovered by import)';
   return `${head} ${r.claim.severity.padEnd(8)} ${r.subject.file}  ${r.subject.description}${why}`;
 }
 
@@ -15,12 +24,13 @@ export function summarize(records) {
   return byVerdict;
 }
 
-export function renderSummary(records) {
+export function renderSummary(records, run) {
   const byVerdict = summarize(records);
   const parts = ORDER.filter((v) => byVerdict[v]).map((v) => `${byVerdict[v]} ${formatVerdict(v)}`);
   const unproven = records.filter((r) => r.verdict !== 'killed');
   const claims = new Set(unproven.map((r) => r.claim.id)).size;
-  return `${records.length} faults probed: ${parts.join(', ')}. ${unproven.length} unproven fault${unproven.length === 1 ? '' : 's'} across ${claims} claim${claims === 1 ? '' : 's'}.`;
+  const where = run ? ` Probed ${run.repo.snapshot ? `working tree (snapshot ${run.repo.snapshot.slice(0, 7)} of ${run.repo.head.slice(0, 7)})` : run.mode === 'in-place' ? `in place at ${run.repo.head.slice(0, 7)}${run.repo.dirty ? ' (dirty)' : ''}` : run.repo.head.slice(0, 7)}.` : '';
+  return `${records.length} faults probed: ${parts.join(', ')}. ${unproven.length} unproven fault${unproven.length === 1 ? '' : 's'} across ${claims} claim${claims === 1 ? '' : 's'}.${where}`;
 }
 
 /** Survivors first, then by rank score; killed last. */

package/src/scaffold/producers.mjs

@@ -0,0 +1,85 @@
+/**
+ * Mechanical fault producers. Deterministic, line-oriented, no AST, no LLM.
+ *
+ * Two independent field reports found that ~80% of hand-written faults are
+ * one of these shapes. Each producer looks at one line (plus a little
+ * context) and proposes a fault whose `find` is the exact line, so the anchor
+ * hits by construction. A human keeps or drops every proposal.
+ */
+
+const COMMENT = /^\s*(\/\/|\*|\/\*)/;
+const GUARD_BODY = /\b(return|throw)\b|\.status\(\s*4\d\d|\bredirect\(|\bfalse\b|\bnull\b/;
+const IF_LINE = /^(\s*)(?:\}\s*)?(?:else\s+)?if\s*\((.+)\)\s*(\{\s*|(?:return|throw)\b.*;\s*)?$/;
+const RETURN_CHECK = /^\s*return\s+(.+);\s*$/;
+const CHECK_EXPR = /(===|!==|\.includes\(|\.has\(|\.some\(|\.every\(|\.test\(|\.startsWith\(|\.endsWith\(|\binstanceof\b|&&|\|\||^!)/;
+const CHECK_CALL = /^\s*(?:await\s+)?(?:[\w$]+\.)*(verify|validate|assert|check|require|ensure|authoriz|authentic|rateLimit|throttle|enforce|guard)\w*\s*\(.*\)\s*;\s*$/i;
+const MUTATION = /^\s*(?!(?:const|let|var|return|if|for|while|else|switch|case|import|export|throw)\b)[\w$]+(?:[.\[][\w$'"\]]+)*\s*(=|\+=|-=|\|\|=|&&=|\?\?=)\s*(?!=)[^;]*;\s*$/;
+const FLAG_TRUE = /\b(httpOnly|secure|signed|requireTLS|rejectUnauthorized|strict)\s*:\s*true\b/;
+const SAME_SITE = /\bsameSite\s*:\s*(['"])(strict|lax)\1/i;
+const COST_NUM = /\b(\w*(?:cost|rounds|iterations)\w*)\s*([:=])\s*(\d+)\b/i;
+const WINDOW_NUM = /\b(\w*(?:ttl|expir|tolerance|window|maxAge|max_age|timeout|limit|attempts|length|minLength|clockSkew|skew)\w*)\s*([:=])\s*(\d+)\b/i;
+const FUNCTION_HEAD = [
+  /^\s*(?:export\s+)?(?:default\s+)?(?:async\s+)?function\s*\*?\s*([\w$]+)\s*\(/,
+  /^\s*(?:export\s+)?(?:const|let|var)\s+([\w$]+)\s*=\s*(?:async\s*)?(?:\([^)]*\)|[\w$]+)\s*=>/,
+  /^\s*(?:export\s+)?(?:const|let|var)\s+([\w$]+)\s*=\s*(?:async\s+)?function\b/,
+  /^\s*(?:public\s+|private\s+|protected\s+)?(?:static\s+)?(?:async\s+)?([\w$]+)\s*\([^)]*\)\s*(?::\s*[\w<>\[\]| ]+)?\s*\{\s*$/,
+];
+const NOT_A_FUNCTION = new Set(['if', 'for', 'while', 'switch', 'catch', 'else', 'return', 'function', 'constructor']);
+
+/** Name of the function whose head is on this line, or null. */
+export function functionHead(line) {
+  for (const re of FUNCTION_HEAD) {
+    const m = re.exec(line);
+    if (m && !NOT_A_FUNCTION.has(m[1])) return m[1];
+  }
+  return null;
+}
+
+function isGuard(cond, lines, i) {
+  if (/^\s*!/.test(cond)) return true;
+  const tail = lines.slice(i, i + 4).join('\n');
+  return GUARD_BODY.test(tail);
+}
+
+/** Proposals for one line. Each: { faultClass, description, replace } where find is the line itself. */
+export function proposalsForLine(lines, i) {
+  const line = lines[i];
+  const out = [];
+  if (!line.trim() || COMMENT.test(line)) return out;
+
+  const ifm = IF_LINE.exec(line);
+  if (ifm && isGuard(ifm[2], lines, i)) {
+    const singleLine = ifm[3] && /^(return|throw)\b/.test(ifm[3].trim());
+    if (singleLine) {
+      out.push({ faultClass: 'statement-deleted', description: `Guard removed: \`${line.trim()}\` no longer runs.`, replace: '' });
+    } else {
+      out.push({ faultClass: 'condition-forced', description: `Guard never triggers: \`if (${ifm[2].trim()})\` becomes \`if (false)\`.`, replace: line.replace(`(${ifm[2]})`, '(false)') });
+    }
+    return out; // an `if` line is not also a mutation/return/call
+  }
+
+  const rm = RETURN_CHECK.exec(line);
+  if (rm && CHECK_EXPR.test(rm[1]) && !/^(new|await)\b/.test(rm[1].trim())) {
+    out.push({ faultClass: 'return-altered', description: `Check always passes: \`return ${rm[1].trim()}\` becomes \`return true\`.`, replace: line.replace(/return\s+.+;/, 'return true;') });
+  }
+
+  if (CHECK_CALL.test(line)) {
+    out.push({ faultClass: 'call-removed', description: `Check call removed: \`${line.trim()}\` no longer runs.`, replace: '' });
+  } else if (MUTATION.test(line)) {
+    out.push({ faultClass: 'statement-deleted', description: `State change removed: \`${line.trim()}\` no longer runs.`, replace: '' });
+  }
+
+  let m;
+  if ((m = FLAG_TRUE.exec(line))) {
+    out.push({ faultClass: 'literal-changed', description: `Security flag flipped: \`${m[1]}: true\` becomes \`${m[1]}: false\`.`, replace: line.replace(m[0], `${m[1]}: false`) });
+  }
+  if ((m = SAME_SITE.exec(line))) {
+    out.push({ faultClass: 'literal-changed', description: `sameSite weakened: \`${m[2]}\` becomes \`none\`.`, replace: line.replace(m[0], `sameSite: ${m[1]}none${m[1]}`) });
+  }
+  if ((m = COST_NUM.exec(line))) {
+    out.push({ faultClass: 'literal-changed', description: `Work factor collapsed: \`${m[1]}\` ${m[3]} becomes 1.`, replace: line.replace(m[0], `${m[1]}${m[2] === ':' ? ': ' : ' = '}1`) });
+  } else if ((m = WINDOW_NUM.exec(line))) {
+    out.push({ faultClass: 'literal-changed', description: `Window widened ×1000: \`${m[1]}\` ${m[3]} becomes ${Number(m[3]) * 1000}.`, replace: line.replace(m[0], `${m[1]}${m[2] === ':' ? ': ' : ' = '}${Number(m[3]) * 1000}`) });
+  }
+  return out;
+}

package/src/scaffold/scaffold.mjs

@@ -0,0 +1,118 @@
+import { readFileSync } from 'node:fs';
+import { basename, extname, join } from 'node:path';
+import { proposalsForLine, functionHead } from './producers.mjs';
+import { locate } from '../probe/inject.mjs';
+import { discoverDefenders } from '../probe/discover.mjs';
+import { validate } from '../../spec/lib/validate.mjs';
+
+const ANNOTATION = /@claim\s+([A-Za-z0-9]+(?:[._]?[A-Za-z0-9]+)*-[A-Za-z0-9._-]*[A-Za-z0-9])\b/;
+
+const idPart = (s) => s.replace(/[^A-Za-z0-9]+/g, '-').replace(/^-+|-+$/g, '').toUpperCase();
+
+/** How many times `find` occurs, and which occurrence the line at `offset` is. */
+function anchorFor(source, find, offset) {
+  let hits = 0;
+  let occurrence = 0;
+  let i = -1;
+  while ((i = source.indexOf(find, i + 1)) !== -1) {
+    hits++;
+    if (i === offset) occurrence = hits;
+  }
+  return { hits, occurrence };
+}
+
+/**
+ * Scan one source file and produce a DRAFT claims document: every proposal is
+ * an exact-line anchor that `locate()` accepts, grouped by enclosing function
+ * (or by a preceding `@claim <ID>` annotation, or entirely under `claimId`),
+ * with `producedBy: { producer: "derived" }` and TODO statements a human must
+ * replace. Never touches the real claims file.
+ */
+export function scaffoldFile({ projectDir, file, claimId, existingClaims, toolVersion = '0.0.0' }) {
+  const source = readFileSync(join(projectDir, file), 'utf8');
+  const lines = source.split('\n');
+  const stem = idPart(basename(file, extname(file)));
+  const producedBy = { producer: 'derived', by: `testguard scaffold ${toolVersion}` };
+
+  const groups = new Map(); // key → { id, proposals[] , annotated }
+  const groupFor = (key, id) => {
+    if (!groups.has(key)) groups.set(key, { id, proposals: [] });
+    return groups.get(key);
+  };
+
+  let offset = 0;
+  let fn = null;
+  let fnDepth = 0;
+  let depth = 0;
+  let pendingAnnotation = null;
+  const proposals = [];
+  lines.forEach((line, i) => {
+    const ann = ANNOTATION.exec(line);
+    if (ann && /^\s*(\/\/|\*|\/\*)/.test(line)) pendingAnnotation = ann[1];
+
+    const head = functionHead(line);
+    if (head) {
+      fn = head;
+      fnDepth = depth;
+    }
+
+    for (const p of proposalsForLine(lines, i)) {
+      const find = line;
+      const { hits, occurrence } = anchorFor(source, find, offset);
+      const fault = { ...p, find, replace: p.replace, expectHits: hits, occurrence, line: i + 1, fn, annotation: pendingAnnotation };
+      if (locate(source, fault).status !== 'ok') continue; // never propose an anchor that would be unverifiable
+      proposals.push(fault);
+    }
+
+    depth += (line.match(/\{/g) ?? []).length - (line.match(/\}/g) ?? []).length;
+    if (fn && depth <= fnDepth && !head) fn = null;
+    if (pendingAnnotation && !ann && !head && line.trim() && !/^\s*(\/\/|\*|\/\*)/.test(line)) pendingAnnotation = null;
+    offset += line.length + 1;
+  });
+
+  const existing = new Map((existingClaims?.claims ?? []).map((c) => [c.id, c]));
+  const usedIds = new Set();
+  for (const p of proposals) {
+    const key = claimId ? '__all__' : p.annotation ?? p.fn ?? '__file__';
+    let id = claimId ?? p.annotation ?? `${stem}-${p.fn ? idPart(p.fn) : 'FILE'}`;
+    groupFor(key, id).proposals.push(p);
+  }
+
+  const defendedBy = discoverDefenders(projectDir, file);
+  const claims = [];
+  for (const g of groups.values()) {
+    let id = g.id;
+    while (usedIds.has(id)) id += '-2';
+    usedIds.add(id);
+    const base = existing.get(id);
+    const fnLabel = g.proposals[0].fn ? `\`${g.proposals[0].fn}\`` : 'this file';
+    const claim = {
+      id,
+      statement: base?.statement ?? `TODO: state what ${fnLabel} in ${file} guarantees (${g.proposals.length} proposed fault${g.proposals.length === 1 ? '' : 's'}; keep or drop each)`,
+      source: base?.source ?? { kind: 'manual', ref: `testguard scaffold ${file}` },
+      severity: base?.severity ?? 'medium',
+      producedBy: base?.producedBy ?? producedBy,
+      ...(base?.defendedBy?.length ? { defendedBy: base.defendedBy } : defendedBy.length ? { defendedBy } : {}),
+      faults: g.proposals.map((p, n) => ({
+        id: `S${n + 1}`,
+        description: `[line ${p.line}] ${p.description}`,
+        faultClass: p.faultClass,
+        file,
+        find: p.find,
+        replace: p.replace,
+        ...(p.expectHits > 1 ? { expectHits: p.expectHits, occurrence: p.occurrence } : {}),
+        producedBy,
+      })),
+      ...(base?.tags ? { tags: base.tags } : {}),
+    };
+    claims.push(claim);
+  }
+
+  const doc = { $schema: './node_modules/testguard-cli/spec/schemas/claims.schema.json', schemaVersion: 1, claims };
+  const result = validate('claims', doc);
+  if (!result.ok) throw new Error(`scaffold produced a non-conforming draft:\n${result.errors.map((e) => `  ${e.path}: ${e.message}`).join('\n')}`);
+
+  const byClass = {};
+  for (const p of proposals) byClass[p.faultClass] = (byClass[p.faultClass] ?? 0) + 1;
+  return { doc, stats: { proposals: proposals.length, claims: claims.length, byClass, defendedBy } };
+}