@dzhechkov/harness-cli 0.8.6 → 0.8.10

package/src/cli.ts

@@ -13,7 +13,7 @@ import { isBooleanFlag } from './boolean-flags.js';
 import { resolveInstallSpec } from './install-spec.js';
 import { execFile, execFileSync, execSync, spawn, spawnSync, type ChildProcess } from 'node:child_process';
 import { createHash, randomBytes } from 'node:crypto';
-import { homedir, tmpdir } from 'node:os';
+import { homedir, hostname, tmpdir } from 'node:os';
 import { createRequire } from 'node:module';
 import { isDeepStrictEqual } from 'node:util';
 
@@ -29,6 +29,10 @@ import {
   TARGET_NAMES_SORTED,
   runDoctor,
   runInit,
+  discoverSkillIds,
+  resolveSelection,
+  formatSelectRefusal,
+  runIntegrationsVerify,
   resolvePackageSkillRoots,
   PACKAGE_SKILL_LAYOUTS,
   benchmarkSkill,
@@ -81,6 +85,7 @@ import {
   NamedLockTimeoutError,
   NamedLockCompromisedError,
   type CodexHooksSyncReport,
+  type IntegrationManifestSource,
   type ParityCell,
   type ParityFeature,
   type ParityReportCell,
@@ -116,6 +121,8 @@ import {
   renderTimelineHtml,
   importEcc,
   recordPattern,
+  recordLessonForms,
+  normalizeLessonForms,
   resolveLearningBackend,
   storeStats,
   consolidateSessions,
@@ -141,6 +148,17 @@ import {
   importRvfCheckpoint,
   statuslineData,
   writeFeatureAdrState,
+  CHECKPOINT_STAGES,
+  estimateEta,
+  extractStageSamples,
+  formatEta,
+  parseCheckpointLines,
+  segmentRun,
+  type CheckpointStage,
+  type EtaEstimate,
+  type FeatureAdrState,
+  type RunSegment,
+  type StageSample,
   computeUsage,
   deriveCostLedger,
   planLedgerBackfill,
@@ -167,6 +185,8 @@ import {
   queryBookKnowledge,
   loadStorePatternsSync,
   patternRecordId,
+  patternIdentityOf,
+  mergeLessonMatchedForms,
   loadStoreRecords,
   recordToPattern,
   bundleSkills,
@@ -192,6 +212,8 @@ import {
   readTailInfo,
   appendChainedLines,
   verifyEventChainText,
+  classifyChainDefects,
+  CHAINED_JOURNALS,
   buildManifest,
   buildSbom,
   resolveTrustRoot,
@@ -204,12 +226,22 @@ import {
   DEFAULT_RULES,
   parsePnpmLockImporters,
   scannableStubPath,
+  type FeatureArtifactFact,
+  type FeatureTier,
+  type FeatureVolumeFact,
+  type GuardObservation,
+  type TemplateVolumeFileFact,
+  type TemplateVolumeTargetFact,
+  type VolumeShadowInput,
   // guard-promotion (feature guard-promotion, scout idea #1)
   assembleCandidates,
   renderPromotionReport,
   renderPromotionAdr,
   normalizePromotionState,
   nextPromotionState,
+  recordPromotionRunEvidence,
+  isLessonRuleContentAnchor,
+  isOffsetIsoTimestamp,
   globMatch,
   promotionAdrRelPath,
   DEFAULT_WINDOW_DAYS,
@@ -219,6 +251,10 @@ import {
   type ChangeSet,
   type ExistingRuleView,
   type PromotionReport,
+  type PromotionAcceptanceEvidence,
+  type PromotionRunEvidence,
+  type FunnelEvidenceSource,
+  type GuardEvent,
   decideProvenance,
   isInsideTree,
   signManifest,
@@ -339,6 +375,11 @@ import {
   type EpochOutcome,
   scoreRun,
   readQeGrade,
+  scoreReceiptToAggregateRow,
+  readScoreAggregateRows,
+  dedupeScoreAggregateRows,
+  buildScoreAggregateReport,
+  renderScoreAggregateReport,
   recapWindow,
   decideHorizon,
   withinWindow,
@@ -446,6 +487,7 @@ import {
   // Mutation gate (feature ha-mutation-gate) — break each named protection, run the suite, require red.
   parseMutationRegistry,
   applyMutationToText,
+  attributeBaselineRedness,
   countFailingTests,
   detectSuiteCompletionReceipt,
   detectSuiteReceiptMismatch,
@@ -455,6 +497,7 @@ import {
   mutationGateExitCode,
   summarizeMutationResults,
   renderMutationReport,
+  runWithOneInternalRetry,
   TRACE_BUNDLE_LEDGER_PATH,
   TRACE_BUNDLE_SCHEMA,
   TRACE_BUNDLE_RUN_META_FILE,
@@ -522,7 +565,7 @@ import type { SetupSpec } from '@dzhechkov/harness-core';
 import type { LogTail } from '@dzhechkov/harness-core';
 import type { DeadwoodInventoryItem } from '@dzhechkov/harness-core';
 import type { ContractDiagnostic, ContractEvidenceReader } from '@dzhechkov/harness-core';
-import type { ProvenanceMode, PackVerdict, ClaudeUsageModel, PatternRecord, TargetName, BookKU, HarmonizeReport, UsageCalibrationPlan, ClaimFinding, RecallUsagePatternRow, GateExecution, GateStep, SlopFinding, SlopLintConfig, SlopRegistry } from '@dzhechkov/harness-core';
+import type { ProvenanceMode, PackVerdict, ClaudeUsageModel, PatternRecord, RecallPatternsOptions, TeachGuardResult, TargetName, IntegrationOutcome, BookKU, HarmonizeReport, UsageCalibrationPlan, ClaimFinding, RecallUsagePatternRow, GateExecution, GateStep, SlopFinding, SlopLintConfig, SlopRegistry } from '@dzhechkov/harness-core';
 import { getPreset, PRESET_NAMES } from '@dzhechkov/harness-presets';
 import { scanGitHub, analyzeRepo, generateReport, deepAnalyze, scanAllSources, ScoutMemory } from '@dzhechkov/scout';
 
@@ -534,20 +577,20 @@ export const DZ_COMMANDS: readonly string[] = [
   'usage', 'claim-check', 'lint', 'sign', 'sbom', 'guard', 'verify-pack', 'setup',
   'pretrain', 'compose', 'diff', 'recommend', 'upgrade', 'auto-canonicalize',
   'publish', 'release', 'parity', 'registry', 'benchmark', 'mcp-scan',
-  'sync-upstream', 'drift-check', 'hooks-sync', 'agents-sync', 'sync-canonical',
+  'sync-upstream', 'drift-check', 'hooks-sync', 'integrations-verify', 'agents-sync', 'sync-canonical',
   'plugin', 'downloads', 'stats', 'architecture', 'project-skills', 'mr-rakes',
   'retro', 'feature-adr-setup', 'challenge', 'discrimination-check',
   'mutation-gate', 'delivery-check', 'skills-verify', 'compounding', 'deadwood',
   'epoch-replay', 'score', 'recap', 'cadence', 'qe-rounds', 'restart-advisor', 'tg-post',
   'name-check', 'provenance-check', 'feature-adr-record', 'amendment-check', 'contract-check',
   'feature-adr-checkpoint', 'profile', 'reqe', 'qe-bridge', 'backlog', 'routing',
-  'bto-optimize', 'dashboard', 'roam', 'import-ecc',
+  'bto-optimize', 'dashboard', 'roam', 'import-ecc', 'chain',
 ];
 
 const USAGE = `dz - DZ cross-platform harness CLI
 
 Usage:
-  dz init   --target <name> [--skills-dir <dir>] [--project <dir>] [--preset <name>] [--select id,id,...] [--force] [--enrich] [--no-hooks] [--no-verify]   (--target codex ALSO installs the user-global dz veto+recall hooks and LIVE-verifies them (ADR-001 §8); --no-hooks = skills only; --no-verify skips the live probe and can never report ready)
+  dz init   --target <name> [--skills-dir <dir>] [--project <dir>] [--preset <name>] [--select id,id,...] [--force] [--enrich] [--allow-integrations <sha256:digest>] [--no-integrations] [--no-hooks] [--no-verify]   (integration manifests require exact digest consent; --no-integrations = explicit skills-only)
   dz verify [--skills-dir <dir>] [--target <name>]
   dz sync   [--canonical <dir>] [--project <dir>] [--dry-run] [--force]
   dz update   (alias of sync)
@@ -576,13 +619,14 @@ Usage:
   dz delivery-check --slug <slug> [--context-only] [--findings <f.json>] [--strict] [--author <model>] [--json]   (portable Step-10 Delivery Gate: prints the 4-plane review brief + artifact probes; --findings classifies a fed-back review into a fail-closed ready|blocked hand-off and writes features/<slug>/10_delivery_review.md; --strict exits 1 on blocked)
   dz challenge --plan <plan.md> [--author <model>]   (the deterministic cartridge behind the challenge-panel adversarial plan-gate (R6): assembles the wide brief — plan + architecture/vision.md + testing.md + map.json + degradations.md — and prints the C1-C8 adversary prompt naming the cross-family reviewer to dispatch. exit 0 brief printed / 1 plan missing or empty)
   dz skills-verify [--dir <project>] [--expect a,b] [--static] [--strict] [--json]   (does .claude/skills/ actually REGISTER? --static = instant layout scan for CI; default reads the authoritative system/init listing from a real session. exit 0 pass / 1 fail / 2 inconclusive — never a false pass)
-  dz compounding [--project <dir>] [--json]   (honest learning-loop payoff report: pool write-only ratio, guard repeat-violation trajectory, cold-vs-warm replay readiness, instrumentation health — a gate without enough data says INSUFFICIENT_DATA, never a fake verdict)
+  dz compounding [--project <dir>] [--json]   (honest learning-loop payoff report: pool/replay/guard instrumentation + monthly eligible→attempted→accepted→executions; unavailable is NOT MEASURED, and only a named empty stage after a non-empty predecessor for 3 measured months is a funnel finding)
   dz deadwood [--weeks <n>] [--json]   (advisory zero-usage candidates for human deprecation review; safety-excluded surfaces carry reasons; never deletes or deprecates anything; shallow history says INSUFFICIENT_DATA)
   dz epoch-replay --mock [--n <N>] [--effect <-1..1>] [--tie-rate <0..1>] [--seed <N>] [--slice <name>] [--json]   ($0 synthetic run — exercises the verdict math, NOT evidence)
   dz epoch-replay --emit [--project <dir>] [--limit <N>] [--seed <N>] [--out <file>]   (cold-vs-warm work order: instances + PRE-REGISTERED blind A/B assignment; the runner never calls a model)
   dz epoch-replay --judge <filled-work-order.json> [--out <file>]   (blind judge prompts from the filled plans)
   dz epoch-replay --score <judgments.json> --work-order <file> [--slice <name>] [--json]   (un-blind against the pre-registered assignment → SUPPORTED only when the two 95% Wilson CIs are DISJOINT, else FALSIFIED / INCONCLUSIVE)
   dz score --slug <feature> [--project <dir>] [--json]   (process scorecard for ONE feature-adr run, from its artifacts: ADR confirmation, discrimination, cross-model QE grade, live verification, README-first, learning loop, amendments — descriptive-only, a low score exits 0)
+  dz score --all [--project <dir>] [--json]              (sweep features/*/.fa-state/score-*.json into the append-only chained scorecards aggregate — descriptive-only, always exits 0)
   dz recap [--day|--week|--month] [--at <ISO date>] [--project <dir>] [--json]   (what was done over a window, from records only: deliveries with the grade an independent review STATED — a report naming two grades is reported ambiguous, never guessed — registry publishes, gate verdicts, knowledge reuse. --quarter/--half-year/--year are RECOGNISED and REFUSED with the real span in days: there is one complete quarter and the longest record is 174 days. Every section carries its own data-start date, and "the source was not read" never prints as zero. Contaminated measures — commit count, lines, tokens, learning-event volume, inventory counts, lesson count — are not computed, and the report says so. exit 0 reported / 2 refused)
   dz cadence [--window day|week|month|quarter|halfyear|year] [--json]   (the WHAT-SHIPPED aggregator: graded-shipment cadence by ISO week + npm-publish cadence (recap cache) + guard repeat decay on the FIXED rule set + recall reuse; a window deeper than 2× the record is REFUSED with the depth named (ADR: a cadence from one point is scale forgery); exit 0 report / 2 refused-window / 1 usage)
   dz qe-rounds (--slug <feature> | --feature-dir <abs>) [--ceiling <n>] [--project <dir>] [--json]   (how many Step-8 review rounds has this feature ALREADY had? Reads what dz qe-bridge already wrote — signoff-<runId>.json and failed-*.json under features/<slug>/.fa-state/qe-bridge — and writes nothing itself, so it can answer for runs already past. A round is a runId, not a file; an attempt with no verdict is counted SEPARATELY and never merged; an unreadable record is NAMED and the count is declared a LOWER BOUND. ONE directory, never a union across checkouts. exit 0 under the ceiling / 1 at-or-over — owner decides, the command does not judge whether the rounds were warranted / 2 NOT ESTABLISHED, which is never "zero rounds")
@@ -601,7 +645,7 @@ Usage:
   dz feature-adr-checkpoint (--slug <feature> | --feature-dir <abs>) --stage <s> --input-hash <h> --result <json> [--artifact a,b] [--json]   (record a pipeline stage ONLY after measuring its artifacts on disk; refuses a null result, an absent artifact, or a stage that declares none — the subagent runs a COMMAND instead of hand-writing durable state)
   dz profile [init|show|set|sync] [--json]   (WHO the assistant is talking to — per-user store at ~/.dz/profile.json (0600, NEVER in a project), delivered as a marked block in ~/.claude/CLAUDE.md so it loads in EVERY project, dz installed or not. init = five questions (language, register, deep/weak domains as comma lists — "networking (CCIE; NSX)" keeps the parenthetical as the note, Enter skips — teaches y/n with one re-ask, never a silent default); show ALWAYS prints the store path + age + drift verdict + the rendered block; set register|language|teaches <v> or set deep|weak add|rm <tag> [note] — register accepts the owner's own words (профи / профи лайт / просто), an unknown value is REFUSED naming the accepted set; sync re-writes the block (runs automatically after init/set; foreign content byte-for-byte, timestamped backup before every modifying write). The register changes FORM, never FACTS, and governs dialogue only — never ADRs/commits/QE reports; both rules are baked into the rendered block at every level. exit 0 done / 1 no profile or failed / 2 refused input)
   dz reqe [--slug <feature> [--done --report <f>]] [--json]   (the re-QE debt ledger: a usage-switched run whose Step-8 QE ran on the coder's OWN family records a debt; list debts, print the cross-family review brief, settle FAIL-CLOSED against a graded report — the settlement lands in 08_qe_report.md)
-  dz qe-bridge --family claude --slug <feature> [--coder-family codex|claude] [--model <id>] [--files a,b] [--out <f>] [--timeout <s>] [--allow-same-family] [--json]   (the REVERSE QE bridge: run an INDEPENDENT Claude reviewer over a feature's Step-8 artifacts from ANY host — a Codex session included, plain shell, no Claude agent plane needed — and land a PARSED signoff. The reviewer runs ISOLATED: an EMPTY temp cwd plus --safe-mode --strict-mcp-config --tools '' --no-session-persistence, so no CLAUDE.md/skills/plugins/hooks/MCP load, and the verdict is read from the --output-format json RESULT ENVELOPE — text a session customization printed onto the same stdout can never become a signoff. Probes the model before trusting it; sends SCOPED extracts with a loud 200k-char ceiling (never silent truncation); the grade must AGREE across three LAST-anchored channels (terminal marker line, fenced qe-bridge-signoff JSON, the report's own GRADE line) AND the marker must be the FINAL content — empty, gradeless, self-contradicting or miscounted output is one of 18 NAMED failures with an audit record under features/<slug>/.fa-state/qe-bridge/ (runId, resolved executable + binOverride, prompt sha256, channel offsets, requestedOut, reportWritten, retained raw stdout; 0600 files in a 0700 dir), never a clean review. A --coder-family that contradicts the recorded reqe debt is refused. Writes features/<slug>/08b_reqe_report.md, which dz reqe --done settles unchanged. DISCLOSURE: the extracts you scope are sent to the Claude runtime; the bridge cannot classify secrets. DZ_QE_BRIDGE_CLAUDE_BIN is a TEST SEAM, not a flag. exit 0 signoff parsed (ANY grade — it reports, it does not gate) / 1 named failure / 2 usage)
+  dz qe-bridge --family claude --slug <feature> [--coder-family codex|claude] [--model <id>] [--files a,b] [--out <f>] [--timeout <s>] [--allow-same-family] [--json]   (the REVERSE QE bridge: run an INDEPENDENT Claude reviewer over a feature's Step-8 artifacts from ANY host — a Codex session included, plain shell, no Claude agent plane needed — and land a PARSED signoff. The reviewer runs ISOLATED: an EMPTY temp cwd plus --safe-mode --strict-mcp-config --tools '' --no-session-persistence, so no CLAUDE.md/skills/plugins/hooks/MCP load, and the verdict is read from the --output-format json RESULT ENVELOPE — text a session customization printed onto the same stdout can never become a signoff. Probes the model before trusting it; sends SCOPED extracts with a loud 200k-char ceiling (never silent truncation); the grade must AGREE across three LAST-anchored channels (terminal marker line, fenced qe-bridge-signoff JSON, the report's own GRADE line) AND the marker must be the FINAL content — empty, gradeless, self-contradicting or miscounted output is one of 17 NAMED failures with an audit record under features/<slug>/.fa-state/qe-bridge/ (runId, resolved executable + binOverride, prompt sha256, channel offsets, requestedOut, reportWritten, retained raw stdout; 0600 files in a 0700 dir), never a clean review. A --coder-family that contradicts the recorded reqe debt is refused. Writes features/<slug>/08b_reqe_report.md, which dz reqe --done settles unchanged. DISCLOSURE: the extracts you scope are sent to the Claude runtime; the bridge cannot classify secrets. DZ_QE_BRIDGE_CLAUDE_BIN is a TEST SEAM, not a flag. exit 0 signoff parsed (ANY grade — it reports, it does not gate) / 1 named failure / 2 usage)
   dz mutation-gate [--package <dir>] [--registry <file>] [--test-cmd "<cmd>"] [--only <id[,id]>] [--timeout <ms>] [--rebaseline per-entry|final] [--keep-scratch] [--json]   (prove each NAMED protection has a test that DISCRIMINATES: copy the package to a scratch dir, verify the baseline suite is green, apply each registry mutation, run the suite, REQUIRE red, restore. The red must be BEHAVIOURAL: a mutation that no longer parses is MUTATION_UNPARSEABLE; a red run whose OWN output reports a test FILE failing to load (node --test file-level not-ok with exitCode, vitest Failed Suites) is MUTATION_LOAD_FATAL — the signal comes from the same run as the failing count, never from a separate isolated import; red output whose shape matches no known runner is INCONCLUSIVE (a runner-coverage gap, loud, never PROVEN); a count far above the entry's bound is OVER_FAILING; a restored tree that does not reproduce green makes the entry INCONCLUSIVE (flaky). Mutation writes are realpath-contained to the scratch copy: a symlink escape or a node_modules/ target is refused (exit 2), the real tree is never written. A mutation that does not apply, a green suite, or an inconclusive run is a FAILURE — never a skip. exit 0 all proven / 1 gate failed / 2 setup error)
   dz backlog add "<idea>" [--effort 1-5] [--proposal <text>] [--dry-run] [--project <dir>] [--json]   (capture an idea: semantic dedup against existing ideas via the Brain vector engine (DUPLICATE>=0.92 merges, RELATED links, NEW creates) + GoalMap alignment; --dry-run classifies without writing)
   dz backlog list [--status <s>] [--goal <id>] [--project <dir>] [--json]   (list captured ideas, filterable by status/goal)
@@ -617,7 +661,7 @@ Usage:
   dz backlog jira <id> [--project <dir>] [--json]                          (draft a Jira issue via the configurable adapter (backlog.jira.adapter: jira-mcp|copilot-mcp|none); none writes an auditable jira-outbox/<id>.json stub)
   dz backlog harmonize [--apply] [--threshold <0-1>] [--project <dir>] [--json]   (batch semantic dedup of the backlog ideas; --dry-run default, --apply snapshots first)
   dz setup --target <name> [--preset <name>] [--select id,id,...] [--skills-dir <dir>] [--project <dir>] [--memory agentdb] [--no-memory] [--no-hooks] [--no-verify] [--install-driver] [--force] [--enrich]   (--target codex ALSO installs + LIVE-verifies the codex hooks; an unverified hook exits non-zero WITHOUT aborting the rest of setup)
-  dz teach "<pattern>" [--reward <0-1>] [--domain <name>] [--type rule|success-pattern|lesson-learned] [--project <dir>] [--no-mirror]   (--project pins the learned store to <dir>/.dz, not the cwd — pin to a canonical brain)
+  dz teach "<pattern>" [--class-form "<template with :slot>"] [--reward <0-1>] [--domain <name>] [--type rule|success-pattern|lesson-learned] [--project <dir>] [--no-mirror]   (class form is optional; rejection never blocks the specific write; --project pins the learned store to <dir>/.dz)
   dz teach --from-json <file> [--project <dir>] [--no-mirror]   (bulk-import a 'dz recall --all --json' export — share a learned store across machines)
   dz consolidate [--sessions-dir <dir>] [--project <dir>] [--no-mirror] [--prune-noise [--apply]] [--prune-quarantine [--apply]]   (both prunes: DRY-RUN by default; --apply snapshots then deletes; prune-quarantine = expired unproven lessons ONLY, never coupled to noise)
   dz recall "<query>" [--limit <N>] [--domain <name>] [--semantic | --no-semantic] [--books [--book <slug>]] [--project <dir>] | dz recall --all [--json] | dz recall --usage [--json] | dz recall --forget <dzId>[,<dzId>] [--apply] | dz recall --promote <dzId>[,<dzId>] [--apply]   (--domain <name> BOOSTS lessons of that domain without dropping foreign ones — a shared store keeps its cross-domain transfers; forget/promote: dry-run default; forget snapshots before removing; promote lifts lesson-quarantine)
@@ -640,6 +684,7 @@ Usage:
   dz statusline --fa-record --slug <s> --step "<label>" [--kind <feature-adr|loop>] [--recalled <n>] [--stored <n>] [--mode <m>]   (feature-adr: record live per-run learning state → 📐 panel segment)
   dz usage [--json] [--project <dir>] | dz usage --calibrate --session <pct> --weekly <pct> [--model fable=<pct>] [--project <dir>]  (ESTIMATE Claude usage from fixed reset windows; optional per-model weekly binding; exit 0 ALWAYS; pct=null when limits unconfigured)
   dz usage --by-stage [--run <runId> | --slug <slug>] [--epsilon <0..1>] [--write <file.jsonl>] [--json]   (per-stage cost ledger for ONE feature-adr run + the reconciliation invariant: accounted + unaccounted = run total; verdict BALANCED | DEFECT | INSUFFICIENT_DATA; local transcript ESTIMATES — catches ATTRIBUTION errors, not pricing errors)
+  dz chain [--project <dir>] [--json]   (verify EVERY hash-chained journal in ONE command: coverage is DERIVED from the CHAINED_JOURNALS registry, never typed, so a journal cannot be given a chain and checked by nobody. An ABSENT journal is NAMED absent, never omitted — omission and cleanliness are indistinguishable in a report. Statuses: ok | healed (defects the current unbroken run has outlived — verdicts over present records are sound) | unchained (present, no chained record yet — legal) | absent | broken | unreadable. Exit 1 on broken/unreadable: a verifier that reports damage and exits 0 is one no automation can act on)
   dz claim-check [paths...] [--json] [--fail-on high|medium|none] [--project <dir>]  (enforce the Integrity Rule: flag untagged/overstated accuracy claims; default scan = root README.md + every discovered package's README.md + features/*/08_qe_report.md + docs/**/*.md (historical feature artifacts are NOT scanned — pass paths explicitly); exit 1 only at/above --fail-on, default high)
   dz lint [paths...] [--json] [--config <file>] [--registry <file>] [--project <dir>]  (advisory EN/RU prose-style lint; findings exit 0, incomplete input/policy exits 1, usage exits 2)
   dz pretrain [--project <dir>]
@@ -656,6 +701,7 @@ Usage:
   dz drift-check [--json] [--project <dir>]                             (CI gate: exit 1 if any shared skill drifted between its monorepo copies)
   dz agents-sync [--project <dir>] [--check] [--json]                   (sync/verify the always-on policy fence in root AGENTS.md; exit 0 synced/written, 1 drift, 3 inconclusive)
   dz hooks-sync --target codex [--check] [--verify] [--remove] [--json]  (install/verify the dz veto + recall hooks in $CODEX_HOME/hooks.json; exit 0 armed+trusted, 1 not armed/drift, 3 inconclusive)
+  dz integrations-verify --target <name> --component <mcp|hooks> [--project <dir>] [--json]  (non-executing exact-version registration probe; exit 0 observed / 1 refused)
   dz sync-canonical <skill> [--check] [--from <dir>] [--auto] [--project <dir>]  (heal every copy from skills-meta/<skill> or --from; no canonical + --check = compare copies to each other (exit 1 on drift); no canonical + write = refuse unless --auto (LOUD, picks most-complete copy); --check writes nothing)
   dz plugin [--version <ver>]
   dz downloads
@@ -684,6 +730,17 @@ Workflows: author loop-plan/1 plans with dz workflow init/validate/render; gate
 Targets: ${TARGET_NAMES.join(', ')}
 Presets: ${PRESET_NAMES.join(', ')}`;
 
+export interface MutationGateRunnerObservation {
+  readonly exitCode: number | null;
+  readonly output: string;
+  readonly failureReason?: string;
+}
+
+export type MutationGateRunner = (
+  command: string,
+  options: { readonly cwd: string; readonly timeoutMs: number },
+) => MutationGateRunnerObservation;
+
 /** Output sink + working directory — injectable so the CLI is testable. */
 export interface CliIo {
   readonly cwd?: string;
@@ -706,6 +763,14 @@ export interface CliIo {
    * command that needs it (`brain ground`), and never when stdin is a TTY (nothing piped).
    */
   readonly stdin?: string;
+  /** Human-terminal rendering seam; production defaults to stdout TTY detection. */
+  readonly interactive?: boolean;
+  /** Fault seam proving that class-form recall degrades to specific recall with a stderr receipt. */
+  readonly classMatcher?: RecallPatternsOptions['classMatcher'];
+  /** Guard decision seam; production always uses the real vector-backed teach guard. */
+  readonly teachGuardRunner?: (projectRoot: string, text: string, opts: { readonly reward?: number }) => Promise<TeachGuardResult>;
+  /** Reinforcement flush seam paired with `teachGuardRunner`; production uses the configured backend. */
+  readonly teachReinforceRunner?: (projectRoot: string, dzId: string, reward: number) => Promise<{ readonly flushed: number }>;
   /**
    * Test seam for `dz release`: overrides subprocess execution for gate steps and the
    * gh/git side channels (production leaves it unset → real `execSync`, stdio piped).
@@ -720,6 +785,8 @@ export interface CliIo {
    * offline, hermetically — mirrors the {@link CliIo.releaseRunner} idiom.
    */
   readonly installRunner?: (command: string, cwd: string) => void;
+  /** Fault seam for proving mutation-gate catches and retries thrown runner internals. */
+  readonly mutationGateRunner?: MutationGateRunner;
 }
 
 /** Injected subprocess runner used by `dz release` (see {@link CliIo.releaseRunner}). */
@@ -809,6 +876,12 @@ function discoverSkillsDirs(cwd: string, explicitSkillsDir?: string | undefined)
 
 /** Outcome of {@link installSkills}. */
 interface InstallSkillsResult {
+  /**
+   * Set when an explicit `--select` named an id no root provides (backlog 9d15b9b6, PR-A). The
+   * caller MUST print it and exit non-zero: `0 skill(s)` is not a success, and by the time this is
+   * set nothing has been written yet — the refusal is decided before the first byte.
+   */
+  readonly selectRefusal?: string;
   readonly results: { id: string; written: number; skipped: number }[];
   readonly dirsSearched: number;
   readonly written: number;
@@ -823,6 +896,8 @@ interface InstallSkillsResult {
    * the source `SKILL.md`.
    */
   readonly applyFailures: SkillApplyFailure[];
+  readonly integrations: readonly IntegrationOutcome[];
+  readonly integrationDigest?: string;
 }
 
 /**
@@ -838,11 +913,48 @@ async function installSkills(opts: {
   select?: readonly string[] | undefined;
   force: boolean;
   enrich: boolean;
+  noHooks?: boolean;
+  noIntegrations?: boolean;
+  noVerify?: boolean;
+  allowIntegrations?: string;
+  writeErr?: (line: string) => void;
 }): Promise<InstallSkillsResult> {
   const { target, projectRoot, cwd, explicitSkillsDir, select, force, enrich } = opts;
 
   const skillsDirs = discoverSkillsDirs(cwd, explicitSkillsDir);
 
+  // PREFLIGHT (backlog 9d15b9b6, PR-A) — resolve the REQUEST once, before anything is written.
+  //
+  // Two defects lived in asking each root independently instead of resolving the request: a skill
+  // present in two roots was installed TWICE and counted twice (the field report's `2 skill(s)` was
+  // one skill installed twice), and a skill present in NO root produced a warning and exit 0 —
+  // `0 skill(s)` reading as success. Both are gone once the decision happens here.
+  //
+  // Placement is load-bearing: an exit 1 that arrives after hooks and memory are written leaves a
+  // half-configured project, which is worse than either clean outcome. This runs before the loop
+  // below and before every target adapter.
+  //
+  // Dependency closure is deliberately NOT resolved here — that is PR-B. This preflight fixes the
+  // count and the exit contract, and gives that work a base it can trust.
+  if (select !== undefined) {
+    const roots = skillsDirs.map((dir) => ({ dir, ids: discoverSkillIds(dir) }));
+    const resolution = resolveSelection(select, roots);
+    for (const shadow of resolution.shadowed) {
+      opts.writeErr?.(
+        `dz: skill '${shadow.id}' is offered by ${shadow.alsoIn.length + 1} roots; ` +
+        `installing from ${shadow.chosen} (earlier root wins). Also present in: ${shadow.alsoIn.join(', ')}`,
+      );
+    }
+    const refusal = formatSelectRefusal(resolution, roots);
+    if (refusal !== null) {
+      return {
+        selectRefusal: refusal,
+        results: [], dirsSearched: skillsDirs.length, written: 0, skipped: 0,
+        missing: [...resolution.missing], failures: [], applyFailures: [], integrations: [],
+      };
+    }
+  }
+
   // agents-md and gemini are FLATTENING single-file targets: each must aggregate
   // every selected skill from ALL discovered dirs into ONE root file (AGENTS.md /
   // GEMINI.md) in a single merge. A per-dir runInit loop (like the tree targets
@@ -850,8 +962,8 @@ async function installSkills(opts: {
   // route them through one aggregation.
   if (target === 'agents-md' || target === 'gemini') {
     const report = target === 'gemini'
-      ? runInitGeminiMd({ skillsDirs, projectRoot, ...(select !== undefined ? { select } : {}) })
-      : runInitAgentsMd({ skillsDirs, projectRoot, ...(select !== undefined ? { select } : {}) });
+      ? runInitGeminiMd({ skillsDirs, projectRoot, ...(select !== undefined ? { select } : {}), ...(opts.noHooks !== undefined ? { noHooks: opts.noHooks } : {}), ...(opts.noIntegrations !== undefined ? { noIntegrations: opts.noIntegrations } : {}) })
+      : runInitAgentsMd({ skillsDirs, projectRoot, ...(select !== undefined ? { select } : {}), ...(opts.noHooks !== undefined ? { noHooks: opts.noHooks } : {}), ...(opts.noIntegrations !== undefined ? { noIntegrations: opts.noIntegrations } : {}) });
     const results = report.skills.map((s) => ({
       id: s.id,
       written: s.written.length,
@@ -860,13 +972,21 @@ async function installSkills(opts: {
     let written = 0;
     let skipped = 0;
     for (const s of results) { written += s.written; skipped += s.skipped; }
-    return { results, dirsSearched: skillsDirs.length, written, skipped, missing: [...report.missing], failures: [...report.failures], applyFailures: [...report.applyFailures] };
+    return { results, dirsSearched: skillsDirs.length, written, skipped, missing: [...report.missing], failures: [...report.failures], applyFailures: [...report.applyFailures], integrations: [...report.integrations], ...(report.integrationDigest !== undefined ? { integrationDigest: report.integrationDigest } : {}) };
   }
 
   const results: { id: string; written: number; skipped: number }[] = [];
   const failures: SkillLoadFailure[] = [];
   const applyFailures: SkillApplyFailure[] = [];
-  for (const skillsDir of skillsDirs) {
+  let integrations: readonly IntegrationOutcome[] = [];
+  let integrationDigest: string | undefined;
+  const integrationManifestSources: readonly IntegrationManifestSource[] = skillsDirs.flatMap((skillsDir) => {
+    const discovered = discoverSkillIds(skillsDir);
+    return discovered
+      .filter((id) => select === undefined || select.includes(id))
+      .map((skillId) => ({ skillId, skillDir: skillsDir }));
+  });
+  for (const [dirIndex, skillsDir] of skillsDirs.entries()) {
     const r = await runInit({
       target,
       skillsDir,
@@ -874,12 +994,24 @@ async function installSkills(opts: {
       force,
       enrich,
       ...(select !== undefined ? { select } : {}),
+      ...(opts.noHooks !== undefined ? { noHooks: opts.noHooks } : {}),
+      ...(dirIndex === 0
+        ? {
+            integrationManifestSources,
+            ...(opts.noIntegrations !== undefined ? { noIntegrations: opts.noIntegrations } : {}),
+          }
+        : { noIntegrations: true }),
+      ...(opts.noVerify !== undefined ? { noVerify: opts.noVerify } : {}),
+      ...(opts.allowIntegrations !== undefined ? { allowIntegrations: opts.allowIntegrations } : {}),
     });
     for (const skill of r.skills) {
       results.push({ id: skill.id, written: skill.written.length, skipped: skill.skipped.length });
     }
     failures.push(...r.failures);
     applyFailures.push(...r.applyFailures);
+    if (r.integrations.some((row) => row.status !== 'not-requested')) integrations = [...r.integrations];
+    else if (integrations.length === 0) integrations = [...r.integrations];
+    if (r.integrationDigest !== undefined) integrationDigest = r.integrationDigest;
   }
 
   let written = 0;
@@ -887,7 +1019,7 @@ async function installSkills(opts: {
   for (const s of results) { written += s.written; skipped += s.skipped; }
   const installed = new Set(results.map((s) => s.id));
   const missing = select !== undefined ? [...select].filter((id) => !installed.has(id)) : [];
-  return { results, dirsSearched: skillsDirs.length, written, skipped, missing, failures, applyFailures };
+  return { results, dirsSearched: skillsDirs.length, written, skipped, missing, failures, applyFailures, integrations, ...(integrationDigest !== undefined ? { integrationDigest } : {}) };
 }
 
 /** Warn about preset/select ids that weren't found in any installed pack. */
@@ -947,28 +1079,56 @@ async function cmdInit(options: Map<string, string>, flags: Set<string>, cwd: st
     cwd,
     explicitSkillsDir,
     select,
+    writeErr,
     force: flags.has('force'),
     enrich: flags.has('enrich'),
+    noHooks: flags.has('no-hooks'),
+    noIntegrations: flags.has('no-integrations'),
+    noVerify: flags.has('no-verify'),
+    ...(options.get('allow-integrations') !== undefined ? { allowIntegrations: options.get('allow-integrations')! } : {}),
   });
 
-  write(`dz init --target ${target}: ${r.results.length} skill(s), ${r.written} file(s) written, ${r.skipped} skipped`);
-  if (r.dirsSearched > 1) {
-    write(`  (searched ${r.dirsSearched} skill directories)`);
+  // PR-A: an explicit --select that named a skill no root provides is a REFUSAL, not a warning.
+  // Printed and returned here, before any target adapter runs — nothing has been written yet.
+  if (r.selectRefusal !== undefined) {
+    writeErr(r.selectRefusal);
+    return 1;
   }
-  writeMissingSkillsHint(write, r.missing, presetName);
 
-  // Codex-targeted init DELIVERS the hooks and verifies them (ADR-001 §8). Skills alone are not the
-  // target's harness: the veto + recall legs are what `--target codex` promises.
-  // `--no-hooks` is the documented escape for "skills only" (the same flag `dz setup` already
-  // carries): hook delivery writes USER-GLOBAL config, so a command that only wants skills compiled
-  // must be able to say so — and every test that is about skills says it.
+  // Codex keeps its established user-registry writer, but its result is normalized into the same
+  // two-outcome contract before JSON/human rendering. A write without a live ready observation is
+  // a refusal with applied=true, never a second success channel.
+  let integrationOutcomes: readonly IntegrationOutcome[] = r.integrations;
   let codexHooksOk = true;
   if (target === 'codex' && !flags.has('no-hooks')) {
     const delivery = deliverCodexHooks({ project: projectRoot, verify: !flags.has('no-verify') }, undefined, 'dz init');
     codexHooksOk = delivery.ok;
     for (const line of delivery.stdout) write(line);
     for (const line of delivery.stderr) writeErr(line);
+    const hookIndex = integrationOutcomes.findIndex((row) => row.component === 'hooks' && row.status !== 'not-requested');
+    if (hookIndex !== -1) {
+      const hook = normalizeCodexHookOutcome(integrationOutcomes[hookIndex]!, delivery, flags.has('no-verify'));
+      integrationOutcomes = integrationOutcomes.map((row, index) => index === hookIndex ? hook : row);
+    }
+  }
+
+  if (flags.has('json')) {
+    write(JSON.stringify({ target, skills: { count: r.results.length, written: r.written, skipped: r.skipped }, integrations: integrationOutcomes, integrationDigest: r.integrationDigest ?? null }));
+  } else {
+    write(`dz init --target ${target}: ${r.results.length} skill(s), ${r.written} file(s) written, ${r.skipped} skipped`);
+    if (r.dirsSearched > 1) write(`  (searched ${r.dirsSearched} skill directories)`);
+    for (const outcome of integrationOutcomes) {
+      const label = outcome.component === 'mcp' ? 'MCP' : 'Hooks';
+      const detail = outcome.status === 'refused'
+        ? `${outcome.reasonCode ?? 'LIVE_PROBE_FAILED'}${outcome.remediation ? ` — ${outcome.remediation}` : ''}`
+        : outcome.status === 'emitted'
+          ? `${outcome.carrier?.path ?? 'registered'}${outcome.registrations.some((row) => row.approval === 'pending') ? '; Pending approval; ready=false' : ''}`
+          : 'explicitly not requested';
+      write(`${label}: ${outcome.status.toUpperCase()} (${detail})`);
+    }
   }
+  writeMissingSkillsHint(write, r.missing, presetName);
+
   // Skip-and-collect must not become skip-and-SILENCE: a skill that failed to load is
   // named on stderr and the command exits 1 (it exited 1 before too — by throwing).
   if (r.failures.length > 0 || r.applyFailures.length > 0) {
@@ -987,7 +1147,35 @@ async function cmdInit(options: Map<string, string>, flags: Set<string>, cwd: st
     for (const line of formatSkillApplyFailures(r.applyFailures)) writeErr(line);
     return 1;
   }
-  return codexHooksOk ? 0 : 1;
+  const integrationOk = !integrationOutcomes.some((row) => row.status === 'refused');
+  return codexHooksOk && integrationOk ? 0 : 1;
+}
+
+function cmdIntegrationsVerify(options: Map<string, string>, flags: Set<string>, cwd: string, write: Write, writeErr: WriteErr): number {
+  const targetInput = options.get('target');
+  const component = options.get('component');
+  if (targetInput === undefined || (component !== 'mcp' && component !== 'hooks')) {
+    writeErr('dz integrations-verify: requires --target <name> --component <mcp|hooks>');
+    return 1;
+  }
+  const resolution = resolveTargetName(targetInput);
+  if (resolution.kind === 'unknown') {
+    for (const line of formatTargetProblem('dz integrations-verify', resolution)) writeErr(line);
+    return 1;
+  }
+  if (resolution.via === 'alias') writeErr(formatTargetAliasNote('dz integrations-verify', targetInput, resolution.target));
+  const result = runIntegrationsVerify({
+    target: resolution.target,
+    component,
+    projectRoot: resolve(cwd, options.get('project') ?? '.'),
+  });
+  if (flags.has('json')) write(JSON.stringify(result));
+  else if (result.ok) {
+    write(`dz integrations-verify: ${resolution.target}/${component} registered (runtime ${result.runtimeVersion ?? 'unknown'}; ready=${result.registrations.every((row) => row.ready === true)})`);
+  } else {
+    writeErr(`dz integrations-verify: ${resolution.target}/${component} REFUSED (${result.reasonCode ?? 'LIVE_PROBE_FAILED'}) — ${result.remediation ?? 'no qualifying receipt'}`);
+  }
+  return result.ok ? 0 : 1;
 }
 
 async function cmdVerify(options: Map<string, string>, cwd: string, write: Write, writeErr: WriteErr): Promise<number> {
@@ -2423,6 +2611,146 @@ function cmdStatuslineFaRecord(options: Map<string, string>, cwd: string, write:
   return 0;
 }
 
+interface EtaCorpusRead {
+  readonly history: StageSample[];
+  readonly currentRunSamples: StageSample[];
+  readonly currentTier: string | undefined;
+  readonly activeStages: CheckpointStage[];
+  readonly lastCheckpointTsMs: number | undefined;
+  readonly hasCurrentCheckpoints: boolean;
+}
+
+function statuslineEtaStage(step: string): CheckpointStage | undefined {
+  const match = step.match(/\bStep\s*-?\s*(0|[1-9](?:\.5)?)(?:\b|\s)/i);
+  if (match === null) return undefined;
+  const value = Number(match[1]);
+  if (value === 0) return 'router';
+  if (value > 0 && value < 6) return 'design';
+  if (value === 6) return 'plan';
+  if (value === 7) return 'code';
+  if (value === 8) return 'qe';
+  if (value === 9) return 'fleet';
+  return undefined;
+}
+
+function routerMetadata(router: RunSegment['router']): { tier?: string; activeSteps?: number[] } {
+  const result = router?.result;
+  if (result === null || typeof result !== 'object') return {};
+  const record = result as Record<string, unknown>;
+  const tier = typeof record['tier'] === 'string' && record['tier'].length > 0 ? record['tier'] : undefined;
+  const activeSteps = Array.isArray(record['activeSteps'])
+    ? record['activeSteps'].filter((value): value is number => typeof value === 'number' && Number.isFinite(value))
+    : undefined;
+  return {
+    ...(tier !== undefined ? { tier } : {}),
+    ...(activeSteps !== undefined ? { activeSteps } : {}),
+  };
+}
+
+function activeCheckpointStages(tier: string | undefined, activeSteps: readonly number[] | undefined): CheckpointStage[] {
+  const stages = new Set<CheckpointStage>();
+  if (activeSteps !== undefined) {
+    for (const step of activeSteps) {
+      if (step === 0) stages.add('router');
+      else if (step > 0 && step < 6) stages.add('design');
+      else if (step === 6) stages.add('plan');
+      else if (step === 7) stages.add('code');
+      else if (step === 8) stages.add('qe');
+      else if (step === 9) stages.add('fleet');
+    }
+  } else if (tier !== undefined) {
+    for (const stage of CHECKPOINT_STAGES) {
+      if (stage !== 'fleet' || tier === 'L' || tier === 'XL') stages.add(stage);
+    }
+  }
+  return CHECKPOINT_STAGES.filter((stage) => stages.has(stage));
+}
+
+/** All checkpoint I/O for ETA lives in this CLI-only wrapper and degrades per file. */
+function readEtaCorpus(projectRoot: string, currentSlug: string): EtaCorpusRead {
+  const trace = process.env['DZ_ETA_TRACE'];
+  if (trace !== undefined && trace.length > 0) {
+    try {
+      appendFileSync(trace, `${JSON.stringify({ projectRoot, currentSlug, ts: new Date().toISOString() })}\n`);
+    } catch { /* a test/debug receipt can never take down the statusline */ }
+  }
+
+  const samples: StageSample[] = [];
+  let currentSegments: RunSegment[] = [];
+  let hasCurrentCheckpoints = false;
+  let entries: Dirent[] = [];
+  try {
+    entries = readdirSync(join(projectRoot, 'features'), { withFileTypes: true });
+  } catch {
+    return {
+      history: [], currentRunSamples: [], currentTier: undefined, activeStages: [],
+      lastCheckpointTsMs: undefined, hasCurrentCheckpoints: false,
+    };
+  }
+
+  for (const entry of entries) {
+    if (!entry.isDirectory()) continue;
+    const checkpointPath = join(projectRoot, 'features', entry.name, '.fa-state', 'checkpoints.jsonl');
+    try {
+      const text = readFileSync(checkpointPath, 'utf8');
+      const observations = parseCheckpointLines(text, entry.name);
+      const segments = segmentRun(observations);
+      samples.push(...extractStageSamples(segments));
+      if (entry.name === currentSlug) {
+        hasCurrentCheckpoints = observations.length > 0;
+        currentSegments = segments;
+      }
+    } catch {
+      // Missing, unreadable, or racing append: this run contributes no evidence.
+    }
+  }
+
+  const lastSegment = currentSegments.at(-1);
+  const currentRouter = lastSegment?.router;
+  const invocationSegments = currentRouter === undefined
+    ? []
+    : currentSegments.filter((segment) => segment.router === currentRouter);
+  const invocationRunIds = new Set(invocationSegments.map((segment) => segment.runId));
+  const currentRunSamples = extractStageSamples(invocationSegments);
+  const metadata = routerMetadata(currentRouter);
+  const currentTimestamps = invocationSegments
+    .flatMap((segment) => segment.observations)
+    .flatMap((observation) => observation.tsMs === undefined ? [] : [observation.tsMs]);
+
+  return {
+    history: samples.filter((sample) => !invocationRunIds.has(sample.runId)),
+    currentRunSamples,
+    currentTier: metadata.tier,
+    activeStages: activeCheckpointStages(metadata.tier, metadata.activeSteps),
+    lastCheckpointTsMs: currentTimestamps.length > 0 ? Math.max(...currentTimestamps) : undefined,
+    hasCurrentCheckpoints,
+  };
+}
+
+function statuslineEta(projectRoot: string, state: FeatureAdrState, nowMs: number): EtaEstimate | undefined {
+  const currentStage = statuslineEtaStage(state.step);
+  if (currentStage === undefined) return undefined;
+  const corpus = readEtaCorpus(projectRoot, state.slug);
+  const currentIndex = CHECKPOINT_STAGES.indexOf(currentStage);
+  const remainingStages = corpus.activeStages.filter((stage) => CHECKPOINT_STAGES.indexOf(stage) >= currentIndex && stage !== 'router');
+  // Preserve honest absence as a machine-readable union member. The text formatter intentionally
+  // omits both variants, but `--json` must still distinguish no file from a file with no tier.
+  const stagesForEstimate = remainingStages.length > 0
+    ? remainingStages
+    : (currentStage === 'router' ? [] : [currentStage]);
+  if (stagesForEstimate.length === 0 && corpus.hasCurrentCheckpoints && corpus.currentTier !== undefined) return undefined;
+  return estimateEta({
+    samples: corpus.history,
+    currentTier: corpus.currentTier,
+    currentStage,
+    remainingStages: stagesForEstimate,
+    currentRunSamples: corpus.currentRunSamples,
+    nowMs,
+    ...(corpus.lastCheckpointTsMs !== undefined ? { lastCheckpointTsMs: corpus.lastCheckpointTsMs } : {}),
+    hasCurrentCheckpoints: corpus.hasCurrentCheckpoints,
+  });
+}
+
 /**
  * `dz statusline` — render dz's OWN self-learning counts as one compact, emoji-tagged line for
  * Claude Code's status bar (modeled on agentic-qe's "🎓 12 patterns"). Claude Code pipes a JSON
@@ -2447,9 +2775,22 @@ function cmdStatusline(
   try {
     const projectRoot = statuslineProjectRoot(readStdin(), options, cwd);
     const data = statuslineData(projectRoot);
+    const fa = data.featureAdr;
+    let eta: EtaEstimate | undefined;
+    let etaFragment: string | undefined;
+    if (fa !== undefined && fa.kind !== 'loop') {
+      try {
+        eta = statuslineEta(projectRoot, fa, Date.now());
+        if (eta !== undefined) etaFragment = formatEta(eta);
+      } catch {
+        // ETA is advisory: any corpus/resource failure omits only this fragment.
+        eta = undefined;
+        etaFragment = undefined;
+      }
+    }
 
     if (flags.has('json')) {
-      write(JSON.stringify(data));
+      write(JSON.stringify({ ...data, ...(eta !== undefined ? { eta } : {}) }));
       return 0;
     }
 
@@ -2459,13 +2800,12 @@ function cmdStatusline(
     if (data.consolidatedAgeH !== undefined) line += ` · ⟳ ${data.consolidatedAgeH}h`;
 
     // Live /feature-adr run in flight → PREPEND the pipeline learning segment to the base dz line.
-    const fa = data.featureAdr;
     if (fa !== undefined) {
       // The producer marker reached data and arbitration in a previous round but not this label, so the bar asserted a pipeline that was not running.
       if (fa.kind === 'loop') {
         line = `🔁 loop ${fa.step} · ${line}`;
       } else {
-        line = `📐 feature-adr ${fa.step} · 🎓 ${fa.pool} pool · ↑${fa.recalled} used · +${fa.stored} new · ↻${fa.reinforced ?? 0} reinforced · ${line}`;
+        line = `📐 feature-adr ${fa.step} · ${etaFragment !== undefined ? `${etaFragment} · ` : ''}🎓 ${fa.pool} pool · ↑${fa.recalled} used · +${fa.stored} new · ↻${fa.reinforced ?? 0} reinforced · ${line}`;
       }
     }
 
@@ -3092,7 +3432,22 @@ function learningStoreLine(
   ) + (reason ? '  [' + reason + ']' : '');
 }
 
-async function cmdTeach(options: Map<string, string>, flags: Set<string>, cwd: string, write: Write): Promise<number> {
+async function runTeachGuardReinforcement(
+  projectRoot: string,
+  dzId: string,
+  reward: number,
+): Promise<{ readonly flushed: number }> {
+  const backend = resolveLearningBackend(projectRoot);
+  backend.addSample({ dzId, kind: 'reinforce', reward, ts: new Date().toISOString() });
+  return backend.train();
+}
+
+async function cmdTeach(
+  options: Map<string, string>, flags: Set<string>, cwd: string, write: Write,
+  writeErr: WriteErr = (line) => { console.error(line); }, interactive = false,
+  guardRunner: (projectRoot: string, text: string, opts: { readonly reward?: number }) => Promise<TeachGuardResult> = teachGuard,
+  reinforceRunner: (projectRoot: string, dzId: string, reward: number) => Promise<{ readonly flushed: number }> = runTeachGuardReinforcement,
+): Promise<number> {
   // WHICH store this lesson belongs to, and WHO decided (teach-chooses-its-store).
   // `--to` → `DZ_LEARN` → `.dz/config.json` learning.teachTo → project. The owner asked for a
   // per-session choice; for a CLI every invocation is a fresh process, so the only honest session
@@ -3176,26 +3531,39 @@ async function cmdTeach(options: Map<string, string>, flags: Set<string>, cwd: s
       write('dz teach --from-json: expected a JSON array (produced by `dz recall --all --json`)');
       return 1;
     }
-    const existing = new Set(loadStorePatternsSync(storeRoot).map((p) => p.pattern));
+    const importedKey = (p: PatternRecord): string => p.lessonForm !== undefined && p.lessonPairId !== undefined
+      ? `${p.pattern}\u0000${p.lessonForm}\u0000${p.lessonPairId}`
+      : `legacy\u0000${p.pattern}`;
+    const existing = new Set(loadStorePatternsSync(storeRoot).map(importedKey));
     let imported = 0;
     let skipped = 0;
     const importedRecs: PatternRecord[] = [];
     for (const item of parsed) {
       const p = item as Partial<PatternRecord>;
-      if (!p || typeof p.pattern !== 'string' || p.pattern.trim() === '' || existing.has(p.pattern)) {
+      if (!p || typeof p !== 'object') {
         skipped += 1;
         continue;
       }
-      const rec: PatternRecord = {
-        pattern: p.pattern,
+      const pair = (p.lessonForm === 'specific' || p.lessonForm === 'class')
+        && typeof p.lessonPairId === 'string' && p.lessonPairId !== ''
+        ? { lessonForm: p.lessonForm, lessonPairId: p.lessonPairId }
+        : {};
+      const candidate = {
+        pattern: typeof p.pattern === 'string' ? p.pattern : '',
         type: (typeof p.type === 'string' ? p.type : 'lesson-learned') as PatternRecord['type'],
         reward: typeof p.reward === 'number' ? Math.max(0, Math.min(1, p.reward)) : 0.8,
         domain: typeof p.domain === 'string' ? p.domain : 'general',
         ts: typeof p.ts === 'string' ? p.ts : new Date().toISOString(),
         source: 'dz-teach-import',
-      };
+        ...pair,
+      } satisfies PatternRecord;
+      if (candidate.pattern.trim() === '' || existing.has(importedKey(candidate))) {
+        skipped += 1;
+        continue;
+      }
+      const rec: PatternRecord = candidate;
       await recordPattern(storeRoot, rec);
-      existing.add(p.pattern);
+      existing.add(importedKey(rec));
       importedRecs.push(rec);
       imported += 1;
     }
@@ -3279,23 +3647,30 @@ async function cmdTeach(options: Map<string, string>, flags: Set<string>, cwd: s
 
   const reward = parseFloat(options.get('reward') ?? '0.8');
   const domain = options.get('domain') ?? 'general';
+  const classWasRequested = options.has('class-form') || flags.has('class-form');
+  const lessonForms = normalizeLessonForms(pattern, options.get('class-form'));
+  let guardedExisting: { readonly dzId: string; readonly cosine: number; readonly pattern: PatternRecord } | undefined;
 
   if (flags.has('guard')) {
-    const verdict = await teachGuard(storeRoot, pattern, { reward: Math.max(0, Math.min(1, reward)) });
+    const verdict = await guardRunner(storeRoot, pattern, { reward: Math.max(0, Math.min(1, reward)) });
     if (verdict.action === 'reinforce') {
-      const backend = resolveLearningBackend(storeRoot);
-      backend.addSample({ dzId: verdict.dzId, kind: 'reinforce', reward: Math.max(0, Math.min(1, reward)), ts: new Date().toISOString() });
-      const trained = await backend.train();
-      // HIGH-fix: only claim success when the reinforce actually FLUSHED. With backend 'off'
-      // (NoopLearningBackend) or a flush failure, flushed === 0 — falling through to the plain
-      // teach below so the lesson is NEVER silently discarded (the exact silent-drop the ADR forbids).
-      if (trained.flushed > 0) {
-        write(`↳ reinforced existing pattern ${verdict.dzId} (cos=${verdict.cosine.toFixed(2)}) — not re-added`);
-        const clearedQ = clearAgentdbQuarantine(storeRoot, [verdict.dzId]);
-        if (clearedQ.cleared > 0) write('  ↳ promoted out of quarantine (mirror updated)');
-        return 0;
+      if (lessonForms.classForm !== undefined) {
+        const existing = loadStoreRecords(storeRoot).find((record) => record.id === verdict.dzId);
+        if (existing !== undefined) {
+          guardedExisting = { dzId: verdict.dzId, cosine: verdict.cosine, pattern: recordToPattern(existing) };
+        } else {
+          write(`dz teach --guard: matched pattern ${verdict.dzId} was not found in the lexical store — teaching the lesson normally`);
+        }
+      } else {
+        const trained = await reinforceRunner(storeRoot, verdict.dzId, Math.max(0, Math.min(1, reward)));
+        if (trained.flushed > 0) {
+          write(`↳ reinforced existing pattern ${verdict.dzId} (cos=${verdict.cosine.toFixed(2)}) — not re-added`);
+          const clearedQ = clearAgentdbQuarantine(storeRoot, [verdict.dzId]);
+          if (clearedQ.cleared > 0) write('  ↳ promoted out of quarantine (mirror updated)');
+          return 0;
+        }
+        write(`dz teach --guard: reinforce of ${verdict.dzId} did not flush (backend off or write failure) — teaching the lesson normally instead`);
       }
-      write(`dz teach --guard: reinforce of ${verdict.dzId} did not flush (backend off or write failure) — teaching the lesson normally instead`);
     }
   }
 
@@ -3310,24 +3685,63 @@ async function cmdTeach(options: Map<string, string>, flags: Set<string>, cwd: s
   // Typed through the shared schema (harness-core owns PatternRecord) so the
   // write side and the read side (recommend's loadPatterns) can never drift —
   // a field rename here is a compile error, not a silently re-muted loop (audit #2).
-  const entry: PatternRecord = {
-    pattern,
-    type: type as PatternRecord['type'],
-    reward: Math.max(0, Math.min(1, reward)),
-    domain,
-    ts: new Date().toISOString(),
-    source: 'dz-teach',
-  };
+  const entry: PatternRecord = guardedExisting?.pattern ?? {
+      pattern: lessonForms.specific,
+      type: type as PatternRecord['type'],
+      reward: Math.max(0, Math.min(1, reward)),
+      domain,
+      ts: new Date().toISOString(),
+      source: 'dz-teach',
+    };
 
   // Tier-2 (ADR-005): persist through the unified @dzhechkov/memory store. recordPattern
   // folds any legacy .dz/patterns.jsonl into the backend (idempotent) and returns the
   // total count. The lossy `npx agentdb add` dual-write was removed in Tier-1 (audit #6).
   // lesson-quarantine (opt-in): a fresh lesson is a HYPOTHESIS until it earns promotion.
   const quarantineOn = readMemoryLearningConfig(storeRoot).quarantine;
-  const count = await recordPattern(storeRoot, entry, quarantineOn ? { quarantine: true } : {});
+  const stored = await recordLessonForms(
+    storeRoot,
+    entry,
+    lessonForms.classForm,
+    quarantineOn ? { quarantine: true } : {},
+  );
+  let recordsToMirror = stored.records;
+  let commandFailed = stored.class === 'failed';
+  let reinforced = false;
+  if (guardedExisting !== undefined) {
+    let reinforceId = guardedExisting.dzId;
+    if (stored.class === 'stored') {
+      const specificRow = stored.records.find((row) => row.lessonForm === 'specific');
+      if (specificRow !== undefined) reinforceId = patternRecordId(specificRow);
+      if (reinforceId !== guardedExisting.dzId) {
+        const removed = removePatternsByIds(storeRoot, new Set([guardedExisting.dzId]));
+        if (removed.error !== undefined || removed.removed === 0) {
+          commandFailed = true;
+          writeErr(`dz teach --guard: class pair stored, but old pattern cleanup failed${removed.error === undefined ? '' : ` — ${removed.error}`}`);
+        }
+      }
+    } else if (stored.class === 'failed') {
+      const partialSpecific = stored.records.find((row) => row.lessonForm === 'specific');
+      if (partialSpecific !== undefined && patternRecordId(partialSpecific) !== guardedExisting.dzId) {
+        const rolledBack = removePatternsByIds(storeRoot, new Set([patternRecordId(partialSpecific)]));
+        if (rolledBack.error !== undefined) writeErr(`dz teach --guard: partial enrichment rollback failed — ${rolledBack.error}`);
+      }
+      recordsToMirror = [];
+      reinforceId = guardedExisting.dzId;
+    }
+    if (!commandFailed) {
+      const trained = await reinforceRunner(storeRoot, reinforceId, Math.max(0, Math.min(1, reward)));
+      reinforced = trained.flushed > 0;
+      if (reinforced) {
+        const clearedQ = clearAgentdbQuarantine(storeRoot, [reinforceId]);
+        if (clearedQ.cleared > 0) write('  ↳ promoted out of quarantine (mirror updated)');
+      }
+    }
+  }
+  const count = guardedExisting === undefined ? stored.count : loadStorePatternsSync(storeRoot).length;
 
-  write(`Learned: "${pattern.slice(0, 60)}${pattern.length > 60 ? '...' : ''}"`);
-  write(`  Domain: ${domain}  Reward: ${reward}  Backend: memory (@dzhechkov/memory)`);
+  write(`${guardedExisting !== undefined && stored.class === 'stored' ? 'Enriched' : 'Learned'}: "${pattern.slice(0, 60)}${pattern.length > 60 ? '...' : ''}"`);
+  write(`  Domain: ${entry.domain}  Reward: ${entry.reward}  Backend: memory (@dzhechkov/memory)`);
   write(`  Total patterns: ${count}`);
   // WHERE the write landed. MEASURED before this line existed: teach printed the pattern, the
   // domain, the reward and the backend — and not one word about the path, so a store written to
@@ -3337,6 +3751,20 @@ async function cmdTeach(options: Map<string, string>, flags: Set<string>, cwd: s
   // sees a path, cannot tell what chose it, and has no reason to question it. `default` adds
   // nothing, so the line stays byte-identical for everyone who set nothing.
   write(storeLine('written'));
+  if (stored.class === 'stored') write('  Class form: stored separately and linked to the specific lesson');
+  if (classWasRequested && stored.class === 'absent') write('  Class form: skipped; the specific lesson was saved');
+  if (stored.class === 'rejected') writeErr(`dz teach: class form rejected — ${stored.reason ?? 'invalid class form'}; the specific lesson was saved`);
+  if (stored.class === 'failed') writeErr(`dz teach: specific stored; class failed — ${stored.reason ?? 'unknown storage failure'}`);
+  if (guardedExisting !== undefined && stored.class === 'stored') {
+    write(commandFailed
+      ? '  Guard: class enrichment stored; reinforcement skipped because old-pattern cleanup failed'
+      : reinforced
+        ? `  Guard: enriched existing pattern (cos=${guardedExisting.cosine.toFixed(2)}), then reinforced the linked specific form`
+        : '  Guard: class enrichment stored; reinforcement did not flush');
+  }
+  if (!classWasRequested && interactive) {
+    write('  Rule of one place or of a class? Optional: add --class-form when a future reader needs the why for structure, interfaces, or maintainability; skip when scope, risk, time, and cost are low or standards, policy, or documentation already cover it.');
+  }
   // ADVICE, not a gate. Someone putting medical lessons in a shared store owns both
   // directories and this binary; refusing would be defending a user against themselves,
   // which this design does not attempt. Making the choice INFORMED is the part that is
@@ -3351,8 +3779,8 @@ async function cmdTeach(options: Map<string, string>, flags: Set<string>, cwd: s
     write('  ⚠ quarantined: excluded from auto-inject, damped in recall — promote by confirming it (dz teach --reinforce "<text>") or dz recall --promote <dzId> --apply');
   }
   // The lexical write above is durable — the vector mirror is strictly best-effort (I-3).
-  await emitMirrorQ(storeRoot, [entry], 'dz-teach', quarantineOn);
-  return 0;
+  await emitMirrorQ(storeRoot, recordsToMirror, 'dz-teach', quarantineOn);
+  return commandFailed ? 1 : 0;
 }
 
 async function cmdConsolidate(options: Map<string, string>, flags: Set<string>, cwd: string, write: Write): Promise<number> {
@@ -3704,7 +4132,14 @@ async function cmdRecallPromote(
   return 0;
 }
 
-async function cmdRecall(options: Map<string, string>, flags: Set<string>, cwd: string, write: Write): Promise<number> {
+async function cmdRecall(
+  options: Map<string, string>,
+  flags: Set<string>,
+  cwd: string,
+  write: Write,
+  writeErr: WriteErr,
+  classMatcher?: RecallPatternsOptions['classMatcher'],
+): Promise<number> {
   const projectRoot = resolve(cwd, options.get('project') ?? '.');
   const asJson = flags.has('json');
   const all = flags.has('all');
@@ -3723,7 +4158,17 @@ async function cmdRecall(options: Map<string, string>, flags: Set<string>, cwd:
     // review could not make correct: a tag set by the writer is decidable, prose is not.
     const allPatterns = loadStorePatternsSync(projectRoot);
     const holdout = applyExportHoldout(allPatterns, heldOutAfterOptIn(options.get('include-domain')));
-    const patterns = holdout.exported;
+    const classByPair = new Map(
+      holdout.exported
+        .filter((row) => row.lessonForm === 'class' && row.lessonPairId !== undefined)
+        .map((row) => [row.lessonPairId as string, row.pattern]),
+    );
+    const patterns = holdout.exported.map((row) => {
+      const classForm = row.lessonForm === 'specific' && row.lessonPairId !== undefined
+        ? classByPair.get(row.lessonPairId)
+        : undefined;
+      return classForm === undefined ? row : { ...row, classForm };
+    });
     const holdoutNote = renderHoldoutNote(holdout);
     // The opt-in is honoured without argument — and named out loud. A flag that silently
     // includes medical lessons in a portable export is a flag whose consequence the user
@@ -3757,7 +4202,15 @@ async function cmdRecall(options: Map<string, string>, flags: Set<string>, cwd:
       const perDomain = Object.fromEntries(
         Object.entries(rawStats.perDomain).filter(([d]) => !holdout.domains.includes(canonicalDomainKey(d))),
       );
-      const stats = { ...rawStats, topUses: topHoldout.exported, perDomain };
+      const generalizedPairs = new Set(patterns.flatMap((p) => p.lessonPairId === undefined ? [] : [p.lessonPairId]));
+      const unpairedLessons = patterns.filter((p) => p.lessonPairId === undefined).length;
+      const stats = {
+        ...rawStats,
+        topUses: topHoldout.exported,
+        perDomain,
+        generalized: generalizedPairs.size,
+        logicalLessons: generalizedPairs.size + unpairedLessons,
+      };
       const backendStats = resolveLearningBackend(projectRoot).getStats();
       if (asJson) {
         write(JSON.stringify({ patterns, stats, learning: backendStats, withheld: holdout.withheld.length, withheldDomains: holdout.domains }));
@@ -3769,6 +4222,7 @@ async function cmdRecall(options: Map<string, string>, flags: Set<string>, cwd:
       write(`  backend: ${backendStats.backend}${backendStats.advisory !== undefined ? ` (${backendStats.advisory})` : ''}`);
       write(`  domains: ${Object.entries(stats.perDomain).map(([k, v]) => `${k}=${v}`).join(', ') || 'none'}`);
       write(`  exact-dup groups: ${stats.exactDupGroups}`);
+      write(`  generalized: ${stats.generalized} of ${stats.logicalLessons} lessons`);
       write(`  re-teach trend: ${stats.teachEvents} teach event(s), ${stats.reinforceEvents} reinforce event(s)`);
       write('  top uses:');
       for (const row of stats.topUses) write(`    ${row.uses}× [${row.reward.toFixed(2)}] (${row.domain}) ${row.pattern.slice(0, 80)}`);
@@ -3889,6 +4343,10 @@ async function cmdRecall(options: Map<string, string>, flags: Set<string>, cwd:
       ? ('lexical' as const)
       : ('hybrid' as const);
   const wantedDomain = options.get('domain');
+  const classRecallOptions = {
+    onClassDegraded: writeErr,
+    ...(classMatcher === undefined ? {} : { classMatcher }),
+  };
   // OVER-FETCH before boosting (Codex QE #5): the boost used to run on hits ALREADY
   // truncated to `limit`, so an exact-domain lesson sitting at rank limit+1 could
   // never receive its promised lift — the feature was weakest in exactly the case it
@@ -3911,8 +4369,8 @@ async function cmdRecall(options: Map<string, string>, flags: Set<string>, cwd:
   // second occurrence. Foreign stdout is routed to stderr for the duration of the engine call — our
   // own output is written after it returns.
   const result = asJson
-    ? await withForeignStdoutOnStderr(() => recallHybrid(projectRoot, query, { limit: fetchLimit, mode, deferExposures: true, ...(wantedDomain !== undefined ? { domain: wantedDomain } : {}) }))
-    : await recallHybrid(projectRoot, query, { limit: fetchLimit, mode, deferExposures: true, ...(wantedDomain !== undefined ? { domain: wantedDomain } : {}) });
+    ? await withForeignStdoutOnStderr(() => recallHybrid(projectRoot, query, { limit: fetchLimit, mode, deferExposures: true, ...classRecallOptions, ...(wantedDomain !== undefined ? { domain: wantedDomain } : {}) }))
+    : await recallHybrid(projectRoot, query, { limit: fetchLimit, mode, deferExposures: true, ...classRecallOptions, ...(wantedDomain !== undefined ? { domain: wantedDomain } : {}) });
 
   if (mode === 'semantic' && result.vectorEngine === 'none') {
     // --semantic is an explicit ask — degrading it silently would be dishonest (FR-3).
@@ -3948,13 +4406,26 @@ async function cmdRecall(options: Map<string, string>, flags: Set<string>, cwd:
   let globalHits: typeof result.hits = [];
   if (readGlobal) {
     const g = asJson
-      ? await withForeignStdoutOnStderr(() => recallHybrid(globalRoot, query, { limit: fetchLimit, mode, deferExposures: true, ...(wantedDomain !== undefined ? { domain: wantedDomain } : {}) }))
-      : await recallHybrid(globalRoot, query, { limit: fetchLimit, mode, deferExposures: true, ...(wantedDomain !== undefined ? { domain: wantedDomain } : {}) });
+      ? await withForeignStdoutOnStderr(() => recallHybrid(globalRoot, query, { limit: fetchLimit, mode, deferExposures: true, ...classRecallOptions, ...(wantedDomain !== undefined ? { domain: wantedDomain } : {}) }))
+      : await recallHybrid(globalRoot, query, { limit: fetchLimit, mode, deferExposures: true, ...classRecallOptions, ...(wantedDomain !== undefined ? { domain: wantedDomain } : {}) });
     globalHits = g.hits;
   }
+  const projectHits = boost ? boost.hits : result.hits;
+  // TWO different keys on purpose, and they must not be unified. The cross-store MERGE key is the
+  // lesson TEXT: the same lesson taught into the project store and the global store is one lesson
+  // shown once, labelled `both`, and those two records legitimately differ in timestamp, reward and
+  // domain. The matchedForm LOOKUP key may be narrower. Folding the merge key into
+  // patternIdentityOf (which includes ts) made two `dz teach` calls of identical text stop
+  // collapsing — it reddened the pre-existing P3 case in recall-reads-both-stores.test.ts.
+  const mergeKey = (hit: (typeof projectHits)[number]): string => hit.pattern.pattern;
+  const globalByIdentity = new Map(globalHits.map((hit) => [mergeKey(hit), hit]));
   const merged = readGlobal
-    ? mergeStoreHits(boost ? boost.hits : result.hits, globalHits, (h) => h.pattern.pattern)
-    : (boost ? boost.hits : result.hits);
+    ? mergeStoreHits(projectHits, globalHits, mergeKey).map((hit) => {
+        if (hit.origin !== 'both') return hit;
+        const matchedForm = mergeLessonMatchedForms(hit.matchedForm, globalByIdentity.get(mergeKey(hit))?.matchedForm);
+        return matchedForm === undefined ? hit : { ...hit, matchedForm };
+      })
+    : projectHits;
   const hits = merged.slice(0, limit);
   // Computed ONCE, honoured by EVERY return path. It used to live only on the text tail, so the two
   // paths that return earlier — `--json` and the zero-hits branch — still reported success. That
@@ -4002,6 +4473,7 @@ async function cmdRecall(options: Map<string, string>, flags: Set<string>, cwd:
     // version emitted the number while its own comment promised null (found by independent review).
     write(JSON.stringify(hits.map((h) => ({
       ...h.pattern,
+      ...(h.matchedForm === undefined ? {} : { matchedForm: h.matchedForm }),
       relevance: boost === null && 'score' in h && typeof h.score === 'number' ? h.score : null,
       // The TRUE cosine, as a second companion key — the design named it and the first ship missed
       // it, so a scripted consumer STILL could not threshold (found while recalibrating the floors:
@@ -4066,6 +4538,10 @@ async function cmdRecall(options: Map<string, string>, flags: Set<string>, cwd:
     // guessing which second one answered.
     write(`  store (read): ${join(globalRoot, '.dz')}  [cross-project]`);
   }
+  const classMatches = hits.filter((h) => h.matchedForm === 'class' || h.matchedForm === 'both').length;
+  if (hits.some((h) => h.pattern.classForm !== undefined)) {
+    write(`  class-form matches: ${classMatches} of ${hits.length}`);
+  }
   let sawQuarantined = false;
   for (const h of hits) {
     const backendTag = vectorOn ? ` ⟨${h.backend}⟩` : '';
@@ -4090,9 +4566,21 @@ async function cmdRecall(options: Map<string, string>, flags: Set<string>, cwd:
     // 160, not 80: at 80 characters the evidence a reader needs to judge relevance sits in the
     // hidden remainder, and the cosine then appears to describe the visible fragment rather than
     // the whole lesson. `--full` prints it all, still on one line.
-    const width = flags.has('full') ? Number.POSITIVE_INFINITY : 160;
-    const oneLined = oneLine(h.pattern.pattern);
-    const shown = width === Number.POSITIVE_INFINITY ? oneLined : oneLined.slice(0, width);
+    const specificText = oneLine(h.pattern.pattern);
+    const classText = h.pattern.classForm === undefined ? undefined : oneLine(h.pattern.classForm);
+    let shown = specificText;
+    if (classText !== undefined) {
+      const suffix = ` [match: ${h.matchedForm ?? 'specific'}]`;
+      if (flags.has('full')) {
+        shown = `specific: ${specificText} · class: ${classText}${suffix}`;
+      } else {
+        const contentWidth = Math.max(2, 160 - 'specific: '.length - ' · class: '.length - suffix.length);
+        const specificWidth = Math.floor(contentWidth / 2);
+        shown = `specific: ${specificText.slice(0, specificWidth)} · class: ${classText.slice(0, contentWidth - specificWidth)}${suffix}`;
+      }
+    } else if (!flags.has('full')) {
+      shown = shown.slice(0, 160);
+    }
     // WHICH store this hit came from. A merged list that does not say re-creates the fragmentation
     // blindness the store-location line just removed, one level down: the reader would see more
     // results and have no way to tell whether the global store is even connected.
@@ -5056,6 +5544,26 @@ async function cmdSetup(options: Map<string, string>, flags: Set<string>, cwd: s
   const projectRoot = resolve(cwd, options.get('project') ?? '.');
   const presetName = options.get('preset');
 
+  // PREFLIGHT BEFORE THE FIRST WRITE (backlog 9d15b9b6, PR-A). Step 3 configures the learning
+  // environment and step 4 installs skills, so refusing at step 4 would leave a project that has
+  // memory and hooks but not the skills the operator asked for — a half-configured state worse than
+  // either clean outcome. The request is therefore resolved HERE, before the banner's first step.
+  //
+  // Only an EXPLICIT --select is refused. A preset names skills the package itself ships, so a gap
+  // there is our packaging defect, not the operator's typo, and it is reported by the existing
+  // missing-list rather than by refusing the whole run.
+  const setupSelectRaw = options.get('select');
+  if (setupSelectRaw !== undefined) {
+    const requested = setupSelectRaw.split(',').map((x) => x.trim()).filter((x) => x.length > 0);
+    const roots = discoverSkillsDirs(cwd, options.get('skills-dir')).map((dir) => ({ dir, ids: discoverSkillIds(dir) }));
+    const resolution = resolveSelection(requested, roots);
+    for (const shadow of resolution.shadowed) {
+      writeErr(`dz: skill '${shadow.id}' is offered by ${shadow.alsoIn.length + 1} roots; installing from ${shadow.chosen} (earlier root wins). Also present in: ${shadow.alsoIn.join(', ')}`);
+    }
+    const refusal = formatSelectRefusal(resolution, roots);
+    if (refusal !== null) { writeErr(refusal); return 1; }
+  }
+
   write(`\n╔══════════════════════════════════════════════════════╗`);
   write(`║           DZ SETUP — Full Environment                ║`);
   write(`╠══════════════════════════════════════════════════════╣`);
@@ -5096,7 +5604,13 @@ async function cmdSetup(options: Map<string, string>, flags: Set<string>, cwd: s
     ? selectArg.split(',').map((s) => s.trim()).filter((s) => s.length > 0)
     : getPreset(preset)?.skills;
   const install = select !== undefined && select.length > 0
-    ? await installSkills({ target, projectRoot, cwd, explicitSkillsDir: options.get('skills-dir'), select, force: flags.has('force'), enrich: flags.has('enrich') })
+    ? await installSkills({
+        target, projectRoot, cwd, explicitSkillsDir: options.get('skills-dir'), select,
+        force: flags.has('force'), enrich: flags.has('enrich'), noHooks: flags.has('no-hooks'),
+        noIntegrations: flags.has('no-integrations'),
+        noVerify: flags.has('no-verify'),
+        ...(options.get('allow-integrations') !== undefined ? { allowIntegrations: options.get('allow-integrations')! } : {}),
+      })
     : undefined;
   if (install) {
     write(`║     ${String(install.results.length).padStart(2)} skill(s), ${String(install.written).padStart(3)} file(s) written${' '.repeat(15)}║`);
@@ -5106,6 +5620,7 @@ async function cmdSetup(options: Map<string, string>, flags: Set<string>, cwd: s
 
   // Step 5 (ADR-001 §8): DELIVER the codex hooks and verify them live. Non-aborting — the rest of
   // setup has already run and the summary still prints; only the exit code carries the failure.
+  let setupIntegrationOutcomes: readonly IntegrationOutcome[] = install?.integrations ?? [];
   let codexHooksOk = true;
   if (target === 'codex' && !flags.has('no-hooks')) {
     write(`║  5. Delivering codex hooks (live verify)...           ║`);
@@ -5113,6 +5628,11 @@ async function cmdSetup(options: Map<string, string>, flags: Set<string>, cwd: s
     codexHooksOk = delivery.ok;
     for (const line of delivery.stdout) write(line);
     for (const line of delivery.stderr) writeErr(line);
+    const hookIndex = setupIntegrationOutcomes.findIndex((row) => row.component === 'hooks' && row.status !== 'not-requested');
+    if (hookIndex !== -1) {
+      const hook = normalizeCodexHookOutcome(setupIntegrationOutcomes[hookIndex]!, delivery, flags.has('no-verify'));
+      setupIntegrationOutcomes = setupIntegrationOutcomes.map((row, index) => index === hookIndex ? hook : row);
+    }
   }
 
   write(`╠══════════════════════════════════════════════════════╣`);
@@ -5132,6 +5652,9 @@ async function cmdSetup(options: Map<string, string>, flags: Set<string>, cwd: s
   if (install) {
     write(`dz setup: ${install.results.length} skill(s), ${install.written} file(s) written, ${install.skipped} skipped`
       + (install.dirsSearched > 1 ? `  (searched ${install.dirsSearched} skill dirs)` : ''));
+    for (const outcome of setupIntegrationOutcomes) {
+      write(`dz setup integration ${outcome.component}: ${outcome.status.toUpperCase()}${outcome.reasonCode ? ` (${outcome.reasonCode})` : ''}`);
+    }
     writeMissingSkillsHint(write, install.missing, selectArg !== undefined ? undefined : preset);
   }
   // A hook that was written but never witnessed firing is NOT a completed setup (ADR-002 §5): the
@@ -5146,7 +5669,8 @@ async function cmdSetup(options: Map<string, string>, flags: Set<string>, cwd: s
   if (erroredSteps.length > 0) {
     write(`\n✗ setup reported ${erroredSteps.length} failed step(s): ${erroredSteps.join(', ')} — exit 1`);
   }
-  return codexHooksOk && erroredSteps.length === 0 ? 0 : 1;
+  const integrationsOk = !setupIntegrationOutcomes.some((row) => row.status === 'refused');
+  return codexHooksOk && erroredSteps.length === 0 && integrationsOk ? 0 : 1;
 }
 
 function cmdPretrain(options: Map<string, string>, cwd: string, write: Write): number {
@@ -5191,7 +5715,7 @@ function cmdPretrain(options: Map<string, string>, cwd: string, write: Write): n
   return 0;
 }
 
-function cmdRecommend(options: Map<string, string>, cwd: string, write: Write): number {
+function cmdRecommend(options: Map<string, string>, flags: Set<string>, cwd: string, write: Write): number {
   const task = options.get('_positional_0');
   if (!task) {
     write('dz recommend: task description required');
@@ -5201,17 +5725,41 @@ function cmdRecommend(options: Map<string, string>, cwd: string, write: Write):
 
   const registry = buildRegistry(cwd);
   const report = recommend(task, registry, cwd);
+  if (flags.has('json')) {
+    write(JSON.stringify(report, null, 2));
+    return 0;
+  }
 
   write(`\n╔══════════════════════════════════════════════════════════════╗`);
   write(`║                 DZ RECOMMEND — Task Advisor                 ║`);
   write(`╠══════════════════════════════════════════════════════════════╣`);
   write(`║  Task: ${report.task.slice(0, 52).padEnd(52)}║`);
-  const topicSuffix = report.pretrainFallback ? ' (via pretrain)' : '';
-  write(`║  Topics: ${(report.topics.join(', ') + topicSuffix).slice(0, 50).padEnd(50)}║`);
+  if (report.topicSource === 'task') {
+    write(`║  Topics: ${report.topics.join(', ').slice(0, 50).padEnd(50)}║`);
+  } else if (report.topicSource === 'project-stack') {
+    write(`║  Topics: ${'not matched in the question'.padEnd(50)}║`);
+  } else {
+    write(`║  Topics: ${'not recognized — no recommendations'.padEnd(50)}║`);
+  }
   write(`╠══════════════════════════════════════════════════════════════╣`);
 
+  if (report.topicSource === 'project-stack') {
+    write(`⚠ Тема запроса не распознана — подбор ниже сделан по СТЕКУ ПРОЕКТА, не по вашему вопросу.`);
+    write(`  (topic not recognized — recommendations reflect the project stack, not the question)`);
+    write(`PROJECT-STACK SUGGESTIONS`);
+  } else if (report.topicSource === 'none') {
+    write(`Тема запроса не распознана; рекомендаций нет.`);
+    write(`Переформулируйте задачу или используйте dz registry search <слово> / /skill-advisor.`);
+    write(`╚══════════════════════════════════════════════════════════════╝`);
+    return 0;
+  }
+
+  const stackDerived = report.topicSource === 'project-stack';
+
   if (report.presets.length > 0) {
-    write(`║  RECOMMENDED PRESETS                                        ║`);
+    write(stackDerived
+      ? `║  PROJECT-STACK PRESETS                                      ║`
+      : `║  RECOMMENDED PRESETS                                        ║`);
     for (const p of report.presets) {
       const matched = p.matchedSkills.length > 0 ? ` (${p.matchedSkills.slice(0, 3).join(', ')})` : '';
       write(`║    ${p.name.padEnd(15)} ${String(p.skills).padStart(2)} skills  coverage: ${String(p.coverage).padStart(2)} topics${matched.padEnd(15)}║`);
@@ -5220,7 +5768,9 @@ function cmdRecommend(options: Map<string, string>, cwd: string, write: Write):
   }
 
   if (report.skills.length > 0) {
-    write(`║  RECOMMENDED SKILLS (top ${Math.min(report.skills.length, 8)})${' '.repeat(35)}║`);
+    write(stackDerived
+      ? `║  PROJECT-STACK SKILLS (top ${Math.min(report.skills.length, 8)})${' '.repeat(35)}║`
+      : `║  RECOMMENDED SKILLS (top ${Math.min(report.skills.length, 8)})${' '.repeat(35)}║`);
     for (const s of report.skills.slice(0, 8)) {
       const desc = s.description.length > 35 ? s.description.slice(0, 32) + '...' : s.description;
       write(`║    ${s.id.padEnd(24)} ${desc.padEnd(36)}║`);
@@ -5229,7 +5779,9 @@ function cmdRecommend(options: Map<string, string>, cwd: string, write: Write):
   }
 
   if (report.toolkits.length > 0) {
-    write(`║  FULL PIPELINE (npx toolkits)                               ║`);
+    write(stackDerived
+      ? `║  PROJECT-STACK PIPELINE (npx toolkits)                      ║`
+      : `║  FULL PIPELINE (npx toolkits)                               ║`);
     for (const tk of report.toolkits) {
       const desc = tk.description.length > 44 ? tk.description.slice(0, 41) + '...' : tk.description;
       write(`║    ${tk.name.padEnd(16)} ${desc.padEnd(44)}║`);
@@ -5240,13 +5792,17 @@ function cmdRecommend(options: Map<string, string>, cwd: string, write: Write):
   }
 
   write(`╠══════════════════════════════════════════════════════════════╣`);
-  write(`║  STEP-BY-STEP PLAN                                         ║`);
+  write(stackDerived
+    ? `║  PROJECT-STACK PLAN                                         ║`
+    : `║  STEP-BY-STEP PLAN                                         ║`);
   for (const step of report.plan) {
     const line = step.length > 60 ? step.slice(0, 57) + '...' : step;
     write(`║    ${line.padEnd(58)}║`);
   }
   write(`╠══════════════════════════════════════════════════════════════╣`);
-  write(`║  QUICK INSTALL                                              ║`);
+  write(stackDerived
+    ? `║  PROJECT-STACK QUICK INSTALL                                ║`
+    : `║  QUICK INSTALL                                              ║`);
   const cmd = report.installCommand.length > 58 ? report.installCommand.slice(0, 55) + '...' : report.installCommand;
   write(`║    ${cmd.padEnd(58)}║`);
   write(`╚══════════════════════════════════════════════════════════════╝`);
@@ -5804,6 +6360,9 @@ function cmdPublish(options: Map<string, string>, flags: Set<string>, cwd: strin
     if (guardResult.verdict === 'block') write(`dz publish: ⚠ guard BLOCK overridden via --no-guard: ${noGuard} (logged)`);
     else if (guardResult.verdict === 'warn') for (const v of guardResult.violations) write(`dz publish: ⚠ guard warn — ${v.rule}: ${v.detail}`);
     else write('dz publish: ✓ guard pre-flight passed');
+    for (const observation of guardResult.observations ?? []) {
+      write(`dz publish: ℹ guard observation — ${observation.rule} ${observation.scope}: ${observation.detail} [${observation.status}]`);
+    }
     for (const n of guardResult.notes ?? []) write(`dz publish: ℹ guard note — ${n}`); // FN-7: on the record, never blocking
   }
 
@@ -6992,6 +7551,84 @@ function looksBinaryText(text: string): boolean {
  * per-file findings (each enriched with its `file`), and applies the exit-code contract.
  * `--json` ALWAYS emits valid JSON `{ok, findings, scanned}`, even on the failure path.
  */
+/**
+ * `dz chain` — verify EVERY hash-chained journal in one command (W0-chain, backlog bc4ee35c).
+ *
+ * The machinery to verify a chain has worked for weeks. What was missing is the ABILITY TO ASK:
+ * verification lived inside two consumers, each carrying its own hardcoded list of which files are
+ * chained, so a journal could be given a chain and still be checked by nobody. Coverage here is
+ * DERIVED from CHAINED_JOURNALS, never typed — adding a journal to the registry adds it to this
+ * report by construction.
+ *
+ * An ABSENT journal is reported as `absent`, not omitted. Omission and cleanliness are
+ * indistinguishable in a report, and that indistinguishability is how the original blind spot
+ * survived; the same reason `broken` exits NON-ZERO rather than merely printing — a verifier that
+ * reports damage and exits 0 is one no automation can act on, and this verb exists to run unattended.
+ *
+ * A journal that exists but carries NO chained records is `unchained`, which is legal (a log may
+ * predate the chain) and therefore does not fail the command. Calling it a defect would train the
+ * reader to ignore the output — the failure mode already measured once on the doctor's own line.
+ */
+function cmdChain(options: Map<string, string>, flags: Set<string>, cwd: string, write: Write): number {
+  const root = options.get('project') ?? cwd;
+  const journals = CHAINED_JOURNALS.map((journal) => {
+    const path = join(root, journal.rel);
+    if (!existsSync(path)) {
+      return { rel: journal.rel, decides: journal.decides, status: 'absent' as const, chained: 0, defects: 0, detail: 'file not present' };
+    }
+    let text = '';
+    try {
+      text = readFileSync(path, 'utf-8');
+    } catch {
+      // Unreadable is NOT clean. It is the one outcome that must never be quietly folded into
+      // "nothing to report": we did not look, so we know nothing.
+      return { rel: journal.rel, decides: journal.decides, status: 'unreadable' as const, chained: 0, defects: 0, detail: 'file could not be read' };
+    }
+    const v = verifyEventChainText(text);
+    if (v.chained === 0) {
+      return { rel: journal.rel, decides: journal.decides, status: 'unchained' as const, chained: 0, defects: 0, detail: 'present, but no record carries a chain (legal — the log predates chaining)' };
+    }
+    const total = text.split('\n').filter((l) => l.trim() !== '').length;
+    const age = classifyChainDefects(v, total);
+    if (v.ok) {
+      return { rel: journal.rel, decides: journal.decides, status: 'ok' as const, chained: v.chained, defects: 0, detail: `${v.chained} chained record(s), ${v.resets} recorded restart(s)` };
+    }
+    // A break the current unbroken run has already outlived does not make TODAY's records unsound.
+    // Reporting both alike is what made the doctor's equivalent line permanently red for four weeks.
+    const historical = age.inRun.length === 0 && age.runRecords > 0;
+    return {
+      rel: journal.rel,
+      decides: journal.decides,
+      status: historical ? ('healed' as const) : ('broken' as const),
+      chained: v.chained,
+      defects: v.defects.length,
+      detail: historical
+        ? `${v.defects.length} defect(s), all BEFORE the current run — the last ${age.runRecords} record(s) are unbroken, so verdicts over those are sound`
+        : `${v.defects.length} defect(s) with NO sound records after them: verdicts computed from this log are unsafe`,
+    };
+  });
+
+  const failed = journals.filter((j) => j.status === 'broken' || j.status === 'unreadable');
+  const ok = failed.length === 0;
+
+  if (flags.has('json')) {
+    write(JSON.stringify({ ok, root, journals }, null, 2));
+    return ok ? 0 : 1;
+  }
+
+  write(`dz chain — ${journals.length} registered journal(s) under ${root}`);
+  write('');
+  const MARK: Record<string, string> = { ok: '\u2713', healed: '\u2713', unchained: '\u00b7', absent: '\u00b7', broken: '\u2717', unreadable: '\u2717' };
+  for (const j of journals) {
+    write(`  ${MARK[j.status] ?? '?'} ${j.rel} — ${j.status}`);
+    write(`      ${j.detail}`);
+    write(`      decides: ${j.decides}`);
+  }
+  write('');
+  write(ok ? '  all registered journals are sound for present verdicts' : `  ${failed.length} journal(s) UNSAFE — see above`);
+  return ok ? 0 : 1;
+}
+
 function cmdClaimCheck(
   options: Map<string, string>,
   _optionLists: Map<string, string[]>,
@@ -7503,6 +8140,31 @@ export interface CodexHooksSummary {
   readonly stderr: readonly string[];
 }
 
+/** Map the retained Codex hook writer's one live verdict into the common integration contract. */
+export function normalizeCodexHookOutcome(
+  base: IntegrationOutcome,
+  delivery: CodexHooksSummary & { readonly report: CodexHooksSyncReport },
+  noVerify = false,
+): IntegrationOutcome {
+  if (delivery.report.ready) {
+    return {
+      target: 'codex', component: 'hooks', status: 'emitted',
+      registrations: [{ id: 'dz-codex-hooks', scope: 'user', registered: delivery.report.installed, approval: delivery.report.trust === 'trusted' ? 'approved' : 'unknown', ready: true }],
+      carrier: { scope: 'user', path: '$CODEX_HOME/hooks.json' },
+      ...(delivery.report.codexVersion !== null ? { runtimeVersion: delivery.report.codexVersion } : {}),
+      evidenceVersion: 'codex-hooks-live-v1',
+    };
+  }
+  return {
+    ...base,
+    target: 'codex', component: 'hooks', status: 'refused',
+    registrations: [{ id: 'dz-codex-hooks', scope: 'user', registered: delivery.report.installed, approval: delivery.report.trust === 'trusted' ? 'approved' : 'unknown', ready: false }],
+    reasonCode: 'CURRENT_LIVE_CHECK_FAILED',
+    remediation: noVerify ? '--no-verify cannot establish ready; rerun with live verification' : 'approve the managed hooks and rerun the live verification',
+    applied: delivery.report.written || delivery.report.installed,
+  };
+}
+
 /**
  * What the user is told about a sync report — the ONE place the success word can be printed.
  *
@@ -7831,6 +8493,392 @@ function gatherReadmeCounts(root: string): { label: string; a: number; b: number
   return pairs;
 }
 
+const MAX_VOLUME_FILES_PER_SCOPE = 512;
+const MAX_VOLUME_BYTES_PER_SCOPE = 32 * 1024 * 1024;
+const CYRILLIC_CHARACTER = /\p{Script=Cyrillic}/u;
+
+function volumePathInside(root: string, candidate: string): boolean {
+  return candidate === root || candidate.startsWith(root + sep);
+}
+
+function cyrillicUtf8Bytes(buffer: Buffer): number {
+  let bytes = 0;
+  for (const character of buffer.toString('utf8')) {
+    if (CYRILLIC_CHARACTER.test(character)) bytes += Buffer.byteLength(character, 'utf8');
+  }
+  return bytes;
+}
+
+function gatherTemplateVolumeTarget(
+  packageDir: string,
+  target: string,
+): TemplateVolumeTargetFact | undefined {
+  const templateRoot = join(packageDir, 'templates', '.claude');
+  if (!existsSync(templateRoot)) return undefined;
+  const files: TemplateVolumeFileFact[] = [];
+  const realFiles = new Set<string>();
+  let totalBytes = 0;
+  let failure: { reason: string; detail: string } | undefined;
+  let packageReal: string;
+  let templateReal: string;
+  try {
+    packageReal = realpathSync(packageDir);
+    templateReal = realpathSync(templateRoot);
+    if (!volumePathInside(packageReal, templateReal)) {
+      failure = { reason: 'template-root-escape', detail: templateRoot };
+    }
+  } catch (error) {
+    return {
+      target,
+      files,
+      collection: { complete: false, reason: 'template-root-unreadable', detail: error instanceof Error ? error.message : String(error) },
+    };
+  }
+
+  const fail = (reason: string, detail: string): void => {
+    failure ??= { reason, detail: detail.replace(/\s+/g, ' ').slice(0, 240) };
+  };
+  const addFile = (absolute: string, kind: 'rules' | 'commands' | 'skills'): void => {
+    if (failure !== undefined) return;
+    if (files.length >= MAX_VOLUME_FILES_PER_SCOPE) {
+      fail('template-file-cap-exceeded', `${MAX_VOLUME_FILES_PER_SCOPE} files`);
+      return;
+    }
+    try {
+      const stat = lstatSync(absolute);
+      if (!stat.isFile()) { fail('template-input-not-regular', absolute); return; }
+      const real = realpathSync(absolute);
+      if (!volumePathInside(templateReal, real)) { fail('template-input-escape', absolute); return; }
+      if (realFiles.has(real)) { fail('template-input-duplicate', absolute); return; }
+      if (stat.size <= 0 || stat.size > MAX_VOLUME_BYTES_PER_SCOPE - totalBytes) {
+        fail(stat.size <= 0 ? 'template-input-empty' : 'template-byte-cap-exceeded', absolute);
+        return;
+      }
+      const content = readFileSync(absolute);
+      if (content.byteLength <= 0 || content.byteLength > MAX_VOLUME_BYTES_PER_SCOPE - totalBytes) {
+        fail(content.byteLength <= 0 ? 'template-input-empty' : 'template-byte-cap-exceeded', absolute);
+        return;
+      }
+      realFiles.add(real);
+      totalBytes += content.byteLength;
+      files.push({
+        path: relative(packageDir, absolute).split(sep).join('/'),
+        kind,
+        bytes: content.byteLength,
+        cyrillicUtf8Bytes: cyrillicUtf8Bytes(content),
+      });
+    } catch (error) {
+      fail('template-input-unreadable', `${absolute}: ${error instanceof Error ? error.message : String(error)}`);
+    }
+  };
+  const scanFlat = (name: 'rules' | 'commands'): void => {
+    const dir = join(templateRoot, name);
+    if (!existsSync(dir) || failure !== undefined) return;
+    try {
+      for (const entry of readdirSync(dir, { withFileTypes: true }).sort((a, b) => a.name.localeCompare(b.name))) {
+        if (!entry.name.endsWith('.md')) continue;
+        addFile(join(dir, entry.name), name);
+      }
+    } catch (error) {
+      fail('template-directory-unreadable', `${dir}: ${error instanceof Error ? error.message : String(error)}`);
+    }
+  };
+  const scanSkills = (dir: string): void => {
+    if (!existsSync(dir) || failure !== undefined) return;
+    let entries: Dirent[];
+    try {
+      entries = readdirSync(dir, { withFileTypes: true }).sort((a, b) => a.name.localeCompare(b.name));
+    } catch (error) {
+      fail('template-directory-unreadable', `${dir}: ${error instanceof Error ? error.message : String(error)}`);
+      return;
+    }
+    for (const entry of entries) {
+      if (failure !== undefined) return;
+      const absolute = join(dir, entry.name);
+      if (entry.isSymbolicLink()) { fail('template-input-not-regular', absolute); return; }
+      if (entry.isDirectory()) scanSkills(absolute);
+      else if (entry.name === 'SKILL.md') addFile(absolute, 'skills');
+    }
+  };
+
+  scanFlat('rules');
+  scanFlat('commands');
+  scanSkills(join(templateRoot, 'skills'));
+  files.sort((a, b) => a.path.localeCompare(b.path));
+  return {
+    target,
+    files,
+    collection: failure === undefined
+      ? { complete: true }
+      : { complete: false, reason: failure.reason, detail: failure.detail },
+  };
+}
+
+function volumeGitText(root: string, args: readonly string[], allowedStatuses: readonly number[] = [0]): string {
+  const result = spawnSync('git', [...args], {
+    cwd: root,
+    encoding: 'utf8',
+    maxBuffer: 32 * 1024 * 1024,
+  });
+  if (result.status === null || !allowedStatuses.includes(result.status)) {
+    throw result.error ?? new Error(`git ${args[0] ?? ''} exited ${String(result.status)}`);
+  }
+  return result.stdout ?? '';
+}
+
+function parseGuardStatusPaths(root: string): { readonly code: string; readonly path: string }[] {
+  const text = volumeGitText(root, ['status', '--porcelain', '-uall']);
+  return text.split('\n').flatMap((line) => {
+    if (line.length < 4) return [];
+    const code = line.slice(0, 2);
+    const raw = line.slice(3).trim();
+    const path = (raw.includes(' -> ') ? raw.split(' -> ')[1] : raw)?.trim();
+    return path ? [{ code, path }] : [];
+  });
+}
+
+function parseFeatureTier(text: string): FeatureTier | undefined {
+  const match = text.match(/^##\s+Tier:\s*(S|M|L|XL)\s*$/m);
+  return match?.[1] as FeatureTier | undefined;
+}
+
+function parseFeatureActiveSteps(text: string): (number | string)[] | undefined {
+  const section = text.match(/^## Active steps[^\n]*\n([\s\S]*?)(?=^## |(?![\s\S]))/mi)?.[1];
+  if (section === undefined) return undefined;
+  const steps = [...section.matchAll(/\b(?:10|[0-9](?:\.5)?)\b/g)].map((match) => match[0]!);
+  return [...new Set(steps)];
+}
+
+function featureLifecycle(root: string, slug: string, assessment: string | undefined): FeatureVolumeFact['lifecycle'] {
+  if (assessment !== undefined && /^Lifecycle:\s*complete\s*$/mi.test(assessment)) return { phase: 'complete' };
+  try {
+    const state = JSON.parse(readFileSync(join(root, '.dz', 'feature-adr', 'learning-state', `${slug}.json`), 'utf8')) as { step?: unknown };
+    const match = typeof state.step === 'string' ? state.step.match(/\bStep\s+(\d+(?:\.5)?)/i) : null;
+    if (!match?.[1]) return undefined;
+    const current = Number(match[1]);
+    if (!Number.isFinite(current)) return undefined;
+    return { phase: 'in-progress', completedThroughStep: current <= 0 ? 0 : Math.ceil(current) - 1 };
+  } catch {
+    return undefined;
+  }
+}
+
+interface GatheredFeatureVolume {
+  readonly fact: FeatureVolumeFact;
+  readonly manifestText?: string;
+}
+
+function gatherFeatureVolumeFact(root: string, slug: string): GatheredFeatureVolume {
+  const featureDir = join(root, 'features', slug);
+  const artifacts: FeatureArtifactFact[] = [];
+  const contents = new Map<string, Buffer>();
+  let totalBytes = 0;
+  let failure: { reason: string; detail: string } | undefined;
+  let rootReal: string;
+  let featureReal: string;
+  try {
+    rootReal = realpathSync(root);
+    featureReal = realpathSync(featureDir);
+    if (!volumePathInside(rootReal, featureReal)) failure = { reason: 'feature-root-escape', detail: featureDir };
+  } catch (error) {
+    return { fact: {
+      slug,
+      artifacts,
+      collection: { complete: false, reason: 'feature-root-unreadable', detail: error instanceof Error ? error.message : String(error) },
+    } };
+  }
+  const fail = (reason: string, detail: string): void => {
+    failure ??= { reason, detail: detail.replace(/\s+/g, ' ').slice(0, 240) };
+  };
+  const addArtifact = (absolute: string): void => {
+    if (failure !== undefined) return;
+    if (artifacts.length >= MAX_VOLUME_FILES_PER_SCOPE) {
+      fail('feature-file-cap-exceeded', `${MAX_VOLUME_FILES_PER_SCOPE} files`);
+      return;
+    }
+    try {
+      const stat = lstatSync(absolute);
+      if (!stat.isFile()) { fail('feature-input-not-regular', absolute); return; }
+      const real = realpathSync(absolute);
+      if (!volumePathInside(featureReal, real)) { fail('feature-input-escape', absolute); return; }
+      if (stat.size <= 0 || stat.size > MAX_VOLUME_BYTES_PER_SCOPE - totalBytes) {
+        fail(stat.size <= 0 ? 'feature-input-empty' : 'feature-byte-cap-exceeded', absolute);
+        return;
+      }
+      const content = readFileSync(absolute);
+      if (content.byteLength <= 0 || content.byteLength > MAX_VOLUME_BYTES_PER_SCOPE - totalBytes) {
+        fail(content.byteLength <= 0 ? 'feature-input-empty' : 'feature-byte-cap-exceeded', absolute);
+        return;
+      }
+      const path = relative(featureDir, absolute).split(sep).join('/');
+      totalBytes += content.byteLength;
+      contents.set(path, content);
+      artifacts.push({ path, bytes: content.byteLength });
+    } catch (error) {
+      fail('feature-input-unreadable', `${absolute}: ${error instanceof Error ? error.message : String(error)}`);
+    }
+  };
+  const scanNested = (dir: string): void => {
+    if (!existsSync(dir) || failure !== undefined) return;
+    let entries: Dirent[];
+    try {
+      entries = readdirSync(dir, { withFileTypes: true }).sort((a, b) => a.name.localeCompare(b.name));
+    } catch (error) {
+      fail('feature-directory-unreadable', `${dir}: ${error instanceof Error ? error.message : String(error)}`);
+      return;
+    }
+    for (const entry of entries) {
+      if (failure !== undefined) return;
+      const absolute = join(dir, entry.name);
+      if (entry.isSymbolicLink()) { fail('feature-input-not-regular', absolute); return; }
+      if (entry.isDirectory()) scanNested(absolute);
+      else addArtifact(absolute);
+    }
+  };
+  try {
+    const entries = readdirSync(featureDir, { withFileTypes: true }).sort((a, b) => a.name.localeCompare(b.name));
+    for (const entry of entries) {
+      if (failure !== undefined) break;
+      const absolute = join(featureDir, entry.name);
+      if (entry.name === '03_adr' || entry.name === '07_code_changes') {
+        if (entry.isSymbolicLink() || !entry.isDirectory()) fail('feature-input-not-regular', absolute);
+        else scanNested(absolute);
+      } else if (entry.name === 'README.md' || /^0[0-9](?:[_.-][^/]*)?\.md$/.test(entry.name)) {
+        addArtifact(absolute);
+      }
+    }
+  } catch (error) {
+    fail('feature-directory-unreadable', `${featureDir}: ${error instanceof Error ? error.message : String(error)}`);
+  }
+  artifacts.sort((a, b) => a.path.localeCompare(b.path));
+  const assessment = contents.get('00_complexity_assessment.md')?.toString('utf8');
+  const tier = assessment !== undefined ? parseFeatureTier(assessment) : undefined;
+  const activeSteps = assessment !== undefined ? parseFeatureActiveSteps(assessment) : undefined;
+  const lifecycle = featureLifecycle(root, slug, assessment);
+  const fact: FeatureVolumeFact = {
+    slug,
+    ...(tier !== undefined ? { tier } : {}),
+    ...(activeSteps !== undefined ? { activeSteps } : {}),
+    namedConsumers: [],
+    ...(lifecycle !== undefined ? { lifecycle } : {}),
+    artifacts,
+    collection: failure === undefined
+      ? { complete: true }
+      : { complete: false, reason: failure.reason, detail: failure.detail },
+  };
+  const manifestText = contents.get('07_code_changes/change_manifest.md')?.toString('utf8');
+  return { fact, ...(manifestText !== undefined ? { manifestText } : {}) };
+}
+
+function manifestPaths(text: string, slug: string): string[] {
+  const paths = new Set<string>();
+  for (const line of text.split('\n')) {
+    const match = line.match(/^\s*-\s+`?([^`]+?)`?(?:\s+[—-]\s+.*)?$/);
+    if (!match?.[1]) continue;
+    const path = match[1].trim().replace(/\\/g, '/').replace(/^\.\//, '');
+    if (path === '' || path.startsWith('/') || path.split('/').some((part) => part === '..')) continue;
+    if (path.startsWith(`features/${slug}/`)) continue;
+    paths.add(path);
+  }
+  return [...paths].sort();
+}
+
+function attributableDiff(
+  root: string,
+  slug: string,
+  feature: GatheredFeatureVolume,
+  status: readonly { readonly code: string; readonly path: string }[],
+  changedSlugs: readonly string[],
+): NonNullable<FeatureVolumeFact['diff']> {
+  if (changedSlugs.length !== 1 || changedSlugs[0] !== slug) {
+    return { attributable: false, reason: changedSlugs.length > 1 ? 'ambiguous-feature-attribution' : 'feature-not-attributable' };
+  }
+  if (feature.manifestText === undefined) return { attributable: false, reason: 'change-manifest-unavailable' };
+  const listed = manifestPaths(feature.manifestText, slug);
+  const changedByPath = new Map(status.map((item) => [item.path, item.code]));
+  const changed = listed.filter((path) => changedByPath.has(path));
+  if (changed.length === 0) return { attributable: true, bytes: 0, base: 'HEAD', head: 'working-tree', method: 'git-unified-diff-bytes/v1', excludedFeaturePath: `features/${slug}/**` };
+  const tracked: string[] = [];
+  const untracked: string[] = [];
+  for (const path of changed) {
+    const absolute = resolve(root, path);
+    if (!volumePathInside(root, absolute)) return { attributable: false, reason: 'manifest-path-escape' };
+    if (changedByPath.get(path) === '??') {
+      try {
+        const stat = lstatSync(absolute);
+        const real = realpathSync(absolute);
+        if (!stat.isFile() || !volumePathInside(root, real) || stat.size > MAX_VOLUME_BYTES_PER_SCOPE) {
+          return { attributable: false, reason: 'untracked-diff-input-refused' };
+        }
+      } catch { return { attributable: false, reason: 'untracked-diff-input-unreadable' }; }
+      untracked.push(path);
+    } else {
+      tracked.push(path);
+    }
+  }
+  let bytes = 0;
+  try {
+    if (tracked.length > 0) {
+      const diff = volumeGitText(root, ['diff', '--binary', '--no-ext-diff', 'HEAD', '--', ...tracked]);
+      bytes += Buffer.byteLength(diff, 'utf8');
+    }
+    for (const path of untracked) {
+      const diff = volumeGitText(root, ['diff', '--no-index', '--binary', '--', '/dev/null', resolve(root, path)], [0, 1]);
+      bytes += Buffer.byteLength(diff, 'utf8');
+      if (bytes > MAX_VOLUME_BYTES_PER_SCOPE) return { attributable: false, reason: 'diff-byte-cap-exceeded' };
+    }
+  } catch {
+    return { attributable: false, reason: 'git-diff-failed' };
+  }
+  return {
+    attributable: true,
+    bytes,
+    base: 'HEAD',
+    head: 'working-tree',
+    method: 'git-unified-diff-bytes/v1',
+    excludedFeaturePath: `features/${slug}/**`,
+  };
+}
+
+function gatherVolumeShadowFacts(
+  root: string,
+  packages: readonly { readonly dir: string; readonly name: string; readonly privateFlag: boolean }[],
+): VolumeShadowInput {
+  const templates = packages
+    .filter((item) => !item.privateFlag)
+    .sort((a, b) => a.name.localeCompare(b.name) || a.dir.localeCompare(b.dir))
+    .flatMap((item) => {
+      const fact = gatherTemplateVolumeTarget(join(root, item.dir), item.name);
+      return fact === undefined ? [] : [fact];
+    });
+  let status: { code: string; path: string }[];
+  try { status = parseGuardStatusPaths(root); }
+  catch { return templates.length > 0 ? { templates } : {}; }
+  const slugs = [...new Set(status.flatMap((item) => {
+    const match = item.path.match(/^features\/([^/]+)\//);
+    return match?.[1] ? [match[1]] : [];
+  }))].sort();
+  const gathered = slugs.slice(0, 32).map((slug) => gatherFeatureVolumeFact(root, slug));
+  const measuredFeatures = gathered.map((feature) => ({
+    ...feature.fact,
+    diff: attributableDiff(root, feature.fact.slug, feature, status, slugs),
+  }));
+  const cappedFeatures: FeatureVolumeFact[] = slugs.slice(32).map((slug) => ({
+    slug,
+    artifacts: [],
+    collection: {
+      complete: false,
+      reason: 'feature-scope-cap-exceeded',
+      detail: 'only the first 32 lexicographically sorted changed feature scopes were traversed',
+    },
+  }));
+  const features = [...measuredFeatures, ...cappedFeatures];
+  return {
+    ...(templates.length > 0 ? { templates } : {}),
+    ...(features.length > 0 ? { features } : {}),
+  };
+}
+
 /** Gather the facts one op needs. All I/O is best-effort — a missing signal skips its rule, never crashes. */
 function gatherGuardFacts(op: string, root: string, text: string | undefined, storeCap: number): Record<string, unknown> {
   const facts: Record<string, unknown> = { op };
@@ -7954,7 +9002,7 @@ function gatherGuardFacts(op: string, root: string, text: string | undefined, st
     const manifests: Manifest[] = [];
     const located: { dir: string; m: Manifest }[] = [];
     try {
-      const out = execSync('git ls-files "packages/@dzhechkov/*/package.json"', { cwd: root, encoding: 'utf-8' });
+      const out = volumeGitText(root, ['ls-files', 'packages/@dzhechkov/*/package.json']);
       for (const rel of out.split('\n').map((s) => s.trim()).filter(Boolean)) {
         try {
           const m = JSON.parse(readFileSync(join(root, rel), 'utf8')) as Manifest;
@@ -7978,6 +9026,11 @@ function gatherGuardFacts(op: string, root: string, text: string | undefined, st
       packages.push({ name: m.name ?? '(unnamed)', deps });
     }
     facts['packages'] = packages;
+    facts['volume'] = gatherVolumeShadowFacts(root, located.map(({ dir, m }) => ({
+      dir,
+      name: m.name ?? dir,
+      privateFlag: m.private === true,
+    })));
 
     // licence-hold (ADR-001, hermes-claude-adaptation): for each pack DECLARING a hold via a
     // `licenseHold` field, hand the raw evidence to the pure checker. Best-effort: an unreadable
@@ -8202,6 +9255,11 @@ function runGuardEvaluation(root: string, op: string, text: string | undefined,
   return result;
 }
 
+function renderGuardObservation(observation: GuardObservation): string {
+  const tag = observation.status === 'unknown' ? 'note' : 'observe';
+  return `  [${tag}] ${observation.rule} ${observation.scope}: ${observation.detail} [${observation.status}]`;
+}
+
 /**
  * The tail facts of an append-only log, read from its END — O(1) in the file size, which is what
  * lets the chain be extended on every append without a full-file scan (FR-2). Anything unreadable
@@ -8542,7 +9600,8 @@ function cmdGuardPromote(options: Map<string, string>, flags: Set<string>, root:
       ...next,
       entries: Object.fromEntries(Object.entries(next.entries).map(([k, v]) => (applied.includes(k) ? [k, { ...v, appliedTs: nowTs }] : [k, v]))),
     };
-    try { writeJsonAtomic(join(root, PROMOTION_STATE_FILE), withApplied); } catch { /* best-effort */ }
+    const withEvidence = recordPromotionRunEvidence(withApplied, report, nowTs);
+    try { writeJsonAtomic(join(root, PROMOTION_STATE_FILE), withEvidence); } catch { /* best-effort */ }
   }
 
   // A refused conflict means the requested apply did NOT fully happen — exit non-zero rather than
@@ -8634,6 +9693,7 @@ function cmdGuard(options: Map<string, string>, flags: Set<string>, cwd: string,
 
   const glyph = result.verdict === 'block' ? '✗' : result.verdict === 'warn' ? '⚠' : '✓';
   write(`dz guard (${op}): ${glyph} ${result.verdict.toUpperCase()}  [checked: ${result.checked.join(', ') || 'no rules for this op'}]`);
+  for (const observation of result.observations ?? []) write(renderGuardObservation(observation));
   for (const v of result.violations) write(`  [${v.severity === 'hard' ? 'BLOCK' : 'warn'}] ${v.rule}: ${v.detail}`);
   for (const n of result.notes ?? []) write(`  [note] ${n}`); // information, never a verdict input (FN-7)
   if (result.verdict === 'block' && forced) write(`  → forced through: ${force} (logged to .dz/guard-audit.jsonl)`);
@@ -9241,9 +10301,74 @@ function cmdDiscriminationCheck(options: Map<string, string>, flags: Set<string>
   const timeoutOpt = Number(options.get('timeout') ?? '300000');
   const timeoutMs = Number.isFinite(timeoutOpt) && timeoutOpt > 0 ? timeoutOpt : 300000;
 
-  const plan = planDiscriminationCheck(runnerOpt !== undefined ? { baseRef, propertyTests, runner: runnerOpt } : { baseRef, propertyTests });
+  // Runner honesty (feature instrument-honesty, ADR-001): the runner is selected from the TARGET
+  // package's own scripts.test, never from a global default. The package dir is the nearest
+  // ancestor of the FIRST named test that carries a package.json — walked here, at the seam,
+  // because the pure half deliberately takes the script text as data and never touches the fs.
+  let packageTestScript: string | null = null;
+  let packageDevDependencies: string[] = [];
+  let packageDir = repoRoot;
+  {
+    const firstTest = propertyTests[0]?.file;
+    // QE-1 (instrument-honesty, HIGH): this walk runs on the RAW --test argument, BEFORE the
+    // engine's sanitation — a `../` traversal made it read an arbitrary package.json OUTSIDE the
+    // repo and echo its scripts.test verbatim into the JSON output (MEASURED with a planted
+    // marker file). Containment first: a start point outside the repo root never gets walked,
+    // the script stays null, and the engine's own path sanitation then refuses the test path.
+    const walkStart = firstTest !== undefined ? resolve(cwd, dirname(firstTest)) : undefined;
+    if (firstTest !== undefined && walkStart !== undefined
+      && (walkStart === resolve(repoRoot) || walkStart.startsWith(resolve(repoRoot) + sep))) {
+      let probe = walkStart;
+      // walk up to the repo root looking for package.json (bounded by the fs root either way)
+      for (;;) {
+        if (existsSync(join(probe, 'package.json'))) { packageDir = probe; break; }
+        const parent = dirname(probe);
+        if (parent === probe || probe === repoRoot) break;
+        probe = parent;
+      }
+      try {
+        const pkg = JSON.parse(readFileSync(join(packageDir, 'package.json'), 'utf-8')) as {
+          scripts?: Record<string, string>; devDependencies?: Record<string, string>;
+        };
+        packageTestScript = typeof pkg.scripts?.test === 'string' ? pkg.scripts.test : null;
+        packageDevDependencies = Object.keys(pkg.devDependencies ?? {});
+      } catch { /* unreadable package.json → selection falls through to the honest REFUSE */ }
+    }
+  }
+  // The pure half's path sanitation expects a REPO-RELATIVE package dir ('.'-rooted), not an
+  // absolute one — an absolute path is refused as unsafe-package-dir by design.
+  const packageDirRel = relative(repoRoot, packageDir) || '.';
+  const planInput = runnerOpt !== undefined
+    ? { baseRef, propertyTests, runner: runnerOpt, packageTestScript, packageDevDependencies, packageDir: packageDirRel }
+    : { baseRef, propertyTests, packageTestScript, packageDevDependencies, packageDir: packageDirRel };
+  const plan = planDiscriminationCheck(planInput);
 
   if (!plan.runnable) {
+    // QE-2 (instrument-honesty, MEDIUM): a runner REFUSE used to be reported through the generic
+    // "no property test to check"/map-a-test framing — the operator-facing surface re-created the
+    // exact "instrument gap misread as test gap" class ADR-001 names as the reason three duplicate
+    // backlog entries existed. The plan's own named reason is the verdict; the generic classify
+    // stays only for the genuinely-empty-target case.
+    const runnerRefusal = typeof plan.reason === 'string' && plan.reason.startsWith('unsupported-runner');
+    if (runnerRefusal) {
+      const refusal = {
+        aggregate: 'CANNOT_ISOLATE',
+        measurementValid: false,
+        primaryAction: plan.primaryAction ?? 'fix-runner-invocation',
+        finding: {
+          severity: 'high',
+          verdict: 'CANNOT_ISOLATE',
+          files: plan.targets.map((t) => t.file),
+          detail: `runner refused: ${plan.reason} — the INSTRUMENT could not run, nothing was measured; `
+            + `declare scripts.test in the target package (or pass --runner) and re-run. `
+            + `This is NOT a statement about the tests.`,
+        },
+      };
+      if (flags.has('json')) { write(JSON.stringify({ plan, results: [], perTest: [], ...refusal }, null, 2)); return 0; }
+      write(`discrimination-check: REFUSED (${plan.reason})`);
+      write(`  → ${refusal.finding.detail}`);
+      return 0;
+    }
     // No safe target to run → this is the existing "property untested" finding (empty propertyTests classify).
     const result = classifyDiscrimination({ propertyTests: [], results: [] });
     if (flags.has('json')) { write(JSON.stringify({ plan, results: [], ...result }, null, 2)); return 0; }
@@ -9332,10 +10457,24 @@ function cmdDiscriminationCheck(options: Map<string, string>, flags: Set<string>
 
         // t.file + t.name already passed the engine's strict sanitation (no quotes/metacharacters/leading-dash);
         // still quote + `--` so a path can never be read as a runner option or split a word.
+        // Runner honesty (ADR-001): the run executes FROM the target package dir with a
+        // package-relative path — a root-cwd `npx vitest run packages/...` loads the ROOT config
+        // (none) and reds unclassifiably, which is exactly the CANNOT_ISOLATE artifact this
+        // feature removes. The plan's own commands encode the same cd; this body mirrors it.
+        const pkgRel = plan.packageDir === '.' ? '' : plan.packageDir;
+        const fileInPkg = pkgRel !== '' && t.file.startsWith(pkgRel + '/') ? t.file.slice(pkgRel.length + 1) : t.file;
+        const execDirBase = pkgRel === '' ? worktree : join(worktree, pkgRel);
+        const execDirTip = pkgRel === '' ? repoRoot : join(repoRoot, pkgRel);
         const nameArg = t.name ? ` -t '${t.name}'` : '';
-        const cmd = `${runner}${nameArg} -- '${t.file}'`;
-        const base = runCapturedTest(cmd, worktree, timeoutMs);
-        const evidence = classifyExecutionEvidence(base.output, base.exitCode, t.file);
+        // NO `--` before the path: MEASURED 2026-09-02 — `npx vitest run -- 'file'` IGNORES the
+        // filter and runs the whole suite (5269 tests), which is the exact whole-repo artifact
+        // this feature removes (QE ha-intake-archive F5). The path is engine-sanitized (no
+        // leading dash, no metacharacters), so it can never be read as an option.
+        const cmd = `${runner}${nameArg} '${fileInPkg}'`;
+        const base = runCapturedTest(cmd, execDirBase, timeoutMs);
+        // The classifier's targetSeen is a substring probe: the run now prints PACKAGE-relative
+        // paths, so it must be probed with the same form, or every hit reads as target-unseen.
+        const evidence = classifyExecutionEvidence(base.output, base.exitCode, fileInPkg);
         const outcome = discriminationOutcomeOf(base.exitCode, evidence);
         const row: Record<string, unknown> = t.name !== undefined
           ? { file: t.file, name: t.name, outcome, evidence }
@@ -9347,8 +10486,8 @@ function cmdDiscriminationCheck(options: Map<string, string>, flags: Set<string>
         // base rows per the matrix; running it is cheap and only ever on an already-broken path.
         // Do NOT "simplify" this to evidenced-error-only — that silently breaks Confirmation 17.
         if (base.exitCode !== null && base.exitCode !== 0 && evidence.failureKind !== 'assertions') {
-          const tip = runCapturedTest(cmd, repoRoot, timeoutMs);
-          const tipEvidence = classifyExecutionEvidence(tip.output, tip.exitCode, t.file);
+          const tip = runCapturedTest(cmd, execDirTip, timeoutMs);
+          const tipEvidence = classifyExecutionEvidence(tip.output, tip.exitCode, fileInPkg);
           row['tipOutcome'] = discriminationOutcomeOf(tip.exitCode, tipEvidence);
           row['tipEvidence'] = tipEvidence;
           // R15, named honestly: the base run is isolated in a worktree, but the tip runs in the LIVE
@@ -9472,9 +10611,9 @@ function nameFor(t: { file: string; name?: string }, outcome: 'pass' | 'fail' |
  *
  * Exit codes: 0 every entry PROVEN · 1 the gate ran and failed (undefended / not-applied /
  * below-min / unparseable / load-fatal / over-failing / inconclusive entry) · 2 usage or setup
- * error (missing registry, red BASELINE — a red unmutated copy proves nothing and must not be
- * read as a mutation result — or an entry whose file RESOLVES outside the scratch copy: a
+ * error (missing registry or an entry whose file RESOLVES outside the scratch copy: a
  * symlink escape is refused before anything is written, SPEC rule 3).
+ * A RED/no-exit baseline is a measured failing verdict (exit 1), never a usage error.
  */
 /**
  * Route-a guard for `dz mutation-gate`: parse-check a MUTATED file as its own language BEFORE the
@@ -9483,7 +10622,14 @@ function nameFor(t: { file: string; name?: string }, outcome: 'pass' | 'fail' |
  * redness says nothing about the named protection. Returns `{error}` when a parser ran and the
  * text does not parse; `{skipped}` (reported loudly, never silently) when no parser is available.
  */
-function parseCheckMutatedFile(absFile: string, text: string): { error?: string; skipped?: string } {
+interface MutationParseCheckResult {
+  readonly error?: string;
+  readonly skipped?: string;
+  readonly internalFailureReason?: string;
+  readonly internalAttempts?: ReturnType<typeof runWithOneInternalRetry>['attempts'];
+}
+
+function parseCheckMutatedFile(absFile: string, text: string): MutationParseCheckResult {
   interface TsLike {
     transpileModule(t: string, o: { reportDiagnostics: boolean; compilerOptions: Record<string, unknown> }): { diagnostics?: { category: number; code: number; messageText: unknown }[] };
     flattenDiagnosticMessageText(m: unknown, s: string): string;
@@ -9507,17 +10653,34 @@ function parseCheckMutatedFile(absFile: string, text: string): { error?: string;
       try { JSON.parse(text); return {}; } catch (e) { return { error: String((e as Error).message).slice(0, 200) }; }
     }
     if (ext === '.js' || ext === '.cjs' || ext === '.mjs' || ext === '') {
-      try {
-        // `node --check` on the file IN PLACE, so the nearest package.json decides the module goal.
-        execFileSync(process.execPath, ['--check', absFile], { stdio: 'pipe' });
-        return {};
-      } catch (e) {
-        const err = e as { stderr?: Buffer | string };
-        const stderrLines = String(err.stderr ?? '').split('\n').map((l) => l.trim()).filter((l) => l !== '');
-        // prefer the actual `SyntaxError: …` line over node's trailing version footer.
-        const msg = [...stderrLines].reverse().find((l) => l.includes('Error')) ?? stderrLines.at(-1) ?? 'node --check failed';
-        return { error: msg.slice(0, 200) };
+      const checked = runWithOneInternalRetry<MutationParseCheckResult>(() => {
+        try {
+          // `node --check` on the file IN PLACE, so the nearest package.json decides the module goal.
+          execFileSync(process.execPath, ['--check', absFile], { stdio: 'pipe' });
+          return {};
+        } catch (e) {
+          const err = e as { code?: unknown; status?: unknown; stderr?: Buffer | string; message?: string };
+          // A launched parser that exits non-zero with a SyntaxError is a parse verdict. A child
+          // launch/internal error (EPERM, ENOENT, Node's thrown internal) is runner infrastructure
+          // and must take the bounded retry → INCONCLUSIVE route instead of masquerading as bad JS.
+          if (typeof err.code === 'string' || typeof err.status !== 'number') throw e;
+          const stderrLines = String(err.stderr ?? '').split('\n').map((line) => line.trim()).filter((line) => line !== '');
+          const msg = [...stderrLines].reverse().find((line) => line.includes('Error'))
+            ?? stderrLines.at(-1)
+            ?? err.message
+            ?? 'node --check failed';
+          return { error: msg.slice(0, 200) };
+        }
+      });
+      if (checked.value === null) {
+        return {
+          internalFailureReason: checked.failureReason ?? 'runner-internal-error: persistent after 2/2 attempts',
+          internalAttempts: checked.attempts,
+        };
       }
+      return checked.internalRetries === 1
+        ? { ...checked.value, internalAttempts: checked.attempts }
+        : checked.value;
     }
     return { skipped: `no parser for '${ext}' files — parse-check unavailable` };
   } catch (e) {
@@ -9525,7 +10688,13 @@ function parseCheckMutatedFile(absFile: string, text: string): { error?: string;
   }
 }
 
-function cmdMutationGate(options: Map<string, string>, flags: Set<string>, cwd: string, write: Write): number {
+function cmdMutationGate(
+  options: Map<string, string>,
+  flags: Set<string>,
+  cwd: string,
+  write: Write,
+  injectedRunner?: MutationGateRunner,
+): number {
   const json = flags.has('json');
   const fail = (what: string): number => {
     write(json ? JSON.stringify({ error: what, exitCode: 2 }) : `dz mutation-gate: ${what}`);
@@ -9596,6 +10765,11 @@ function cmdMutationGate(options: Map<string, string>, flags: Set<string>, cwd:
   const results: MutationEntryResult[] = [];
   const observations: MutationObservation[] = [];
   const warnings: string[] = [];
+  const internalRetries: {
+    readonly phase: 'baseline' | 'parse-check' | 'mutation' | 'rebaseline' | 'final-rebaseline';
+    readonly entryId?: string;
+    readonly attempts: ReturnType<typeof runWithOneInternalRetry>['attempts'];
+  }[] = [];
   let baseline: ReturnType<typeof classifyBaseline>;
   try {
     if (gitTop !== null && gitTop !== pkgDir && resolve(pkgDir).startsWith(resolve(gitTop) + sep)) {
@@ -9635,7 +10809,11 @@ function cmdMutationGate(options: Map<string, string>, flags: Set<string>, cwd:
     const realScratchRoot = realpathSync(copyDir);
     const requireCompletionReceipt = parsed.registry.requireCompletionReceipt === true;
 
-    const runSuite = (): { exitCode: number | null; output: string; failureReason?: string } => {
+    type SuiteRun = MutationGateRunnerObservation & { readonly internalAttemptLog?: string };
+    const invokeSuite = (): MutationGateRunnerObservation => {
+      if (injectedRunner !== undefined) {
+        return injectedRunner(testCmd, { cwd: copyDir, timeoutMs: timeout });
+      }
       const run = spawnSync(testCmd, {
         cwd: copyDir,
         shell: true,
@@ -9647,6 +10825,12 @@ function cmdMutationGate(options: Map<string, string>, flags: Set<string>, cwd:
       const errorCode = run.error && 'code' in run.error && typeof run.error.code === 'string'
         ? run.error.code
         : undefined;
+      // Node may populate both `error` and a numeric `status` for an internal spawn failure. The
+      // error wins except for the two already-named resource observations: a status alongside
+      // EPERM/Unreachable-code is not a suite verdict and takes the one-retry internal-error path.
+      if (run.error !== undefined && errorCode !== 'ETIMEDOUT' && errorCode !== 'ENOBUFS') {
+        throw run.error;
+      }
       const signal = typeof run.signal === 'string' ? run.signal : undefined;
       let failureReason: string | undefined;
       if (typeof run.status !== 'number') {
@@ -9658,22 +10842,62 @@ function cmdMutationGate(options: Map<string, string>, flags: Set<string>, cwd:
       }
       return {
         exitCode: typeof run.status === 'number' ? run.status : null,
-        // Receipt markers may be on stderr. Preserve both streams even on exit 0; stdout-only
-        // collection would silently lose a green-run marker.
         output: `${String(run.stdout ?? '')}\n${String(run.stderr ?? '')}`,
         ...(failureReason !== undefined ? { failureReason } : {}),
       };
     };
 
+    const runSuite = (
+      phase: 'baseline' | 'mutation' | 'rebaseline' | 'final-rebaseline',
+      entryId?: string,
+    ): SuiteRun => {
+      const retried = runWithOneInternalRetry(invokeSuite);
+      const loggedAttempts = retried.attempts.map((attempt) => {
+        if (attempt.outcome !== 'completed' || retried.value === null) return attempt;
+        const outcome = retried.value.exitCode === null
+          ? `no exit code (${retried.value.failureReason ?? 'unnamed failure'})`
+          : `exit ${retried.value.exitCode}`;
+        return { ...attempt, detail: `attempt ${attempt.attempt}: completed — ${outcome}` };
+      });
+      if (retried.internalRetries === 1) {
+        const record = entryId === undefined
+          ? { phase, attempts: loggedAttempts }
+          : { phase, entryId, attempts: loggedAttempts };
+        internalRetries.push(record);
+        if (!json) write(`mutation-gate: internal retry — ${loggedAttempts.map((attempt) => attempt.detail).join('; ')}`);
+      }
+      const internalAttemptLog = retried.internalRetries === 1
+        ? loggedAttempts.map((attempt) => attempt.detail).join('; ')
+        : undefined;
+      if (retried.value !== null) {
+        return {
+          ...retried.value,
+          ...(internalAttemptLog !== undefined ? { internalAttemptLog } : {}),
+        };
+      }
+      return {
+        exitCode: null,
+        output: '',
+        failureReason: retried.failureReason ?? 'runner-internal-error: persistent after 2/2 attempts',
+        ...(internalAttemptLog !== undefined ? { internalAttemptLog } : {}),
+      };
+    };
+
     // Baseline BEFORE any mutation: a red copy proves nothing, and reading it as a mutation
     // result would be this gate shipping the defect class it exists to catch.
     if (!json) write(`mutation-gate: baseline suite in scratch copy of ${pkgDir} …`);
-    const base = runSuite();
-    baseline = classifyBaseline(base.exitCode, base.failureReason);
+    const base = runSuite('baseline');
+    baseline = classifyBaseline(
+      base.exitCode,
+      base.failureReason,
+      base.exitCode !== null && base.exitCode !== 0
+        ? attributeBaselineRedness(base.output, entries.map((entry) => entry.file))
+        : undefined,
+    );
     if (!baseline.ok) {
-      if (json) { write(JSON.stringify({ packageDir: pkgDir, registryPath, testCommand: testCmd, baseline, results: [], exitCode: 2 }, null, 2)); return 2; }
+      if (json) { write(JSON.stringify({ packageDir: pkgDir, registryPath, testCommand: testCmd, baseline, results: [], internalRetries, exitCode: 1 }, null, 2)); return 1; }
       write(renderMutationReport([], baseline, pkgDir));
-      return 2;
+      return 1;
     }
 
     for (const entry of entries) {
@@ -9708,8 +10932,10 @@ function cmdMutationGate(options: Map<string, string>, flags: Set<string>, cwd:
         return fail(`entry '${entry.id}': ${entry.file} resolves to ${realTarget ?? '<unresolvable>'} — OUTSIDE the scratch copy (${realScratchRoot}). A path component is a symlink escaping the scratch tree, so writing the mutation would mutate the REAL working tree (SPEC rule 3). Refused; nothing was written.`);
       }
       if (!json) write(`mutation-gate: ${entry.id} — mutating ${entry.file}, running suite …`);
-      let run: { exitCode: number | null; output: string; failureReason?: string } | null = null;
+      let run: SuiteRun | null = null;
       let parseError: string | undefined;
+      let parseInternalFailureReason: string | undefined;
+      let parseInternalAttemptLog: string | undefined;
       try {
         writeFileSync(filePath, applied.text);
         // Route-a guard: the mutated file must still PARSE — a load failure reddens the whole
@@ -9719,10 +10945,16 @@ function cmdMutationGate(options: Map<string, string>, flags: Set<string>, cwd:
           warnings.push(`${entry.id}: parse-check SKIPPED — ${check.skipped}`);
           if (!json) write(`mutation-gate: WARNING ${entry.id}: parse-check skipped — ${check.skipped}`);
         }
+        if (check.internalAttempts !== undefined) {
+          internalRetries.push({ phase: 'parse-check', entryId: entry.id, attempts: check.internalAttempts });
+          parseInternalAttemptLog = check.internalAttempts.map((attempt) => attempt.detail).join('; ');
+          if (!json) write(`mutation-gate: internal retry — ${parseInternalAttemptLog}`);
+        }
+        parseInternalFailureReason = check.internalFailureReason;
         if (check.error !== undefined) {
           parseError = check.error; // no suite run: the verdict is MUTATION_UNPARSEABLE regardless
-        } else {
-          run = runSuite();
+        } else if (parseInternalFailureReason === undefined) {
+          run = runSuite('mutation', entry.id);
         }
       } finally {
         writeFileSync(filePath, sourceText); // restore the COPY so the next entry starts pristine
@@ -9756,13 +10988,26 @@ function cmdMutationGate(options: Map<string, string>, flags: Set<string>, cwd:
       // those verdicts outrank the rebaseline check, so the extra suite run would buy nothing.
       let rebaselineExitCode: number | null | undefined;
       let rebaselineFailureReason: string | undefined;
+      let rebaselineAttribution: ReturnType<typeof attributeBaselineRedness> | undefined;
+      let rebaselineInternalAttemptLog: string | undefined;
       if (rebaselineMode === 'per-entry' && run !== null && run.exitCode !== null && run.exitCode !== 0
         && fileLoadFailure === undefined && outputUnrecognised === undefined && receiptMismatch === undefined) {
         if (!json) write(`mutation-gate: ${entry.id} — re-baselining the restored tree …`);
-        const rebaselineRun = runSuite();
+        const rebaselineRun = runSuite('rebaseline', entry.id);
         rebaselineExitCode = rebaselineRun.exitCode;
         rebaselineFailureReason = rebaselineRun.failureReason;
+        rebaselineInternalAttemptLog = rebaselineRun.internalAttemptLog;
+        if (rebaselineRun.exitCode !== null && rebaselineRun.exitCode !== 0) {
+          rebaselineAttribution = attributeBaselineRedness(
+            rebaselineRun.output,
+            entries.map((candidate) => candidate.file),
+          );
+        }
       }
+      const entryRunFailureReason = run?.failureReason ?? parseInternalFailureReason;
+      const entryInternalAttemptLog = [parseInternalAttemptLog, run?.internalAttemptLog, rebaselineInternalAttemptLog]
+        .filter((log): log is string => log !== undefined)
+        .join('; ');
       const obs: MutationObservation = {
         entry,
         occurrences: 1,
@@ -9772,9 +11017,11 @@ function cmdMutationGate(options: Map<string, string>, flags: Set<string>, cwd:
         ...(fileLoadFailure !== undefined ? { fileLoadFailure } : {}),
         ...(outputUnrecognised !== undefined ? { outputUnrecognised } : {}),
         ...(receiptMismatch !== undefined ? { receiptMismatch } : {}),
-        ...(run?.failureReason !== undefined ? { runFailureReason: run.failureReason } : {}),
+        ...(entryRunFailureReason !== undefined ? { runFailureReason: entryRunFailureReason } : {}),
+        ...(entryInternalAttemptLog !== '' ? { internalAttemptLog: entryInternalAttemptLog } : {}),
         ...(rebaselineExitCode !== undefined ? { rebaselineExitCode } : {}),
         ...(rebaselineFailureReason !== undefined ? { rebaselineFailureReason } : {}),
+        ...(rebaselineAttribution !== undefined ? { rebaselineAttribution } : {}),
       };
       observations.push(obs);
       results.push(classifyMutationOutcome(obs));
@@ -9787,7 +11034,7 @@ function cmdMutationGate(options: Map<string, string>, flags: Set<string>, cwd:
     // MUTATION_LOAD_FATAL / RECEIPT_MISMATCH untouched.
     if (rebaselineMode === 'final') {
       if (!json) write('mutation-gate: final re-baseline of the restored tree …');
-      const finalRun = runSuite();
+      const finalRun = runSuite('final-rebaseline');
       const finalExit = finalRun.exitCode;
       if (finalExit !== 0) {
         const what = finalExit === null ? `no exit code: ${finalRun.failureReason ?? 'unknown timeout / spawn failure'}` : `exit ${finalExit}`;
@@ -9797,6 +11044,12 @@ function cmdMutationGate(options: Map<string, string>, flags: Set<string>, cwd:
           ...obs,
           rebaselineExitCode: finalExit,
           ...(finalRun.failureReason !== undefined ? { rebaselineFailureReason: finalRun.failureReason } : {}),
+          ...(finalRun.internalAttemptLog !== undefined
+            ? { internalAttemptLog: [obs.internalAttemptLog, finalRun.internalAttemptLog].filter((log): log is string => log !== undefined).join('; ') }
+            : {}),
+          ...(finalExit !== null && finalExit !== 0
+            ? { rebaselineAttribution: attributeBaselineRedness(finalRun.output, entries.map((entry) => entry.file)) }
+            : {}),
         }));
         results.length = 0;
         results.push(...reclassified);
@@ -9812,7 +11065,7 @@ function cmdMutationGate(options: Map<string, string>, flags: Set<string>, cwd:
 
   const exitCode = mutationGateExitCode(results, baseline.ok);
   if (json) {
-    write(JSON.stringify({ packageDir: pkgDir, registryPath, testCommand: testCmd, rebaselineMode, baseline, results, summary: summarizeMutationResults(results), warnings, exitCode }, null, 2));
+    write(JSON.stringify({ packageDir: pkgDir, registryPath, testCommand: testCmd, rebaselineMode, baseline, results, summary: summarizeMutationResults(results), warnings, internalRetries, exitCode }, null, 2));
     return exitCode;
   }
   write(renderMutationReport(results, baseline, pkgDir));
@@ -11525,6 +12778,13 @@ function cmdFeatureAdrRecord(options: Map<string, string>, flags: Set<string>, c
     targetExists: existsSync(target),
     targetHasPair: flags.has('once') && existsSync(target),
     timestamp: new Date().toISOString(),
+    // WHO ran it: `--runner <id>` when the caller knows, otherwise this host. The workflow cannot
+    // supply it — it has no host inside its sandbox — so the identity is resolved here, at the one
+    // seam that runs outside. hostname() can throw on an exotic setup; an unresolvable runner stays
+    // ABSENT rather than becoming the string 'unknown', which would later join as if it were one.
+    runnerId: (options.get('runner') ?? '').trim() !== ''
+      ? (options.get('runner') ?? '').trim()
+      : (() => { try { return hostname(); } catch { return null; } })(),
   });
   if (decision.line === null) return emit(decision);
 
@@ -12920,6 +14180,145 @@ async function cmdQeBridge(options: Map<string, string>, flags: Set<string>, cwd
 }
 
 
+interface ScoreReceiptFile {
+  readonly path: string;
+  readonly displayPath: string;
+  readonly qeHash: string;
+}
+
+function scoreReceiptFiles(root: string): ScoreReceiptFile[] {
+  const featuresDir = join(root, 'features');
+  let features: Dirent[];
+  try {
+    features = readdirSync(featuresDir, { withFileTypes: true });
+  } catch {
+    return [];
+  }
+  const receipts: ScoreReceiptFile[] = [];
+  for (const feature of features) {
+    if (!feature.isDirectory()) continue;
+    const stateDir = join(featuresDir, feature.name, '.fa-state');
+    let entries: Dirent[];
+    try {
+      if (lstatSync(stateDir).isSymbolicLink()) continue;
+      entries = readdirSync(stateDir, { withFileTypes: true });
+    } catch {
+      continue;
+    }
+    for (const entry of entries) {
+      if (!entry.isFile()) continue;
+      const match = /^score-(.+)\.json$/.exec(entry.name);
+      if (match === null || match[1] === undefined || match[1] === '') continue;
+      const path = join(stateDir, entry.name);
+      receipts.push({ path, displayPath: relative(root, path), qeHash: match[1] });
+    }
+  }
+  return receipts.sort((a, b) => a.displayPath < b.displayPath ? -1 : a.displayPath > b.displayPath ? 1 : 0);
+}
+
+function scoreAggregateChainLine(text: string): {
+  readonly line: string;
+  readonly verification: ReturnType<typeof verifyEventChainText> | null;
+  readonly defectAges: ReturnType<typeof classifyChainDefects> | null;
+} {
+  if (text === '') {
+    return { line: 'chain: NOT_PRESENT — no aggregate evidence file was created', verification: null, defectAges: null };
+  }
+  const verification = verifyEventChainText(text);
+  const defectAges = classifyChainDefects(verification, verification.lines);
+  const kinds = new Map<string, number>();
+  for (const defect of verification.defects) kinds.set(defect.kind, (kinds.get(defect.kind) ?? 0) + 1);
+  const kindText = [...kinds.entries()].map(([kind, count]) => `${kind}: ${count}`).join(' · ');
+  const line =
+    `chain: ${verification.ok ? 'OK' : 'FAILED'} · ${verification.chained} chained · ` +
+    `${verification.resets} recorded restart(s) · before-run defects ${defectAges.beforeRun.length} · ` +
+    `in-run defects ${defectAges.inRun.length} · current run ${defectAges.runRecords} record(s)` +
+    (kindText === '' ? '' : ` · ${kindText}`) +
+    ` — ${verification.scope}`;
+  return { line, verification, defectAges };
+}
+
+function cmdScoreAll(options: Map<string, string>, flags: Set<string>, cwd: string, write: Write): number {
+  const json = flags.has('json');
+  if (options.has('slug')) {
+    write(json
+      ? JSON.stringify({ error: '--all and --slug are mutually exclusive', exitCode: 1 })
+      : 'dz score: --all and --slug are mutually exclusive');
+    return 1;
+  }
+  const root = resolve(cwd, options.get('project') ?? '.');
+  const receiptFiles = scoreReceiptFiles(root);
+  if (receiptFiles.length === 0) {
+    const report = buildScoreAggregateReport([], [], 0);
+    const chain = scoreAggregateChainLine('');
+    if (json) write(JSON.stringify({ ...report, chain: null, aggregatePath: '.dz/feature-adr/scorecards.jsonl', exitCode: 0 }, null, 2));
+    else {
+      write(renderScoreAggregateReport(report));
+      write(chain.line);
+    }
+    return 0;
+  }
+
+  const ts = new Date().toISOString();
+  const rows: ReturnType<typeof scoreReceiptToAggregateRow>[] = [];
+  const unreadableReceipts: string[] = [];
+  for (const receipt of receiptFiles) {
+    try {
+      rows.push(scoreReceiptToAggregateRow({
+        content: readFileSync(receipt.path, 'utf8'),
+        qeHash: receipt.qeHash,
+        ts,
+      }));
+    } catch {
+      unreadableReceipts.push(receipt.displayPath);
+    }
+  }
+
+  const storeDir = join(root, '.dz', 'feature-adr');
+  const aggregatePath = join(storeDir, 'scorecards.jsonl');
+  let finalText = '';
+  let finalRows = rows;
+  let appended = 0;
+  let storeError: string | null = null;
+  try {
+    const result = withNamedLockSync(storeDir, 'scorecards', () => {
+      let existingText = '';
+      try {
+        existingText = readFileSync(aggregatePath, 'utf8');
+      } catch (error) {
+        if ((error as NodeJS.ErrnoException).code !== 'ENOENT') throw error;
+      }
+      const fresh = dedupeScoreAggregateRows(rows, readScoreAggregateRows(existingText));
+      const appendText = appendChainedLines(fresh, readTailInfo(existingText));
+      if (appendText !== '') appendFileSync(aggregatePath, appendText, { encoding: 'utf8', mode: 0o600 });
+      const settledText = existingText + appendText;
+      return { text: settledText, rows: readScoreAggregateRows(settledText), appended: fresh.length };
+    });
+    finalText = result.text;
+    finalRows = result.rows;
+    appended = result.appended;
+  } catch (error) {
+    storeError = error instanceof Error ? error.message : String(error);
+  }
+
+  const report = buildScoreAggregateReport(finalRows, unreadableReceipts, appended);
+  const chain = scoreAggregateChainLine(finalText);
+  if (json) {
+    write(JSON.stringify({
+      ...report,
+      aggregatePath: '.dz/feature-adr/scorecards.jsonl',
+      chain: chain.verification === null ? null : { verification: chain.verification, defectAges: chain.defectAges },
+      storeError,
+      exitCode: 0,
+    }, null, 2));
+  } else {
+    write(renderScoreAggregateReport(report));
+    write(chain.line);
+    if (storeError !== null) write(`store error (nothing was claimed appended): ${storeError}`);
+  }
+  return 0;
+}
+
 function cmdScore(options: Map<string, string>, flags: Set<string>, cwd: string, write: Write): number {
   const json = flags.has('json');
   if (flags.has('help')) {
@@ -12927,13 +14326,14 @@ function cmdScore(options: Map<string, string>, flags: Set<string>, cwd: string,
     if (json) write(JSON.stringify({ help: usage, exitCode: 0 })); // --json stays ONE document even for help
     else {
       write(usage);
+      write('dz score --all [--project <dir>] [--json] — sweep immutable score receipts into the append-only chained aggregate');
       write('  disciplines: ADR confirmation · discrimination · cross-model QE · live verification · README-first · learning loop · amendments');
       write('  descriptive-only, never a gate: a low score exits 0');
     }
     return 0;
   }
   for (const flag of flags) {
-    if (!new Set(['json', 'help']).has(flag)) {
+    if (!new Set(['json', 'help', 'all']).has(flag)) {
       write(json ? JSON.stringify({ error: `unknown option --${flag}`, exitCode: 1 }) : `dz score: unknown option --${flag}\n  allowed: --slug <feature>, --project <dir>, --json`);
       return 1;
     }
@@ -12945,6 +14345,7 @@ function cmdScore(options: Map<string, string>, flags: Set<string>, cwd: string,
       return 1;
     }
   }
+  if (flags.has('all')) return cmdScoreAll(options, flags, cwd, write);
   const slug = options.get('slug') ?? '';
   // The delivery-check traversal lesson, upgraded to a WHITELIST: `.` slipped the blacklist and
   // silently aggregated the entire features/ tree as one "run" (Codex QE #2).
@@ -13058,6 +14459,160 @@ function readOptionalText(path: string): string {
   }
 }
 
+function localEvidenceReadReason(resource: 'promotion-journal' | 'guard-audit', error: unknown): string {
+  const code = error && typeof error === 'object' && 'code' in error ? String((error as { code?: unknown }).code) : '';
+  return code === 'ENOENT' ? `${resource}-missing` : `${resource}-unreadable`;
+}
+
+interface PromotionEvidenceRead {
+  readonly source: FunnelEvidenceSource<PromotionRunEvidence>;
+  readonly acceptances: readonly PromotionAcceptanceEvidence[];
+  readonly truncatedPeriods: readonly string[];
+  readonly acceptanceHistoryComplete: boolean;
+}
+
+function unavailablePromotionEvidence(reason: string): PromotionEvidenceRead {
+  return { source: { status: 'not-measured', reason }, acceptances: [], truncatedPeriods: [], acceptanceHistoryComplete: false };
+}
+
+function readPromotionRunEvidence(root: string): PromotionEvidenceRead {
+  let raw: unknown;
+  try {
+    raw = JSON.parse(readFileSync(join(root, PROMOTION_STATE_FILE), 'utf-8')) as unknown;
+  } catch (error) {
+    const reason = error instanceof SyntaxError
+      ? 'promotion-journal-malformed'
+      : localEvidenceReadReason('promotion-journal', error);
+    return unavailablePromotionEvidence(reason);
+  }
+  if (!raw || typeof raw !== 'object' || Array.isArray(raw)) {
+    return unavailablePromotionEvidence('promotion-journal-malformed');
+  }
+  const record = raw as Record<string, unknown>;
+  if (record['version'] !== 1 || !Object.hasOwn(record, 'runs')) {
+    return unavailablePromotionEvidence(
+      record['version'] === 1 ? 'promotion-history-not-recorded' : 'promotion-journal-malformed',
+    );
+  }
+  if (!Array.isArray(record['runs'])) {
+    return unavailablePromotionEvidence('promotion-history-malformed');
+  }
+  const state = normalizePromotionState(raw);
+  if (state.runs === undefined || state.runs.length !== record['runs'].length) {
+    return unavailablePromotionEvidence('promotion-history-malformed');
+  }
+  if (
+    (Object.hasOwn(record, 'acceptances') && (
+      !Array.isArray(record['acceptances']) || state.acceptances?.length !== record['acceptances'].length
+    )) ||
+    (Object.hasOwn(record, 'truncatedRunPeriods') && (
+      !Array.isArray(record['truncatedRunPeriods']) || state.truncatedRunPeriods?.length !== record['truncatedRunPeriods'].length
+    )) ||
+    (Object.hasOwn(record, 'acceptanceHistoryComplete') && typeof record['acceptanceHistoryComplete'] !== 'boolean')
+  ) {
+    return unavailablePromotionEvidence('promotion-history-malformed');
+  }
+  const derivedAcceptances = state.runs.flatMap((run) => run.candidates
+    .filter((candidate) => candidate.verdict === 'promote' && candidate.ruleContentAnchor !== null)
+    .map((candidate) => ({ ruleContentAnchor: candidate.ruleContentAnchor!, acceptedTs: run.ts })));
+  const claimedAcceptanceComplete = state.acceptanceHistoryComplete ??
+    ((state.truncatedRunPeriods?.length ?? 0) === 0 && state.runs.every((run) => run.complete === true));
+  if (claimedAcceptanceComplete && state.acceptances !== undefined && derivedAcceptances.some((derived) =>
+    !state.acceptances!.some((stored) =>
+      stored.ruleContentAnchor === derived.ruleContentAnchor &&
+      Date.parse(stored.acceptedTs) <= Date.parse(derived.acceptedTs),
+    ),
+  )) {
+    return unavailablePromotionEvidence('promotion-history-malformed');
+  }
+  const acceptancesByAnchor = new Map<string, PromotionAcceptanceEvidence>();
+  for (const acceptance of [...(state.acceptances ?? []), ...derivedAcceptances]) {
+    const prior = acceptancesByAnchor.get(acceptance.ruleContentAnchor);
+    if (prior === undefined || Date.parse(acceptance.acceptedTs) < Date.parse(prior.acceptedTs)) {
+      acceptancesByAnchor.set(acceptance.ruleContentAnchor, acceptance);
+    }
+  }
+  return {
+    source: { status: 'measured', rows: state.runs },
+    acceptances: [...acceptancesByAnchor.values()],
+    truncatedPeriods: state.truncatedRunPeriods ?? [],
+    acceptanceHistoryComplete: claimedAcceptanceComplete,
+  };
+}
+
+interface GuardAuditEvidenceRead {
+  readonly source: FunnelEvidenceSource<GuardEvent>;
+  readonly rows: readonly GuardEvent[];
+  readonly text: string | null;
+}
+
+function readGuardAuditEvidence(root: string): GuardAuditEvidenceRead {
+  let text: string;
+  try {
+    text = readFileSync(join(root, '.dz', 'guard-audit.jsonl'), 'utf-8');
+  } catch (error) {
+    return {
+      source: { status: 'not-measured', reason: localEvidenceReadReason('guard-audit', error) },
+      rows: [],
+      text: null,
+    };
+  }
+  const rows: GuardEvent[] = [];
+  let malformed = false;
+  for (const line of text.split('\n')) {
+    if (line.trim() === '') continue;
+    try {
+      const raw = JSON.parse(line) as Record<string, unknown>;
+      if (
+        !isOffsetIsoTimestamp(raw['ts']) ||
+        !['publish', 'teach', 'consolidate', 'reindex'].includes(String(raw['op'])) ||
+        !['pass', 'warn', 'block'].includes(String(raw['verdict']))
+      ) {
+        malformed = true;
+        continue;
+      }
+      const violations: { rule: string; contentAnchor?: string }[] = [];
+      if (!Array.isArray(raw['violations'])) {
+        malformed = true;
+        continue;
+      }
+      for (const item of raw['violations']) {
+        const rule = item && typeof item === 'object' ? (item as { rule?: unknown }).rule : undefined;
+        if (typeof rule !== 'string' || rule === '' || rule.length > 200) {
+          malformed = true;
+          continue;
+        }
+        const anchor = (item as { contentAnchor?: unknown }).contentAnchor;
+        if (anchor !== undefined && !isLessonRuleContentAnchor(anchor)) {
+          malformed = true;
+          continue;
+        }
+        violations.push({ rule, ...(typeof anchor === 'string' ? { contentAnchor: anchor } : {}) });
+      }
+      const verdict = raw['verdict'] as 'pass' | 'warn' | 'block';
+      if ((verdict === 'pass') !== (violations.length === 0)) malformed = true;
+      rows.push({
+        ts: raw['ts'],
+        op: raw['op'] as 'publish' | 'teach' | 'consolidate' | 'reindex',
+        verdict,
+        rules: violations.map((item) => item.rule),
+        violations,
+      });
+    } catch {
+      malformed = true;
+    }
+  }
+  return {
+    source: malformed
+      ? { status: 'not-measured', reason: 'guard-audit-malformed' }
+      : !verifyEventChainText(text).ok
+        ? { status: 'not-measured', reason: 'guard-audit-chain-corrupt' }
+        : { status: 'measured', rows },
+    rows,
+    text,
+  };
+}
+
 function deadwoodAllowlistText(): string {
   const require = createRequire(import.meta.url);
   const corePackage = require.resolve('@dzhechkov/harness-core/package.json');
@@ -13143,7 +14698,7 @@ function cmdCompounding(options: Map<string, string>, flags: Set<string>, cwd: s
   const json = flags.has('json');
   if (flags.has('help')) {
     write('dz compounding [--project <dir>] [--json] — honest learning-loop payoff report');
-    write('  pool payoff (write-only ratio) · guard repeat-violation trajectory · cold-vs-warm replay readiness · instrumentation health');
+    write('  pool payoff · guard trajectory · replay readiness · instrumentation · monthly eligible→attempted→accepted→executions funnel');
     return 0;
   }
   for (const flag of flags) {
@@ -13175,40 +14730,24 @@ function cmdCompounding(options: Map<string, string>, flags: Set<string>, cwd: s
   // apply-leg usage events (read records only; aggregate rows carry no query by construction)
   const usage = readRecallUsageEvents(root);
 
-  // guard audit events
-  const guard: { ts: string; verdict: string; rules: string[] }[] = [];
-  try {
-    const text = readFileSync(join(root, '.dz', 'guard-audit.jsonl'), 'utf-8');
-    for (const line of text.split('\n')) {
-      if (line.trim() === '') continue;
-      try {
-        const o = JSON.parse(line) as { ts?: unknown; verdict?: unknown; violations?: { rule?: unknown }[] };
-        if (typeof o.ts === 'string' && typeof o.verdict === 'string') {
-          guard.push({
-            ts: o.ts,
-            verdict: o.verdict,
-            rules: Array.isArray(o.violations) ? o.violations.map((v) => (typeof v?.rule === 'string' ? v.rule : '')).filter(Boolean) : [],
-          });
-        }
-      } catch {
-        /* skip */
-      }
-    }
-  } catch {
-    /* no audit yet */
-  }
+  const promotionEvidence = readPromotionRunEvidence(root);
+  const guardEvidence = readGuardAuditEvidence(root);
+  const guard = [...guardEvidence.rows];
 
   // The evidence logs themselves, verbatim: the report verifies their hash chains (feature
   // event-chain). Handing over the TEXT rather than a pre-computed verdict keeps one definition of
   // "the chain is intact" — a second copy here is how a gate and its report start disagreeing.
   const evidenceLogs: { log: string; text: string }[] = [];
-  for (const rel of ['.dz/recall-usage.jsonl', '.dz/guard-audit.jsonl']) {
+  for (const rel of ['.dz/recall-usage.jsonl']) {
     try {
       evidenceLogs.push({ log: rel, text: readFileSync(join(root, ...rel.split('/')), 'utf-8') });
     } catch {
       /* absent log — reported by its own gate above, not invented here */
     }
   }
+  if (guardEvidence.text !== null) {
+    evidenceLogs.push({ log: '.dz/guard-audit.jsonl', text: guardEvidence.text });
+  }
 
   const now = new Date();
   const report = assembleCompoundingReport({
@@ -13218,6 +14757,13 @@ function cmdCompounding(options: Map<string, string>, flags: Set<string>, cwd: s
     nowTs: now.toISOString(),
     evidenceLogs,
     cmdUsageDepthDays: cmdUsageDepthDays(root, now),
+    lessonToRule: {
+      promotionRuns: promotionEvidence.source,
+      guardAudits: guardEvidence.source,
+      promotionAcceptances: promotionEvidence.acceptances,
+      truncatedPromotionPeriods: promotionEvidence.truncatedPeriods,
+      acceptanceHistoryComplete: promotionEvidence.acceptanceHistoryComplete,
+    },
   });
   // lesson-bandit-rerank §11: the payoff axis joins THIS report rather than growing a private
   // dashboard — the `rewardEvents : exposureEvents` row asks exactly the question this command
@@ -14580,17 +16126,19 @@ function cmdStats(cwd: string, write: Write): number {
   }
   const dirs = readdirSync(baseDir, { withFileTypes: true }).filter((e) => e.isDirectory());
   const packages = dirs.length;
-  let totalSkills = 0;
-  let skillPacks = 0;
-  for (const dir of dirs) {
-    if (dir.name.startsWith('skills-')) {
-      skillPacks++;
-      const skillDir = join(baseDir, dir.name);
-      const skillDirs = readdirSync(skillDir, { withFileTypes: true })
-        .filter((e) => e.isDirectory() && existsSync(join(skillDir, e.name, 'SKILL.md')));
-      totalSkills += skillDirs.length;
-    }
-  }
+  // Backlog e160aeee. This used to walk the tree ITSELF, and was wrong in two independent ways:
+  // it counted only packages whose NAME starts with `skills-` (health-advisor, p-replicator,
+  // keysarium and trip-planner were therefore invisible), and it knew only ONE of the three skill
+  // layouts. Result: 203 here against 250 from `dz registry` on the same tree — two counters of one
+  // quantity, each unable to refute the other because neither knew the other existed.
+  //
+  // The fix is structural, not arithmetic: there is now ONE enumerator, and both commands ask it.
+  // Pinned by test/stats-registry-parity.test.ts, whose red half is this exact divergence.
+  // The registry already PUBLISHES these totals; recomputing them from `entries` here would be a
+  // third implementation of the same count, which is the very defect being fixed.
+  const registry = buildRegistry(cwd);
+  const totalSkills = registry.totalSkills;
+  const skillPacks = registry.totalPacks;
   const targets = TARGET_NAMES.length;
   const presets = PRESET_NAMES.length;
   write(`dz stats — DZ Harness Hub`);
@@ -15063,7 +16611,31 @@ export async function runCli(argv: string[], io: CliIo = {}): Promise<number> {
     return version === 'unknown' ? 1 : 0;
   }
 
-  if (command === '' || command === 'help' || flags.has('help')) {
+  // `-h` is the most-typed help flag and is NOT a command: before the unknown-command contract
+  // landed it fell through to the switch and still printed usage; afterwards it would have died
+  // with exit 2 and an empty stdout (measured regression, cross-model QE M1). It belongs beside
+  // `-v` above — an argv-level flag, resolved before command dispatch.
+  if (argv[0] === '-h') {
+    write(USAGE);
+    return 0;
+  }
+  // A bare `--typo` leaves the command empty, so the usage branch reported SUCCESS on a misspelled
+  // FLAG exactly as it used to on a misspelled VERB (cross-model QE M2): `dz --frobnicate` exited 0
+  // with 30 KB of usage. The refusal is deliberately narrowed to the no-command case, because the
+  // warn-don't-refuse decision above is measured and still stands: with a command present, an
+  // unrecognised name may simply be missing from KNOWN_CLI_FLAGS and refusing would break working
+  // invocations. With NO command there is nothing the flag could belong to, so it is a usage error.
+  if (command === '') {
+    const strayNames = unknownFlagNotice(
+      [...flags, ...options.keys()].filter((k) => !k.startsWith('_positional_')),
+      KNOWN_CLI_FLAGS,
+    ).map((n) => n.name);
+    if (strayNames.length > 0) {
+      writeErr(`dz: unknown option --${strayNames[0]} — run 'dz help' for usage`);
+      return 2;
+    }
+  }
+  if (command === '' || command === 'help' || (flags.has('help') && DZ_COMMANDS.includes(command))) {
     write(USAGE);
     return 0;
   }
@@ -15110,11 +16682,20 @@ export async function runCli(argv: string[], io: CliIo = {}): Promise<number> {
       case 'bundle':
         return cmdBundle(options, flags, cwd, write);
       case 'teach':
-        return await cmdTeach(options, flags, cwd, write);
+        return await cmdTeach(
+          options,
+          flags,
+          cwd,
+          write,
+          writeErr,
+          io.interactive ?? process.stdout.isTTY === true,
+          io.teachGuardRunner ?? teachGuard,
+          io.teachReinforceRunner ?? runTeachGuardReinforcement,
+        );
       case 'consolidate':
         return await cmdConsolidate(options, flags, cwd, write);
       case 'recall':
-        return await cmdRecall(options, flags, cwd, write);
+        return await cmdRecall(options, flags, cwd, write, writeErr, io.classMatcher);
       case 'vector':
         return await cmdVector(options, flags, cwd, write);
       case 'brain':
@@ -15123,6 +16704,8 @@ export async function runCli(argv: string[], io: CliIo = {}): Promise<number> {
         return cmdStatusline(options, flags, cwd, write, readStdin);
       case 'usage':
         return cmdUsage(options, optionLists, flags, cwd, write);
+      case 'chain':
+        return cmdChain(options, flags, cwd, write);
       case 'claim-check':
         return cmdClaimCheck(options, optionLists, flags, cwd, write);
       case 'lint':
@@ -15144,7 +16727,7 @@ export async function runCli(argv: string[], io: CliIo = {}): Promise<number> {
       case 'diff':
         return cmdDiff(options, cwd, write);
       case 'recommend':
-        return cmdRecommend(options, cwd, write);
+        return cmdRecommend(options, flags, cwd, write);
       case 'upgrade':
         return cmdUpgrade(options, flags, cwd, write, writeErr);
       case 'auto-canonicalize':
@@ -15167,6 +16750,8 @@ export async function runCli(argv: string[], io: CliIo = {}): Promise<number> {
         return cmdDriftCheck(options, flags, cwd, write);
       case 'hooks-sync':
         return cmdHooksSync(options, flags, cwd, write, writeErr);
+      case 'integrations-verify':
+        return cmdIntegrationsVerify(options, flags, cwd, write, writeErr);
       case 'agents-sync':
         return cmdAgentsSync(options, flags, cwd, write, writeErr);
       case 'sync-canonical':
@@ -15191,8 +16776,20 @@ export async function runCli(argv: string[], io: CliIo = {}): Promise<number> {
         return cmdChallenge(options, flags, cwd, write);
       case 'discrimination-check':
         return cmdDiscriminationCheck(options, flags, cwd, write);
-      case 'mutation-gate':
-        return cmdMutationGate(options, flags, cwd, write);
+      case 'mutation-gate': {
+        try {
+          return cmdMutationGate(options, flags, cwd, write, io.mutationGateRunner);
+        } catch (error) {
+          const raw = error instanceof Error ? error.message : String(error);
+          const head = Array.from(raw.split(/\r?\n/, 1)[0]?.trim() || 'unknown internal error').slice(0, 160).join('');
+          if (flags.has('json')) {
+            write(JSON.stringify({ verdict: 'INCONCLUSIVE', reason: 'runner-internal-error', error: head, exitCode: 1 }));
+          } else {
+            write(`mutation-gate: INTERNAL ERROR (${head}) — verdict INCONCLUSIVE, exit 1`);
+          }
+          return 1;
+        }
+      }
       case 'delivery-check':
         return cmdDeliveryCheck(options, flags, cwd, write);
       case 'skills-verify':
@@ -15246,9 +16843,8 @@ export async function runCli(argv: string[], io: CliIo = {}): Promise<number> {
       case 'import-ecc':
         return await cmdImportEcc(options, flags, cwd, write);
       default:
-        write(`dz: unknown command ${JSON.stringify(command)}`);
-        write(USAGE);
-        return 1;
+        writeErr(`dz: unknown command ${JSON.stringify(command)} — run 'dz help' for the command list`);
+        return 2;
     }
   } catch (error) {
     // stderr, not stdout: an uncaught failure is a diagnostic, and routing it through