@yemi33/minions 0.1.2370 → 0.1.2372

package/engine/cli.js

@@ -247,10 +247,10 @@ const CLI_COMMAND_DOCS = Object.freeze({
   kill:       { args: '',                      summary: 'Kill all active agents, reset to pending' },
   complete:   { args: '<dispatch-id>',         summary: 'Mark a dispatch as done' },
   cleanup:    { args: '',                      summary: 'Clean temp files, worktrees, zombies' },
-  'mcp-sync': { args: '',                      summary: 'Print harness propagation diagnostic (same source as `minions doctor --harness`; read-only, no writes)' },
-  doctor:     { args: '[--harness]',           summary: 'Check prerequisites and runtime health (--harness: print harness propagation diagnostic)' },
+  'mcp-sync': { args: '',                      summary: 'Print runtime harness inventory (same source as `minions doctor --harness`; read-only, no writes)' },
+  doctor:     { args: '[--harness]',           summary: 'Check prerequisites and runtime health (--harness: print runtime harness inventory)' },
   config:     { args: 'set-cli <R> [--model M]', summary: 'Persist defaultCli/defaultModel without starting' },
-  pr:         { args: 'comment <repo> <prNumber> --agent <id> --kind <k> [--wi <id>] [--resolved] [--harness-file <f>|--harness-json <j>] [--skill-skipped-file <f>|--skill-skipped-json <j>] [--body-file <f>|--body <text>]', summary: 'Post a marker-prepended PR comment via gh (ADO: --resolved posts pre-closed)' },
+  pr:         { args: 'comment <repo> <prNumber> --agent <id> --kind <k> [--wi <id>] [--resolved] [--body-file <f>|--body <text>]', summary: 'Post a marker-prepended PR comment via gh (ADO: --resolved posts pre-closed)' },
   bridge:     { args: 'status|health|enable|disable',         summary: 'Constellation bridge: toggle and inspect the read-only cross-repo feed' },
 });
 
@@ -413,111 +413,6 @@ function _applyRuntimeFlags({ cli, model, modelExplicit }) {
   return { warnings, applied: true };
 }
 
