@gobing-ai/spur 0.3.65 → 0.3.66

package/spur.js

@@ -39046,6 +39046,7 @@ var init_finding_codes = __esm(() => {
     "L3.scope-delineation",
     "L3.one-active-goal",
     "L3.children-limit",
+    "L3.review-testing-contradiction",
     "L4.design-placeholder",
     "L4.feature-not-found",
     "L4.feature-terminal",
@@ -39055,6 +39056,7 @@ var init_finding_codes = __esm(() => {
     "L4.rollup-subtasks-open",
     "L4.rollup-parent-open",
     "L4.rollup-missing-roster",
+    "L4.rollup-roster-not-declared-dependency",
     "L4.readiness-blocked",
     "L4.prose-prerequisite-unlisted",
     "L4.prerequisite-cycle",
@@ -39064,6 +39066,7 @@ var init_finding_codes = __esm(() => {
     "L4.orphan-scenarios",
     "L4.uncovered-task-scenario",
     "L4.uncovered-feature-scenario",
+    "L4.verdict-rows-match-no-scenario",
     "L4.verifying-incomplete-tasks",
     "L4.dogfood-missing",
     "L4.stale-line-anchor",
@@ -39098,6 +39101,7 @@ var init_finding_codes = __esm(() => {
     L3_SCOPE_DELINEATION: "L3.scope-delineation",
     L3_ONE_ACTIVE_GOAL: "L3.one-active-goal",
     L3_CHILDREN_LIMIT: "L3.children-limit",
+    L3_REVIEW_TESTING_CONTRADICTION: "L3.review-testing-contradiction",
     L4_DESIGN_PLACEHOLDER: "L4.design-placeholder",
     L4_FEATURE_NOT_FOUND: "L4.feature-not-found",
     L4_FEATURE_TERMINAL: "L4.feature-terminal",
@@ -39107,6 +39111,7 @@ var init_finding_codes = __esm(() => {
     L4_ROLLUP_SUBTASKS_OPEN: "L4.rollup-subtasks-open",
     L4_ROLLUP_PARENT_OPEN: "L4.rollup-parent-open",
     L4_ROLLUP_MISSING_ROSTER: "L4.rollup-missing-roster",
+    L4_ROLLUP_ROSTER_NOT_DECLARED_DEPENDENCY: "L4.rollup-roster-not-declared-dependency",
     L4_READINESS_BLOCKED: "L4.readiness-blocked",
     L4_PROSE_PREREQUISITE_UNLISTED: "L4.prose-prerequisite-unlisted",
     L4_PREREQUISITE_CYCLE: "L4.prerequisite-cycle",
@@ -39116,6 +39121,7 @@ var init_finding_codes = __esm(() => {
     L4_ORPHAN_SCENARIOS: "L4.orphan-scenarios",
     L4_UNCOVERED_TASK_SCENARIO: "L4.uncovered-task-scenario",
     L4_UNCOVERED_FEATURE_SCENARIO: "L4.uncovered-feature-scenario",
+    L4_VERDICT_ROWS_MATCH_NO_SCENARIO: "L4.verdict-rows-match-no-scenario",
     L4_DOGFOOD_MISSING: "L4.dogfood-missing",
     L4_VERIFYING_INCOMPLETE_TASKS: "L4.verifying-incomplete-tasks",
     L4_STALE_LINE_ANCHOR: "L4.stale-line-anchor",
@@ -50346,6 +50352,42 @@ var init_artifact_digest = __esm(() => {
   RANKED_ARTIFACT_KEYS = new Set(Object.entries(ARTIFACT_ARRAY_CLASSIFICATION).filter(([, kind]) => kind === "ranked").map(([key]) => key));
 });
 
+// ../../packages/domain/src/analytics/assistant-duration.ts
+async function deriveAssistantDurations(db2) {
+  const candidateSql = `
+        WITH ordered AS (
+            SELECT record_hash,
+                   role,
+                   duration_ms,
+                   ts,
+                   LAG(ts) OVER (PARTITION BY source, session_id ORDER BY seq) AS prev_ts
+            FROM history_message
+            WHERE ts IS NOT NULL AND ts LIKE '____-__-__T%'
+        )
+        SELECT record_hash AS recordHash,
+               CAST(ROUND((unixepoch(ts, 'subsec') - unixepoch(prev_ts, 'subsec')) * 1000) AS INTEGER) AS deltaMs
+        FROM ordered
+        WHERE role = 'assistant' AND duration_ms IS NULL AND prev_ts IS NOT NULL`;
+  const rows = await db2.queryAll(candidateSql);
+  let derived = 0;
+  let skippedOverCeiling = 0;
+  for (const row of rows) {
+    if (row.deltaMs === null || row.deltaMs <= 0)
+      continue;
+    if (row.deltaMs > DERIVED_DURATION_CEILING_MS) {
+      skippedOverCeiling += 1;
+      continue;
+    }
+    await db2.run("UPDATE history_message SET duration_ms = ?, duration_source = ? WHERE record_hash = ? AND duration_ms IS NULL", row.deltaMs, DURATION_SOURCE_DERIVED, row.recordHash);
+    derived += 1;
+  }
+  return { derived, skippedOverCeiling };
+}
+var DURATION_SOURCE_DERIVED = "derived", DERIVED_DURATION_CEILING_MS;
+var init_assistant_duration = __esm(() => {
+  DERIVED_DURATION_CEILING_MS = 30 * 60 * 1000;
+});
+
 // ../../packages/domain/src/analytics/models.ts
 function resolvePricing(model) {
   if (model === undefined || model.length === 0)
@@ -51083,6 +51125,7 @@ async function stepSupport(db2, sel, opts) {
                 COUNT(*) AS assistantSteps,
                 SUM(m.input_tokens IS NOT NULL OR m.output_tokens IS NOT NULL) AS stepsWithUsage,
                 SUM(m.duration_ms IS NOT NULL) AS stepsWithDuration,
+                SUM(m.duration_source IS 'derived') AS stepsWithDerivedDuration,
                 SUM(m.cache_read_tokens IS NOT NULL) AS stepsWithCacheRead
          FROM history_message m
          ${withStepPredicates(wm.where, "m.role = 'assistant'")}
@@ -52190,7 +52233,7 @@ async function pairingSummary(db2, spec = {}) {
       failures: d.failures,
       unknownOutcomes: d.dispatches - known,
       escalations: {},
-      totalCostUsd: 0,
+      totalCostUsd: null,
       meanDurationMs: d.durationCount > 0 ? d.durationTotal / d.durationCount : 0
     });
   }
@@ -52204,7 +52247,7 @@ async function pairingSummary(db2, spec = {}) {
     const entry = byKey.get(pairingKey(f.executor, f.role));
     if (entry === undefined)
       continue;
-    entry.totalCostUsd += f.totalCostUsd;
+    entry.totalCostUsd = entry.totalCostUsd === null ? f.totalCostUsd : f.totalCostUsd === null ? entry.totalCostUsd : entry.totalCostUsd + f.totalCostUsd;
   }
   return [...byKey.values()].sort((a2, b) => a2.executor.localeCompare(b.executor) || a2.role.localeCompare(b.role));
 }
@@ -52346,7 +52389,7 @@ async function loadFolds(db2, spec) {
                  WHERE m.session_id IS NOT NULL
              )
              SELECT m.executor AS executor, m.role AS role,
-                    COALESCE(SUM(h.cost_usd), 0) AS totalCostUsd
+                    SUM(h.cost_usd) AS totalCostUsd
              FROM mapped m
              LEFT JOIN history_message h
                ON h.source = m.source AND h.session_id = m.session_id
@@ -52658,7 +52701,7 @@ function renderPerStep(artifact) {
   if ((artifact.stepSupport?.length ?? 0) > 0) {
     lines.push("### Section Support", "", "| Source | Assistant steps | Tokens | Time | Cache |", "| --- | ---: | --- | --- | --- |");
     for (const e of artifact.stepSupport ?? []) {
-      lines.push(`| ${e.source} | ${e.assistantSteps.toLocaleString("en-US")} | ${e.stepsWithUsage > 0 ? "yes" : "no"} | ${e.stepsWithDuration > 0 ? "yes" : "no"} | ${e.stepsWithCacheRead > 0 ? "yes" : "no"} |`);
+      lines.push(`| ${e.source} | ${e.assistantSteps.toLocaleString("en-US")} | ${e.stepsWithUsage > 0 ? "yes" : "no"} | ${timeSupport(e)} | ${e.stepsWithCacheRead > 0 ? "yes" : "no"} |`);
     }
     lines.push("");
   }
@@ -52691,6 +52734,15 @@ function renderTopStepsByTokens(artifact) {
   lines.push("");
   return lines;
 }
+function timeSupport(e) {
+  if (e.stepsWithDuration === 0)
+    return "no";
+  if (e.stepsWithDerivedDuration === 0)
+    return "yes";
+  if (e.stepsWithDerivedDuration >= e.stepsWithDuration)
+    return "derived";
+  return "yes (mixed)";
+}
 function renderTopStepsByDuration(artifact) {
   const lines = ["### Top Steps by Duration", ""];
   if (artifact.topStepsByDuration === undefined) {
@@ -52852,7 +52904,16 @@ function renderPairings(artifact) {
 `);
 }
 function comparePairings(a2, b) {
-  return b.successRate - a2.successRate || totalEscalations(a2) - totalEscalations(b) || a2.totalCostUsd - b.totalCostUsd;
+  return b.successRate - a2.successRate || totalEscalations(a2) - totalEscalations(b) || compareCost(a2.totalCostUsd, b.totalCostUsd);
+}
+function compareCost(a2, b) {
+  if (a2 === null && b === null)
+    return 0;
+  if (a2 === null)
+    return 1;
+  if (b === null)
+    return -1;
+  return a2 - b;
 }
 function renderPairingsSection(artifact) {
   const lines = ["## Pairings", ""];
@@ -52895,11 +52956,11 @@ function measureExecutor(entry, pairings) {
     dispatches,
     successRate: dispatches > 0 ? successes / dispatches : 0,
     escalations: owned.reduce((sum, p) => sum + totalEscalations(p), 0),
-    costUsd: owned.reduce((sum, p) => sum + p.totalCostUsd, 0)
+    costUsd: owned.reduce((sum, p) => sum === null ? p.totalCostUsd : p.totalCostUsd === null ? sum : sum + p.totalCostUsd, null)
   };
 }
 function compareMeasured(a2, b) {
-  return b.successRate - a2.successRate || a2.escalations - b.escalations || a2.costUsd - b.costUsd;
+  return b.successRate - a2.successRate || a2.escalations - b.escalations || compareCost(a2.costUsd, b.costUsd);
 }
 function renderLadderDiffSection(artifact) {
   const lines = ["## Ladder diff", ""];
@@ -52945,7 +53006,7 @@ function pct(rate) {
   return `${(rate * 100).toFixed(1)}%`;
 }
 function usd(cost) {
-  return `$${cost.toFixed(2)}`;
+  return cost === null ? "not available" : `$${cost.toFixed(2)}`;
 }
 function fmtDuration(ms) {
   return ms > 0 ? fmtDur(ms) : "n/a";
@@ -53637,6 +53698,7 @@ var init_run_cost = __esm(() => {
 var init_analytics = __esm(() => {
   init_artifact();
   init_artifact_digest();
+  init_assistant_duration();
   init_costs();
   init_forensic_query();
   init_models();
@@ -53669,7 +53731,7 @@ function parseChecklist(content) {
     const checked = (match[1] ?? "").toLowerCase() === "x";
     const rawText = (match[2] ?? "").trim();
     const line = i2 + 1;
-    const reqIdMatch = rawText.match(/^(R\d+)\s*[:\-\u2014]?\s*(.*)$/);
+    const reqIdMatch = rawText.match(/^[*_]{0,2}\s*((?:AC|R)\d+)\.?[*_]{0,2}\s*[:\-\u2014]?\s*(.*)$/);
     if (reqIdMatch) {
       items.push({
         text: (reqIdMatch[2] ?? "").trim(),
@@ -53857,6 +53919,20 @@ function stripScenarioPrefixes(title) {
 function normalizeTitle(title) {
   return stripScenarioPrefixes(title).replace(/^(R\d+)\s*[:\-\u2014]?\s*/, "").trim().toLowerCase().replace(/[\u0027\u2018\u2019\u201c\u201d]/g, "").replace(/\s+/g, " ").trim();
 }
+function stripCoversClause(text3) {
+  return text3.replace(new RegExp(COVERS_RE_SOURCE, "gi"), " ").replace(/\s+/g, " ").trim();
+}
+function extractCoversAliases(text3) {
+  const out = [];
+  for (const m of text3.matchAll(new RegExp(COVERS_RE_SOURCE, "gi"))) {
+    for (const part of (m[1] ?? "").split(";")) {
+      const alias3 = part.trim();
+      if (alias3.length > 0)
+        out.push(alias3);
+    }
+  }
+  return out;
+}
 function checkAcCoverage(featureAc, taskAc, taskChecklist, acAltitude) {
   if (acAltitude === "task-local") {
     return { covered: true, orphans: [], uncovered: [], issues: [] };
@@ -53868,7 +53944,10 @@ function checkAcCoverage(featureAc, taskAc, taskChecklist, acAltitude) {
   const checklistTitles = new Set;
   if (taskChecklist) {
     for (const item of taskChecklist) {
-      checklistTitles.add(normalizeTitle(item.text));
+      checklistTitles.add(normalizeTitle(stripCoversClause(item.text)));
+      for (const alias3 of extractCoversAliases(item.text)) {
+        checklistTitles.add(normalizeTitle(alias3));
+      }
     }
   }
   const uncovered = [];
@@ -53886,6 +53965,15 @@ function checkAcCoverage(featureAc, taskAc, taskChecklist, acAltitude) {
   }
   if (taskChecklist) {
     for (const item of taskChecklist) {
+      const aliases = extractCoversAliases(item.text);
+      if (aliases.length > 0) {
+        for (const alias3 of aliases) {
+          if (!featureTitles.has(normalizeTitle(alias3))) {
+            uncovered.push(item.text);
+          }
+        }
+        continue;
+      }
       const normalized = normalizeTitle(item.text);
       if (!featureTitles.has(normalized) && !taskTitles.has(normalized)) {
         uncovered.push(item.text);
@@ -53933,6 +54021,7 @@ function tryParseFeature(content) {
 ${content}`;
   return parseFeature(toParse);
 }
+var COVERS_RE_SOURCE = "\\(covers:\\s*([^)]*)\\)";
 var init_coverage = () => {};
 
 // ../../packages/domain/src/bdd/fence.ts
@@ -64318,6 +64407,11 @@ ${HISTORY_RUN_SESSION_SCHEMA_SQL}
       id: "0025_spur_cli_history_checkpoint_identity_mtime",
       sql: "ALTER TABLE history_import_checkpoint ADD COLUMN source_mtime_ms REAL",
       addColumnIfMissing: { table: "history_import_checkpoint", column: "source_mtime_ms" }
+    },
+    {
+      id: "0026_spur_cli_history_message_duration_source",
+      sql: "ALTER TABLE history_message ADD COLUMN duration_source TEXT",
+      addColumnIfMissing: { table: "history_message", column: "duration_source" }
     }
   ];
 });
@@ -65925,7 +66019,7 @@ class MarkdownDocument {
   _frontmatter;
   _preamble;
   _sections;
-  _strippedHeadings = [];
+  _demotedHeadings = [];
   _duplicateSectionNames = [];
   constructor(domain2, frontmatterBlock, frontmatter, preamble, sections) {
     this._domain = domain2;
@@ -66008,8 +66102,8 @@ class MarkdownDocument {
   get sectionNames() {
     return this._sections.map((s2) => s2.name);
   }
-  get strippedHeadings() {
-    return this._strippedHeadings;
+  get demotedHeadings() {
+    return this._demotedHeadings;
   }
   get duplicateSectionNames() {
     return this._duplicateSectionNames;
@@ -66067,7 +66161,8 @@ ${withTrailer}`;
         continue;
       }
       if (!inCodeBlock && line.startsWith(prefix)) {
-        this._strippedHeadings.push(line);
+        this._demotedHeadings.push(line);
+        kept.push(`#${line}`);
         continue;
       }
       kept.push(line);
@@ -66978,6 +67073,7 @@ __export(exports_src, {
   drift: () => drift,
   deterministicExecutionSchema: () => deterministicExecutionSchema,
   derivedWarnings: () => derivedWarnings,
+  deriveAssistantDurations: () => deriveAssistantDurations,
   dbHealthCheck: () => dbHealthCheck,
   dataWindow: () => dataWindow,
   dailyTokenMatrix: () => dailyTokenMatrix,
@@ -67087,7 +67183,9 @@ __export(exports_src, {
   FEATURE_ID_PATTERN: () => FEATURE_ID_PATTERN,
   FEATURE_CANONICAL_SECTIONS: () => FEATURE_CANONICAL_SECTIONS,
   EXECUTION_KINDS: () => EXECUTION_KINDS,
+  DURATION_SOURCE_DERIVED: () => DURATION_SOURCE_DERIVED,
   DOMAIN_SCHEMA_SQL: () => DOMAIN_SCHEMA_SQL,
+  DERIVED_DURATION_CEILING_MS: () => DERIVED_DURATION_CEILING_MS,
   DEFAULT_TASK_VARIANT: () => DEFAULT_TASK_VARIANT,
   DEFAULT_LOCK_TTL_MS: () => DEFAULT_LOCK_TTL_MS,
   DEFAULT_DISCLOSURE_BUDGET_BYTES: () => DEFAULT_DISCLOSURE_BUDGET_BYTES,
@@ -67885,12 +67983,14 @@ function toEnvelopeJson(value, opts = {}) {
 function toEnvelopeError(code, message, details) {
   return toJson(details !== undefined ? { ok: false, error: { code, message, details } } : { ok: false, error: { code, message } });
 }
-function writeJsonError(output2, options, message) {
+function writeJsonError(output2, options, message, code = "INTERNAL_ERROR", details) {
+  const text4 = typeof message === "string" ? message : String(message);
   if (options.json && envelopeEnabled(options.jsonEnvelope)) {
-    output2.write(toEnvelopeError("INTERNAL_ERROR", message));
+    const bare = text4.startsWith("Error: ") ? text4.slice("Error: ".length) : text4;
+    output2.write(toEnvelopeError(code, bare, details));
     return;
   }
-  output2.error(message);
+  output2.error(text4);
 }
 
 // ../../packages/app/src/services/agent-instance-store.ts
@@ -70771,8 +70871,18 @@ function splitTableRow(line) {
 function unescapeTablePipe(s2) {
   return s2.replace(/\\\|/g, "|");
 }
+function isRecordAuthoredReview(body) {
+  if (body === null)
+    return false;
+  const trimmed = body.trim();
+  if (trimmed.startsWith(RECORD_REVIEW_MARKER))
+    return true;
+  return LEGACY_RECORD_REVIEW_RE.test(trimmed);
+}
 function renderReview(v) {
   const lines = [];
+  lines.push(RECORD_REVIEW_MARKER);
+  lines.push("");
   lines.push(`**SECU findings** (pipeline verify step \u2014 verdict: ${v.verdict})`);
   lines.push("");
   lines.push("| Priority | Dimension | Location | Finding |");
@@ -70864,10 +70974,12 @@ function gitDiffU0(cwd) {
     return "";
   }
 }
+var RECORD_REVIEW_MARKER = "<!-- spur:record-review -->", LEGACY_RECORD_REVIEW_RE;
 var init_task_record = __esm(() => {
   init_src2();
   init_dist5();
   init_verify_verdict();
+  LEGACY_RECORD_REVIEW_RE = /^\*\*SECU findings\*\* \(pipeline verify step \u2014 verdict: [A-Z]+\)/;
 });
 
 // ../../packages/app/src/services/feature-check.ts
@@ -71330,7 +71442,14 @@ var init_feature_check = __esm(() => {
         if (touchesSelfRef && dogfoodDir !== undefined) {
           let hasDogfood = false;
           try {
-            const entries = await this.fs.readDir(dogfoodDir);
+            let entries;
+            try {
+              const ledger = await this.fs.readFile(`${dogfoodDir}/INDEX.md`);
+              entries = ledger.split(`
+`);
+            } catch {
+              entries = await this.fs.readDir(dogfoodDir);
+            }
             const segmentRe = new RegExp(`(^|[^A-Za-z0-9])${featureId2}([^A-Za-z0-9]|$)`, "i");
             hasDogfood = entries.some((f) => segmentRe.test(f));
           } catch {}
@@ -71438,6 +71557,23 @@ var init_feature_check = __esm(() => {
           });
         }
       }
+      for (const [taskWbs, artifact] of artifacts2) {
+        if (artifact.diagnostics.artifactError === "artifact is missing")
+          continue;
+        const rows = [...artifact.requirements, ...artifact.acceptanceCriteria];
+        if (rows.length === 0)
+          continue;
+        const anyMatch = rows.some((r) => scenarioAliases.some((sc) => rowMatchesScenario(r.id, sc)));
+        if (!anyMatch) {
+          findings.push({
+            layer: "L4",
+            code: FINDING_CODES.L4_VERDICT_ROWS_MATCH_NO_SCENARIO,
+            severity: "warning",
+            section: "Acceptance Criteria",
+            message: `Task ${taskWbs} verdict evidence (${artifact.path}) carries ${rows.length} row(s) matching no scenario of this feature \u2014 key rows by scenario title or AC-N alias (repair: /sp:dev-verify ${taskWbs})`
+          });
+        }
+      }
       for (const sc of scenarioAliases) {
         const linked = covers[sc.title] ?? [];
         if (linked.length === 0)
@@ -71904,15 +72040,23 @@ var init_task_check = __esm(() => {
       const reqBody = doc2.getSection("Requirements");
       if (reqBody !== null && !isPlaceholderBody(reqBody)) {
         const blocks = reqBody.trim().split(/\n\s*\n/).filter((b) => b.trim().length > 0);
+        const R_ITEM_RE = /^\s*[-*]?\s*(?:\[[ xX]\]\s*)?[*_]{0,2}R\d+\.?[*_]{0,2}\s/;
         let numbered = 0;
+        let proseBlocks = 0;
+        let seenItem = false;
         for (const block of blocks) {
-          const firstLine = block.trimStart().split(`
-`)[0] ?? "";
-          if (/^\s*[-*]?\s*(?:\[[ xX]\]\s*)?[*_]{0,2}R\d+\.?[*_]{0,2}\s/.test(firstLine)) {
-            numbered++;
+          const itemLines = block.split(`
+`).filter((l) => R_ITEM_RE.test(l)).length;
+          if (itemLines > 0) {
+            numbered += itemLines;
+            seenItem = true;
+            continue;
+          }
+          if (!seenItem || /^\s*[*_]{1,2}[^*_\s]/.test(block.trimStart())) {
+            proseBlocks++;
           }
         }
-        if (numbered === 0 || numbered < blocks.length * 0.5) {
+        if (numbered === 0 || proseBlocks > numbered) {
           findings.push({
             layer: "L3",
             code: FINDING_CODES.L3_REQUIREMENTS_FORMAT,
@@ -72041,6 +72185,26 @@ var init_task_check = __esm(() => {
             message: `Task is ${status} but carries ${openBoxes} unchecked checklist box(es) \u2014 flip to [x] or remove before closing`
           });
         }
+        const reviewBody = doc2.getSection("Review");
+        const testingBody = doc2.getSection("Testing");
+        if (reviewBody !== null && testingBody !== null) {
+          const lastVerdict = (body) => {
+            const lines = [...body.matchAll(/\**\s*Verdict\b\**\s*[:\uFF1A]?\s*([^*()\n]+)/gi)];
+            return (lines[lines.length - 1]?.[1] ?? "").replace(/\*/g, "").trim();
+          };
+          const reviewVerdict = lastVerdict(reviewBody);
+          const nonPassing = /\bPARTIAL\b|\bFAIL\b|request-changes/i.test(reviewVerdict);
+          const testingVerdict = lastVerdict(testingBody);
+          if (nonPassing && /^PASS\b/i.test(testingVerdict)) {
+            findings.push({
+              layer: "L3",
+              code: FINDING_CODES.L3_REVIEW_TESTING_CONTRADICTION,
+              severity: "error",
+              section: "Review",
+              message: `Review verdict is "${reviewVerdict}" while Testing records PASS \u2014 reconcile the stale Review via /sp:dev-review (semantics: the last Verdict line in the section is authoritative)`
+            });
+          }
+        }
       }
     }
     async runL4(doc2, fm, status, findings, featuresDir, tasksDir, wbs) {
@@ -72178,6 +72342,18 @@ var init_task_check = __esm(() => {
           section: "Plan",
           message: "Parent task has sub-tasks but its Plan has no sub-task roster (decomposition.md)"
         });
+        return;
+      }
+      const declared = new Set(this.extractDependencyWbs(doc2.frontmatterData?.dependencies));
+      const undeclared = openKids.filter((kid) => !declared.has(kid.wbs)).map((kid) => kid.wbs);
+      if (undeclared.length > 0) {
+        findings.push({
+          layer: "L4",
+          code: FINDING_CODES.L4_ROLLUP_ROSTER_NOT_DECLARED_DEPENDENCY,
+          severity: "warning",
+          section: "Plan",
+          message: `Plan rosters open sub-task(s) ${undeclared.join(", ")} that frontmatter dependencies[] does not declare \u2014 batch ordering reads dependencies[], not the Plan (repair: spur task deps ${wbs} add ${undeclared.join(" ")})`
+        });
       }
     }
     hasSubtaskRoster(planBody, kids) {
@@ -72297,6 +72473,9 @@ var init_task_check = __esm(() => {
       }
     }
     checkGateLanguage(doc2, findings) {
+      const declaredDeps = doc2.frontmatterData?.dependencies;
+      if (Array.isArray(declaredDeps) && declaredDeps.length > 0)
+        return;
       for (const section of ["Background", "Requirements", "Design", "Acceptance Criteria", "Plan"]) {
         const body = doc2.getSection(section);
         if (body === null)
@@ -72656,7 +72835,7 @@ async function structuralSweep(projectRoot) {
   });
   const taskService = new TaskCheckService(fs3, await loadTaskMatrix(projectRoot), locator);
   const findings = [];
-  for (const tasksDir of taskDirs) {
+  for (const tasksDir of [activeTasksDir]) {
     if (!await fs3.exists(tasksDir))
       continue;
     for (const fileName of await fs3.readDir(tasksDir)) {
@@ -78058,6 +78237,7 @@ class HistoryService {
         });
       }
       await dao2.alignMessageProvenance();
+      await deriveAssistantDurations(db2);
     }
     return result;
   }
@@ -79111,7 +79291,7 @@ class PlanningWriteService {
       } : {}
     };
     await this.emitter.emit(event);
-    const warnings = doc2.strippedHeadings.map((line) => `Stripped same-level heading from section body (would become a phantom section): "${line}". ` + "Use bullet lists, tables, or **bold** labels for sub-structure instead.");
+    const warnings = doc2.demotedHeadings.map((line) => `Demoted same-level heading one level deeper in section body (would become a phantom section): "${line}". ` + "Use bullet lists, tables, or **bold** labels for sub-structure instead.");
     for (const dup of doc2.duplicateSectionNames) {
       warnings.push(`Dropped duplicate "${dup}" section (appeared more than once in the file \u2014 ` + "likely a copy-paste or double-write error). The first occurrence was kept.");
     }
@@ -79142,6 +79322,10 @@ function applyMutation(doc2, mutation) {
     case "updateSection":
       if (mutation.sectionName !== undefined && mutation.sectionBody !== undefined) {
         const body = mutation.sectionName.toLowerCase() === "acceptance criteria" ? normalizeAcFence(mutation.sectionBody) : mutation.sectionBody;
+        if (mutation.sectionName.toLowerCase() === "q&a") {
+          appendQaEntry(doc2, body);
+          break;
+        }
         doc2.replaceSection(mutation.sectionName, body);
       }
       break;
@@ -79172,6 +79356,22 @@ ${line}
 `;
   doc2.replaceSection("History", updated);
 }
+function appendQaEntry(doc2, body) {
+  const REPLACE_MARKER = "<!-- qa:replace -->";
+  if (body.trimStart().startsWith(REPLACE_MARKER)) {
+    doc2.replaceSection("Q&A", body.trimStart().slice(REPLACE_MARKER.length).trimStart());
+    return;
+  }
+  const existing = doc2.getSection("Q&A") ?? "";
+  const entry = `#### Q&A entry \u2014 ${new Date().toISOString()}
+
+${body.trim()}
+`;
+  const updated = existing.trim().length > 0 ? `${existing.trimEnd()}
+
+${entry}` : entry;
+  doc2.replaceSection("Q&A", updated);
+}
 function resolveEventName(kind, domain2, statusChanged) {
   if (kind === "create") {
     return domain2 === "task" ? "task.created" : "feature.created";
@@ -81838,7 +82038,7 @@ class TaskService {
       await this.writeService.updateSection(ref, "Testing", testingBody);
       result.testingWritten = true;
     }
-    if (sectionIsBare(doc2, "Review")) {
+    if (sectionIsBare(doc2, "Review") || isRecordAuthoredReview(doc2.getSection("Review"))) {
       const reviewBody = renderReview(verdict);
       await this.writeService.updateSection(ref, "Review", reviewBody);
       result.reviewWritten = true;
@@ -82163,8 +82363,11 @@ ${block}` : block);
   }
   async resolveTaskFile(wbs) {
     const result = await this.findTaskFileName(wbs);
-    if (!result)
-      throw new Error(`Task ${wbs} not found in any registered task folder`);
+    if (!result) {
+      const err = new Error(`Task ${wbs} not found in any registered task folder`);
+      err.cliCode = "NOT_FOUND";
+      throw err;
+    }
     return result.filePath;
   }
   async findTaskFileName(wbs) {
@@ -87564,6 +87767,7 @@ __export(exports_src2, {
   looksLikeOpaqueId: () => looksLikeOpaqueId,
   loadAcceptedFindings: () => loadAcceptedFindings,
   isSystemEventEnvelopeV2: () => isSystemEventEnvelopeV2,
+  isRecordAuthoredReview: () => isRecordAuthoredReview,
   isPortLive: () => isPortLive,
   isPortAvailable: () => isPortAvailable,
   isFindingCode: () => isFindingCode,
@@ -95318,12 +95522,12 @@ async function runAgentList(svc, context4, opts) {
 }
 async function runAgentCreate(id, context4, flags) {
   if (id === undefined) {
-    context4.output.error("agent create requires <id>");
+    writeJsonError(context4.output, jsonFlags(flags), "agent create requires <id>", "VALIDATION_FAILED");
     return 2;
   }
   const type = typeof flags.type === "string" ? flags.type : "";
   if (type === "") {
-    context4.output.error("agent create requires --type <agent-type>");
+    writeJsonError(context4.output, jsonFlags(flags), "agent create requires --type <agent-type>", "VALIDATION_FAILED");
     return 2;
   }
   const tags = typeof flags.tags === "string" ? flags.tags : "";
@@ -95423,6 +95627,13 @@ async function runAgentDelete(id, context4, flags) {
     return 1;
   }
 }
+function jsonFlags(flags) {
+  const envelope2 = flags.jsonEnvelope ?? flags["json-envelope"];
+  return {
+    json: flags.json === true,
+    jsonEnvelope: typeof envelope2 === "boolean" ? envelope2 : undefined
+  };
+}
 async function runAgentRun(prompt, context4, flags, deps) {
   const bus = new EventBus;
   const ledger = await attachSystemEventLedger(bus, context4);
@@ -95431,19 +95642,19 @@ async function runAgentRun(prompt, context4, flags, deps) {
     if (flags.drain === true || typeof flags.spec === "string") {
       const { prompt: drained, flags: rewritten } = await drainIntoPrompt(prompt, context4, flags);
       if (typeof flags.spec === "string" && flags.spec !== "" && rewritten["spec-id"] !== flags.spec) {
-        context4.output.error(`--spec "${flags.spec}" does not match a team agent spec`);
+        writeJsonError(context4.output, jsonFlags(flags), `--spec "${flags.spec}" does not match a team agent spec`, "VALIDATION_FAILED");
         return 2;
       }
       const invalid2 = validateAgentSelector(rewritten, context4);
       if (invalid2 !== null) {
-        context4.output.error(invalid2);
+        writeJsonError(context4.output, jsonFlags(flags), invalid2, "VALIDATION_FAILED");
         return 2;
       }
       return await svc.run(drained, rewritten, deps);
     }
     const invalid = validateAgentSelector(flags, context4);
     if (invalid !== null) {
-      context4.output.error(invalid);
+      writeJsonError(context4.output, jsonFlags(flags), invalid, "VALIDATION_FAILED");
       return 2;
     }
     return await svc.run(prompt, flags, deps);
@@ -96299,7 +96510,7 @@ function registerFeatureCommand(program2, context4) {
     try {
       const result = await svc.show(id);
       if (result === null) {
-        writeJsonError(context4.output, options, `Feature ${id} not found`);
+        writeJsonError(context4.output, options, `Feature ${id} not found`, "NOT_FOUND");
         context4.setExitCode(1);
         return;
       }
@@ -96325,7 +96536,7 @@ function registerFeatureCommand(program2, context4) {
       let result;
       if (options.section !== undefined) {
         if (options.fromFile === undefined) {
-          context4.output.error("--from-file is required with --section");
+          writeJsonError(context4.output, options, "--from-file is required with --section", "VALIDATION_FAILED");
           context4.setExitCode(2);
           return;
         }
@@ -96337,13 +96548,13 @@ function registerFeatureCommand(program2, context4) {
           context4.output.write(`Updated section '${options.section}' in feature ${result.ref.id}`);
         }
       } else if (options.fromFile !== undefined) {
-        context4.output.error("--section is required with --from-file");
+        writeJsonError(context4.output, options, "--section is required with --from-file", "VALIDATION_FAILED");
         context4.setExitCode(2);
         return;
       }
       if (options.field !== undefined) {
         if (options.value === undefined) {
-          context4.output.error("--value is required with --field");
+          writeJsonError(context4.output, options, "--value is required with --field", "VALIDATION_FAILED");
           context4.setExitCode(2);
           return;
         }
@@ -96352,7 +96563,7 @@ function registerFeatureCommand(program2, context4) {
           context4.output.write(`Updated ${options.field} on feature ${result.ref.id}`);
         }
       } else if (options.value !== undefined) {
-        context4.output.error("--field is required with --value");
+        writeJsonError(context4.output, options, "--field is required with --value", "VALIDATION_FAILED");
         context4.setExitCode(2);
         return;
       }
@@ -96363,7 +96574,7 @@ function registerFeatureCommand(program2, context4) {
         }
       }
       if (result === undefined) {
-        context4.output.error("Either <status>, --field/--value, or --section/--from-file is required");
+        writeJsonError(context4.output, options, "Either <status>, --field/--value, or --section/--from-file is required", "VALIDATION_FAILED");
         context4.setExitCode(2);
         return;
       }
@@ -96387,7 +96598,7 @@ function registerFeatureCommand(program2, context4) {
     try {
       const initial = await svc.show(id);
       if (initial === null) {
-        writeJsonError(context4.output, options, `Feature ${id} not found`);
+        writeJsonError(context4.output, options, `Feature ${id} not found`, "NOT_FOUND");
         context4.setExitCode(1);
         return;
       }
@@ -96419,7 +96630,7 @@ function registerFeatureCommand(program2, context4) {
         next = forwardPath[current];
       }
       if (current !== target) {
-        context4.output.error(`${id}: cannot reach '${target}' from '${current}' along the forward path`);
+        writeJsonError(context4.output, options, `${id}: cannot reach '${target}' from '${current}' along the forward path`, "GUARD_DENIED");
         context4.setExitCode(1);
         return;
       }
@@ -96495,12 +96706,12 @@ function registerFeatureCommand(program2, context4) {
     const svc = await makeService(context4, options.folder);
     try {
       if (options.all && options.feature) {
-        context4.output.error("--feature <id> and --all are mutually exclusive");
+        writeJsonError(context4.output, options, "--feature <id> and --all are mutually exclusive", "VALIDATION_FAILED");
         context4.setExitCode(2);
         return;
       }
       if (!options.all && !options.feature) {
-        context4.output.error("--feature <id> or --all is required (refusing silent all-features sweep)");
+        writeJsonError(context4.output, options, "--feature <id> or --all is required (refusing silent all-features sweep)", "VALIDATION_FAILED");
         context4.setExitCode(2);
         return;
       }
@@ -96534,9 +96745,9 @@ function registerFeatureCommand(program2, context4) {
       for (const fid of ids) {
         const fileName = entries.find((n3) => n3.match(new RegExp(`^${fid}_.+\\.md$`)));
         if (!fileName) {
-          context4.output.error(`Feature ${fid} not found`);
+          writeJsonError(context4.output, options, `Feature ${fid} not found`, "NOT_FOUND");
           context4.setExitCode(1);
-          continue;
+          return;
         }
         const result = await svc.check(`${featuresDir}/${fileName}`, fid, {
           strict,
@@ -96586,7 +96797,7 @@ ${result.id} (${result.status}): ${result.pass ? "PASS" : "FAIL"}`);
     const svc = await makeService(context4, options.folder);
     try {
       if (!options.all && !id) {
-        context4.output.error("Feature ID is required unless --all is passed");
+        writeJsonError(context4.output, options, "Feature ID is required unless --all is passed", "VALIDATION_FAILED");
         context4.setExitCode(2);
         return;
       }
@@ -96675,7 +96886,7 @@ import { createRequire } from "module";
 var CLI_CONFIG = {
   binaryName: "spur",
   binaryLabel: "spur",
-  binaryVersion: "0.3.65",
+  binaryVersion: "0.3.66",
   configDir: ".spur",
   configFile: ".spur/config.yaml",
   databaseFile: ".spur/spur.db"
@@ -97362,7 +97573,7 @@ function registerMessageCommand(program2, context4) {
     const svc = new TeamService(context4);
     const intervalMs = parseInterval2(options.interval);
     if (intervalMs === null) {
-      context4.output.error(`invalid --interval "${options.interval}" (expected a positive integer ms)`);
+      writeJsonError(context4.output, options, `invalid --interval "${options.interval}" (expected a positive integer ms)`, "VALIDATION_FAILED");
       context4.setExitCode(2);
       return;
     }
@@ -97527,7 +97738,7 @@ async function runMessageInbox(svc, context4, options) {
 async function runMessageReply(svc, context4, msgId, body, options) {
   const trimmed = body.trim();
   if (trimmed === "") {
-    context4.output.error("message reply requires a non-empty body");
+    writeJsonError(context4.output, options, "message reply requires a non-empty body", "VALIDATION_FAILED");
     return 2;
   }
   const result = await svc.replyToMessage(msgId, trimmed);
@@ -97930,17 +98141,17 @@ function registerRuleCommand(program2, context4) {
   rule.command("trace").summary("Show persisted rule run history.").argument("[run-id]", "Run ID for per-run detail").option("--preset <name>", "Filter by preset name").option(...SHARED_OPTIONS.statusDoneFailed).option(...SHARED_OPTIONS.since).option(...SHARED_OPTIONS.last, "20").option(...SHARED_OPTIONS.json).option(...SHARED_OPTIONS.jsonEnvelope).action(async (runId, options) => {
     const last = parseInt(options.last, 10);
     if (!Number.isInteger(last) || last < 1) {
-      context4.output.error("--last must be a positive integer");
+      writeJsonError(context4.output, options, "--last must be a positive integer", "VALIDATION_FAILED");
       context4.setExitCode(1);
       return;
     }
     if (options.status !== undefined && !["done", "failed"].includes(options.status)) {
-      context4.output.error("--status must be one of: done, failed");
+      writeJsonError(context4.output, options, "--status must be one of: done, failed", "VALIDATION_FAILED");
       context4.setExitCode(1);
       return;
     }
     if (options.since !== undefined && Number.isNaN(Date.parse(options.since))) {
-      context4.output.error("--since must be a valid ISO date");
+      writeJsonError(context4.output, options, "--since must be a valid ISO date", "VALIDATION_FAILED");
       context4.setExitCode(1);
       return;
     }
@@ -108141,7 +108352,7 @@ function registerServeCommand(program2, context4, options = {}) {
     } catch (err) {
       writeJsonError(context4.output, options2, err instanceof Error ? err.message : String(err));
       if (context4.env?.SPUR_DEBUG === "1" && err instanceof Error && err.stack) {
-        context4.output.error(err.stack);
+        writeJsonError(context4.output, options2, err.stack, "INTERNAL_ERROR");
       }
       context4.setExitCode(1);
     }
@@ -109168,12 +109379,12 @@ function registerTaskCommand(program2, context4) {
   const task = program2.command("task").summary("manage tasks");
   task.command("create").summary("Create a new task with race-safe WBS allocation.").argument("<title>", "Task title").option(...SHARED_OPTIONS.featureTrace).option("--parent <wbs>", "Parent WBS for sub-task grouping").option("--template <variant>", `Template variant (${TASK_VARIANTS.join("|")})`).option(...SHARED_OPTIONS.folderTasks).option("--dedupe-within <seconds>", "Override the default dedup window (seconds). Guard is on (300s) by default when --feature is set.", Number).option("--allow-duplicate-name", "Disable the dedup guard entirely (creates anyway)").option(...SHARED_OPTIONS.json).option(...SHARED_OPTIONS.jsonEnvelope).action(async (title2, options) => {
     if (options.template !== undefined && !TASK_VARIANTS.includes(options.template)) {
-      context4.output.error(`Unknown template variant "${options.template}". Valid: ${TASK_VARIANTS.join(", ")}`);
+      writeJsonError(context4.output, options, `Unknown template variant "${options.template}". Valid: ${TASK_VARIANTS.join(", ")}`, "VALIDATION_FAILED");
       context4.setExitCode(2);
       return;
     }
     if (options.dedupeWithin !== undefined && (!Number.isInteger(options.dedupeWithin) || options.dedupeWithin <= 0)) {
-      context4.output.error("--dedupe-within must be a positive integer");
+      writeJsonError(context4.output, options, "--dedupe-within must be a positive integer", "VALIDATION_FAILED");
       context4.setExitCode(2);
       return;
     }
@@ -109267,7 +109478,8 @@ function registerTaskCommand(program2, context4) {
 ${result.content}`);
       }
     } catch (err) {
-      writeJsonError(context4.output, options, String(err));
+      const cliCode = err?.cliCode;
+      writeJsonError(context4.output, options, String(err), "INTERNAL_ERROR", cliCode !== undefined ? { cliCode } : undefined);
       context4.setExitCode(1);
     }
   });
@@ -109287,7 +109499,7 @@ ${result.content}`);
     try {
       if (options.section !== undefined) {
         if (options.fromFile === undefined) {
-          context4.output.error("--from-file is required with --section");
+          writeJsonError(context4.output, options, "--from-file is required with --section", "VALIDATION_FAILED");
           context4.setExitCode(2);
           return;
         }
@@ -109319,7 +109531,7 @@ ${result.content}`);
             }
             const ok = await runDoneGateCheck(context4, wbs, options.folder, status);
             if (!ok) {
-              context4.output.error(`Lifecycle transition blocked: \`spur task check ${wbs}\` failed. Fix the findings before transitioning to ${status}.`);
+              writeJsonError(context4.output, options, `Lifecycle transition blocked: \`spur task check ${wbs}\` failed. Fix the findings before transitioning to ${status}.`, "GUARD_DENIED");
               context4.setExitCode(1);
               return;
             }
@@ -109350,7 +109562,7 @@ ${result.content}`);
             return;
           }
           if (guardOutcome.kind === "deny") {
-            context4.output.error(guardOutcome.message);
+            writeJsonError(context4.output, options, guardOutcome.message, "GUARD_DENIED");
             context4.setExitCode(1);
             return;
           }
@@ -109397,7 +109609,7 @@ ${result.content}`);
       }
     } catch (err) {
       if (err instanceof SectionMutationError) {
-        context4.output.error(`[${err.code}] ${err.message}`);
+        writeJsonError(context4.output, options, `[${err.code}] ${err.message}`, "INTERNAL_ERROR");
         context4.setExitCode(err.code === "usage" ? 2 : 3);
       } else {
         writeJsonError(context4.output, options, String(err));
@@ -109415,7 +109627,7 @@ ${result.content}`);
 ` + "2 usage error, 3 validation error.").argument("<wbs>", "Task WBS number to mutate").argument("<op>", "Operation: set | add | remove | clear").argument("[values...]", "WBS values (required for set/add/remove; forbidden for clear)").option(...SHARED_OPTIONS.folderTasks).option(...SHARED_OPTIONS.json).option(...SHARED_OPTIONS.jsonEnvelope).action(async (wbs, op, values, options) => {
     const allowedOps = ["set", "add", "remove", "clear"];
     if (!allowedOps.includes(op)) {
-      context4.output.error(`Unknown op "${op}". Allowed: ${allowedOps.join(", ")}.`);
+      writeJsonError(context4.output, options, `Unknown op "${op}". Allowed: ${allowedOps.join(", ")}.`, "VALIDATION_FAILED");
       context4.setExitCode(2);
       return;
     }
@@ -109431,7 +109643,7 @@ ${result.content}`);
       }
     } catch (err) {
       if (err instanceof DependencyMutationError) {
-        context4.output.error(`[${err.code}] ${err.message}`);
+        writeJsonError(context4.output, options, `[${err.code}] ${err.message}`, "INTERNAL_ERROR");
         context4.setExitCode(err.code === "usage" ? 2 : 3);
       } else {
         writeJsonError(context4.output, options, String(err));
@@ -109455,18 +109667,18 @@ ${result.content}`);
 ` + "1 generic error, 2 usage error, 3 validation error.").argument("<wbs>", "Task WBS number to mutate").argument("<op>", "Operation: init | add | list").argument("[name]", "Canonical section name (required for add; forbidden for init/list)").option(...SHARED_OPTIONS.folderTasks).option(...SHARED_OPTIONS.json).option(...SHARED_OPTIONS.jsonEnvelope).action(async (wbs, op, name, options) => {
     const allowedOps = ["init", "add", "list"];
     if (!allowedOps.includes(op)) {
-      context4.output.error(`Unknown op "${op}". Allowed: ${allowedOps.join(", ")}.`);
+      writeJsonError(context4.output, options, `Unknown op "${op}". Allowed: ${allowedOps.join(", ")}.`, "VALIDATION_FAILED");
       context4.setExitCode(2);
       return;
     }
     const typedOp = op;
     if (typedOp === "add" && typeof name !== "string") {
-      context4.output.error('op "add" requires a section name argument.');
+      writeJsonError(context4.output, options, 'op "add" requires a section name argument.', "VALIDATION_FAILED");
       context4.setExitCode(2);
       return;
     }
     if ((typedOp === "init" || typedOp === "list") && name !== undefined) {
-      context4.output.error(`op "${typedOp}" takes no section name argument.`);
+      writeJsonError(context4.output, options, `op "${typedOp}" takes no section name argument.`, "VALIDATION_FAILED");
       context4.setExitCode(2);
       return;
     }
@@ -109491,7 +109703,7 @@ ${result.content}`);
       }
     } catch (err) {
       if (err instanceof SectionMutationError) {
-        context4.output.error(`[${err.code}] ${err.message}`);
+        writeJsonError(context4.output, options, `[${err.code}] ${err.message}`, "INTERNAL_ERROR");
         context4.setExitCode(err.code === "usage" ? 2 : 3);
       } else {
         writeJsonError(context4.output, options, String(err));
@@ -109704,7 +109916,7 @@ ${result.content}`);
     }
   });
   task.command("verdict").summary("Derive PASS/PARTIAL/FAIL/UNKNOWN verdict from verify answer text (replaces pipeline grep/shell).").argument("<wbs>", "Task WBS number").option("--from-answer <path>", "Path to verify answer text file").option(...SHARED_OPTIONS.folderTasks).option(...SHARED_OPTIONS.json).option(...SHARED_OPTIONS.jsonEnvelope).action(async (wbs, options) => {
-    const { deriveVerdict: deriveVerdict2, verdictRowsMatchScenarios: verdictRowsMatchScenarios2 } = await init_src3().then(() => exports_src2);
+    const { deriveVerdict: deriveVerdict2 } = await init_src3().then(() => exports_src2);
     const answerPath = options.fromAnswer ?? `.spur/run/${wbs}-verify-answer.txt`;
     let answerText;
     try {
@@ -109716,22 +109928,6 @@ ${result.content}`);
     }
     const taskCheckPassed = true;
     const result = deriveVerdict2(answerText, taskCheckPassed);
-    try {
-      const svc = await makeService2(context4, options.folder);
-      const task2 = await svc.show(wbs);
-      const featureId2 = task2.frontmatter.feature_id;
-      if (typeof featureId2 === "string" && featureId2.length > 0) {
-        const resolved = await resolvePlanningFolders(context4.fs);
-        const names = await context4.fs.readDir(context4.fs.resolve(resolved.featuresDir));
-        const name = names.find((n3) => n3.startsWith(`${featureId2}_`) && n3.endsWith(".md"));
-        if (name !== undefined) {
-          const raw2 = await context4.fs.readFile(context4.fs.resolve(`${resolved.featuresDir}/${name}`));
-          if (!verdictRowsMatchScenarios2(result.requirements, raw2)) {
-            context4.output.error(`warning: no verdict row matches any scenario in feature ${featureId2} \u2014 key rows by scenario title or AC-N alias, or the feature done gate reports L4.scenario-unverified`);
-          }
-        }
-      }
-    } catch {}
     const jsonOut = JSON.stringify({ wbs, ...result, source: "spur-task-verdict" }, null, 2);
     await context4.fs.ensureDir(".spur/run");
     await context4.fs.writeFile(`.spur/run/${wbs}-verdict.json`, `${jsonOut}
@@ -109792,34 +109988,34 @@ ${result.content}`);
       context4.setExitCode(1);
     }
   });
-  task.command("check").summary("Validate a task file through the four-layer check (design \xA73).").argument("[wbs]", "Task WBS number (validates all tasks in the folder when omitted)").option(...SHARED_OPTIONS.strictTaskAll).option("--strict-core", "Compatibility alias (F92 R2): historically the done-gate label; kept so installed plugins/workflows that call it keep working. No longer meaningful on its own \u2014 target-state selection (`--as`) supplies the real done semantics.").option(...SHARED_OPTIONS.asTaskF92).option("--corpus", "Sweep every task and feature against config/corpus-baseline.json").option("--since <ref>", "Scope the corpus fog check to changes since a git ref (requires --corpus)").option("--fix", "repair structural findings in place (heading presence/level/order, R-item checkboxes)").option(...SHARED_OPTIONS.folderTasks).option(...SHARED_OPTIONS.json).option(...SHARED_OPTIONS.jsonEnvelope).action(async (wbs, options) => {
+  task.command("check").summary("Validate a task file through the four-layer check (design \xA73).").argument("[wbs]", "Task WBS number (validates all tasks in the folder when omitted)").option(...SHARED_OPTIONS.strictTaskAll).option("--strict-core", "Compatibility alias (F92 R2): historically the done-gate label; kept so installed plugins/workflows that call it keep working. No longer meaningful on its own \u2014 target-state selection (`--as`) supplies the real done semantics.").option(...SHARED_OPTIONS.asTaskF92).option("--corpus", "Sweep every task and feature against config/corpus-baseline.json").option("--since <ref>", "Scope the corpus fog check to changes since a git ref (requires --corpus)").option("--fix", "repair structural findings in place (heading presence/level/order; adds missing R-item checkbox markers \u2014 flipping verified boxes is task record's job, not --fix)").option(...SHARED_OPTIONS.folderTasks).option(...SHARED_OPTIONS.json).option(...SHARED_OPTIONS.jsonEnvelope).action(async (wbs, options) => {
     const json3 = options.json === true;
     const strict = options.strict === true;
     const asStatus = options.as === undefined ? undefined : canonicalStatusOrRaw(options.as);
     if (options.as !== undefined && !TASK_STATUSES.includes(asStatus ?? "")) {
-      context4.output.error(`invalid --as status "${options.as}" (canonical: ${TASK_STATUSES.join(", ")})`);
+      writeJsonError(context4.output, options, `invalid --as status "${options.as}" (canonical: ${TASK_STATUSES.join(", ")})`, "VALIDATION_FAILED");
       context4.setExitCode(2);
       return;
     }
     if (asStatus !== undefined && options.corpus === true) {
-      context4.output.error("--as <status> is a single-task target projection and cannot be combined with --corpus");
+      writeJsonError(context4.output, options, "--as <status> is a single-task target projection and cannot be combined with --corpus", "VALIDATION_FAILED");
       context4.setExitCode(2);
       return;
     }
     if (options.fix === true && options.corpus === true) {
-      context4.output.error("--fix repairs files in place and cannot be combined with --corpus");
+      writeJsonError(context4.output, options, "--fix repairs files in place and cannot be combined with --corpus", "VALIDATION_FAILED");
       context4.setExitCode(2);
       return;
     }
     try {
       if (options.corpus === true) {
         if (wbs !== undefined) {
-          context4.output.error("--corpus validates the whole corpus and cannot be combined with a WBS");
+          writeJsonError(context4.output, options, "--corpus validates the whole corpus and cannot be combined with a WBS", "VALIDATION_FAILED");
           context4.setExitCode(2);
           return;
         }
         if (String(options.since ?? "").startsWith("-")) {
-          context4.output.error("--since requires a git ref value (e.g. --since HEAD~1)");
+          writeJsonError(context4.output, options, "--since requires a git ref value (e.g. --since HEAD~1)", "VALIDATION_FAILED");
           context4.setExitCode(2);
           return;
         }
@@ -109852,7 +110048,7 @@ ${result.content}`);
         return;
       }
       if (options.since !== undefined) {
-        context4.output.error("--since requires --corpus");
+        writeJsonError(context4.output, options, "--since requires --corpus", "VALIDATION_FAILED");
         context4.setExitCode(2);
         return;
       }
@@ -109884,8 +110080,9 @@ ${result.wbs} (${result.status}): ${result.pass ? "PASS" : "FAIL"}`);
         const locator = options.folder !== undefined ? TaskLocator.forSingleDir(context4.fs, tasksDir) : await makeTaskLocator(context4);
         const hit = await locator.findByWbs(wbs);
         if (hit === null) {
-          context4.output.error(`Task ${wbs} not found`);
+          writeJsonError(context4.output, options, `Task ${wbs} not found`, "NOT_FOUND");
           context4.setExitCode(1);
+          return;
         } else {
           const result = await svc.check(hit.filePath, wbs, {
             strict,
@@ -109903,7 +110100,7 @@ ${result.wbs} (${result.status}): ${result.pass ? "PASS" : "FAIL"}`);
         for (const w of wbsPattern) {
           const fileName = entries.find((n3) => n3.startsWith(`${w}_`) && n3.endsWith(".md"));
           if (!fileName) {
-            context4.output.error(`Task ${w} not found`);
+            writeJsonError(context4.output, options, `Task ${w} not found`, "NOT_FOUND");
             context4.setExitCode(1);
             continue;
           }
@@ -109957,7 +110154,7 @@ ${result.wbs} (${result.status}): ${result.pass ? "PASS" : "FAIL"}`);
           context4.output.write(`${result.wbs}  ${result.filePath}`);
         }
       } else {
-        context4.output.error(`No owning task found for ${filePath}`);
+        writeJsonError(context4.output, options, `No owning task found for ${filePath}`, "NOT_FOUND");
         context4.setExitCode(1);
       }
     } catch (err) {
@@ -109976,7 +110173,7 @@ ${result.wbs} (${result.status}): ${result.pass ? "PASS" : "FAIL"}`);
           context4.output.write(filePath);
         }
       } else {
-        context4.output.error(`Task ${wbs} not found`);
+        writeJsonError(context4.output, options, `Task ${wbs} not found`, "NOT_FOUND");
         context4.setExitCode(1);
       }
     } catch (err) {
@@ -110253,7 +110450,8 @@ async function performTeamStart(agentId, options) {
     const body = await res.json();
     if (res.ok)
       return { ok: true, body };
-    return { ok: false, error: body.error ?? `start failed: ${res.status}`, status: res.status };
+    const detail = errorText(body.error);
+    return { ok: false, error: detail ?? `start failed: ${res.status}`, status: res.status };
   } catch (err) {
     return { ok: false, transportError: err };
   }
@@ -110262,11 +110460,11 @@ async function runTeamStart(agentId, options, context4) {
   const result = await performTeamStart(agentId, options);
   if ("transportError" in result) {
     const err = result.transportError;
-    context4.output.error(`Cannot reach server at ${options.server} \u2014 is spur serve running? (${err instanceof Error ? err.message : String(err)})`);
+    writeJsonError(context4.output, options, `Cannot reach server at ${options.server} \u2014 is spur serve running? (${err instanceof Error ? err.message : String(err)})`, "INTERNAL_ERROR");
     return 1;
   }
   if (!result.ok) {
-    context4.output.error(result.error);
+    writeJsonError(context4.output, options, result.error, "INTERNAL_ERROR");
     return 1;
   }
   if (options.json) {
@@ -110276,6 +110474,19 @@ async function runTeamStart(agentId, options, context4) {
   }
   return 0;
 }
+function errorText(raw2) {
+  if (typeof raw2 === "string")
+    return raw2;
+  if (raw2 !== null && typeof raw2 === "object" && "message" in raw2) {
+    const message = raw2.message;
+    if (typeof message === "string" && message !== "")
+      return message;
+    if ("code" in raw2 && typeof raw2.code === "string") {
+      return raw2.code;
+    }
+  }
+  return raw2 === undefined ? undefined : JSON.stringify(raw2);
+}
 async function performTeamStop(agentId, options) {
   try {
     const url2 = `${options.server}/team/agents/${encodeURIComponent(agentId)}/stop`;
@@ -110283,7 +110494,8 @@ async function performTeamStop(agentId, options) {
     const body = await res.json();
     if (res.ok)
       return { ok: true, body };
-    return { ok: false, error: body.error ?? `stop failed: ${res.status}`, status: res.status };
+    const detail = errorText(body.error);
+    return { ok: false, error: detail ?? `stop failed: ${res.status}`, status: res.status };
   } catch (err) {
     return { ok: false, transportError: err };
   }
@@ -110292,11 +110504,11 @@ async function runTeamStop(agentId, options, context4) {
   const result = await performTeamStop(agentId, options);
   if ("transportError" in result) {
     const err = result.transportError;
-    context4.output.error(`Cannot reach server at ${options.server} \u2014 is spur serve running? (${err instanceof Error ? err.message : String(err)})`);
+    writeJsonError(context4.output, options, `Cannot reach server at ${options.server} \u2014 is spur serve running? (${err instanceof Error ? err.message : String(err)})`, "INTERNAL_ERROR");
     return 1;
   }
   if (!result.ok) {
-    context4.output.error(result.error);
+    writeJsonError(context4.output, options, result.error, "INTERNAL_ERROR");
     return 1;
   }
   if (options.json) {
@@ -110627,32 +110839,32 @@ ${result.errors.map((m) => `  - ${m}`).join(`
     const silent = !json3 && options.silent === true;
     const quiet = !json3 && options.quiet === true;
     if (!json3 && options.quiet === true && options.verbose === true) {
-      context4.output.error("--quiet and --verbose are mutually exclusive");
+      writeJsonError(context4.output, options, "--quiet and --verbose are mutually exclusive", "VALIDATION_FAILED");
       context4.setExitCode(2);
       return;
     }
     if (!json3 && options.silent === true && (options.quiet === true || options.verbose === true)) {
-      context4.output.error("--silent cannot be combined with --quiet or --verbose");
+      writeJsonError(context4.output, options, "--silent cannot be combined with --quiet or --verbose", "VALIDATION_FAILED");
       context4.setExitCode(2);
       return;
     }
     if (options.steer === true && (json3 || options.async === true)) {
-      context4.output.error("--steer is synchronous and in-process; it cannot be combined with --json or --async");
+      writeJsonError(context4.output, options, "--steer is synchronous and in-process; it cannot be combined with --json or --async", "VALIDATION_FAILED");
       context4.setExitCode(2);
       return;
     }
     const requestedDetail = options.detail;
     if (requestedDetail !== undefined && !["minimal", "invocation", "full"].includes(requestedDetail)) {
-      context4.output.error("--detail must be one of: minimal, invocation, full");
+      writeJsonError(context4.output, options, "--detail must be one of: minimal, invocation, full", "VALIDATION_FAILED");
       context4.setExitCode(2);
       return;
     }
     const detail = options.verbose === true ? "full" : requestedDetail ?? "invocation";
     if (process.env[WORKFLOW_RUN_ACTIVE_ENV] === "1") {
-      context4.output.error(`workflow run: refusing to start \u2014 already inside an active workflow run (${WORKFLOW_RUN_ACTIVE_ENV}=1).
+      writeJsonError(context4.output, options, `workflow run: refusing to start \u2014 already inside an active workflow run (${WORKFLOW_RUN_ACTIVE_ENV}=1).
 ` + `A pipeline that starts another pipeline forks a worktree and an agent run per level, without bound.
 ` + `If you are an agent running inside a pipeline step: do NOT start a pipeline here. Report what you
-` + "needed and let the operator run it from a clean shell.");
+` + "needed and let the operator run it from a clean shell.", "VALIDATION_FAILED");
       context4.setExitCode(1);
       return;
     }
@@ -110847,7 +111059,7 @@ Monitor with: spur workflow trace ${runId2} --follow`);
     if (options.answer !== undefined) {
       const v = String(options.answer).toLowerCase();
       if (v !== "yes" && v !== "no" && v !== "cancel") {
-        context4.output.error(`Invalid --answer value "${options.answer}" - must be yes, no, or cancel.`);
+        writeJsonError(context4.output, options, `Invalid --answer value "${options.answer}" - must be yes, no, or cancel.`, "VALIDATION_FAILED");
         context4.setExitCode(2);
         return;
       }
@@ -110861,7 +111073,7 @@ Monitor with: spur workflow trace ${runId2} --follow`);
       if (targetId === undefined) {
         const latest = await svc.latestPausedRun();
         if (latest === null) {
-          context4.output.error("No paused workflow run to continue.");
+          writeJsonError(context4.output, options, "No paused workflow run to continue.", "NOT_FOUND");
           context4.setExitCode(1);
           return;
         }
@@ -110874,7 +111086,7 @@ Monitor with: spur workflow trace ${runId2} --follow`);
             node: "continue"
           });
           if (answer.value !== "yes") {
-            context4.output.error(`Aborted - run ${latest.runId} not resumed.`);
+            writeJsonError(context4.output, options, `Aborted - run ${latest.runId} not resumed.`, "GUARD_DENIED");
             context4.setExitCode(1);
             return;
           }
@@ -110900,7 +111112,7 @@ Monitor with: spur workflow trace ${runId2} --follow`);
     const force = options.force === true;
     const minutes = force ? 0 : Number.parseInt(options.olderThan ?? "30", 10);
     if (!Number.isFinite(minutes) || minutes < 0) {
-      context4.output.error(`Invalid --older-than value: ${options.olderThan}`);
+      writeJsonError(context4.output, options, `Invalid --older-than value: ${options.olderThan}`, "VALIDATION_FAILED");
       context4.setExitCode(2);
       return;
     }
@@ -110945,7 +111157,7 @@ Monitor with: spur workflow trace ${runId2} --follow`);
       return;
     }
     if (result.status === "not_found") {
-      context4.output.error(`Run ${runId} not found.`);
+      writeJsonError(context4.output, options, `Run ${runId} not found.`, "NOT_FOUND");
       context4.setExitCode(1);
       return;
     }
@@ -110967,14 +111179,14 @@ Monitor with: spur workflow trace ${runId2} --follow`);
   });
   workflow.command("show").description("Render a workflow definition: mermaid FSM diagram (default) or declared-step todo checklist.").argument("<file>", "Workflow YAML file").option("--format <name>", "Projection to render: mermaid (default) or todo", "mermaid").option(...SHARED_OPTIONS.jsonSupported).action(async (file2, options) => {
     if (options.format !== "mermaid" && options.format !== "todo") {
-      context4.output.error(`workflow show: unknown --format '${options.format}' \u2014 expected mermaid or todo`);
+      writeJsonError(context4.output, options, `workflow show: unknown --format '${options.format}' \u2014 expected mermaid or todo`, "VALIDATION_FAILED");
       context4.setExitCode(1);
       return;
     }
     const resolved = resolveWorkflowFile(context4.cwd, file2);
     if (resolved.path === null) {
       const [probedProject, probedBundled] = resolved.probed;
-      context4.output.error(`workflow show: file not found: ${probedProject}${probedBundled !== null ? ` (bundled: ${probedBundled})` : ""}`);
+      writeJsonError(context4.output, options, `workflow show: file not found: ${probedProject}${probedBundled !== null ? ` (bundled: ${probedBundled})` : ""}`, "NOT_FOUND");
       context4.setExitCode(1);
       return;
     }
@@ -110983,7 +111195,7 @@ Monitor with: spur workflow trace ${runId2} --follow`);
     try {
       def = await loadWorkflowDef(filePath, { validateSchema: true });
     } catch (err) {
-      context4.output.error(`workflow show: cannot read or parse ${file2} \u2014 ${err instanceof Error ? err.message : String(err)}`);
+      writeJsonError(context4.output, options, `workflow show: cannot read or parse ${file2} \u2014 ${err instanceof Error ? err.message : String(err)}`, "VALIDATION_FAILED");
       context4.setExitCode(1);
       return;
     }
@@ -111011,38 +111223,38 @@ Monitor with: spur workflow trace ${runId2} --follow`);
     const svc = makeSvc();
     const last = parseInt(options.last, 10);
     if (Number.isNaN(last) || last < 1) {
-      context4.output.error("--last must be a positive integer");
+      writeJsonError(context4.output, options, "--last must be a positive integer", "VALIDATION_FAILED");
       context4.setExitCode(1);
       return;
     }
     const pollMs = parseInt(options.poll, 10);
     if (Number.isNaN(pollMs) || pollMs < 50) {
-      context4.output.error("--poll must be an integer of at least 50ms");
+      writeJsonError(context4.output, options, "--poll must be an integer of at least 50ms", "VALIDATION_FAILED");
       context4.setExitCode(1);
       return;
     }
     if (options.follow === true && runId === undefined) {
-      context4.output.error("--follow requires a run-id");
+      writeJsonError(context4.output, options, "--follow requires a run-id", "VALIDATION_FAILED");
       context4.setExitCode(1);
       return;
     }
     if (options.follow === true && options.json === true) {
-      context4.output.error("--follow is a human streaming mode and cannot be combined with --json");
+      writeJsonError(context4.output, options, "--follow is a human streaming mode and cannot be combined with --json", "VALIDATION_FAILED");
       context4.setExitCode(1);
       return;
     }
     if (options.output === true && options.follow !== true) {
-      context4.output.error("--output requires --follow");
+      writeJsonError(context4.output, options, "--output requires --follow", "VALIDATION_FAILED");
       context4.setExitCode(1);
       return;
     }
     if (options.output === true && options.json === true) {
-      context4.output.error("--output is a human streaming mode and cannot be combined with --json");
+      writeJsonError(context4.output, options, "--output is a human streaming mode and cannot be combined with --json", "VALIDATION_FAILED");
       context4.setExitCode(1);
       return;
     }
     if (options.status !== undefined && !["done", "failed", "running"].includes(options.status)) {
-      context4.output.error("--status must be one of: done, failed, running");
+      writeJsonError(context4.output, options, "--status must be one of: done, failed, running", "VALIDATION_FAILED");
       context4.setExitCode(1);
       return;
     }