@yemi33/minions 0.1.2369 → 0.1.2371

package/engine/metrics-store.js

@@ -10,17 +10,6 @@
 //   applyMetricsMutation(fn)     -> mutator receives + returns the
 //                                    legacy-shape object; diff-then-apply
 //                                    into per-row UPSERT/DELETE
-//   _mirrorJsonFromSql(filePath) -> writes the SQL state back to
-//                                    metrics.json for legacy direct-readers
-//
-// Like work-items-store and pull-requests-store, an external-edit
-// detection layer (mtime tracking + resync) catches direct fs.writeFile
-// edits from tests or operators so the next read/mutation rebuilds SQL
-// from the JSON canonical state.
-
-const fs = require('fs');
-const path = require('path');
-
 // Reserved top-level keys → kind sentinel in the table.
 const RESERVED_KEYS = new Map([
   ['_engine', 'engine_category'],
@@ -33,50 +22,12 @@ const RESERVED_KEY_BY_KIND = new Map([
   ['context_pressure', '_contextPressure'],
 ]);
 
-function _metricsFilePath() {
-  const shared = require('./shared');
-  return path.join(shared.MINIONS_DIR, 'engine', 'metrics.json');
-}
-
 function _parseRow(row) {
   if (!row || !row.data) return null;
   try { return JSON.parse(row.data); }
   catch { return null; }
 }
 
-function _readJsonObjectFallback() {
-  const fp = _metricsFilePath();
-  let raw;
-  try { raw = fs.readFileSync(fp, 'utf8'); }
-  catch { return {}; }
-  try {
-    const parsed = JSON.parse(raw);
-    return (parsed && typeof parsed === 'object') ? parsed : {};
-  } catch (e) {
-    try {
-      // eslint-disable-next-line no-console
-      console.warn(`[metrics-store] corrupt JSON in ${fp}: ${e.message}`);
-    } catch { /* console may be wrapped */ }
-    return {};
-  }
-}
-
-// Content-hash fingerprint of the JSON mirror so external edits are
-// detected unambiguously. (mtime, size) is too coarse: ISO timestamps
-// have fixed byte length, so a `last_*` swap inside the same ms tick
-// preserves both axes. SHA-1 on a few-KB file is sub-ms.
-let _lastMirrorHash = null;
-
-const crypto = require('crypto');
-
-function _fileContentHash(filePath) {
-  try {
-    const buf = fs.readFileSync(filePath);
-    return crypto.createHash('sha1').update(buf).digest('hex');
-  }
-  catch { return null; }
-}
-
 // Convert legacy-shape metrics object into (kind, key, data) rows.
 function _flatten(metrics) {
   const out = [];
@@ -120,38 +71,6 @@ function _inflate(rows) {
   return out;
 }
 
-function _hydrateFromJson(db) {
-  const json = _readJsonObjectFallback();
-  db.prepare('DELETE FROM metrics').run();
-  const rows = _flatten(json);
-  if (rows.length === 0) return;
-  const now = Date.now();
-  const ins = db.prepare(`
-    INSERT INTO metrics (kind, key, data, updated_at)
-    VALUES (?, ?, ?, ?)
-    ON CONFLICT(kind, key) DO NOTHING
-  `);
-  for (const { kind, key, value } of rows) {
-    ins.run(kind, key, JSON.stringify(value), now);
-  }
-}
-
-function _resyncIfJsonDiverged(db) {
-  const jsonPath = _metricsFilePath();
-  const currentHash = _fileContentHash(jsonPath);
-  if (currentHash == null) return;
-  if (_lastMirrorHash != null && currentHash === _lastMirrorHash) return;
-  if (_lastMirrorHash == null) {
-    const sqlHas = db.prepare('SELECT 1 FROM metrics LIMIT 1').get();
-    if (sqlHas) {
-      _lastMirrorHash = currentHash;
-      return;
-    }
-  }
-  _hydrateFromJson(db);
-  _lastMirrorHash = currentHash;
-}
-
 function _readAllRows(db) {
   const raw = db.prepare('SELECT kind, key, data FROM metrics ORDER BY rowid').all();
   const rows = [];
@@ -163,26 +82,15 @@ function _readAllRows(db) {
   return rows;
 }
 
-// Read the full legacy-shape metrics object. Fall back to JSON when SQL
-// is empty AND JSON has content (mirrors the work-items-store fallback
-// for fresh installs + legacy test seeds).
+// Read the full legacy-shape metrics object from SQL.
 function readMetrics() {
   const { getDb } = require('./db');
-  let db;
-  try { db = getDb(); }
-  catch { return _readJsonObjectFallback(); }
+  const db = getDb();
 
   migrateWatchCcTriageKeysOnce();
 
-  _resyncIfJsonDiverged(db);
-
   const rows = _readAllRows(db);
-  if (rows.length === 0) {
-    const fallback = _readJsonObjectFallback();
-    if (fallback && Object.keys(fallback).length > 0) return fallback;
-    return {};
-  }
-  return _inflate(rows);
+  return rows.length === 0 ? {} : _inflate(rows);
 }
 
 function _indexByCompositeKey(rows) {
@@ -229,7 +137,7 @@ function _applyMetricsDiff(db, diff) {
   return true;
 }
 
-function applyMetricsMutation(mutator, options = {}) {
+function applyMetricsMutation(mutator) {
   const { getDb, withTransaction } = require('./db');
   let db;
   try { db = getDb(); }
@@ -238,7 +146,6 @@ function applyMetricsMutation(mutator, options = {}) {
   }
 
   return withTransaction(db, () => {
-    _resyncIfJsonDiverged(db);
     const beforeRows = _readAllRows(db);
     const beforeObj = _inflate(beforeRows);
     const beforeSnapshot = JSON.parse(JSON.stringify(beforeObj));
@@ -248,43 +155,13 @@ function applyMetricsMutation(mutator, options = {}) {
     const beforeRowsSnap = _flatten(beforeSnapshot);
     const diff = _computeMetricsDiff(beforeRowsSnap, afterRows);
     const wrote = _applyMetricsDiff(db, diff);
-    // W-mradg74d000rfd45 — phantom-record race fix: mirror the JSON
-    // sidecar INSIDE this same SQL write transaction, BEFORE it commits,
-    // instead of after (as the caller used to do post-return). Engine and
-    // dashboard are separate Node processes, each with its own in-memory
-    // mirror-hash cache; mirroring post-commit left a window where a
-    // sibling process could observe the newly committed SQL rows before
-    // the JSON file caught up and read stale/missing metrics from the
-    // sidecar. Mirroring pre-commit means "SQL committed" and "JSON
-    // mirror has the data" can never observably disagree across
-    // processes. Mirrors the work-items-store.js fix from PR #720.
-    if (wrote) {
-      try { _mirrorJsonFromSql(options.mirrorPath); } catch { /* best-effort — mirror failure must not block the SQL write */ }
-    }
     return { wrote, result: afterObj };
   });
 }
 
-function _mirrorJsonFromSql(filePath) {
-  try {
-    const shared = require('./shared');
-    const { getDb } = require('./db');
-    // Read SQL directly — bypass JSON fallback so a mutation that
-    // empties all metrics rows doesn't resurrect stale JSON content.
-    const obj = _inflate(_readAllRows(getDb()));
-    const target = filePath || _metricsFilePath();
-    shared.safeWrite(target, obj);
-    const h = _fileContentHash(target);
-    if (h != null) _lastMirrorHash = h;
-  } catch {
-    // Mirror failures are non-fatal — SQL has already committed.
-  }
-}
-
 function _resetMetricsTableForTest() {
   const { getDb } = require('./db');
   try { getDb().exec('DELETE FROM metrics'); } catch { /* not initialized */ }
-  _lastMirrorHash = null;
 }
 
 // W-mrb1a3950003d9ea — one-time collapse of legacy `watch-cc-triage:<watchId>`
@@ -351,7 +228,6 @@ function _resetWatchCcTriageMigrationFlagForTest() {
 module.exports = {
   readMetrics,
   applyMetricsMutation,
-  _mirrorJsonFromSql,
   _resetMetricsTableForTest,
   migrateWatchCcTriageKeys,
   migrateWatchCcTriageKeysOnce,

package/engine/pipeline.js

@@ -575,13 +575,11 @@ const _VALID_EXISTING_PRD_STATUSES = new Set(Object.values(PLAN_STATUS));
 // a usable PRD. Require both a recognized top-level status AND an array
 // `missing_features` field before counting the PRD as an existing conversion.
 function _findExistingPrdForPlan(planFile, prdDir) {
-  if (!fs.existsSync(prdDir)) return null;
-  const prdFiles = safeReadDir(prdDir).filter(f => f.endsWith('.json'));
+  const prdFiles = require('./prd-store').listPrdRows().filter(row => !row.archived);
   const planKey = _canonicalPlanName(planFile);
-  for (const pf of prdFiles) {
+  for (const { filename: pf, plan: prd } of prdFiles) {
     // safeJsonNoRestore: PRDs are terminal artifacts — never restore archived
     // PRDs from a stale .backup sidecar (W-mouptdh1000h9f39).
-    const prd = safeJsonNoRestore(path.join(prdDir, pf));
     if (!prd?.source_plan || _canonicalPlanName(path.basename(String(prd.source_plan))) !== planKey) continue;
     if (!(_VALID_EXISTING_PRD_STATUSES.has(prd.status) || isPrdArchived(prd)) || !Array.isArray(prd.missing_features)) {
       log('warn', `Pipeline plan-to-prd: found PRD "${pf}" for plan "${planFile}" but it lacks a valid status/missing_features (garbage/incomplete conversion) — treating plan-to-prd as not yet done`);
@@ -992,12 +990,11 @@ function isStageComplete(stage, stageState, run, config) {
       const plans = artifacts.plans || [];
       const discoveredPrds = [];
       const discoveredWiIds = [];
-      const prdFiles = fs.existsSync(prdDir) ? safeReadDir(prdDir).filter(f => f.endsWith('.json')) : [];
+      const prdRows = require('./prd-store').listPrdRows().filter(row => !row.archived);
       for (const planFile of plans) {
         const planKey = _canonicalPlanName(planFile);
-        for (const pf of prdFiles) {
+        for (const { filename: pf, plan: prd } of prdRows) {
           // safeJsonNoRestore — see _findExistingPrdForPlan above (W-mouptdh1000h9f39).
-          const prd = safeJsonNoRestore(path.join(prdDir, pf));
           // Canonical match: a collision-bumped run plan (<name>-<date>-2.md)
           // still links to the PRD written for <name>-<date>.md, so the stage's
           // autoApprove reaches the PRD instead of stranding it awaiting-approval.

package/engine/playbook.js

@@ -5,12 +5,14 @@
  */
 
 const fs = require('fs');
-const os = require('os');
 const path = require('path');
 const shared = require('./shared');
 const queries = require('./queries');
 const { wrapUntrusted, buildSource } = require('./untrusted-fence');
 const { MINIONS_BRAND_URL } = require('./comment-format');
+const features = require('./features');
+const memoryRetrieval = require('./memory-retrieval');
+const memoryStore = require('./memory-store');
 
 const { safeJsonArr, safeRead, getProjects, log, ts, dateStamp, truncateTextBytes, ENGINE_DEFAULTS, WI_STATUS, WORK_TYPE, PR_STATUS, DISPATCH_RESULT, getProjectOrg } = shared;
 const { getConfig, getDispatch, getNotes, getPrs, getKnowledgeBaseIndex, AGENTS_DIR } = queries;
@@ -78,7 +80,7 @@ function getPrCommentInstructions(project) {
   const repoName = project?.repoName || '';
   const adoOrg = getProjectOrg(project);
   const adoProject = project?.adoProject || '<ado-project>';
-  return `Post the comment via \`minions pr comment --host ado\` (preferred) — it prepends the hidden \`<!-- minions:agent=… kind=… -->\` marker, folds in the "Harnesses used" section, and hyperlinks the Minions brand mention for you, exactly like the GitHub path:\n` +
+  return `Post the comment via \`minions pr comment --host ado\` (preferred) — it prepends the hidden \`<!-- minions:agent=… kind=… -->\` marker and hyperlinks the Minions brand mention for you, exactly like the GitHub path:\n` +
     `- \`minions pr comment <number> --host ado --ado-org ${adoOrg} --ado-project ${adoProject} --repo-id ${repoId || '<repo-id>'} --agent <your-agent-id> --kind <kind> [--wi <work-item-id>] --body-file <body-file.md>\`\n` +
     `- Pick \`--kind\` from: \`review-decision\` | \`verify-report\` | \`rebase-report\` | \`positive-signal\` | \`fix-summary\` | \`other\`\n` +
     `- Use --body-file so Markdown, quotes, and newlines pass safely\n\n` +
@@ -128,7 +130,6 @@ function getPrVoteInstructions(project, config) {
       "<your review body here>\n" +
       "```\n" +
       `Then run: \`gh pr review <number> --comment --body-file <verdict.md> --repo ${org}/${repo}\`. Do NOT use \`--approve\` or \`--request-changes\` flags — they will fail.\n\n` +
-      `When you author the summary body, append the collapsible **"Harnesses used"** \`<details>\` section described in the shared rules (mirror of your \`harnessUsed\` completion field) so reviewers see which skills / MCPs / docs informed the change; omit it when you used none.\n\n` +
       `**Brand link:** whenever the body names "Minions" (e.g. the \`Reviewed by Minions (…)\` sign-off), render it as \`[Minions](${MINIONS_BRAND_URL})\` per the shared rules. On the GitHub path the engine also auto-links the first bare \`… by Minions\` trailer as a backstop (\`engine/comment-format.js#linkifyBrandTrailer\`), but write the link yourself so the first occurrence is correct.`;
   }
   // Azure DevOps — prefer `az` CLI first, ADO REST API as fallback.
@@ -140,16 +141,14 @@ function getPrVoteInstructions(project, config) {
   const autoApplyReviewVote = config?.engine?.autoApplyReviewVote ?? ENGINE_DEFAULTS.autoApplyReviewVote;
   if (!autoApplyReviewVote) {
     return `**Do NOT cast a platform reviewer vote.** The operator has "Auto-apply review vote to PR" disabled, so Minions record verdicts as comments only — the human casts the final vote. Do NOT run \`az repos pr set-vote\` or PUT a reviewer vote via the REST API.\n\n` +
-      `Post your verdict as a thread comment. **Preferred:** \`minions pr comment <number> --host ado --ado-org ${getProjectOrg(project)} --ado-project ${project?.adoProject || '<ado-project>'} --repo-id ${repoId || '<repo-id>'} --agent <your-agent-id> --kind review-decision [--wi <work-item-id>] --body-file <verdict.md>\` (applies the marker + harness section + brand link for you). Fallback: \`az repos pr comment create --pull-request-id <number> --content @<verdict.md>\`\n\n` +
+      `Post your verdict as a thread comment. **Preferred:** \`minions pr comment <number> --host ado --ado-org ${getProjectOrg(project)} --ado-project ${project?.adoProject || '<ado-project>'} --repo-id ${repoId || '<repo-id>'} --agent <your-agent-id> --kind review-decision [--wi <work-item-id>] --body-file <verdict.md>\` (applies the marker + brand link for you). Fallback: \`az repos pr comment create --pull-request-id <number> --content @<verdict.md>\`\n\n` +
       `The verdict body file's first non-marker line MUST be \`VERDICT: APPROVE\` or \`VERDICT: REQUEST_CHANGES\` — the engine parses this to record your verdict in local state.\n\n` +
-      `When you author the comment body, append the collapsible **"Harnesses used"** \`<details>\` section described in the shared rules (mirror of your \`harnessUsed\` completion field); omit it when you used none.\n\n` +
       `**Brand link:** whenever the body names "Minions" (e.g. the \`Reviewed by Minions (…)\` sign-off), render it as \`Reviewed by [Minions](${MINIONS_BRAND_URL}) (…)\` per the shared rules. \`minions pr comment --host ado\` auto-links the first bare \`… by Minions\` trailer for you; the raw \`az repos pr comment\` fallback does NOT, so if you use it you MUST link it yourself.`;
   }
   return `For Azure DevOps, use the \`az\` CLI first to set your reviewer vote:\n` +
     `- \`az repos pr set-vote --id <number> --vote {approve | approve-with-suggestions | reject | reset | wait-for-author}\`\n` +
-    `- Pair the vote with a thread comment. **Preferred:** \`minions pr comment <number> --host ado --ado-org ${getProjectOrg(project)} --ado-project ${project?.adoProject || '<ado-project>'} --repo-id ${repoId || '<repo-id>'} --agent <your-agent-id> --kind review-decision [--wi <work-item-id>] --body-file <verdict.md>\` (applies the marker + harness section + brand link for you). Fallback: \`az repos pr comment create --pull-request-id <number> --content @<verdict.md>\`\n\n` +
+    `- Pair the vote with a thread comment. **Preferred:** \`minions pr comment <number> --host ado --ado-org ${getProjectOrg(project)} --ado-project ${project?.adoProject || '<ado-project>'} --repo-id ${repoId || '<repo-id>'} --agent <your-agent-id> --kind review-decision [--wi <work-item-id>] --body-file <verdict.md>\` (applies the marker + brand link for you). Fallback: \`az repos pr comment create --pull-request-id <number> --content @<verdict.md>\`\n\n` +
     `If \`az\` is unavailable, fall back to the ADO REST API: get a token with \`az account get-access-token --resource 499b84ac-1321-427f-aa17-267ca6975798 --query accessToken -o tsv\` and \`PUT .../_apis/git/repositories/${repoId}/pullrequests/<number>/reviewers/<reviewerId>?api-version=7.1\` with body \`{"vote":10}\` (10=approve, 5=approve-with-suggestions, 0=no-vote, -5=wait-for-author, -10=reject; Bearer auth). Do not use \`gh\` for Azure DevOps repositories.\n\n` +
-    `When you author the comment body, append the collapsible **"Harnesses used"** \`<details>\` section described in the shared rules (mirror of your \`harnessUsed\` completion field) so reviewers see which skills / MCPs / docs informed the change; render it identically to the GitHub path and omit it when you used none.\n\n` +
     `**Brand link:** whenever the body names "Minions" (e.g. the \`Reviewed by Minions (…)\` sign-off), render it as \`Reviewed by [Minions](${MINIONS_BRAND_URL}) (…)\` per the shared rules. \`minions pr comment --host ado\` auto-links the first bare \`… by Minions\` trailer for you (same backstop as GitHub); the raw \`az repos pr comment\` / REST fallbacks do NOT, so if you use those you MUST link it yourself.`;
 }
 
@@ -343,12 +342,6 @@ const PLAYBOOK_OPTIONAL_VARS = new Set([
   // PR-context vars on non-PR tasks (implement/explore/etc.)
   'pr_id', 'pr_number', 'pr_title', 'pr_branch', 'pr_author', 'pr_url',
   'reviewer',
-  // W-mq16xtdx001a347e — review dispatches inject this block (or empty string
-  // when discovery finds no project-local review skills). Optional because
-  // non-review playbooks never reference it and review-against-skill-less
-  // projects legitimately resolve it to ''.
-  'project_review_skills_block',
-  'skip_project_review_skills',
   // W-mq5l3f2u000i9045 — opt-out flag for the PR description audit + screenshot
   // refresh fragment inlined into fix.md / implement.md. Truthy (set when
   // item.meta.skipDescriptionAudit is true) renders the "audit suppressed"
@@ -389,26 +382,6 @@ const PLAYBOOK_OPTIONAL_VARS = new Set([
   'role',                  // 'primary' | 'co-service'
   'primary_project',       // canonical primary project name; empty on single-project sessions
   'co_services_json',      // JSON-encoded co-service project names (e.g. ["api","worker"]); empty when none
-  // W-mq16xtdx001a347e (PR-82) — project-local review-skill discovery vars.
-  // Always rendered (empty string when no discoveries); listed here so the
-  // unresolved-var check doesn't complain when discovery returns nothing or
-  // projects legitimately resolve it to ''.
-  'project_review_skills_block',
-  'skip_project_review_skills',
-  // W-mq1cczi90006b21f — generic, intent-filtered project skills block.
-  // Spliced by review/fix/implement/plan/etc. when discovery + intent map
-  // produce matches. Optional for the same reason as the review-only alias.
-  'project_skills_block',
-  'skip_project_skills',
-  // P-f52d81ba — monorepo-aware harness scoping. The engine derives a dominant
-  // sub-project for the dispatch (explicit meta.workdir first segment, or
-  // detectDominantSubproject over the current dispatch's changed paths) and threads
-  // it here so playbook.js can pass it as `scopeSubproject` into project-skill
-  // discovery. Optional with an empty-string default: single-root projects and
-  // mixed/root diffs legitimately resolve it to '' (flat discovery), and no
-  // playbook references {{dominant_subproject}} directly, so the unresolved-var check
-  // must stay quiet when it is unset.
-  'dominant_subproject',
   // M006 — typed handoff envelope fields. Set on a follow-up dispatch meta
   // when lifecycle.js queues the item after a completing agent so the
   // receiving agent has explicit context about who handed off and why.
@@ -716,10 +689,61 @@ function renderPlaybook(type, vars) {
     inertAppendices.push('\n\n---\n\n## Pinned Context (CRITICAL — READ FIRST)\n\n' + (fenced || pinnedContent));
   }
 
+  // Structured memory rollout is deliberately two-stage. The feature flag
+  // turns retrieval on; shadow mode (default) records selection telemetry but
+  // leaves the legacy notes/personal-memory prompt unchanged. Once shadow mode
+  // is disabled, a non-empty bounded retrieval pack replaces those broad
+  // appendices. Pinned operator context always remains fully visible.
+  let relevantMemoryInjected = false;
+  if (features.isFeatureOn('memoryRetrieval', configEarly)) {
+    const engineConfig = configEarly.engine || {};
+    const shadow = engineConfig.memoryRetrievalShadowMode ?? ENGINE_DEFAULTS.memoryRetrievalShadowMode;
+    try {
+      const retrieved = memoryRetrieval.retrieveRelevantMemory({
+        workItemId: vars.item_id || vars.task_id || '',
+        title: vars.item_name || vars.pr_title || '',
+        description: vars.item_description || vars.task_description || vars.pr_description || '',
+        type: vars.work_type || type,
+        project: projectName || '',
+        agent: vars.agent_id || '',
+        failureClass: vars.failure_class || '',
+        sourcePlan: vars.source_plan || '',
+        references: vars.references || '',
+        prTitle: vars.pr_title || '',
+        prBranch: vars.pr_branch || '',
+      }, {
+        topK: engineConfig.memoryRetrievalTopK ?? ENGINE_DEFAULTS.memoryRetrievalTopK,
+        maxBytes: engineConfig.memoryRetrievalMaxBytes ?? ENGINE_DEFAULTS.memoryRetrievalMaxBytes,
+        candidateLimit: engineConfig.memoryRetrievalCandidateLimit ?? ENGINE_DEFAULTS.memoryRetrievalCandidateLimit,
+      });
+      memoryStore.recordRetrievalRun({
+        workItemId: vars.item_id || vars.task_id || null,
+        project: projectName,
+        agent: vars.agent_id || null,
+        query: retrieved.query,
+        candidateCount: retrieved.candidates.length,
+        selectedCount: retrieved.selected.length,
+        selectedBytes: retrieved.bytes,
+        durationMs: retrieved.durationMs,
+        shadow,
+      });
+      if (!shadow && retrieved.text) {
+        const fenced = wrapUntrusted(
+          retrieved.text,
+          buildSource('memory-retrieval', { item: vars.item_id || vars.task_id || 'unknown' })
+        );
+        inertAppendices.push('\n\n---\n\n## Relevant Memory (task-selected; verify against live code)\n\n' + (fenced || retrieved.text));
+        relevantMemoryInjected = true;
+      }
+    } catch (e) {
+      log('warn', `Memory retrieval failed for ${vars.item_id || vars.task_id || type}; using legacy memory: ${e.message}`);
+    }
+  }
+
   // Inject team notes (single injection point — not in buildAgentContext) — capped via ENGINE_DEFAULTS.
   // F5: wrap in <UNTRUSTED-INPUT> fence — notes.md is an LLM-consolidated mix
   // of agent inbox notes (semi-trusted) and human edits.
-  let notes = getNotes();
+  let notes = relevantMemoryInjected ? '' : getNotes();
   if (notes) {
     if (Buffer.byteLength(notes, 'utf8') > ENGINE_DEFAULTS.maxNotesPromptBytes) {
       const sections = notes.split(/(?=^### )/m);
@@ -738,7 +762,7 @@ function renderPlaybook(type, vars) {
   // notes budget; missing file degrades gracefully (silent skip).
   // F5: fence — agent-authored inbox notes routed into this file; any agent
   // could include attacker-controlled quoted material.
-  const agentIdForMemory = vars.agent_id;
+  const agentIdForMemory = relevantMemoryInjected ? '' : vars.agent_id;
   if (agentIdForMemory && /^[a-z][a-z0-9-]{0,40}$/i.test(agentIdForMemory) && !String(agentIdForMemory).toLowerCase().startsWith('temp-')) {
     const agentMemRel = `knowledge/agents/${String(agentIdForMemory).toLowerCase()}.md`;
     const agentMemPath = path.join(MINIONS_DIR, agentMemRel);
@@ -807,78 +831,6 @@ function renderPlaybook(type, vars) {
     } catch (e) { log('warn', `managed-spawn live-processes inject failed: ${e.message}`); }
   }
 
-  // W-mq16xtdx001a347e (PR #82) + W-mq1cczi90006b21f (generalization) —
-  // surface project-local skills relevant to the playbook being dispatched.
-  //
-  // PR-82 hard-scoped this to type === 'review'. This wiring generalizes it:
-  //   1. Discovery walks every project skill / command / documented slash-
-  //      command (engine/discover-project-skills.js).
-  //   2. engine/playbook-intents.js maps playbook → intent set.
-  //   3. Discovered entries are filtered to the playbook's intent set and
-  //      rendered into `project_skills_block`. Empty intent set or zero
-  //      matches → empty string (no stray header).
-  //
-  // Header copy: review dispatches keep PR-82's "## Project review skills"
-  // header (existing agents/tests grep for it). All other playbooks use the
-  // generalized "## Project skills" header.
-  //
-  // Backward-compat: `project_review_skills_block` and
-  // `vars.skip_project_review_skills` remain wired so external consumers of
-  // the PR-82 names keep working. They alias to the generic var/flag.
-  const skipProjectSkills = !!(vars.skip_project_skills || vars.skip_project_review_skills);
-  let projectSkillsBlock = '';
-  if (!skipProjectSkills) {
-    try {
-      const discover = require('./discover-project-skills');
-      const { intentsForPlaybook } = require('./playbook-intents');
-      const projectPath = matchedProject?.localPath || '';
-      if (projectPath) {
-        // Inherit intent set from parent dispatch type when the engine
-        // passes vars.parent_dispatch_type (followup-dispatch flow).
-        const effectiveType = vars.parent_dispatch_type || type;
-        const intents = intentsForPlaybook(effectiveType);
-        if (intents.length > 0) {
-          // P-f52d81ba — monorepo-aware scoping. When the engine derived a
-          // dominant sub-project for this dispatch (git diff / PR files /
-          // references → detectDominantSubproject, threaded in via vars.dominant_subproject),
-          // surface that sub-project's skills FIRST. Empty/unset ⇒ today's flat
-          // global name-sort. Use the diagnostics variant so per-surface
-          // overflow (entries dropped past the maxFilesPerSurface cap) is
-          // observable instead of silent.
-          const scopeSubproject = typeof vars.dominant_subproject === 'string' ? vars.dominant_subproject : '';
-          const { entries, truncations } = discover.discoverProjectSkillsWithDiagnostics({
-            projectPath,
-            scopeSubproject,
-            opts: { maxFilesPerSurface: ENGINE_DEFAULTS.projectSkillMaxFilesPerSurface },
-          });
-          if (Array.isArray(truncations) && truncations.length > 0) {
-            log('warn', `discover-project-skills: ${truncations.length} surface(s) exceeded maxFilesPerSurface (entries dropped) for project ${matchedProject?.name || projectPath}${scopeSubproject ? ', subproject=' + scopeSubproject : ''}: ${truncations.map(t => `${t.dir} (${t.scanned}/${t.total})`).join('; ')}`);
-          }
-          // Stash discovery diagnostics on the vars object so the engine
-          // caller (spawnAgent) can record detected sub-project + truncations onto
-          // the dispatch record for later grounding/observability. Best-effort:
-          // callers that don't read it simply ignore the field.
-          vars._discoveryDiagnostics = { subproject: scopeSubproject, truncations: Array.isArray(truncations) ? truncations : [] };
-          const filtered = discover.filterByIntents(entries, intents);
-          // type === 'review' keeps PR-82 header copy + meta.review.* outcome
-          // guidance; everything else uses the generic header that points at
-          // meta.skill.* in the completion report.
-          projectSkillsBlock = (type === WORK_TYPE.REVIEW)
-            ? discover.renderReviewSkillsBlock(filtered)
-            : discover.renderProjectSkillsBlock(filtered);
-        }
-      }
-    } catch (e) {
-      log('warn', `discover-project-skills failed: ${e.message}`);
-    }
-  }
-  vars.project_skills_block = projectSkillsBlock;
-  // Backward-compat alias for any consumer that still references
-  // {{project_review_skills_block}} directly. Same content; cheaper than
-  // re-rendering. Non-review playbooks that don't reference the alias
-  // ignore it (it's in PLAYBOOK_OPTIONAL_VARS).
-  vars.project_review_skills_block = projectSkillsBlock;
-
   // W-mpeiwz6k0005bf34-c — opt-in qa-validate context block. Injected only
   // when the dispatcher set vars.qa_run_id (truthy) from the work item's
   // `meta.qaRunId`. Mirrors the managed_spawn hint pattern: the playbook is
@@ -1134,72 +1086,13 @@ function buildSystemPrompt(agentId, config, project) {
   return { prompt, warnings: [] };
 }
 
-// E2.b (W-mp7goxe4000p75f7): build the `## Existing Skills (do not duplicate)`
-// section for buildAgentContext. Lists name + first-line description for every
-// personal-scope/installed-plugin skill discovered by queries.getSkills().
-// Caps at ~2KB by truncating alphabetically with a "_...and N more_" tail.
-// Returns '' when there are no personal-scope skills to advertise.
-const EXISTING_SKILLS_MAX_BYTES = 2048;
-const PERSONAL_SKILL_SCOPES = new Set(['claude-code', 'copilot', 'agent-skill', 'plugin', 'copilot-plugin']);
-
-function _buildExistingSkillsSection(config) {
-  let skills;
-  try {
-    skills = queries.getSkills(config) || [];
-  } catch { return ''; }
-  const personal = skills
-    .filter(s => PERSONAL_SKILL_SCOPES.has(s.scope))
-    .map(s => ({
-      name: String(s.name || '').trim(),
-      description: String(s.description || '').split('\n')[0].trim(),
-    }))
-    .filter(s => s.name)
-    .sort((a, b) => a.name.localeCompare(b.name));
-  if (personal.length === 0) return '';
-
-  const header = `## Existing Skills (do not duplicate)\n\nThese personal-scope skills already exist on disk. Do NOT emit a \`\`\`skill block whose name duplicates or near-duplicates one of these — the engine will flag it for human review and skip the write.\n\n`;
-  const lines = personal.map(s => s.description ? `- ${s.name} — ${s.description}` : `- ${s.name}`);
-
-  let body = lines.join('\n') + '\n\n';
-  if (Buffer.byteLength(header + body, 'utf8') <= EXISTING_SKILLS_MAX_BYTES) {
-    return header + body;
-  }
-
-  // Truncate alphabetically until we fit, leaving room for the tail line.
-  let kept = lines.length;
-  while (kept > 0) {
-    const dropped = lines.length - kept;
-    const tail = `_...and ${dropped} more (alphabetical truncation; full list on disk)_\n\n`;
-    body = lines.slice(0, kept).join('\n') + '\n' + tail;
-    if (Buffer.byteLength(header + body, 'utf8') <= EXISTING_SKILLS_MAX_BYTES) {
-      return header + body;
-    }
-    kept--;
-  }
-  // Pathological: header alone exceeds the cap. Return at least the header
-  // with a tail showing every skill was dropped, so the agent still sees the
-  // section heading.
-  return header + `_...and ${lines.length} more (alphabetical truncation; full list on disk)_\n\n`;
-}
-
-// Bulk context: history, notes, conventions, skills — prepended to user/task prompt.
+// Bulk Minions context: history, notes, and orchestration state prepended to
+// the user/task prompt. Repository harness discovery remains runtime-native.
 // This is the content that grows over time and would bloat the system prompt.
 function buildAgentContext(agentId, config, project) {
   project = project || getProjects(config)[0] || {};
   let context = '';
 
-  function appendContextFile(heading, filePath, maxBytes, extra = '') {
-    if (!filePath) return;
-    const content = safeRead(filePath);
-    if (!content || !content.trim()) return;
-    const truncated = Buffer.byteLength(content, 'utf8') > maxBytes
-      ? truncateTextBytes(content, maxBytes, '\n\n_...truncated; read the full file if needed_')
-      : content;
-    context += `## ${heading}\n\n`;
-    if (extra) context += `${extra}\n\n`;
-    context += `${truncated}\n\n`;
-  }
-
   function appendIndex(heading, body, maxBytes) {
     if (!body || !String(body).trim()) return;
     const truncated = Buffer.byteLength(body, 'utf8') > maxBytes
@@ -1218,28 +1111,9 @@ function buildAgentContext(agentId, config, project) {
     const trimmed = (header ? header + '\n' : '') + recent.join('');
     context += `## Your Recent History (last 5 tasks)\n\n${trimmed}\n\n`;
   }
-
-  // Project conventions and instruction files — explicit, inert context for
-  // every runtime. Runtime-native skills/commands stay in their native indexes.
-  if (project.localPath) {
-    appendContextFile('Project Conventions (from CLAUDE.md)', path.join(project.localPath, 'CLAUDE.md'), 8192);
-    appendContextFile('Project Agent Instructions (from AGENTS.md)', path.join(project.localPath, 'AGENTS.md'), 8192,
-      'These instructions are explicitly injected because some runtimes suppress automatic AGENTS.md loading. Follow them unless they conflict with the Minions task contract or playbook.');
-    appendContextFile('Project Copilot Instructions (from .github/copilot-instructions.md)', path.join(project.localPath, '.github', 'copilot-instructions.md'), 8192,
-      'Follow these repository instructions unless they conflict with the Minions task contract or playbook.');
-  }
-
-  appendContextFile('User Claude Instructions (from ~/.claude/CLAUDE.md)', path.join(os.homedir(), '.claude', 'CLAUDE.md'), 8192,
-    'These are the user-level Claude Code instructions available in regular Claude usage. Follow them unless they conflict with the Minions task contract or playbook.');
-
   appendIndex('Knowledge Base Reference', getKnowledgeBaseIndex(), 8192);
 
-  context += `## Reference Files\n\nKnowledge base entries are in \`knowledge/{category}/*.md\`, and project-local playbooks live in \`projects/<project>/playbooks/\`. Runtime-native skills and commands live in their native indexes (the catalog of names + descriptions is injected below as "Existing Skills"; full skill bodies are not).\n\n`;
-
-  // E2.b (W-mp7goxe4000p75f7): inject existing personal-scope skill catalog
-  // so agents can see what already exists before emitting a near-duplicate
-  // skill block. Caps at ~2KB; truncates alphabetically with a tail count.
-  context += _buildExistingSkillsSection(config);
+  context += `## Reference Files\n\nKnowledge base entries are in \`knowledge/{category}/*.md\`, and project-local playbooks live in \`projects/<project>/playbooks/\`.\n\n`;
 
   // Minions awareness: what's in flight, who's doing what
   const dispatch = getDispatch();
@@ -1265,9 +1139,9 @@ function buildAgentContext(agentId, config, project) {
     const prs = getPrs(p).filter(pr => pr.status === PR_STATUS.ACTIVE);
     for (const pr of prs) allPrs.push({ ...pr, _project: p.name });
   }
-  // Also check central pull-requests.json
+  // Also check the central SQL pull-request scope.
   try {
-    const centralPrs = safeJsonArr(path.join(MINIONS_DIR, 'pull-requests.json'));
+    const centralPrs = require('./pull-requests-store').readPullRequestsForScope('central');
     for (const pr of centralPrs.filter(pr => pr.status === PR_STATUS.ACTIVE)) {
       if (!allPrs.some(p => p.id === pr.id)) allPrs.push({ ...pr, _project: 'central' });
     }
@@ -1378,14 +1252,6 @@ function buildPrDispatch(agentId, config, project, pr, type, extraVars, taskLabe
   const vars = {
     ...buildBaseVars(agentId, config, project),
     branch_name: extraVars?.pr_branch || '',
-    // W-mq16xtdx001a347e + W-mq1cczi90006b21f — honor both meta flag names
-    // (skipProjectReviewSkills is the PR-82 alias). Default OFF: review/fix
-    // dispatches surface the project-local skills block.
-    skip_project_review_skills: !!(meta && meta.skipProjectReviewSkills),
-    // W-mq1cczi90006b21f — generalized project-skills suppression flag.
-    // Honors either the new `meta.skipProjectSkills` or the PR-82
-    // `meta.skipProjectReviewSkills` alias so older work items keep working.
-    skip_project_skills: !!(meta && (meta.skipProjectSkills || meta.skipProjectReviewSkills)),
     // W-mq5l3f2u000i9045 — opt-out for the inlined PR description audit
     // section in fix.md. Truthy renders the "audit suppressed" notice; falsy
     // (the default) leaves the standard audit instructions in place.