-// resolveHarnessUsedForComment(flags) — P-7a3c9e21. Turn the `minions pr comment`
-// harness flags into a grounded `harnessUsed` record suitable for the posters'
-// `harnessUsed` param (engine/gh-comment.js / engine/ado-comment.js), which fold
-// it via buildMinionsCommentBody -> buildHarnessUsedSection.
-//
-// Source precedence: `--harness-file <path>` (JSON on disk) wins over the inline
-// `--harness-json <json>` convenience; neither supplied -> returns undefined so
-// the comment body is byte-identical to today (no section). Read/parse failures
-// are HARD errors (process.exit(2) with the offending message) — never a silent
-// drop. Grounding uses the spawn-time `_harnessPropagated` manifest located by
-// dispatch id (explicit `--dispatch-id` -> else basename(MINIONS_COMPLETION_REPORT,
-// '.json')); an unresolvable manifest passes null, marking every entry
-// grounded:false — the honest "no record" state, not a fatal condition.
-function resolveHarnessUsedForComment(flags) {
-  const fileArg = flags['harness-file'];
-  const jsonArg = flags['harness-json'];
-
-  let raw;
-  if (fileArg !== undefined) {
-    try {
-      raw = fs.readFileSync(fileArg, 'utf8');
-    } catch (e) {
-      console.error(`error: could not read --harness-file ${fileArg}: ${e.message}`);
-      process.exit(2);
-    }
-  } else if (jsonArg !== undefined) {
-    raw = String(jsonArg);
-  } else {
-    return undefined;
-  }
-
-  let parsed;
-  try {
-    parsed = JSON.parse(raw);
-  } catch (e) {
-    const src = fileArg !== undefined ? `--harness-file ${fileArg}` : '--harness-json';
-    console.error(`error: invalid JSON in ${src}: ${e.message}`);
-    process.exit(2);
-  }
-
-  // Resolve the grounding manifest best-effort: explicit id -> completion-report
-  // basename. A missing/unresolvable manifest is non-fatal (groundHarnessUsed
-  // with null propagated marks everything grounded:false).
-  const dispatchId = flags['dispatch-id']
-    || path.basename(process.env.MINIONS_COMPLETION_REPORT || '', '.json')
-    || undefined;
-  let propagated = null;
-  if (dispatchId) {
-    try {
-      const dispatch = getDispatch();
-      for (const queue of ['active', 'completed', 'pending']) {
-        const list = Array.isArray(dispatch?.[queue]) ? dispatch[queue] : null;
-        if (!list) continue;
-        const found = list.find(d => d && d.id === dispatchId);
-        if (found && found._harnessPropagated) { propagated = found._harnessPropagated; break; }
-      }
-    } catch { propagated = null; }
-  }
-
-  return shared.groundHarnessUsed(parsed, propagated);
-}
-
-// resolveSkillSkippedForComment(flags) — W-mr287sc0000uc214. Turn the
-// `minions pr comment` skip flags into a canonical `{name, reason}` record for
-// the posters' `skillSkipped` param (engine/gh-comment.js / engine/ado-comment.js),
-// which fold it via buildMinionsCommentBody -> buildSkippedSkillSection into a
-// VISIBLE callout in the same comment as the verdict.
-//
-// Source precedence mirrors the harness resolver: `--skill-skipped-file <path>`
-// (JSON on disk) wins over the inline `--skill-skipped-json <json>`; neither
-// supplied -> returns undefined so the comment body is byte-identical to today
-// (no callout). Read/parse failures are HARD errors (process.exit(2)). Accepts
-// the raw `{name, reason}` shape or a `meta.skill` / `meta.review` wrapper; a
-// record with no non-empty `name` yields undefined (nothing to surface).
-function resolveSkillSkippedForComment(flags) {
-  const fileArg = flags['skill-skipped-file'];
-  const jsonArg = flags['skill-skipped-json'];
-
-  let raw;
-  if (fileArg !== undefined) {
-    try {
-      raw = fs.readFileSync(fileArg, 'utf8');
-    } catch (e) {
-      console.error(`error: could not read --skill-skipped-file ${fileArg}: ${e.message}`);
-      process.exit(2);
-    }
-  } else if (jsonArg !== undefined) {
-    raw = String(jsonArg);
-  } else {
-    return undefined;
-  }
-
-  let parsed;
-  try {
-    parsed = JSON.parse(raw);
-  } catch (e) {
-    const src = fileArg !== undefined ? `--skill-skipped-file ${fileArg}` : '--skill-skipped-json';
-    console.error(`error: invalid JSON in ${src}: ${e.message}`);
-    process.exit(2);
-  }
-
-  const { _extractSkillSkipped } = require('./comment-format');
-  return _extractSkillSkipped(parsed) || undefined;
-}
-
 const commands = {
   start(...startArgs) {
     // Apply --cli / --model fleet flags before any engine wiring touches
@@ -539,18 +434,6 @@ const commands = {
       throw err;
     }
 
-    // Startup state-file size guard (#1167): dispatch.json / cooldowns.json
-    // bloated past 100 MB silently OOMed V8 on JSON.parse at startup. Fail fast
-    // with an actionable message instead.
-    try {
-      for (const fp of [DISPATCH_PATH, path.join(ENGINE_DIR, 'cooldowns.json')]) {
-        shared.assertStateFileSize(fp);
-      }
-    } catch (stateErr) {
-      console.error('\n[engine] STARTUP ABORTED — ' + stateErr.message + '\n');
-      process.exit(78); // 78 = configuration error
-    }
-
     // Run preflight checks (warn but don't block — engine may still be useful)
     try {
       const { runPreflight, printPreflight } = require('./preflight');
@@ -667,10 +550,7 @@ const commands = {
       }
     } catch (err) { e.log('warn', `note-link backfill failed: ${err.message}`); }
 
-    // Backfill work_items.prd_item_id (the WI↔PRD-item FK) for rows that predate
-    // the dual-write stamp (#546) or that a JSON re-hydrate transiently zeroed.
-    // Set-based, only touches NULL FKs, no-op once everything is linked — safe on
-    // every boot. Lets the Phase-10 render join move off the feature-id string.
+    // Backfill work_items.prd_item_id for rows created before FK stamping.
     try {
       const fk = require('./prd-store').backfillWorkItemPrdItemIds();
       const filled = (fk.byWorkItemId || 0) + (fk.bySourcePlan || 0);
@@ -1211,22 +1091,7 @@ const commands = {
     const _watchedFiles = new Set();
     let _globalDebounce = null;
     function watchForWorkChanges() {
-      const filesToWatch = [
-        path.join(MINIONS_DIR, 'work-items.json'),
-        // dispatch.json excluded — it changes every tick, causing a feedback loop
-      ];
-      // Watch project-specific work-items.json
-      const { getProjects } = require('./shared');
-      for (const p of getProjects(config)) {
-        filesToWatch.push(shared.projectWorkItemsPath(p));
-      }
-      // Watch PRD files
-      const prdDir = path.join(MINIONS_DIR, 'prd');
-      try {
-        for (const f of fs.readdirSync(prdDir).filter(f => f.endsWith('.json'))) {
-          filesToWatch.push(path.join(prdDir, f));
-        }
-      } catch { /* optional */ }
+      const filesToWatch = [];
 
       for (const filePath of filesToWatch) {
         if (_watchedFiles.has(filePath)) continue;
@@ -1465,8 +1330,8 @@ const commands = {
     }
     const flagFields = [
       'claudeBareMode', 'claudeFallbackModel',
-      'copilotDisableBuiltinMcps', 'copilotSuppressAgentsMd', 'copilotStreamMode', 'copilotReasoningSummaries',
-      'harnessPropagateProjectLocal', 'claudePreApproveWorkspaceMcps', 'hermeticHarness',
+      'copilotDisableBuiltinMcps', 'copilotStreamMode', 'copilotReasoningSummaries',
+      'claudePreApproveWorkspaceMcps',
       'maxBudgetUsd', 'disableModelDiscovery',
       'ccUseWorkerPool',
     ];
@@ -1488,14 +1353,13 @@ const commands = {
     }
 
     console.log('');
-    const metrics = shared.safeJsonObj(path.join(ENGINE_DIR, 'metrics.json'));
+    const metrics = queries.getMetrics();
     const lifetimeCompleted = Object.entries(metrics).filter(([k]) => !k.startsWith('_')).reduce((sum, [, m]) => sum + (m.tasksCompleted || 0) + (m.tasksErrored || 0), 0);
     console.log(`Dispatch: ${dispatch.pending.length} pending | ${(dispatch.active || []).length} active | ${lifetimeCompleted} completed`);
     const pidSummary = summarizeActiveDispatchPids(dispatch.active || []);
     console.log(`Active dispatch PID files: ${pidSummary.live} live | ${pidSummary.dead} dead | ${pidSummary.missing} missing`);
 
-    const metricsPath = path.join(ENGINE_DIR, 'metrics.json');
-    const metricsData = safeJson(metricsPath);
+    const metricsData = queries.getMetrics();
     if (metricsData && Object.keys(metricsData).length > 0) {
       console.log('\nMetrics:');
       console.log(`  ${'Agent'.padEnd(12)} ${'Done'.padEnd(6)} ${'Err'.padEnd(6)} ${'PRs'.padEnd(6)} ${'Appr'.padEnd(6)} ${'Rej'.padEnd(6)} ${'Reviews'.padEnd(8)} ${'Cost'.padEnd(8)}`);
@@ -1989,7 +1853,7 @@ const commands = {
   doctor(...doctorArgs) {
     const { doctor, runHarnessDoctor } = require('./preflight');
     if (doctorArgs.includes('--harness')) {
-      // P-a3f9b2c1 — harness propagation diagnostic. See
+      // Read-only runtime harness inventory. See
       // docs/harness-propagation.md and the parallel branch in bin/minions.js.
       const ok = runHarnessDoctor(MINIONS_DIR);
       if (!ok) process.exit(1);
@@ -2086,19 +1950,9 @@ const commands = {
       console.log('Usage:');
       console.log('  GitHub: minions pr comment <repo> <prNumber> --agent <id> --kind <k> [--wi <id>] (--body-file <path> | --body <text>)');
       console.log('  ADO:    minions pr comment <prNumber> --host ado --ado-org <org> --ado-project <proj> --repo-id <id> --agent <id> --kind <k> [--wi <id>] (--body-file <path> | --body <text>)');
-      console.log('');
-      console.log('Optional harness self-report (folded into the collapsible "Harnesses used" section):');
-      console.log('  --harness-file <path>   JSON file with the { skills, mcpServers, commands, docs } record (wins over --harness-json)');
-      console.log('  --harness-json <json>   same record inline as a JSON string');
-      console.log('  --dispatch-id <id>      grounding manifest override (else basename of $MINIONS_COMPLETION_REPORT)');
-      console.log('');
-      console.log('Skipped in-scope project skill (folded in as a VISIBLE "⚠️ Skipped project skill" callout):');
-      console.log('  --skill-skipped-file <path>   JSON file with the { name, reason } skip record (wins over --skill-skipped-json)');
-      console.log('  --skill-skipped-json <json>   same record inline as a JSON string (also accepts a meta.skill/meta.review wrapper)');
       console.log('  --resolved              (ADO only) post the thread pre-resolved/closed — for non-actionable FYI/praise notes');
       console.log('');
-      console.log('Posts a PR comment with the hidden minions marker, the collapsible');
-      console.log('"Harnesses used" section, and the brand link folded in by the shared');
+      console.log('Posts a PR comment with the hidden minions marker and brand link folded in by the shared');
       console.log('builder — so engine classifiers identify agent-authored comments by');
       console.log('structure, and the body is byte-identical on GitHub (`gh pr comment`)');
       console.log('and Azure DevOps (REST `…/threads`).');
@@ -2162,18 +2016,6 @@ const commands = {
       process.exit(2);
     }
 
-    // P-7a3c9e21 — thread the consulted-sources footprint into both posters so
-    // the auto-folded "Harnesses used" <details> section the help already
-    // promises is actually rendered. Resolved once (host-neutral); absent flags
-    // -> undefined -> body byte-identical to today.
-    const harnessUsed = resolveHarnessUsedForComment(flags);
-
-    // W-mr287sc0000uc214 — thread the skipped-in-scope-project-skill self-report
-    // into both posters so it's surfaced as a VISIBLE callout in the same comment
-    // as the verdict (not buried in the completion-report JSON). Absent flags
-    // -> undefined -> body byte-identical to today.
-    const skillSkipped = resolveSkillSkippedForComment(flags);
-
     // ── Azure DevOps: <prNumber> --host ado --ado-org --ado-project --repo-id ──
     if (isAdo) {
       const [prNumberRaw] = positional;
@@ -2193,7 +2035,7 @@ const commands = {
       const orgBase = flags['org-base'] || `https://dev.azure.com/${adoOrg}`;
       const adoComment = require('./ado-comment');
       adoComment.postAdoPrComment({
-        orgBase, project, repositoryId, prNumber, body, agentId, kind, workItemId, harnessUsed, skillSkipped,
+        orgBase, project, repositoryId, prNumber, body, agentId, kind, workItemId,
         resolved: flags.resolved === true,
       }).then((result) => {
         if (result && result.threadId) {
@@ -2232,7 +2074,7 @@ const commands = {
 
     try {
       const result = ghComment.postPrComment({
-        repo, prNumber, body, agentId, kind, workItemId, harnessUsed, skillSkipped,
+        repo, prNumber, body, agentId, kind, workItemId,
       });
       if (result.output) console.log(result.output);
     } catch (e) {
@@ -2371,10 +2213,6 @@ module.exports = {
   _readDispatchPid: readDispatchPid,
   _normalizeSessionBranch: normalizeSessionBranch,
   _dispatchSessionBranch: dispatchSessionBranch,
-  // P-7a3c9e21 — harness-flag resolver exported for CLI-threading tests.
-  _resolveHarnessUsedForComment: resolveHarnessUsedForComment,
-  // W-mr287sc0000uc214 — skipped-project-skill flag resolver exported for tests.
-  _resolveSkillSkippedForComment: resolveSkillSkippedForComment,
   // W-mpcyvff6000pf828 (#2653) — heartbeat writer + factory exported for tests
   _writeHeartbeatNow: writeHeartbeatNow,
   _createHeartbeatInterval: createHeartbeatInterval,

package/engine/comment-format.js

@@ -1,48 +1,10 @@
 /**
  * engine/comment-format.js — platform-neutral PR-comment body fragments.
  *
- * Harness Transparency, Stage 3 readout #1 (P-e4b7a6d5). The other readouts —
- * the work-item modal (P-d5a6f7c4) and the notes/inbox digest — live in the
- * dashboard renderer and the consolidation path respectively. This module owns
- * the *PR-comment* surface.
- *
- * `buildHarnessUsedSection(harnessUsed)` renders the grounded harness-usage
- * record (the canonical `{ skills, mcpServers, commands, docs }` shape produced
- * by `shared.groundHarnessUsed` / `shared.normalizeHarnessUsed`; each entry may
- * carry `grounded: true | false`) as a collapsible Markdown `<details>` block.
- *
- * It is deliberately platform-NEUTRAL: the output is plain Markdown with no
- * GitHub- or ADO-specific syntax, so the GitHub comment path
- * (`engine/gh-comment.js buildMinionsCommentBody`) and the ADO comment path
- * (agent-authored via `az repos pr comment` per `playbooks/shared-rules.md`)
- * fold in a **byte-identical** section. Both consume this one helper — there is
- * no second renderer to drift.
- *
- * Returns '' when the record is absent, malformed, or has no renderable entries
- * so callers can append it unconditionally without emitting an empty section.
+ * Owns the platform-neutral Minions marker and brand-link formatting shared by
+ * GitHub and Azure DevOps comment transports.
  */
 
-// Kind metadata mirrors the dashboard work-item modal (P-d5a6f7c4,
-// dashboard/js/render-work-items.js): same four kinds, same icons, same
-// primary/secondary field mapping, so the PR-comment and modal readouts stay
-// visually consistent.
-const HARNESS_KINDS = [
-  { key: 'skills', icon: '\u{1F9E9}', primary: 'name', secondary: 'source' }, // 🧩
-  { key: 'mcpServers', icon: '\u{1F50C}', primary: 'name', secondary: 'scope' }, // 🔌
-  { key: 'commands', icon: '\u{2318}', primary: 'name', secondary: 'scope' }, // ⌘
-  { key: 'docs', icon: '\u{1F4C4}', primary: 'path', secondary: 'why' }, // 📄
-];
-
-const HARNESS_SUMMARY_ICON = '\u{1F9F0}'; // 🧰
-const HARNESS_WARN_ICON = '⚠️'; // ⚠️
-
-// W-mr287sc0000uc214 — the visible "skipped project skill" callout. The label is
-// a stable literal so buildMinionsCommentBody can dedupe (never stack two
-// callouts) and tests can assert on it. Clamps mirror the harness field caps.
-const SKILL_SKIPPED_LABEL = '**Skipped project skill:**';
-const SKILL_SKIPPED_MAX_NAME_LEN = 200;
-const SKILL_SKIPPED_MAX_REASON_LEN = 1000;
-
 // Canonical Minions site URL. shared-rules.md ("Brand link (MANDATORY)") requires
 // the human-readable "Minions" mention in a PR/ADO comment to render as a markdown
 // hyperlink to this destination. Keep this in sync with the literal in
@@ -76,118 +38,10 @@ function linkifyBrandTrailer(text) {
   return text.replace(BRAND_TRAILER_RE, `by [Minions](${MINIONS_BRAND_URL})`);
 }
 
-// Collapse internal whitespace/newlines to single spaces and neutralize
-// backticks so each entry renders on one line and can't break the inline-code
-// span. Values arrive already trimmed + length-clamped by normalizeHarnessUsed,
-// but may still contain internal newlines.
-function _clean(value) {
-  return String(value).replace(/`/g, "'").replace(/\s+/g, ' ').trim();
-}
-
-/**
- * Render the grounded harnessUsed record as a collapsible Markdown section.
- * @param {object|null} harnessUsed canonical { skills, mcpServers, commands, docs }
- * @returns {string} '' when empty, else a `<details>` block (no trailing newline)
- */
-function buildHarnessUsedSection(harnessUsed) {
-  if (!harnessUsed || typeof harnessUsed !== 'object' || Array.isArray(harnessUsed)) return '';
-
-  const lines = [];
-  let anyUngrounded = false;
-
-  for (const kind of HARNESS_KINDS) {
-    const entries = Array.isArray(harnessUsed[kind.key]) ? harnessUsed[kind.key] : [];
-    for (const entry of entries) {
-      if (!entry || typeof entry !== 'object') continue;
-      const primaryRaw = entry[kind.primary];
-      if (typeof primaryRaw !== 'string' || !primaryRaw.trim()) continue;
-      const primary = _clean(primaryRaw);
-
-      const grounded = entry.grounded === true;
-      if (!grounded) anyUngrounded = true;
-
-      const secondaryRaw = entry[kind.secondary];
-      const secondary = (typeof secondaryRaw === 'string' && secondaryRaw.trim())
-        ? _clean(secondaryRaw) : '';
-
-      const tail = secondary ? ` — ${secondary}` : ''; // em dash
-      const warn = grounded ? '' : ` ${HARNESS_WARN_ICON}`;
-      lines.push(`- ${kind.icon} \`${primary}\`${tail}${warn}`);
-    }
-  }
-
-  if (lines.length === 0) return '';
-
-  const legend = anyUngrounded
-    ? `\n\n> ${HARNESS_WARN_ICON} agent-reported, not verified by the engine`
-    : '';
-
-  return `<details>\n<summary>${HARNESS_SUMMARY_ICON} Harnesses used (${lines.length})</summary>\n\n`
-    + `${lines.join('\n')}${legend}\n\n</details>`;
-}
-
-/**
- * Extract a canonical `{ name, reason }` skip record from a self-reported skip
- * value. Accepts the raw `{ name, reason }` shape directly, or a `meta` wrapper
- * that carries it — `meta.skill` (`{ skipped: { name, reason } }`) or
- * `meta.review` (`{ skillSkipped: { name, reason } }`) — so callers can pass the
- * completion-report block verbatim. Returns null when no non-empty `name` is
- * present so callers treat "no skip" as a single falsy case.
- * @param {*} input
- * @returns {{name:string, reason:string}|null}
- */
-function _extractSkillSkipped(input) {
-  if (!input || typeof input !== 'object' || Array.isArray(input)) return null;
-  let node = input;
-  if (input.skipped && typeof input.skipped === 'object' && !Array.isArray(input.skipped)) {
-    node = input.skipped; // meta.skill shape
-  } else if (input.skillSkipped && typeof input.skillSkipped === 'object' && !Array.isArray(input.skillSkipped)) {
-    node = input.skillSkipped; // meta.review shape
-  }
-  const name = typeof node.name === 'string' ? node.name.trim() : '';
-  if (!name) return null;
-  const reason = typeof node.reason === 'string' ? node.reason.trim() : '';
-  return { name, reason };
-}
-
-/**
- * Render the "skipped project skill" self-report as a VISIBLE Markdown
- * blockquote callout (W-mr287sc0000uc214), e.g.:
- *   > ⚠️ **Skipped project skill:** `FMF-review-context` — small 2-file diff…
- *
- * A review/fix agent may self-report that it intentionally skipped an available,
- * in-scope project (review) skill via `meta.review.skillSkipped` /
- * `meta.skill.skipped` (shape `{name, reason}`). That skip used to live ONLY in
- * the completion-report JSON — invisible to a human reading the PR before merge.
- * This is a sibling of buildHarnessUsedSection (same neutral chokepoint, same
- * `_clean` hygiene) but a VISIBLE blockquote rather than a collapsed <details>:
- * the whole point is that a human reviewing the PR sees the skip rationale in the
- * same comment as the APPROVE / REQUEST_CHANGES verdict, before merge.
- *
- * Deliberately platform-NEUTRAL Markdown so the GitHub and ADO posters fold in a
- * byte-identical callout — there is no second renderer to drift. Accepts either
- * the raw `{name, reason}` record or a `meta.skill` / `meta.review` wrapper.
- *
- * Returns '' when the record is absent/malformed (no skip name), so callers can
- * append it unconditionally without emitting a stray callout — reports without
- * meta.review.skillSkipped / meta.skill.skipped render identically to today.
- *
- * @param {object|null} skillSkipped `{name, reason}` or a meta.skill/meta.review wrapper
- * @returns {string} '' when empty, else a one-line `> ⚠️ …` blockquote
- */
-function buildSkippedSkillSection(skillSkipped) {
-  const parsed = _extractSkillSkipped(skillSkipped);
-  if (!parsed) return '';
-  const name = _clean(parsed.name).slice(0, SKILL_SKIPPED_MAX_NAME_LEN);
-  const reasonClean = parsed.reason ? _clean(parsed.reason).slice(0, SKILL_SKIPPED_MAX_REASON_LEN) : '';
-  const tail = reasonClean ? ` — ${reasonClean}` : ''; // em dash
-  return `> ${HARNESS_WARN_ICON} ${SKILL_SKIPPED_LABEL} \`${name}\`${tail}`;
-}
-
 // ── Minions marker + neutral comment-body builder ───────────────────────────
 //
 // The hidden HTML-comment marker and the body composition (marker + harness
-// section + brand link) are platform-NEUTRAL: GitHub (engine/gh-comment.js) and
+// brand link) are platform-NEUTRAL: GitHub (engine/gh-comment.js) and
 // Azure DevOps (engine/ado-comment.js) both post the byte-identical body built
 // here, so there is one builder and no drift. The host modules own only the
 // transport (gh CLI vs ADO REST) and host-specific validation (repo slug vs
@@ -246,42 +100,21 @@ function _buildMarker({ agentId, kind, workItemId }) {
 }
 
 /**
- * Compose a minions PR-comment body: prepend the hidden marker, fold in the
- * collapsible "Harnesses used" section, and hyperlink the first bare brand
- * trailer. Platform-neutral — GitHub and ADO posters both call this.
+ * Compose a minions PR-comment body: prepend the hidden marker and hyperlink the
+ * first bare brand trailer. Platform-neutral — GitHub and ADO posters both call this.
  *
  * Idempotency: if `body` already starts with a minions marker it is returned
- * with the harness/brand transforms applied but no second marker prepended.
+ * with the brand transform applied but no second marker prepended.
  *
- * @param {{agentId:string, kind:string, workItemId?:string, body?:string, harnessUsed?:object, skillSkipped?:object}} args
+ * @param {{agentId:string, kind:string, workItemId?:string, body?:string}} args
  * @returns {string} the final comment body
  */
-function buildMinionsCommentBody({ agentId, kind, workItemId, body, harnessUsed, skillSkipped }) {
+function buildMinionsCommentBody({ agentId, kind, workItemId, body }) {
   // Validate the inputs even when the body is pre-marked, so callers can't
   // silently bypass validation by pre-marking their body.
   _validateMarkerInputs({ agentId, kind, workItemId });
   let safeBody = body == null ? '' : String(body);
 
-  // Fold in the VISIBLE "skipped project skill" callout (W-mr287sc0000uc214)
-  // BEFORE the collapsed harness section so a human sees the skip rationale in
-  // the same comment as the verdict — not buried in a <details> or reachable
-  // only via a separate API call. Dedup on the stable label so a re-marked body
-  // already carrying the callout doesn't stack a second one. Absent/malformed
-  // skip → '' → no-op (byte-identical to today).
-  const skipSection = buildSkippedSkillSection(skillSkipped);
-  if (skipSection && !safeBody.includes(SKILL_SKIPPED_LABEL)) {
-    safeBody = safeBody ? `${safeBody}\n\n${skipSection}` : skipSection;
-  }
-
-  // Fold the grounded harness-usage digest in as a collapsible <details>
-  // section. Append at the END so it survives the marker-idempotency path;
-  // dedup on the summary line so a re-marked body that already carries the
-  // section doesn't stack a second one.
-  const harnessSection = buildHarnessUsedSection(harnessUsed);
-  if (harnessSection && !safeBody.includes('<summary>\u{1F9F0} Harnesses used')) {
-    safeBody = safeBody ? `${safeBody}\n\n${harnessSection}` : harnessSection;
-  }
-
   // Brand-link safety net: deterministically hyperlink the first bare
   // "… by Minions" signature trailer (no-op when the agent already linked it).
   safeBody = linkifyBrandTrailer(safeBody);
@@ -307,8 +140,6 @@ function parseMinionsMarker(body) {
 }
 
 module.exports = {
-  buildHarnessUsedSection,
-  buildSkippedSkillSection,
   linkifyBrandTrailer,
   MINIONS_BRAND_URL,
   // Neutral marker + body builder (consumed by gh-comment.js and ado-comment.js).
@@ -322,9 +153,4 @@ module.exports = {
   // Internal helpers exported for tests / host posters.
   _buildMarker,
   _validateMarkerInputs,
-  // Exported for tests / advanced callers that want to mirror the kind mapping.
-  HARNESS_KINDS,
-  // W-mr287sc0000uc214 — skipped-project-skill callout helpers.
-  _extractSkillSkipped,
-  SKILL_SKIPPED_LABEL,
 };

package/engine/db/index.js

@@ -21,6 +21,45 @@ let _db = null;
 let _dbPath = null;
 let _dbInitError = null;
 let _exitCheckpointRegistered = false;
+let _cleanedDbPath = null;
+
+function _cleanupRetiredJsonFiles(db, dbPath) {
+  if (_cleanedDbPath === dbPath) return;
+  const marker = db.prepare("SELECT value FROM state_markers WHERE key='sql_only_cutover'").get();
+  if (!marker) return;
+  const minionsDir = path.dirname(path.dirname(dbPath));
+  const engineDir = path.join(minionsDir, 'engine');
+  const engineFiles = [
+    'dispatch.json', 'log.json', 'metrics.json', 'watches.json',
+    'schedule-runs.json', 'pipeline-runs.json', 'managed-processes.json',
+    'worktree-pool.json', 'qa-runs.json', 'qa-sessions.json', 'pr-links.json',
+    'cooldowns.json', 'pending-rebases.json', 'cc-sessions.json', 'doc-sessions.json',
+  ];
+  const targets = engineFiles.map(name => path.join(engineDir, name));
+  targets.push(path.join(minionsDir, 'work-items.json'), path.join(minionsDir, 'pull-requests.json'));
+  try {
+    for (const project of fs.readdirSync(path.join(minionsDir, 'projects'), { withFileTypes: true })) {
+      if (!project.isDirectory() || project.name === '.archived') continue;
+      targets.push(
+        path.join(minionsDir, 'projects', project.name, 'work-items.json'),
+        path.join(minionsDir, 'projects', project.name, 'pull-requests.json'),
+      );
+    }
+  } catch { /* projects directory is optional */ }
+  for (const dir of [path.join(minionsDir, 'prd'), path.join(minionsDir, 'prd', 'archive')]) {
+    try {
+      for (const name of fs.readdirSync(dir)) {
+        if (name.endsWith('.json')) targets.push(path.join(dir, name));
+      }
+    } catch { /* PRD directory is optional */ }
+  }
+  for (const target of targets) {
+    for (const suffix of ['', '.backup', '.lock']) {
+      try { fs.unlinkSync(target + suffix); } catch (e) { if (e.code !== 'ENOENT') throw e; }
+    }
+  }
+  _cleanedDbPath = dbPath;
+}
 
 // DATA-LOSS GUARD: register a one-time process-exit hook that checkpoints +
 // closes the DB. Registered by getDb() on first successful open so EVERY DB
@@ -68,14 +107,6 @@ function _installExperimentalWarningFilter() {
 }
 
 function getDb() {
-  // Hard opt-out (issue #3035, option #3): MINIONS_FORCE_JSON=1 makes
-  // every getDb() call throw, forcing the entire stack onto the JSON
-  // fallback path. Useful for users who can't enable
-  // --experimental-sqlite on Node 22.x and for regression tests that
-  // need to exercise the JSON-fallback branches deterministically.
-  if (process.env.MINIONS_FORCE_JSON === '1') {
-    throw new Error('engine/db: SQL disabled via MINIONS_FORCE_JSON=1');
-  }
   // Re-resolve the DB path on every call so tests that swap MINIONS_TEST_DIR
   // (or production-side configuration that changes MINIONS_HOME between
   // operations) get a fresh connection to the new location instead of
@@ -143,12 +174,13 @@ function getDb() {
     if (lastErr) throw lastErr;
     const { runMigrations } = require('./migrate');
     runMigrations(_db);
+    _cleanupRetiredJsonFiles(_db, dbPath);
     _registerExitCheckpoint();
     return _db;
   } catch (e) {
     const nodeMajor = parseInt(String(process.versions.node).split('.')[0], 10);
     const flagHint = nodeMajor === 22
-      ? ` On Node 22.x, node:sqlite is gated behind --experimental-sqlite. Restart with NODE_OPTIONS=--experimental-sqlite, upgrade to Node 24+, or set MINIONS_FORCE_JSON=1 to bypass SQL.`
+      ? ` On Node 22.x, node:sqlite is gated behind --experimental-sqlite. Restart with NODE_OPTIONS=--experimental-sqlite or upgrade to Node 24+.`
       : ` Node 22.5+ (with --experimental-sqlite on 22.x) or 24+ required for built-in 'node:sqlite' support.`;
     _dbInitError = new Error(`engine/db: failed to open SQLite — ${e.message}.${flagHint}`);
     throw _dbInitError;
@@ -200,4 +232,22 @@ function withTransaction(db, fn) {
   }
 }
 
-module.exports = { getDb, closeDb, withTransaction };
+// Cache compiled statements on the db connection itself so hot, fixed-shape
+// read paths (e.g. FTS5 memory search run repeatedly per dispatch) don't pay
+// SQLite's parse/plan cost on every call — `db.prepare()` recompiles from
+// scratch each time it's invoked, node:sqlite does not dedupe by text. Keyed
+// per-connection (not module-level) so closeDb()/getDb() reopening against a
+// new path (test isolation) naturally starts with an empty cache instead of
+// holding stale statements bound to a closed handle.
+function prepareCached(db, sql) {
+  if (!db) throw new Error('engine/db.prepareCached: db is required');
+  if (!db._minionsStmtCache) db._minionsStmtCache = new Map();
+  let stmt = db._minionsStmtCache.get(sql);
+  if (!stmt) {
+    stmt = db.prepare(sql);
+    db._minionsStmtCache.set(sql, stmt);
+  }
+  return stmt;
+}
+
+module.exports = { getDb, closeDb, withTransaction, prepareCached };