@productbrain/mcp 0.0.1-beta.70 → 0.0.1-beta.72

package/dist/{chunk-JOJWCU7A.js → chunk-ZPEIKRYG.js}

@@ -43,7 +43,7 @@ import {
   unknownAction,
   validationResult,
   withEnvelope
-} from "./chunk-TH5AUVVM.js";
+} from "./chunk-XLMQ7POI.js";
 import {
   trackKnowledgeGap,
   trackQualityCheck,
@@ -69,7 +69,7 @@ var WORKFLOW_STATUS_VALUES = [
   "conflict",
   "processing",
   "closed",
-  // Bets lifecycle
+  // Chains (bet type) lifecycle
   "shaped",
   "bet",
   "building",
@@ -91,7 +91,7 @@ var updateEntrySchema = z.object({
     z.enum(["draft", "active", "deprecated", "archived"]),
     z.enum(WORKFLOW_STATUS_VALUES)
   ]).optional().describe("Lifecycle status: draft | active | deprecated | archived. **Workflow values (open, pending, decided\u2026) are deprecated here \u2014 use `workflowStatus` instead. Passing a workflow value as `status` will be auto-routed with a warning until 2026-09-03, then hard-errored.**"),
-  workflowStatus: z.enum(WORKFLOW_STATUS_VALUES).optional().describe("Collection workflow state. Each collection restricts which values are valid (e.g. bets: 'shaped' | 'bet' | 'building' | 'shipped'; assumptions: 'untested' | 'testing' | 'validated' | 'invalidated'; decisions: 'pending' | 'decided'; tensions: 'open' | 'processing' | 'decided' | 'closed'). The backend will reject values invalid for the target collection."),
+  workflowStatus: z.enum(WORKFLOW_STATUS_VALUES).optional().describe("Collection workflow state. Each collection restricts which values are valid (e.g. chains with chainTypeId='bet': 'shaped' | 'bet' | 'building' | 'shipped'; assumptions: 'untested' | 'testing' | 'validated' | 'invalidated'; decisions: 'pending' | 'decided'; tensions: 'open' | 'processing' | 'decided' | 'closed'). The backend will reject values invalid for the target collection."),
   data: z.record(z.unknown()).optional().describe("Fields to update (merged with existing data)"),
   order: z.number().optional().describe("New sort order"),
   canonicalKey: z.string().optional().describe("Semantic type (e.g. 'decision', 'tension'). Only changeable on draft/uncommitted entries."),
@@ -238,7 +238,7 @@ ${formatted}` }],
     },
     withEnvelope(async ({ entryId }) => {
       requireWriteAccess();
-      const { runContradictionCheck } = await import("./smart-capture-Q64ZXK65.js");
+      const { runContradictionCheck } = await import("./smart-capture-QFYRKMBM.js");
       const entry = await mcpQuery("chain.getEntry", { entryId });
       if (!entry) {
         return notFoundResult(entryId, `Entry '${entryId}' not found. Try search to find the right ID.`);
@@ -1691,7 +1691,7 @@ async function handleBuild(server, entryId, maxHops) {
 
 // src/tools/collections.ts
 import { z as z6 } from "zod";
-var COLLECTIONS_ACTIONS = ["list", "create", "update"];
+var COLLECTIONS_ACTIONS = ["list", "create", "update", "describe"];
 var fieldSchema = z6.object({
   key: z6.string().describe("Field key, e.g. 'description', 'severity', 'status'"),
   label: z6.string().describe("Display label, e.g. 'Description', 'Severity'"),
@@ -1705,7 +1705,7 @@ var fieldSchema = z6.object({
 });
 var collectionsSchema = z6.object({
   action: z6.enum(COLLECTIONS_ACTIONS).describe(
-    "'list': browse all collections. 'create': create a new collection. 'update': update an existing collection."
+    "'list': browse all collections. 'create': create a new collection. 'update': update an existing collection. 'describe': full documentation for one collection \u2014 fields, option guides, usage guidance, examples."
   ),
   slug: z6.string().optional().describe("URL-safe identifier for create/update, e.g. 'glossary', 'tech-debt'"),
   name: z6.string().optional().describe("Display name for create, or new name for update"),
@@ -1720,7 +1720,7 @@ function registerCollectionsTools(server) {
     "collections",
     {
       title: "Collections",
-      description: "Manage knowledge collections. Three actions:\n\n- **list**: Browse all collections \u2014 glossary, business rules, tracking events, etc. Returns slug, name, description, and field schema. Use before capture to see what exists.\n- **create**: Create a new collection. Provide slug, name, and field schema. Use when setting up a workspace or tracking a new type of knowledge.\n- **update**: Update an existing collection's name, description, purpose, icon, navGroup, or fields. Only provide the fields you want to change.",
+      description: "Manage knowledge collections. Four actions:\n\n- **list**: Browse all collections \u2014 glossary, business rules, tracking events, etc. Returns slug, name, description, and field schema. Use before capture to see what exists.\n- **describe**: Full documentation for a single collection. Returns field help text, option decision guides, usage guidance, examples, and cross-references. Use when you need to understand a collection's purpose, field semantics, or option values.\n- **create**: Create a new collection. Provide slug, name, and field schema. Use when setting up a workspace or tracking a new type of knowledge.\n- **update**: Update an existing collection's name, description, purpose, icon, navGroup, or fields. Only provide the fields you want to change.",
       inputSchema: collectionsSchema,
       annotations: { readOnlyHint: false, destructiveHint: true, openWorldHint: false }
     },
@@ -1732,6 +1732,12 @@ function registerCollectionsTools(server) {
         if (action === "list") {
           return handleList2();
         }
+        if (action === "describe") {
+          if (!slug) {
+            return validationResult("slug is required when action is 'describe'.");
+          }
+          return handleDescribe(slug);
+        }
         if (action === "create") {
           if (!slug || !name || !fields || fields.length === 0) {
             return validationResult("slug, name, and fields are required when action is 'create'.");
@@ -1753,6 +1759,99 @@ function registerCollectionsTools(server) {
   );
   trackWriteTool(tool);
 }
+async function handleDescribe(slug) {
+  const col = await mcpQuery("chain.getCollection", { slug });
+  if (!col) {
+    return failureResult(
+      `Collection '${slug}' not found.`,
+      "NOT_FOUND",
+      `No collection with slug '${slug}' in this workspace.`,
+      "Use `collections action=list` to see available collections."
+    );
+  }
+  const sections = [];
+  sections.push(`# ${col.name} (\`${col.slug}\`)`);
+  if (col.description) sections.push(col.description);
+  const meta = [
+    col.governed ? "**Governed**" : null,
+    col.navGroup ? `**Nav group:** ${col.navGroup}` : null,
+    col.idPrefix ? `**Prefix:** ${col.idPrefix}-*` : null,
+    col.stratum ? `**Stratum:** ${col.stratum}` : null
+  ].filter(Boolean).join(" \xB7 ");
+  if (meta) sections.push(meta);
+  if (col.usageGuidance) {
+    sections.push(`
+## When to Use
+
+${col.usageGuidance}`);
+  } else if (col.purpose) {
+    sections.push(`
+## Purpose
+
+${col.purpose}`);
+  }
+  if (col.fields.length > 0) {
+    const fieldDocs = col.fields.map((f) => {
+      const parts = [];
+      const typeInfo = `${f.type}${f.required ? ", required" : ""}`;
+      parts.push(`### \`${f.key}\` \u2014 ${f.label ?? f.key} (${typeInfo})`);
+      if (f.helpText) parts.push(f.helpText);
+      if (f.options && f.options.length > 0) {
+        const optLines = f.options.map((opt) => {
+          const desc = f.optionDescriptions?.[opt];
+          return desc ? `  - **${opt}**: ${desc}` : `  - ${opt}`;
+        });
+        parts.push(`
+Options:
+${optLines.join("\n")}`);
+      }
+      return parts.join("\n");
+    });
+    sections.push(`
+## Fields
+
+${fieldDocs.join("\n\n")}`);
+  }
+  if (col.examples && col.examples.length > 0) {
+    const exList = col.examples.map((ex) => `- **${ex.name}** \u2014 ${ex.description}`).join("\n");
+    sections.push(`
+## Examples
+
+${exList}`);
+  }
+  if (col.crossReferences && col.crossReferences.length > 0) {
+    const refList = col.crossReferences.map(
+      (r) => `- **${r.slug}** (${r.relationship}): ${r.guidance}`
+    ).join("\n");
+    sections.push(`
+## Related Collections
+
+${refList}`);
+  }
+  return {
+    content: [{ type: "text", text: sections.join("\n\n") }],
+    structuredContent: success(
+      `Documentation for collection '${col.name}' (${col.slug}).`,
+      {
+        slug: col.slug,
+        name: col.name,
+        description: col.description,
+        usageGuidance: col.usageGuidance ?? null,
+        fieldCount: col.fields.length,
+        fields: col.fields.map((f) => ({
+          key: f.key,
+          type: f.type,
+          required: f.required,
+          helpText: f.helpText ?? null,
+          options: f.options ?? null,
+          optionDescriptions: f.optionDescriptions ?? null
+        })),
+        examples: col.examples ?? [],
+        crossReferences: col.crossReferences ?? []
+      }
+    )
+  };
+}
 async function handleList2() {
   const collections = await mcpQuery("chain.listCollections");
   if (collections.length === 0) {
@@ -1997,7 +2096,7 @@ function registerLabelTools(server) {
 }
 
 // src/tools/health.ts
-import { z as z20 } from "zod";
+import { z as z21 } from "zod";
 
 // src/tools/session.ts
 import { z as z9 } from "zod";
@@ -2363,6 +2462,7 @@ function toSnapshot(report, maxTopGaps = 10) {
 import { readFileSync } from "fs";
 import { resolve } from "path";
 function resolveRegistries(projectRoot, manifest) {
+  if (!projectRoot) return {};
   const resolved = {};
   for (const ref of manifest) {
     try {
@@ -2374,7 +2474,10 @@ function resolveRegistries(projectRoot, manifest) {
       if (keys.size > 0) {
         resolved[ref.id] = keys;
       }
-    } catch {
+    } catch (err) {
+      if (process.env.DEBUG_COHERENCE) {
+        console.debug(`[coherence] Skipping ${ref.id} (${ref.path}):`, err instanceof Error ? err.message : err);
+      }
     }
   }
   return resolved;
@@ -2409,14 +2512,19 @@ function extractBalanced(content, openPos, openChar, closeChar) {
       i = skipString(content, i, ch);
       continue;
     }
-    if (ch === "/" && content[i + 1] === "/") {
+    if (ch === "/" && i + 1 < content.length && content[i + 1] === "/") {
       while (i < content.length && content[i] !== "\n") i++;
       continue;
     }
-    if (ch === "/" && content[i + 1] === "*") {
+    if (ch === "/" && i + 1 < content.length && content[i + 1] === "*") {
       i += 2;
-      while (i < content.length && !(content[i - 1] === "*" && content[i] === "/")) i++;
-      i++;
+      while (i < content.length) {
+        if (content[i] === "/" && i > 0 && content[i - 1] === "*") {
+          i++;
+          break;
+        }
+        i++;
+      }
       continue;
     }
     if (ch === openChar) depth++;
@@ -2429,11 +2537,12 @@ function extractBalanced(content, openPos, openChar, closeChar) {
 function skipString(content, start, quote) {
   let i = start + 1;
   while (i < content.length) {
-    if (content[i] === "\\" && quote !== "`") {
+    const ch = content[i];
+    if (ch === "\\") {
       i += 2;
       continue;
     }
-    if (content[i] === quote) return i + 1;
+    if (ch === quote) return i + 1;
     i++;
   }
   return i;
@@ -2454,14 +2563,19 @@ function extractObjectKeys(block) {
   let i = 0;
   while (i < block.length) {
     const ch = block[i];
-    if (ch === "/" && block[i + 1] === "/") {
+    if (ch === "/" && i + 1 < block.length && block[i + 1] === "/") {
       while (i < block.length && block[i] !== "\n") i++;
       continue;
     }
-    if (ch === "/" && block[i + 1] === "*") {
+    if (ch === "/" && i + 1 < block.length && block[i + 1] === "*") {
       i += 2;
-      while (i < block.length && !(block[i - 1] === "*" && block[i] === "/")) i++;
-      i++;
+      while (i < block.length) {
+        if (block[i] === "/" && i > 0 && block[i - 1] === "*") {
+          i++;
+          break;
+        }
+        i++;
+      }
       continue;
     }
     if (depth === 0) {
@@ -2515,6 +2629,7 @@ function extractSetValues(block) {
 // src/lib/coherence/git-detection.ts
 import { execSync } from "child_process";
 function detectTouchedRegistries(projectRoot) {
+  if (!projectRoot) return /* @__PURE__ */ new Set();
   const manifestPaths = new Set(REGISTRY_MANIFEST.map((r) => r.path));
   const touched = /* @__PURE__ */ new Set();
   try {
@@ -2529,7 +2644,10 @@ function detectTouchedRegistries(projectRoot) {
         touched.add(trimmed);
       }
     }
-  } catch {
+  } catch (err) {
+    if (process.env.DEBUG_COHERENCE) {
+      console.debug("[coherence] Git detection failed:", err instanceof Error ? err.message : err);
+    }
   }
   return touched;
 }
@@ -2599,13 +2717,16 @@ function computeDelta(before, after) {
 function renderCoherenceDelta(delta) {
   const lines = ["### Coherence Delta"];
   const p = (n) => n === 1 ? "" : "s";
+  const absNet = Math.abs(delta.netChange);
+  const approx = absNet > delta.gapsFixed + delta.gapsIntroduced;
+  const prefix = approx ? "at least " : "";
   if (delta.verdict === "improved") {
     lines.push(
-      `Registry coherence **improved**: ${delta.gapsFixed} gap${p(delta.gapsFixed)} fixed` + (delta.gapsIntroduced > 0 ? `, ${delta.gapsIntroduced} introduced` : "") + ` (net ${delta.netChange}). ${delta.after.totalGaps} gap${p(delta.after.totalGaps)} remain${delta.after.totalGaps === 1 ? "s" : ""}.`
+      `Registry coherence **improved**: ${prefix}${delta.gapsFixed} gap${p(delta.gapsFixed)} fixed` + (delta.gapsIntroduced > 0 ? `, ${delta.gapsIntroduced} introduced` : "") + ` (net ${delta.netChange}). ${delta.after.totalGaps} gap${p(delta.after.totalGaps)} remain${delta.after.totalGaps === 1 ? "s" : ""}.`
     );
   } else if (delta.verdict === "degraded") {
     lines.push(
-      `**Registry coherence degraded**: ${delta.gapsIntroduced} new gap${p(delta.gapsIntroduced)} introduced` + (delta.gapsFixed > 0 ? `, ${delta.gapsFixed} fixed` : "") + ` (net +${delta.netChange}). ${delta.after.totalGaps} gap${p(delta.after.totalGaps)} total.`
+      `**Registry coherence degraded**: ${prefix}${delta.gapsIntroduced} new gap${p(delta.gapsIntroduced)} introduced` + (delta.gapsFixed > 0 ? `, ${delta.gapsFixed} fixed` : "") + ` (net +${delta.netChange}). ${delta.after.totalGaps} gap${p(delta.after.totalGaps)} total.`
     );
   } else {
     lines.push(
@@ -2615,6 +2736,58 @@ function renderCoherenceDelta(delta) {
   lines.push("");
   return lines;
 }
+function findPersistentGaps(delta, currentViolations) {
+  const beforeSet = new Set(delta.before.topGaps.map((g) => `${g.registry}::${g.slug}`));
+  const afterSet = new Set(delta.after.topGaps.map((g) => `${g.registry}::${g.slug}`));
+  const persistentKeys = /* @__PURE__ */ new Set();
+  for (const key of beforeSet) {
+    if (afterSet.has(key)) persistentKeys.add(key);
+  }
+  if (persistentKeys.size === 0) return [];
+  const violationMap = /* @__PURE__ */ new Map();
+  for (const v of currentViolations) {
+    violationMap.set(`${v.registryId}::${v.collectionSlug}`, v);
+  }
+  return [...persistentKeys].map((key) => {
+    const [registry = "", slug = ""] = key.split("::", 2);
+    return {
+      registry,
+      slug,
+      severity: delta.after.topGaps.find((g) => g.registry === registry && g.slug === slug)?.severity ?? "warning",
+      violation: violationMap.get(key) ?? null
+    };
+  });
+}
+function renderPersistentGapOffers(gaps) {
+  if (gaps.length === 0) return [];
+  const lines = [
+    "### Persistent Coherence Gaps",
+    "",
+    "These gaps existed before and after this session \u2014 they represent structural registry drift.",
+    "Want me to capture them as tensions on the Chain?",
+    ""
+  ];
+  const SEVERITY_RANK2 = { error: 0, warning: 1, info: 2 };
+  const errorsFirst = [...gaps].sort(
+    (a, b) => SEVERITY_RANK2[a.severity] - SEVERITY_RANK2[b.severity]
+  );
+  for (const gap of errorsFirst.slice(0, 5)) {
+    const v = gap.violation;
+    const fixHint = v?.fix ? ` \u2014 ${v.fix}` : "";
+    lines.push(
+      `- **\`${gap.slug}\`** missing from \`${gap.registry}\` (${gap.severity})${fixHint}`
+    );
+  }
+  if (errorsFirst.length > 5) {
+    lines.push(`- ...and ${errorsFirst.length - 5} more`);
+  }
+  lines.push("");
+  lines.push(
+    '_Say "capture these as tensions" to commit them to the Chain, or skip to continue._'
+  );
+  lines.push("");
+  return lines;
+}
 
 // src/lib/resolve-project-root.ts
 import { existsSync } from "fs";
@@ -2623,6 +2796,8 @@ function resolveProjectRoot() {
   const candidates = [
     process.env.WORKSPACE_PATH,
     process.cwd(),
+    // Parent of cwd: handles monorepo subpackages (e.g. packages/mcp-server)
+    // where the Convex schema lives one level up.
     resolve2(process.cwd(), "..")
   ].filter(Boolean);
   for (const dir of candidates) {
@@ -2652,16 +2827,24 @@ async function mapWithConcurrency(items, mapper, concurrency = 3) {
   );
   return results;
 }
+function isValidTopGap(g) {
+  if (typeof g !== "object" || g === null) return false;
+  const obj = g;
+  return typeof obj.registry === "string" && typeof obj.slug === "string" && typeof obj.severity === "string" && (obj.severity === "error" || obj.severity === "warning" || obj.severity === "info");
+}
 async function fetchSessionCoherenceSnapshot(sessionId) {
   try {
     const session = await mcpCall("agent.getSession", {
       sessionId
     });
     const raw = session?.coherenceSnapshot;
-    if (raw && typeof raw.checkedAt === "number" && typeof raw.totalGaps === "number") {
+    if (raw && typeof raw.checkedAt === "number" && typeof raw.totalGaps === "number" && Array.isArray(raw.topGaps) && raw.topGaps.every(isValidTopGap)) {
       return raw;
     }
-  } catch {
+  } catch (err) {
+    if (process.env.DEBUG_COHERENCE) {
+      console.debug("[coherence] Snapshot fetch failed:", err instanceof Error ? err.message : err);
+    }
   }
   return null;
 }
@@ -2760,6 +2943,7 @@ async function runWrapupReview() {
     lines.push("");
   }
   let coherenceVerdict;
+  let persistentGaps;
   try {
     const projectRoot = resolveProjectRoot();
     if (projectRoot) {
@@ -2781,6 +2965,10 @@ async function runWrapupReview() {
               );
               lines.push("");
             }
+            persistentGaps = findPersistentGaps(delta, report.violations);
+            if (persistentGaps.length > 0) {
+              lines.push(...renderPersistentGapOffers(persistentGaps));
+            }
           } else if (touchedFiles.size > 0) {
             lines.push("### Coherence Check");
             lines.push(
@@ -2797,7 +2985,10 @@ async function runWrapupReview() {
         }
       }
     }
-  } catch {
+  } catch (err) {
+    if (process.env.DEBUG_COHERENCE) {
+      console.debug("[coherence] Wrapup coherence check failed:", err instanceof Error ? err.message : err);
+    }
   }
   if (data.drafts.length > 0) {
     const draftIds = data.drafts.map((d) => `\`${d.entryId}\``).join(", ");
@@ -2807,7 +2998,7 @@ async function runWrapupReview() {
     lines.push("- **Skip:** call `session action=close` \u2014 drafts remain for next session's orient recovery.");
   }
   const gapCount = getSessionGaps().length;
-  return { text: lines.join("\n"), data, suggestions, gapCount, coherenceVerdict };
+  return { text: lines.join("\n"), data, suggestions, gapCount, coherenceVerdict, persistentGaps };
 }
 async function runWrapupCommitAll(data, cachedSuggestions) {
   requireWriteAccess();
@@ -2932,7 +3123,7 @@ function registerWrapupTools(server) {
         }
       );
     }
-    const { text, data, suggestions, failureCode, gapCount, coherenceVerdict } = await runWrapupReview();
+    const { text, data, suggestions, failureCode, gapCount, coherenceVerdict, persistentGaps } = await runWrapupReview();
     lastReviewData = data;
     lastReviewSuggestions = suggestions;
     lastReviewSessionId = getAgentSessionId();
@@ -2945,16 +3136,18 @@ ${text}` : text;
     const next = data.drafts.length > 0 ? [{ tool: "session-wrapup", description: "Commit all drafts", parameters: { action: "commit-all" } }] : void 0;
     const gapsSummary = gapCount ? `, ${gapCount} knowledge gaps detected` : "";
     const coherenceSummary = coherenceVerdict ? `, coherence: ${coherenceVerdict}` : "";
+    const persistentSummary = persistentGaps?.length ? `, ${persistentGaps.length} persistent coherence gaps` : "";
     return successResult(
       fullText,
-      `Session review: ${data.drafts.length} uncommitted, ${data.committed.length} committed, ${suggestions.length} link suggestions${gapsSummary}${coherenceSummary}.`,
+      `Session review: ${data.drafts.length} uncommitted, ${data.committed.length} committed, ${suggestions.length} link suggestions${gapsSummary}${coherenceSummary}${persistentSummary}.`,
       {
         drafts: data.drafts.length,
         committed: data.committed.length,
         uncommitted: data.summary.uncommitted,
         suggestedLinks: suggestions.length,
         knowledgeGaps: gapCount ?? 0,
-        ...coherenceVerdict ? { coherenceVerdict } : {}
+        ...coherenceVerdict ? { coherenceVerdict } : {},
+        ...persistentGaps?.length ? { persistentCoherenceGaps: persistentGaps.length } : {}
       },
       next
     );
@@ -3758,7 +3951,7 @@ If any facilitate call fails:
         description: "Confirmed problem statement and appetite",
         format: "structured"
       },
-      kbCollection: "bets",
+      kbCollection: "chains",
       maxDurationHint: "10 min"
     },
     {
@@ -3828,7 +4021,7 @@ If any facilitate call fails:
         description: "Final capture summary \u2014 entries committed, relations created",
         format: "structured"
       },
-      kbCollection: "bets",
+      kbCollection: "chains",
       maxDurationHint: "5 min"
     }
   ],
@@ -3836,7 +4029,7 @@ If any facilitate call fails:
     primaryRecord: {
       routing: {
         mode: "fixed",
-        collection: "bets"
+        collection: "chains"
       }
     },
     emits: [
@@ -3862,7 +4055,7 @@ If any facilitate call fails:
       },
       {
         kind: "update",
-        collection: "bets",
+        collection: "chains",
         description: "Bet status and no-go updates during finalize."
       }
     ]
@@ -5729,7 +5922,8 @@ function generateBuildContract(ctx) {
 function computeCommitBlockers(opts) {
   const { betEntryId, betDocId, relations, hasStrategyLink, betData, sessionDrafts } = opts;
   const blockers = [];
-  const str = (key) => (betData[key] ?? "").trim();
+  const links = betData.links ?? {};
+  const str = (key) => (links[key] ?? "").trim();
   if (!hasStrategyLink) {
     blockers.push({
       entryId: betEntryId,
@@ -6093,7 +6287,8 @@ async function loadSessionDrafts(betEntryId, betInternalId) {
   }
 }
 function buildScoringContext(userInput, betData, constellation, overlapIds, chainResults = [], activeDimension, source = "user") {
-  const str = (key) => betData[key] ?? "";
+  const links = betData.links ?? {};
+  const str = (key) => links[key] ?? "";
   const accParts = [
     str("problem"),
     str("appetite"),
@@ -6248,17 +6443,20 @@ async function processCaptures(opts) {
   };
   const FALLBACK_DEFAULTS = { dataField: "description", relationType: "related_to" };
   let runningBetData = { ...betData };
+  const runningLinks = () => ({ ...runningBetData.links ?? {} });
   for (const item of captureItems) {
     if (item.type === "noGo") {
+      const curLinks = runningLinks();
       const updatedNoGos = appendNoGo(
-        runningBetData.noGos,
+        curLinks.noGos,
         { title: item.name, explanation: item.description }
       );
-      runningBetData.noGos = updatedNoGos;
+      const newLinks = { ...curLinks, noGos: updatedNoGos };
+      runningBetData.links = newLinks;
       try {
         await mcpMutation("chain.updateEntry", {
           entryId: betEntryId,
-          data: { noGos: updatedNoGos },
+          data: { links: newLinks },
           changeNote: `Added no-go: ${item.name}`
         });
         await recordSessionActivity({ entryModified: betDocId });
@@ -6342,15 +6540,17 @@ async function processCaptures(opts) {
       }
     }
     if (item.type === "element") {
+      const curLinks = runningLinks();
       const updatedElements = appendElement(
-        runningBetData.elements,
+        curLinks.elements,
         { name: item.name, description: item.description, entryId: capturedEntryId }
       );
-      runningBetData.elements = updatedElements;
+      const newLinks = { ...curLinks, elements: updatedElements };
+      runningBetData.links = newLinks;
       try {
         await mcpMutation("chain.updateEntry", {
           entryId: betEntryId,
-          data: { elements: updatedElements },
+          data: { links: newLinks },
           changeNote: `Added element: ${item.name}`
         });
         await recordSessionActivity({ entryModified: betDocId });
@@ -6361,15 +6561,17 @@ async function processCaptures(opts) {
         });
       }
     } else if (item.type === "risk") {
+      const curLinks = runningLinks();
       const updatedRisks = appendRabbitHole(
-        runningBetData.rabbitHoles,
+        curLinks.rabbitHoles,
         { name: item.name, description: item.description, theme: item.theme, entryId: capturedEntryId }
       );
-      runningBetData.rabbitHoles = updatedRisks;
+      const newLinks = { ...curLinks, rabbitHoles: updatedRisks };
+      runningBetData.links = newLinks;
       try {
         await mcpMutation("chain.updateEntry", {
           entryId: betEntryId,
-          data: { rabbitHoles: updatedRisks },
+          data: { links: newLinks },
           changeNote: `Added risk: ${item.name}`
         });
         await recordSessionActivity({ entryModified: betDocId });
@@ -6405,7 +6607,8 @@ async function computeAndUpdateScores(opts) {
   const alreadyCheckedOverlap = typeof refreshedData._overlapIds === "string";
   let overlap = [];
   if (!alreadyCheckedOverlap && captureItems.length === 0) {
-    const problemText = refreshedData.problem ?? userInput;
+    const refreshedLinks = refreshedData.links ?? {};
+    const problemText = refreshedLinks.problem ?? userInput;
     const overlapResults = await searchChain(problemText, { maxResults: 5, excludeIds: [betEntryId, ...constellationEntryIds] });
     overlap = overlapResults.map((r) => ({
       entryId: r.entryId,
@@ -6414,7 +6617,8 @@ async function computeAndUpdateScores(opts) {
     }));
   }
   const overlapIds = overlap.map((o) => o.entryId);
-  const appetiteText = refreshedData.appetite ?? "";
+  const refreshedLinksForAppetite = refreshedData.links ?? {};
+  const appetiteText = refreshedLinksForAppetite.appetite ?? "";
   const isSmallBatch = detectSmallBatch(
     argDimension === "appetite" ? userInput : appetiteText
   );
@@ -6440,15 +6644,20 @@ async function computeAndUpdateScores(opts) {
   const phase = inferPhase(scorecard, isSmallBatch, extractContentEvidence(scoringCtx));
   try {
     const fieldUpdates = {};
+    const linksUpdates = {};
+    const currentLinks = refreshedData.links ?? {};
     const persist = (dim, field, minLen) => {
-      if (activeDimension === dim && !refreshedData[field] && userInput.length > minLen) {
-        fieldUpdates[field] = userInput;
+      if (activeDimension === dim && !currentLinks[field] && userInput.length > minLen) {
+        linksUpdates[field] = userInput;
       }
     };
     persist("problem_clarity", "problem", 50);
     persist("appetite", "appetite", 20);
     persist("architecture", "architecture", 50);
     persist("done_when", "done_when", 30);
+    if (Object.keys(linksUpdates).length > 0) {
+      fieldUpdates.links = { ...currentLinks, ...linksUpdates };
+    }
     if (!refreshedData._overlapIds) {
       fieldUpdates._overlapIds = overlapIds.length > 0 ? overlapIds.join(",") : "_checked";
     }
@@ -6473,7 +6682,7 @@ async function computeAndUpdateScores(opts) {
     });
   }
   const alignment = [];
-  const governanceCollections = /* @__PURE__ */ new Set(["principles", "standards", "business-rules", "strategy", "bets"]);
+  const governanceCollections = /* @__PURE__ */ new Set(["principles", "standards", "business-rules", "strategy", "chains"]);
   for (const result of chainSurfaced) {
     if (governanceCollections.has(result.collection)) {
       alignment.push({ entryId: result.entryId, relationship: `governs [${result.collection}]` });
@@ -6492,11 +6701,13 @@ async function computeAndUpdateScores(opts) {
       relatedTensions: chainSurfaced.filter((e) => e.collection === "tensions").map((e) => ({ entryId: e.entryId, name: e.name }))
     };
     buildContract = generateBuildContract(contractCtx);
-    if (refreshedData.buildContract !== buildContract) {
+    const currentBCLinks = refreshedData.links ?? {};
+    if (currentBCLinks.buildContract !== buildContract) {
       try {
+        const bcLinks = { ...refreshedData.links ?? {}, buildContract };
         await mcpMutation("chain.updateEntry", {
           entryId: betEntryId,
-          data: { buildContract },
+          data: { links: bcLinks },
           changeNote: "Updated build contract from shaping session"
         });
         await recordSessionActivity({ entryModified: refreshedBet?._id ?? betEntry._id });
@@ -6573,9 +6784,10 @@ function assembleResponse(opts) {
   } = opts;
   const studioUrl = buildStudioUrl(workspaceSlug, betEntryId);
   const suggested = suggestCaptures(scoringCtx, activeDimension);
-  const betProblem = refreshedData.problem ?? "";
+  const assembleLinks = refreshedData.links ?? {};
+  const betProblem = assembleLinks.problem ?? "";
   const responseBetName = refreshedData.description ?? betName;
-  const elementNames = (refreshedData.elements ?? "").match(/###\s*Element\s*\d+:\s*(.+)/gi)?.map((h) => h.replace(/###\s*Element\s*\d+:\s*/i, "").trim()) ?? [];
+  const elementNames = (assembleLinks.elements ?? "").match(/###\s*Element\s*\d+:\s*(.+)/gi)?.map((h) => h.replace(/###\s*Element\s*\d+:\s*/i, "").trim()) ?? [];
   const investigationBrief = buildInvestigationBrief(phase, responseBetName, betEntryId, betProblem, elementNames) ?? void 0;
   const response = {
     version: 2,
@@ -6663,20 +6875,23 @@ async function handleRespond(args) {
       const result = await mcpMutation(
         "chain.createEntry",
         {
-          collectionSlug: "bets",
+          collectionSlug: "chains",
           name: betName,
           status: "draft",
           data: {
-            problem: userInput,
-            appetite: "",
-            elements: "",
-            rabbitHoles: "",
-            noGos: "",
-            architecture: "",
-            buildContract: "",
+            chainTypeId: "bet",
             description: `Shaping session for: ${betName}`,
             status: "shaping",
-            shapingSessionActive: true
+            shapingSessionActive: true,
+            links: {
+              problem: userInput,
+              appetite: "",
+              elements: "",
+              rabbitHoles: "",
+              noGos: "",
+              architecture: "",
+              buildContract: ""
+            }
           },
           createdBy: agentId ? `agent:${agentId}` : "facilitate",
           sessionId: agentId ?? void 0
@@ -6782,7 +6997,8 @@ async function handleScore(args) {
   }
   const constellation = await loadConstellationState(betId, betEntry._id);
   const betData = betEntry.data ?? {};
-  const isSmallBatch = detectSmallBatch(betData.appetite ?? "");
+  const scoreLinks = betData.links ?? {};
+  const isSmallBatch = detectSmallBatch(scoreLinks.appetite ?? "");
   const scoringCtx = buildCachedScoringContext(betData, constellation);
   const { scorecard, criteria: scorecardCriteria } = buildDetailedScorecard(scoringCtx, { isSmallBatch });
   const dims = activeDimensions(isSmallBatch);
@@ -6885,7 +7101,8 @@ async function handleResume(args) {
   }
   const constellation = await loadConstellationState(betId, betEntry._id);
   const betData = betEntry.data ?? {};
-  const isSmallBatch = detectSmallBatch(betData.appetite ?? "");
+  const resumeLinks = betData.links ?? {};
+  const isSmallBatch = detectSmallBatch(resumeLinks.appetite ?? "");
   const scoringCtx = buildCachedScoringContext(betData, constellation);
   const { scorecard, criteria: scorecardCriteria } = buildDetailedScorecard(scoringCtx, { isSmallBatch });
   const dims = activeDimensions(isSmallBatch);
@@ -7036,8 +7253,9 @@ async function handleCommitConstellation(args) {
   }
   let contradictionWarnings = [];
   try {
-    const { runContradictionCheck } = await import("./smart-capture-Q64ZXK65.js");
-    const descField = betData.problem ?? betData.description ?? "";
+    const { runContradictionCheck } = await import("./smart-capture-QFYRKMBM.js");
+    const commitLinks = betData.links ?? {};
+    const descField = commitLinks.problem ?? betData.description ?? "";
     contradictionWarnings = await runContradictionCheck(
       betEntry.name ?? betId,
       descField
@@ -7687,22 +7905,25 @@ function buildCoherenceSection(projectRoot) {
   try {
     const root = projectRoot ?? resolveProjectRoot() ?? process.cwd();
     return checkAndRender(root);
-  } catch {
+  } catch (err) {
+    if (process.env.DEBUG_COHERENCE) {
+      console.debug("[coherence] buildCoherenceSection failed:", err instanceof Error ? err.message : err);
+    }
     return null;
   }
 }
 function runAlignmentCheck(task, activeBets, taskContextHits) {
   const betNames = activeBets.map((b) => b.name);
-  const taskWords = task.toLowerCase().split(/\s+/).filter((w) => w.length > 2);
+  const taskWords = extractKeywords(task);
   const matchingBet = activeBets.find((b) => {
-    const name = (b.name ?? "").toLowerCase();
-    return taskWords.some((w) => name.includes(w));
+    const words = (b.name ?? "").toLowerCase().split(/\s+/);
+    return taskWords.some((tw) => words.some((w) => w === tw || w.startsWith(tw + "-")));
   });
   if (matchingBet) {
     return { aligned: true, matchedBet: matchingBet.name, matchSource: "active_bet", betNames };
   }
   const betHits = (taskContextHits ?? []).filter(
-    (e) => e.collectionSlug === "bets"
+    (e) => e.collectionSlug === "chains"
   );
   if (betHits.length > 0) {
     return { aligned: true, matchedBet: betHits[0]?.name ?? null, matchSource: "task_context", betNames };
@@ -7711,11 +7932,11 @@ function runAlignmentCheck(task, activeBets, taskContextHits) {
 }
 function buildAlignmentCheckLines(result) {
   const lines = ["## Alignment Check"];
-  if (result.aligned && result.matchSource === "active_bet") {
+  if (result.aligned && result.matchSource === "active_bet" && result.matchedBet) {
     lines.push(
       `Task aligns with active bet: **${result.matchedBet}**. Proceed.`
     );
-  } else if (result.aligned && result.matchSource === "task_context") {
+  } else if (result.aligned && result.matchSource === "task_context" && result.matchedBet) {
     const noActiveBets = result.betNames.length === 0;
     lines.push(
       `Task related to **${result.matchedBet}** via task context${noActiveBets ? " (no active bets in horizon=now)" : ""}. Proceed with caution \u2014 confirm scope with the user if uncertain.`
@@ -7745,7 +7966,15 @@ var RULE5_COMPACT = '**Validate against governance.** Before proposing or buildi
 var MAX_ENTRIES_NO_TASK = 3;
 var MAX_ENTRIES_WITH_TASK = 5;
 function extractKeywords(text) {
-  return [...new Set(text.toLowerCase().split(/\s+/).filter((w) => w.length > 2))];
+  const normalized = text.toLowerCase().replace(/[^\w\s-]/g, " ");
+  const tokens = [];
+  for (const raw of normalized.split(/\s+/)) {
+    if (!raw) continue;
+    const parts = raw.split(/[-_]/);
+    if (parts.length > 1) tokens.push(raw.replace(/[-_]/g, ""));
+    for (const p of parts) if (p) tokens.push(p);
+  }
+  return [...new Set(tokens.filter((w) => w.length > 2))];
 }
 function scoreEntry(entry, keywords) {
   const text = `${entry.name} ${entry.description ?? ""}`.toLowerCase();
@@ -7846,73 +8075,16 @@ var interviewExtractionSchema = z14.object({
   keyDecisions: z14.array(z14.string()).optional().describe("Recent significant decisions made (each as a concise statement)"),
   tensions: z14.array(z14.string()).optional().describe("Pain points or friction the product is solving")
 });
-function extractionToBatchEntries(extracted) {
-  const entries = [];
-  if (extracted.vision) {
-    entries.push({
-      collection: "strategy",
-      name: "Product Vision",
-      description: extracted.vision
-    });
-  }
-  if (extracted.audience) {
-    const audienceName = extracted.audience.split(/\s+/).slice(0, 6).join(" ");
-    entries.push({
-      collection: "audiences",
-      name: audienceName,
-      description: extracted.audience
-    });
-  }
-  if (extracted.techStack?.length) {
-    entries.push({
-      collection: "architecture",
-      name: "Tech Stack",
-      description: `Technology choices: ${extracted.techStack.join(", ")}`
-    });
-    for (const tech of extracted.techStack.slice(0, 3)) {
-      entries.push({ collection: "glossary", name: tech, description: `${tech} \u2014 part of the tech stack` });
-    }
-  }
-  if (extracted.keyTerms?.length) {
-    for (const term of extracted.keyTerms) {
-      const alreadyAdded = entries.some(
-        (e) => e.collection === "glossary" && e.name.toLowerCase() === term.toLowerCase()
-      );
-      if (!alreadyAdded) {
-        entries.push({ collection: "glossary", name: term, description: `Core domain term: ${term}` });
-      }
-    }
-  }
-  if (extracted.keyDecisions?.length) {
-    for (const decision of extracted.keyDecisions) {
-      entries.push({
-        collection: "decisions",
-        name: decision.slice(0, 80),
-        description: decision
-      });
-    }
-  }
-  if (extracted.tensions?.length) {
-    for (const tension of extracted.tensions) {
-      entries.push({
-        collection: "tensions",
-        name: tension.slice(0, 80),
-        description: tension
-      });
-    }
-  }
-  return entries;
-}
 function getInterviewInstructions(workspaceName) {
   return {
-    systemPrompt: `You are activating the **${workspaceName}** Product Brain. Ask 1\u20132 focused questions, then extract structured knowledge and feed it to batch-capture. In Open governance mode, entries are committed automatically. In consensus/role mode, they stay as drafts for review.`,
-    question1: `**Q1 \u2014 What are you building and for whom?** Describe your product in 1\u20132 sentences and who it's for. (This becomes your Product Vision and primary Audience.)`,
-    question2: `**Q2 (optional)** What's one word or phrase that would trip someone up if they didn't know your context? (This becomes your first glossary term \u2014 the one that matters most.)`,
+    systemPrompt: `You are activating the **${workspaceName}** Product Brain. Ask 1\u20132 focused questions, then extract structured knowledge and batch-capture it. Let the user talk naturally \u2014 you do the structuring. In Open governance mode, entries commit automatically. In consensus/role mode, they stay as drafts for review.`,
+    question1: `**What are you building, and who is it for?** A sentence or two is plenty \u2014 I'll pull out the structure.`,
+    question2: `**What's one word or phrase that would trip someone up if they didn't know your world?** (That becomes your first glossary term \u2014 the one that saves explanations later.)`,
     extractionGuidance: `After the user answers, extract:
 - vision: the core product purpose (required)
 - audience: who it's for (optional)
 - techStack: technologies mentioned (optional, array)
-- keyTerms: domain terms \u2014 Q2 answer (the word/phrase that trips people up) goes here (optional, array)
+- keyTerms: domain terms \u2014 Q2 answer goes here (optional, array)
 - keyDecisions: any decisions stated (optional, array)
 - tensions: any pain points stated (optional, array)
 
@@ -7923,7 +8095,7 @@ Map to batch-capture entries:
 - keyTerms \u2192 glossary (1 per term)
 - keyDecisions \u2192 decisions (1 per decision)
 - tensions \u2192 tensions (1 per tension)`,
-    captureInstructions: `Call batch-capture with the extracted entries. Omit \`autoCommit\` to follow workspace governance automatically, or pass \`autoCommit: false\` if the user wants a review-first pass. Keep descriptions concise (1\u20132 sentences each). Prefer 8 good entries over 15 mediocre ones \u2014 quality over volume. If batch-capture returns failedEntries, tell the user and retry those individually.`,
+    captureInstructions: `Call batch-capture with the extracted entries. Omit \`autoCommit\` to follow workspace governance automatically, or pass \`autoCommit: false\` if the user wants review-first. Keep descriptions concise (1\u20132 sentences each). Prefer 8 good entries over 15 mediocre ones \u2014 quality over volume. If batch-capture returns failedEntries, tell the user and retry individually.`,
     qualityNote: (
       // FEAT-149: Retrieval-First Proof Moment.
       // The aha is friction elimination ("I'll never have to explain this again"),
@@ -7943,25 +8115,73 @@ That's context you won't have to explain again."
 
 End with: "**Try it right now** \u2014 ask me something you'd normally have to re-explain first. I'll answer like I've known your product for months."`
     ),
-    scanOffer: `After the proof moment, offer the codebase scan as a way to deepen the knowledge:
-"Want me to learn even more? I can scan your project files (README, package.json, source structure) and pick up technical decisions, conventions, and architecture that I missed. Takes about 2 minutes."`
+    scanOffer: `After the proof moment, offer the codebase scan:
+"Want me to learn more? I can read your project files \u2014 README, package.json, source structure \u2014 and pick up technical decisions, conventions, and architecture I missed. Takes about two minutes."`
   };
 }
 function buildInterviewResponse(workspaceName) {
   const instructions = getInterviewInstructions(workspaceName);
   return [
-    "## Let's activate your workspace",
+    "## Let's get to know your product",
     "",
     instructions.systemPrompt,
     "",
-    "I'll ask you 1\u20132 questions. Your answers become the foundation of your product knowledge.",
+    "I'll ask you one or two questions. Your answers become the foundation of your Brain.",
     "",
-    `**${instructions.question1}**`,
+    instructions.question1,
     "",
-    "_Take your time \u2014 a sentence or two is enough. I'll extract the structure from your answer._"
+    "_Take your time \u2014 I'll pull out the structure from whatever you say._"
   ].join("\n");
 }
 
+// src/lib/gapToPrompt.ts
+function cleanLabel(label) {
+  return label.replace(/ has entries$/i, "").replace(/ coverage$/i, "").replace(/^Strategy — /i, "");
+}
+function progressFrame(ctx) {
+  if (ctx.passedChecks === 0) {
+    return "Your Brain is just getting started.";
+  }
+  if (ctx.passedChecks === 1) {
+    return "Your Brain has one area covered so far.";
+  }
+  if (ctx.score >= 70) {
+    return `Your Brain covers ${ctx.passedChecks} areas \u2014 almost there.`;
+  }
+  return `Your Brain covers ${ctx.passedChecks} of ${ctx.totalChecks} areas.`;
+}
+function formatTopGapPrompt(gap, remaining, ctx) {
+  const prompt = gap.capabilityGuidance ?? gap.guidance;
+  const label = cleanLabel(gap.label);
+  const lines = [
+    progressFrame(ctx),
+    remaining > 0 ? `The biggest gap right now: **${label}**.` : `One area would strengthen it: **${label}**.`,
+    "",
+    prompt
+  ];
+  return lines.join("\n");
+}
+function formatGapList(gaps, limit = 3) {
+  const topGaps = gaps.slice(0, limit);
+  if (topGaps.length === 0) return [];
+  const lines = [
+    "Here's where your Brain would benefit most:",
+    ""
+  ];
+  for (let i = 0; i < topGaps.length; i++) {
+    const gap = topGaps[i];
+    const prompt = gap.capabilityGuidance ?? gap.guidance;
+    const label = cleanLabel(gap.label);
+    lines.push(`${i + 1}. **${label}** \u2014 ${prompt}`);
+  }
+  return lines;
+}
+function formatGapOneLiner(gap) {
+  if (!gap) return null;
+  const prompt = gap.capabilityGuidance ?? gap.guidance;
+  return `Next gap: ${prompt}`;
+}
+
 // src/tools/start.ts
 async function tryMarkOriented(agentSessionId, coherenceSnapshot) {
   if (!agentSessionId) return { oriented: false, orientationStatus: "no_session" };
@@ -8000,7 +8220,7 @@ function registerStartTools(server) {
       try {
         wsCtx = await getWorkspaceContext();
       } catch (e) {
-        errors.push(`Workspace: ${e.message}`);
+        errors.push(`Workspace: ${e instanceof Error ? e.message : String(e)}`);
       }
       if (!wsCtx) {
         const text = "# Could not connect to Product Brain\n\n" + (errors.length > 0 ? errors.map((e) => `- ${e}`).join("\n") : "Check your API key and CONVEX_SITE_URL.");
@@ -8149,7 +8369,7 @@ function buildBlankResponse(wsCtx, sessionCtx) {
 }
 async function buildSeededResponse(wsCtx, readiness, agentSessionId) {
   const stage = readiness?.stage ?? "seeded";
-  const score = readiness?.score;
+  const score = readiness?.score ?? null;
   const gaps = readiness?.gaps ?? [];
   const lines = [
     `# ${wsCtx.workspaceName}`,
@@ -8157,14 +8377,8 @@ async function buildSeededResponse(wsCtx, readiness, agentSessionId) {
     ""
   ];
   if (gaps.length > 0) {
-    lines.push("Here are the most impactful gaps to fill next:");
-    lines.push("");
-    const topGaps = gaps.slice(0, 3);
-    for (let i = 0; i < topGaps.length; i++) {
-      const gap = topGaps[i];
-      const cta = gap.capabilityGuidance ?? gap.guidance ?? `Describe your ${gap.label.toLowerCase()}.`;
-      lines.push(`${i + 1}. **${gap.label}** \u2014 ${cta}`);
-    }
+    const gapLines = formatGapList(gaps, 3);
+    lines.push(...gapLines);
     lines.push("");
     lines.push("Pick any to start \u2014 or begin with **#1** and I'll guide you through it.");
   } else {
@@ -8279,21 +8493,13 @@ function computeWorkspaceAge(createdAt) {
   const ageDays = Math.floor((Date.now() - createdAt) / (1e3 * 60 * 60 * 24));
   return { ageDays, isNeglected: ageDays >= 30 };
 }
-function pickNextAction(gaps, openTensions, priorSessions) {
-  if (gaps.length === 0 && openTensions.length === 0) return null;
-  if (gaps.length > 0) {
-    const gap = gaps[0];
-    const cta = gap.capabilityGuidance ?? gap.guidance ?? `Tell me about your ${gap.label.toLowerCase()} and I'll capture it.`;
-    return { action: gap.label, cta };
-  }
-  if (openTensions.length > 0) {
-    const t = openTensions[0];
-    return {
-      action: `Open tension: ${t.name}`,
-      cta: "Want to discuss this tension or capture a decision about it?"
-    };
-  }
-  return null;
+function pickNextTensionPrompt(openTensions) {
+  if (openTensions.length === 0) return null;
+  const t = openTensions[0];
+  return {
+    action: `Open tension: ${t.name}`,
+    cta: "Want to discuss this tension or capture a decision about it?"
+  };
 }
 async function buildOrientResponse(wsCtx, agentSessionId, errors, task) {
   const wsFullCtx = await getWorkspaceContext();
@@ -8316,7 +8522,7 @@ async function buildOrientResponse(wsCtx, agentSessionId, errors, task) {
   try {
     readiness = await mcpQuery("chain.workspaceReadiness");
   } catch (e) {
-    errors.push(`Readiness: ${e.message}`);
+    errors.push(`Readiness: ${e instanceof Error ? e.message : String(e)}`);
   }
   const lines = [];
   const isLowReadiness = readiness !== null && readiness.score < 50;
@@ -8336,29 +8542,42 @@ async function buildOrientResponse(wsCtx, agentSessionId, errors, task) {
     lines.push("Let's get your workspace active.");
     lines.push("");
   }
-  if (isLowReadiness) {
-    const nextAction = pickNextAction(readiness.gaps ?? [], openTensions, priorSessions);
-    if (nextAction) {
-      lines.push("## Recommended next step");
-      lines.push(`**${nextAction.action}**`);
-      lines.push("");
-      lines.push(nextAction.cta);
+  if (isLowReadiness && readiness) {
+    const gaps = readiness.gaps ?? [];
+    if (gaps.length > 0) {
+      const gapCtx = {
+        stage: stage ?? "seeded",
+        passedChecks: readiness.passedChecks ?? 0,
+        totalChecks: readiness.totalChecks ?? 0,
+        score: readiness.score ?? 0
+      };
+      lines.push(formatTopGapPrompt(gaps[0], gaps.length - 1, gapCtx));
       lines.push("");
       lines.push(captureBehaviorNote);
       lines.push("");
-      const remainingGaps = (readiness.gaps ?? []).length - 1;
+      const remainingGaps = gaps.length - 1;
       if (remainingGaps > 0 || openTensions.length > 0) {
-        lines.push(`_${remainingGaps > 0 ? `${remainingGaps} more area${remainingGaps === 1 ? "" : "s"} to cover` : ""}${remainingGaps > 0 && openTensions.length > 0 ? " and " : ""}${openTensions.length > 0 ? `${openTensions.length} open tension${openTensions.length === 1 ? "" : "s"}` : ""} \u2014 ask for full status to see everything._`);
+        const parts = [];
+        if (remainingGaps > 0) parts.push(`${remainingGaps} more area${remainingGaps === 1 ? "" : "s"} to cover`);
+        if (openTensions.length > 0) parts.push(`${openTensions.length} open tension${openTensions.length === 1 ? "" : "s"}`);
+        lines.push(`_${parts.join(" and ")} \u2014 ask for full status to see everything._`);
+        lines.push("");
+      }
+    } else {
+      const tensionPrompt = pickNextTensionPrompt(openTensions);
+      if (tensionPrompt) {
+        lines.push(`**${tensionPrompt.action}**`);
+        lines.push(tensionPrompt.cta);
         lines.push("");
       }
     }
-    lines.push("_Need a collection that doesn't exist yet (e.g. audiences, personas, metrics)? Just ask \u2014 I'll set it up._");
+    lines.push("_Need a collection that doesn't exist yet? Just ask \u2014 I'll set it up._");
     lines.push("");
   } else if (isHighReadiness) {
     let activeBets = [];
     try {
-      const betEntries = await mcpQuery("chain.listEntries", { collectionSlug: "bets" });
-      activeBets = (betEntries ?? []).filter((e) => e.status === "active" && e.data?.horizon === "now").slice(0, 8);
+      const chainEntries = await mcpQuery("chain.listEntries", { collectionSlug: "chains" });
+      activeBets = (chainEntries ?? []).filter((e) => e.data?.chainTypeId === "bet" && e.status === "active" && e.data?.horizon === "now").slice(0, 8);
     } catch {
     }
     if (task) {
@@ -10153,90 +10372,17 @@ function formatScanReport(result) {
   return lines.join("\n");
 }
 
-// src/tools/health.ts
-var CALL_CATEGORIES = {
-  "chain.getEntry": "read",
-  "chain.batchGetEntries": "read",
-  "chain.listEntries": "read",
-  "chain.listEntryHistory": "read",
-  "chain.listEntryRelations": "read",
-  "chain.listEntriesByLabel": "read",
-  "chain.searchEntries": "search",
-  "chain.createEntry": "write",
-  "chain.updateEntry": "write",
-  "chain.moveToCollection": "write",
-  "chain.createEntryRelation": "write",
-  "chain.applyLabel": "label",
-  "chain.removeLabel": "label",
-  "chain.createLabel": "label",
-  "chain.updateLabel": "label",
-  "chain.deleteLabel": "label",
-  "chain.createCollection": "write",
-  "chain.updateCollection": "write",
-  "chain.listCollections": "meta",
-  "chain.getCollection": "meta",
-  "chain.listLabels": "meta",
-  "resolveWorkspace": "meta"
-};
-function categorize(fn) {
-  return CALL_CATEGORIES[fn] ?? "meta";
-}
-function formatDuration(ms) {
-  if (ms < 6e4) return `${Math.round(ms / 1e3)}s`;
-  const mins = Math.floor(ms / 6e4);
-  const secs = Math.round(ms % 6e4 / 1e3);
-  return `${mins}m ${secs}s`;
-}
-function buildSessionSummary(log) {
-  if (log.length === 0) return "";
-  const byCategory = /* @__PURE__ */ new Map();
-  let errorCount = 0;
-  let writeCreates = 0;
-  let writeUpdates = 0;
-  for (const entry of log) {
-    const cat = categorize(entry.fn);
-    if (!byCategory.has(cat)) byCategory.set(cat, /* @__PURE__ */ new Map());
-    const fnCounts = byCategory.get(cat);
-    fnCounts.set(entry.fn, (fnCounts.get(entry.fn) ?? 0) + 1);
-    if (entry.status === "error") errorCount++;
-    if (entry.fn === "chain.createEntry" && entry.status === "ok") writeCreates++;
-    if (entry.fn === "chain.updateEntry" && entry.status === "ok") writeUpdates++;
-  }
-  const firstTs = new Date(log[0].ts).getTime();
-  const lastTs = new Date(log[log.length - 1].ts).getTime();
-  const duration = formatDuration(lastTs - firstTs);
-  const lines = [`# Session Summary (${duration})
-`];
-  const categoryLabels = [
-    ["read", "Reads"],
-    ["search", "Searches"],
-    ["write", "Writes"],
-    ["label", "Labels"],
-    ["meta", "Meta"]
-  ];
-  for (const [cat, label] of categoryLabels) {
-    const fnCounts = byCategory.get(cat);
-    if (!fnCounts || fnCounts.size === 0) continue;
-    const total = [...fnCounts.values()].reduce((a, b) => a + b, 0);
-    const detail = [...fnCounts.entries()].sort((a, b) => b[1] - a[1]).map(([fn, count]) => `${fn.replace("chain.", "")} x${count}`).join(", ");
-    lines.push(`- **${label}:** ${total} call${total === 1 ? "" : "s"} (${detail})`);
-  }
-  lines.push(`- **Errors:** ${errorCount}`);
-  if (writeCreates > 0 || writeUpdates > 0) {
-    lines.push("");
-    lines.push("## Knowledge Contribution");
-    if (writeCreates > 0) lines.push(`- ${writeCreates} entr${writeCreates === 1 ? "y" : "ies"} created`);
-    if (writeUpdates > 0) lines.push(`- ${writeUpdates} entr${writeUpdates === 1 ? "y" : "ies"} updated`);
-  }
-  return lines.join("\n");
-}
+// src/tools/orient.ts
+import { z as z20 } from "zod";
 function extractSessionEntryIds(priorSessions) {
   const allSeen = /* @__PURE__ */ new Set();
   const all = [];
   let lastSessionOnly = [];
   for (let i = 0; i < priorSessions.length; i++) {
     const s = priorSessions[i];
-    const ids = [...s.entriesCreated ?? [], ...s.entriesModified ?? []].filter((id) => id);
+    const created = Array.isArray(s.entriesCreated) ? s.entriesCreated : [];
+    const modified = Array.isArray(s.entriesModified) ? s.entriesModified : [];
+    const ids = [...created, ...modified].filter((id) => typeof id === "string" && id.length > 0);
     if (i === 0) {
       lastSessionOnly = [...new Set(ids)].slice(0, 5);
     }
@@ -10251,426 +10397,11 @@ function extractSessionEntryIds(priorSessions) {
   }
   return { all, lastSessionOnly };
 }
-function computeOrganisationHealth(entries) {
-  let agreements = 0;
-  let disagreements = 0;
-  let abstentions = 0;
-  const flagMap = /* @__PURE__ */ new Map();
-  for (const entry of entries) {
-    const slug = entry.collectionSlug ?? entry.collection ?? "unknown";
-    const description = typeof entry.data?.description === "string" ? entry.data.description : "";
-    const result = classifyCollection(entry.name, description);
-    if (!result) {
-      abstentions++;
-      continue;
-    }
-    if (result.collection === slug) {
-      agreements++;
-    } else {
-      disagreements++;
-      if (!flagMap.has(slug)) flagMap.set(slug, /* @__PURE__ */ new Map());
-      const suggestions = flagMap.get(slug);
-      suggestions.set(result.collection, (suggestions.get(result.collection) ?? 0) + 1);
-    }
-  }
-  const opinionated = agreements + disagreements;
-  const agreementRate = opinionated > 0 ? Math.round(agreements / opinionated * 100) : 100;
-  const flags = [...flagMap.entries()].map(([collection, suggestions]) => {
-    const total = [...suggestions.values()].reduce((a, b) => a + b, 0);
-    const topSuggested = [...suggestions.entries()].sort((a, b) => b[1] - a[1])[0];
-    return { collection, count: total, suggestedCollection: topSuggested?.[0] ?? "unknown" };
-  }).sort((a, b) => b.count - a.count).slice(0, 3);
-  return { reviewed: entries.length, agreements, disagreements, abstentions, agreementRate, flags };
-}
-function formatOrgHealthLines(orgHealth, maxFlags = 3) {
-  const lines = [];
-  if (orgHealth.disagreements > 0) {
-    lines.push(
-      `${orgHealth.disagreements} of ${orgHealth.reviewed} entries flagged for review (${orgHealth.agreementRate}% classifier agreement).`
-    );
-    for (const flag of orgHealth.flags.slice(0, maxFlags)) {
-      lines.push(`- **${flag.collection}**: ${flag.count} entries may belong in \`${flag.suggestedCollection}\``);
-    }
-  } else if (orgHealth.reviewed > 0) {
-    lines.push(`All ${orgHealth.reviewed - orgHealth.abstentions} classified entries agree with stored collection (${orgHealth.abstentions} without coverage).`);
-  }
-  return lines;
-}
-async function fetchOrganisationHealth() {
-  try {
-    const allEntries = await mcpQuery("chain.listEntries", { status: "active" });
-    if (!allEntries || allEntries.length === 0) return null;
-    return computeOrganisationHealth(allEntries);
-  } catch (err) {
-    process.stderr.write(`[MCP] fetchOrganisationHealth failed: ${err.message}
-`);
-    return null;
-  }
-}
-async function handleHealthCheck() {
-  const start = Date.now();
-  const errors = [];
-  let workspaceId;
-  try {
-    workspaceId = await getWorkspaceId();
-  } catch (e) {
-    errors.push(`Workspace resolution failed: ${e instanceof Error ? e.message : String(e)}`);
-  }
-  let collections = [];
-  try {
-    collections = await mcpQuery("chain.listCollections");
-  } catch (e) {
-    errors.push(`Collection fetch failed: ${e instanceof Error ? e.message : String(e)}`);
-  }
-  let totalEntries = 0;
-  if (collections.length > 0) {
-    try {
-      const entries = await mcpQuery("chain.listEntries", {});
-      totalEntries = entries.length;
-    } catch (e) {
-      errors.push(`Entry count failed: ${e instanceof Error ? e.message : String(e)}`);
-    }
-  }
-  let wsCtx = null;
-  try {
-    wsCtx = await getWorkspaceContext();
-  } catch {
-  }
-  const durationMs = Date.now() - start;
-  const healthy = errors.length === 0;
-  const lines = [
-    `# ${healthy ? "Healthy" : "Degraded"}`,
-    "",
-    `**Workspace:** ${workspaceId ?? "unresolved"}`,
-    `**Workspace Slug:** ${wsCtx?.workspaceSlug ?? "unknown"}`,
-    `**Workspace Name:** ${wsCtx?.workspaceName ?? "unknown"}`,
-    `**Collections:** ${collections.length}`,
-    `**Entries:** ${totalEntries}`,
-    `**Latency:** ${durationMs}ms`
-  ];
-  if (errors.length > 0) {
-    lines.push("", "## Errors");
-    for (const err of errors) {
-      lines.push(`- ${err}`);
-    }
-  }
-  const healthData = {
-    healthy,
-    collections: collections.length,
-    entries: totalEntries,
-    latencyMs: durationMs,
-    workspace: workspaceId ?? "unresolved"
-  };
-  return {
-    content: [{ type: "text", text: lines.join("\n") }],
-    structuredContent: success(
-      healthy ? `Healthy. ${collections.length} collections, ${totalEntries} entries, ${durationMs}ms.` : `Degraded. ${errors.length} error(s).`,
-      healthData
-    )
-  };
-}
-async function handleWhoami() {
-  const ctx = await getWorkspaceContext();
-  const sessionId = getAgentSessionId();
-  const scope = getApiKeyScope();
-  const oriented = isSessionOriented();
-  const lines = [
-    `# Session Identity`,
-    "",
-    `**Workspace ID:** ${ctx.workspaceId}`,
-    `**Workspace Slug:** ${ctx.workspaceSlug}`,
-    `**Workspace Name:** ${ctx.workspaceName}`
-  ];
-  return {
-    content: [{ type: "text", text: lines.join("\n") }],
-    structuredContent: success(
-      `Session: ${ctx.workspaceName} (${scope}). ${oriented ? "Oriented." : "Not oriented."}`,
-      { workspaceId: ctx.workspaceId, workspaceName: ctx.workspaceName, scope, sessionId, oriented }
-    )
-  };
-}
-var STAGE_LABELS = {
-  blank: "Blank",
-  seeded: "Seeded",
-  grounded: "Grounded",
-  connected: "Connected"
-};
-var STAGE_DESCRIPTIONS = {
-  blank: "No knowledge captured yet.",
-  seeded: "Early knowledge is in place \u2014 keep building.",
-  grounded: "Solid foundations \u2014 a few gaps remain.",
-  connected: "Well-connected knowledge graph \u2014 your Brain is useful."
-};
-async function handleWorkspaceStatus() {
-  const result = await mcpQuery("chain.workspaceReadiness");
-  const { score, totalChecks, passedChecks, checks, gaps, stats, governanceMode } = result;
-  const scoringVersion = result.scoringVersion ?? "v1";
-  const stage = result.stage ?? "seeded";
-  const stageLabel = STAGE_LABELS[stage] ?? stage;
-  const stageDescription = STAGE_DESCRIPTIONS[stage] ?? "";
-  const scoreBar = "\u2588".repeat(Math.round(score / 10)) + "\u2591".repeat(10 - Math.round(score / 10));
-  const lines = [
-    `# Brain Status: ${stageLabel}`,
-    `_${stageDescription}_`,
-    "",
-    `${scoreBar} ${stageLabel} \xB7 ${score}%`,
-    `**Governance:** ${governanceMode ?? "open"}${(governanceMode ?? "open") !== "open" ? " (commits require proposal)" : ""}`,
-    "",
-    "## Stats",
-    `- **Entries:** ${stats.totalEntries} (${stats.activeCount} active, ${stats.draftCount} draft)`,
-    `- **Relations:** ${stats.totalRelations}`,
-    `- **Collections:** ${stats.collectionCount}`,
-    `- **Orphaned:** ${stats.orphanedCount} committed entries with no relations`,
-    ""
-  ];
-  if (gaps.length > 0) {
-    lines.push("## Gaps");
-    for (const gap of gaps) {
-      const action = gap.capabilityGuidance ?? gap.guidance;
-      lines.push(`- [ ] **${gap.label}**`);
-      lines.push(`  _${action}_`);
-    }
-    lines.push("");
-  }
-  const passed = checks.filter((c) => c.passed);
-  if (passed.length > 0) {
-    lines.push("## Passing checks");
-    for (const check of passed) {
-      lines.push(`- [x] ${check.label} (${check.current}/${check.required})`);
-    }
-    lines.push("");
-  }
-  const orgHealth = await fetchOrganisationHealth();
-  if (orgHealth && orgHealth.reviewed > 0) {
-    lines.push("## Organisation Health");
-    lines.push(...formatOrgHealthLines(orgHealth));
-    lines.push("");
-  }
-  const statusData = {
-    stage,
-    scoringVersion,
-    readinessScore: score,
-    activeEntries: stats.activeCount,
-    totalRelations: stats.totalRelations,
-    orphanedEntries: stats.orphanedCount,
-    gaps: gaps.map((g) => ({
-      id: g.id,
-      label: g.label,
-      guidance: g.capabilityGuidance ?? g.guidance
-    })),
-    ...orgHealth && { organisationHealth: orgHealth }
-  };
-  return {
-    content: [{ type: "text", text: lines.join("\n") }],
-    structuredContent: success(
-      `Brain: ${stageLabel} (${score}%). ${stats.activeCount} active entries, ${gaps.length} gap(s).`,
-      statusData
-    )
-  };
-}
-async function handleAudit(limit) {
-  const log = getAuditLog();
-  const recent = log.slice(-limit);
-  if (recent.length === 0) {
-    return successResult("No calls recorded yet this session.", "No calls recorded yet this session.", { totalCalls: 0, calls: [] });
-  }
-  const summary = buildSessionSummary(log);
-  const logLines = [`# Audit Log (last ${recent.length} of ${log.length} total)
-`];
-  for (const entry of recent) {
-    const icon = entry.status === "ok" ? "\u2713" : "\u2717";
-    const errPart = entry.error ? ` \u2014 ${entry.error}` : "";
-    const toolPart = entry.toolContext ? ` [${entry.toolContext.tool}${entry.toolContext.action ? ` action=${entry.toolContext.action}` : ""}]` : "";
-    logLines.push(`${icon} \`${entry.fn}\`${toolPart} ${entry.durationMs}ms ${entry.status}${errPart}`);
-  }
-  const auditData = {
-    totalCalls: log.length,
-    calls: recent.map((entry) => ({
-      tool: entry.fn,
-      ...entry.toolContext?.action && { action: entry.toolContext.action },
-      timestamp: entry.ts,
-      ...entry.durationMs != null && { durationMs: entry.durationMs }
-    }))
-  };
-  return {
-    content: [{ type: "text", text: `${summary}
-
----
-
-${logLines.join("\n")}` }],
-    structuredContent: success(
-      `Audit: ${log.length} total calls, showing last ${recent.length}.`,
-      auditData
-    )
-  };
-}
-var HEALTH_ACTIONS = ["check", "whoami", "status", "audit", "self-test"];
-var healthSchema = z20.object({
-  action: z20.enum(HEALTH_ACTIONS).describe(
-    "'check': connectivity and workspace stats. 'whoami': session identity. 'status': workspace readiness. 'audit': session audit log. 'self-test': validate all tool schemas."
-  ),
-  limit: z20.number().min(1).max(50).default(20).optional().describe("For audit: how many recent calls to show (max 50)")
-});
 var orientSchema = z20.object({
   mode: z20.enum(["full", "brief"]).optional().default("full").describe("full = full context (default). brief = compact summary for mid-session re-orientation."),
   task: z20.string().optional().describe("Natural-language task description for task-scoped context. When provided, orient returns scored, relevant entries for the task.")
 });
-var healthCheckOutputSchema = z20.object({
-  healthy: z20.boolean(),
-  collections: z20.number(),
-  entries: z20.number(),
-  latencyMs: z20.number(),
-  workspace: z20.string()
-});
-var organisationHealthSchema = z20.object({
-  reviewed: z20.number(),
-  agreements: z20.number(),
-  disagreements: z20.number(),
-  abstentions: z20.number(),
-  agreementRate: z20.number(),
-  flags: z20.array(z20.object({
-    collection: z20.string(),
-    count: z20.number(),
-    suggestedCollection: z20.string()
-  }))
-});
-var healthStatusOutputSchema = z20.object({
-  stage: z20.enum(["blank", "seeded", "grounded", "connected"]).optional().default("seeded"),
-  scoringVersion: z20.enum(["v1", "v2"]).optional().default("v1"),
-  readinessScore: z20.number(),
-  activeEntries: z20.number(),
-  totalRelations: z20.number(),
-  orphanedEntries: z20.number(),
-  gaps: z20.array(z20.object({ id: z20.string(), label: z20.string(), guidance: z20.string() })),
-  organisationHealth: organisationHealthSchema.optional()
-});
-var healthAuditOutputSchema = z20.object({
-  totalCalls: z20.number(),
-  calls: z20.array(z20.object({
-    tool: z20.string(),
-    action: z20.string().optional(),
-    timestamp: z20.string(),
-    durationMs: z20.number().optional()
-  }))
-});
-var healthWhoamiOutputSchema = z20.object({
-  workspaceId: z20.string(),
-  workspaceName: z20.string(),
-  scope: z20.string(),
-  sessionId: z20.union([z20.string(), z20.null()]),
-  oriented: z20.boolean()
-});
-var ALL_TOOL_SCHEMAS = [
-  { name: "entries", schema: entriesSchema },
-  { name: "relations", schema: relationsSchema },
-  { name: "graph", schema: graphSchema },
-  { name: "context", schema: contextSchema },
-  { name: "collections", schema: collectionsSchema },
-  { name: "session", schema: sessionSchema },
-  { name: "health", schema: healthSchema },
-  { name: "orient", schema: orientSchema },
-  { name: "quality", schema: qualitySchema },
-  { name: "workflows", schema: workflowsSchema },
-  { name: "session-wrapup", schema: wrapupSchema },
-  { name: "labels", schema: labelsSchema },
-  { name: "verify", schema: verifySchema },
-  { name: "capture", schema: captureSchema },
-  { name: "batch-capture", schema: batchCaptureSchema },
-  { name: "update-entry", schema: updateEntrySchema },
-  { name: "get-history", schema: getHistorySchema },
-  { name: "commit-entry", schema: commitEntrySchema },
-  { name: "start", schema: startSchema },
-  { name: "get-usage-summary", schema: usageSummarySchema },
-  { name: "chain", schema: chainSchema },
-  { name: "chain-version", schema: chainVersionSchema },
-  { name: "chain-branch", schema: chainBranchSchema },
-  { name: "chain-review", schema: chainReviewSchema },
-  { name: "create-audience-map-set", schema: createAudienceMapSetSchema },
-  { name: "map", schema: mapSchema },
-  { name: "map-slot", schema: mapSlotSchema },
-  { name: "map-version", schema: mapVersionSchema },
-  { name: "map-suggest", schema: mapSuggestSchema },
-  { name: "architecture", schema: architectureSchema },
-  { name: "architecture-admin", schema: architectureAdminSchema },
-  { name: "facilitate", schema: facilitateSchema }
-];
-var selfTestOutputSchema = z20.object({
-  passed: z20.number(),
-  failed: z20.number(),
-  total: z20.number(),
-  results: z20.array(z20.object({
-    tool: z20.string(),
-    valid: z20.boolean(),
-    error: z20.string().optional()
-  }))
-});
-function handleSelfTest() {
-  const results = [];
-  for (const { name, schema } of ALL_TOOL_SCHEMAS) {
-    try {
-      if (!schema || typeof schema.safeParse !== "function") {
-        results.push({ tool: name, valid: false, error: "Schema is not a valid Zod object" });
-        continue;
-      }
-      const test = schema.safeParse({});
-      if (test.success || test.error) {
-        results.push({ tool: name, valid: true });
-      }
-    } catch (e) {
-      results.push({ tool: name, valid: false, error: e instanceof Error ? e.message : String(e) });
-    }
-  }
-  const passed = results.filter((r) => r.valid).length;
-  const failed = results.filter((r) => !r.valid).length;
-  const total = results.length;
-  const lines = [
-    `# Self-Test: Tool Schema Validation`,
-    `**Result:** ${failed === 0 ? "ALL PASS" : `${failed} FAILED`}`,
-    `**Schemas validated:** ${passed}/${total}`,
-    ""
-  ];
-  if (failed > 0) {
-    lines.push("## Failures");
-    for (const r of results.filter((r2) => !r2.valid)) {
-      lines.push(`- **${r.tool}**: ${r.error}`);
-    }
-    lines.push("");
-  }
-  lines.push("## All Tools");
-  for (const r of results) {
-    lines.push(`- ${r.valid ? "PASS" : "FAIL"} \`${r.tool}\``);
-  }
-  return {
-    content: [{ type: "text", text: lines.join("\n") }],
-    structuredContent: success(
-      failed === 0 ? `Self-test: all ${total} schemas valid.` : `Self-test: ${failed}/${total} schemas failed.`,
-      { passed, failed, total, results }
-    )
-  };
-}
-function registerHealthTools(server) {
-  server.registerTool(
-    "health",
-    {
-      title: "Health",
-      description: "Diagnostics and session identity. Four actions:\n\n- **check**: Verify connectivity \u2014 workspace, collections, entries, latency.\n- **whoami**: Session identity \u2014 workspace ID, slug, name.\n- **status**: Workspace readiness \u2014 score, gaps, stats (entries, relations, orphans).\n- **audit**: Session audit log \u2014 last N backend calls with summary.",
-      inputSchema: healthSchema,
-      annotations: { readOnlyHint: true, idempotentHint: true, openWorldHint: false }
-    },
-    withEnvelope(async (args) => {
-      const parsed = parseOrFail(healthSchema, args);
-      if (!parsed.ok) return parsed.result;
-      const { action, limit } = parsed.data;
-      return runWithToolContext({ tool: "health", action }, async () => {
-        if (action === "check") return handleHealthCheck();
-        if (action === "whoami") return handleWhoami();
-        if (action === "status") return handleWorkspaceStatus();
-        if (action === "audit") return handleAudit(limit ?? 20);
-        if (action === "self-test") return handleSelfTest();
-        return unknownAction(action, HEALTH_ACTIONS);
-      });
-    })
-  );
+function registerOrientTool(server) {
   server.registerTool(
     "orient",
     {
@@ -10793,6 +10524,11 @@ function registerHealthTools(server) {
             lines.push(`- \`${e.entryId ?? e._id}\` ${e.name}${tensionPart}`);
           }
         }
+        const briefGaps = readiness?.gaps ?? [];
+        if (briefGaps.length > 0) {
+          const oneLiner = formatGapOneLiner(briefGaps[0]);
+          if (oneLiner) lines.push(oneLiner);
+        }
         if (recoveryBlock) {
           lines.push("");
           lines.push(...formatRecoveryBlock(recoveryBlock));
@@ -10863,29 +10599,31 @@ function registerHealthTools(server) {
           lines.push("");
         }
       }
+      let fullCoherenceSnapshot;
       if (isLowReadiness) {
-        lines.push(`**Brain stage: ${orientStage}.**`);
-        lines.push("");
-        const captureBehaviorNote = (readiness?.governanceMode ?? wsCtx?.governanceMode ?? "open") === "open" ? "_In Open mode, user-authored captures commit immediately unless you ask me to keep them as drafts._" : '_Everything stays as a draft until you confirm. Say "commit" or "looks good" to promote to the Chain._';
+        const captureBehaviorNote = (readiness?.governanceMode ?? wsCtx?.governanceMode ?? "open") === "open" ? "_In Open mode, captures commit automatically unless you ask me to keep them as drafts._" : "_Everything stays as a draft until you confirm._";
         const gaps = readiness.gaps ?? [];
         if (gaps.length > 0) {
-          const gap = gaps[0];
-          const cta = gap.capabilityGuidance ?? gap.guidance ?? `Tell me about your ${gap.label.toLowerCase()} and I'll capture it.`;
-          lines.push("## Recommended next step");
-          lines.push(`**${gap.label}**`);
-          lines.push("");
-          lines.push(cta);
+          const gapCtx = {
+            stage: orientStage,
+            passedChecks: readiness.passedChecks ?? 0,
+            totalChecks: readiness.totalChecks ?? 0,
+            score: readiness.score ?? 0
+          };
+          lines.push(formatTopGapPrompt(gaps[0], gaps.length - 1, gapCtx));
           lines.push("");
           lines.push(captureBehaviorNote);
           lines.push("");
           const remainingGaps = gaps.length - 1;
           if (remainingGaps > 0 || openTensions.length > 0) {
-            lines.push(`_${remainingGaps > 0 ? `${remainingGaps} more gap${remainingGaps === 1 ? "" : "s"}` : ""}${remainingGaps > 0 && openTensions.length > 0 ? " and " : ""}${openTensions.length > 0 ? `${openTensions.length} open tension${openTensions.length === 1 ? "" : "s"}` : ""} \u2014 ask "show full status" for details._`);
+            const parts = [];
+            if (remainingGaps > 0) parts.push(`${remainingGaps} more area${remainingGaps === 1 ? "" : "s"} to cover`);
+            if (openTensions.length > 0) parts.push(`${openTensions.length} open tension${openTensions.length === 1 ? "" : "s"}`);
+            lines.push(`_${parts.join(" and ")} \u2014 ask for full status to see everything._`);
             lines.push("");
           }
         }
-        lines.push("_Need a collection that doesn't exist yet (e.g. audiences, personas, metrics)?_");
-        lines.push("_Use `collections action=create` to add it, or ask me to propose collections for your domain._");
+        lines.push("_Need a collection that doesn't exist yet? Just ask \u2014 I'll set it up._");
         lines.push("");
       } else if (readiness) {
         const fmt = (e) => {
@@ -10893,10 +10631,9 @@ function registerHealthTools(server) {
           const stratum = e.stratum ?? "?";
           return `- \`${e.entryId ?? e._id}\` [${type} \xB7 ${stratum}] ${e.name}`;
         };
-        let fullCoherenceSnapshot2;
         const fullCoherence = buildCoherenceSection();
         if (fullCoherence) {
-          fullCoherenceSnapshot2 = fullCoherence.snapshot;
+          fullCoherenceSnapshot = fullCoherence.snapshot;
         }
         if (task) {
           lines.push(`**Brain stage: ${orientStage}.** Working on: **${task}**`);
@@ -10984,6 +10721,13 @@ function registerHealthTools(server) {
               orientEntries.activeGoals.forEach((e) => lines.push(fmt(e)));
               lines.push("");
             }
+            if (orientEntries.strategyHighlights?.length > 0) {
+              lines.push("## Strategy highlights");
+              lines.push("_One-sentence strategy, positioning, moat, business model, GTM \u2014 high-level strategic context._");
+              lines.push("");
+              orientEntries.strategyHighlights.forEach((e) => lines.push(fmt(e)));
+              lines.push("");
+            }
             if (orientEntries.recentDecisions?.length > 0) {
               lines.push("## Recent decisions");
               orientEntries.recentDecisions.forEach((e) => lines.push(fmt(e)));
@@ -11063,40 +10807,535 @@ function registerHealthTools(server) {
         for (const err of errors) lines.push(`- ${err}`);
         lines.push("");
       }
-      if (agentSessionId) {
-        try {
-          await mcpCall("agent.markOriented", {
-            sessionId: agentSessionId,
-            ...fullCoherenceSnapshot ? { coherenceSnapshot: fullCoherenceSnapshot } : {}
-          });
-          setSessionOriented(true);
-          lines.push("---");
-          lines.push(`Orientation complete. Session ${agentSessionId}. Write tools available.`);
-        } catch {
-          lines.push("---");
-          lines.push("_Warning: Could not mark session as oriented. Write tools may be restricted._");
-        }
-        try {
-          await mcpMutation("chain.recordSessionSignal", {
-            sessionId: agentSessionId,
-            signalType: "immediate_context_load",
-            metadata: { source: "orient" }
-          });
-        } catch (err) {
-          process.stderr.write(`[MCP] recordSessionSignal failed: ${err.message}
-`);
-        }
-      } else {
-        lines.push("---");
-        lines.push("_No active agent session. Call `session action=start` to begin a tracked session._");
+      if (agentSessionId) {
+        try {
+          await mcpCall("agent.markOriented", {
+            sessionId: agentSessionId,
+            ...fullCoherenceSnapshot ? { coherenceSnapshot: fullCoherenceSnapshot } : {}
+          });
+          setSessionOriented(true);
+          lines.push("---");
+          lines.push(`Orientation complete. Session ${agentSessionId}. Write tools available.`);
+        } catch {
+          lines.push("---");
+          lines.push("_Warning: Could not mark session as oriented. Write tools may be restricted._");
+        }
+        try {
+          await mcpMutation("chain.recordSessionSignal", {
+            sessionId: agentSessionId,
+            signalType: "immediate_context_load",
+            metadata: { source: "orient" }
+          });
+        } catch (err) {
+          process.stderr.write(`[MCP] recordSessionSignal failed: ${err.message}
+`);
+        }
+      } else {
+        lines.push("---");
+        lines.push("_No active agent session. Call `session action=start` to begin a tracked session._");
+      }
+      return {
+        content: [{ type: "text", text: lines.join("\n") }],
+        structuredContent: success(
+          `Oriented (full). Stage: ${orientStage}. ${isLowReadiness ? "Low readiness \u2014 gaps remain." : "Ready."}`,
+          { mode: "full", stage: orientStage, oriented: isSessionOriented(), sessionId: agentSessionId }
+        )
+      };
+    })
+  );
+}
+
+// src/tools/health.ts
+var CALL_CATEGORIES = {
+  "chain.getEntry": "read",
+  "chain.batchGetEntries": "read",
+  "chain.listEntries": "read",
+  "chain.listEntryHistory": "read",
+  "chain.listEntryRelations": "read",
+  "chain.listEntriesByLabel": "read",
+  "chain.searchEntries": "search",
+  "chain.createEntry": "write",
+  "chain.updateEntry": "write",
+  "chain.moveToCollection": "write",
+  "chain.createEntryRelation": "write",
+  "chain.applyLabel": "label",
+  "chain.removeLabel": "label",
+  "chain.createLabel": "label",
+  "chain.updateLabel": "label",
+  "chain.deleteLabel": "label",
+  "chain.createCollection": "write",
+  "chain.updateCollection": "write",
+  "chain.listCollections": "meta",
+  "chain.getCollection": "meta",
+  "chain.listLabels": "meta",
+  "resolveWorkspace": "meta"
+};
+function categorize(fn) {
+  return CALL_CATEGORIES[fn] ?? "meta";
+}
+function formatDuration(ms) {
+  if (ms < 6e4) return `${Math.round(ms / 1e3)}s`;
+  const mins = Math.floor(ms / 6e4);
+  const secs = Math.round(ms % 6e4 / 1e3);
+  return `${mins}m ${secs}s`;
+}
+function buildSessionSummary(log) {
+  if (log.length === 0) return "";
+  const byCategory = /* @__PURE__ */ new Map();
+  let errorCount = 0;
+  let writeCreates = 0;
+  let writeUpdates = 0;
+  for (const entry of log) {
+    const cat = categorize(entry.fn);
+    if (!byCategory.has(cat)) byCategory.set(cat, /* @__PURE__ */ new Map());
+    const fnCounts = byCategory.get(cat);
+    fnCounts.set(entry.fn, (fnCounts.get(entry.fn) ?? 0) + 1);
+    if (entry.status === "error") errorCount++;
+    if (entry.fn === "chain.createEntry" && entry.status === "ok") writeCreates++;
+    if (entry.fn === "chain.updateEntry" && entry.status === "ok") writeUpdates++;
+  }
+  const firstTs = new Date(log[0].ts).getTime();
+  const lastTs = new Date(log[log.length - 1].ts).getTime();
+  const duration = formatDuration(lastTs - firstTs);
+  const lines = [`# Session Summary (${duration})
+`];
+  const categoryLabels = [
+    ["read", "Reads"],
+    ["search", "Searches"],
+    ["write", "Writes"],
+    ["label", "Labels"],
+    ["meta", "Meta"]
+  ];
+  for (const [cat, label] of categoryLabels) {
+    const fnCounts = byCategory.get(cat);
+    if (!fnCounts || fnCounts.size === 0) continue;
+    const total = [...fnCounts.values()].reduce((a, b) => a + b, 0);
+    const detail = [...fnCounts.entries()].sort((a, b) => b[1] - a[1]).map(([fn, count]) => `${fn.replace("chain.", "")} x${count}`).join(", ");
+    lines.push(`- **${label}:** ${total} call${total === 1 ? "" : "s"} (${detail})`);
+  }
+  lines.push(`- **Errors:** ${errorCount}`);
+  if (writeCreates > 0 || writeUpdates > 0) {
+    lines.push("");
+    lines.push("## Knowledge Contribution");
+    if (writeCreates > 0) lines.push(`- ${writeCreates} entr${writeCreates === 1 ? "y" : "ies"} created`);
+    if (writeUpdates > 0) lines.push(`- ${writeUpdates} entr${writeUpdates === 1 ? "y" : "ies"} updated`);
+  }
+  return lines.join("\n");
+}
+function computeOrganisationHealth(entries) {
+  let agreements = 0;
+  let disagreements = 0;
+  let abstentions = 0;
+  const flagMap = /* @__PURE__ */ new Map();
+  for (const entry of entries) {
+    const slug = entry.collectionSlug ?? entry.collection ?? "unknown";
+    const description = typeof entry.data?.description === "string" ? entry.data.description : "";
+    const result = classifyCollection(entry.name, description);
+    if (!result) {
+      abstentions++;
+      continue;
+    }
+    if (result.collection === slug) {
+      agreements++;
+    } else {
+      disagreements++;
+      if (!flagMap.has(slug)) flagMap.set(slug, /* @__PURE__ */ new Map());
+      const suggestions = flagMap.get(slug);
+      suggestions.set(result.collection, (suggestions.get(result.collection) ?? 0) + 1);
+    }
+  }
+  const opinionated = agreements + disagreements;
+  const agreementRate = opinionated > 0 ? Math.round(agreements / opinionated * 100) : 100;
+  const flags = [...flagMap.entries()].map(([collection, suggestions]) => {
+    const total = [...suggestions.values()].reduce((a, b) => a + b, 0);
+    const topSuggested = [...suggestions.entries()].sort((a, b) => b[1] - a[1])[0];
+    return { collection, count: total, suggestedCollection: topSuggested?.[0] ?? "unknown" };
+  }).sort((a, b) => b.count - a.count).slice(0, 3);
+  return { reviewed: entries.length, agreements, disagreements, abstentions, agreementRate, flags };
+}
+function formatOrgHealthLines(orgHealth, maxFlags = 3) {
+  const lines = [];
+  if (orgHealth.disagreements > 0) {
+    lines.push(
+      `${orgHealth.disagreements} of ${orgHealth.reviewed} entries flagged for review (${orgHealth.agreementRate}% classifier agreement).`
+    );
+    for (const flag of orgHealth.flags.slice(0, maxFlags)) {
+      lines.push(`- **${flag.collection}**: ${flag.count} entries may belong in \`${flag.suggestedCollection}\``);
+    }
+  } else if (orgHealth.reviewed > 0) {
+    lines.push(`All ${orgHealth.reviewed - orgHealth.abstentions} classified entries agree with stored collection (${orgHealth.abstentions} without coverage).`);
+  }
+  return lines;
+}
+async function fetchOrganisationHealth() {
+  try {
+    const allEntries = await mcpQuery("chain.listEntries", { status: "active" });
+    if (!allEntries || allEntries.length === 0) return null;
+    return computeOrganisationHealth(allEntries);
+  } catch (err) {
+    process.stderr.write(`[MCP] fetchOrganisationHealth failed: ${err.message}
+`);
+    return null;
+  }
+}
+async function handleHealthCheck() {
+  const start = Date.now();
+  const errors = [];
+  let workspaceId;
+  try {
+    workspaceId = await getWorkspaceId();
+  } catch (e) {
+    errors.push(`Workspace resolution failed: ${e instanceof Error ? e.message : String(e)}`);
+  }
+  let collections = [];
+  try {
+    collections = await mcpQuery("chain.listCollections");
+  } catch (e) {
+    errors.push(`Collection fetch failed: ${e instanceof Error ? e.message : String(e)}`);
+  }
+  let totalEntries = 0;
+  if (collections.length > 0) {
+    try {
+      const entries = await mcpQuery("chain.listEntries", {});
+      totalEntries = entries.length;
+    } catch (e) {
+      errors.push(`Entry count failed: ${e instanceof Error ? e.message : String(e)}`);
+    }
+  }
+  let wsCtx = null;
+  try {
+    wsCtx = await getWorkspaceContext();
+  } catch {
+  }
+  const durationMs = Date.now() - start;
+  const healthy = errors.length === 0;
+  const lines = [
+    `# ${healthy ? "Healthy" : "Degraded"}`,
+    "",
+    `**Workspace:** ${workspaceId ?? "unresolved"}`,
+    `**Workspace Slug:** ${wsCtx?.workspaceSlug ?? "unknown"}`,
+    `**Workspace Name:** ${wsCtx?.workspaceName ?? "unknown"}`,
+    `**Collections:** ${collections.length}`,
+    `**Entries:** ${totalEntries}`,
+    `**Latency:** ${durationMs}ms`
+  ];
+  if (errors.length > 0) {
+    lines.push("", "## Errors");
+    for (const err of errors) {
+      lines.push(`- ${err}`);
+    }
+  }
+  const healthData = {
+    healthy,
+    collections: collections.length,
+    entries: totalEntries,
+    latencyMs: durationMs,
+    workspace: workspaceId ?? "unresolved"
+  };
+  return {
+    content: [{ type: "text", text: lines.join("\n") }],
+    structuredContent: success(
+      healthy ? `Healthy. ${collections.length} collections, ${totalEntries} entries, ${durationMs}ms.` : `Degraded. ${errors.length} error(s).`,
+      healthData
+    )
+  };
+}
+async function handleWhoami() {
+  const ctx = await getWorkspaceContext();
+  const sessionId = getAgentSessionId();
+  const scope = getApiKeyScope();
+  const oriented = isSessionOriented();
+  const lines = [
+    `# Session Identity`,
+    "",
+    `**Workspace ID:** ${ctx.workspaceId}`,
+    `**Workspace Slug:** ${ctx.workspaceSlug}`,
+    `**Workspace Name:** ${ctx.workspaceName}`
+  ];
+  return {
+    content: [{ type: "text", text: lines.join("\n") }],
+    structuredContent: success(
+      `Session: ${ctx.workspaceName} (${scope}). ${oriented ? "Oriented." : "Not oriented."}`,
+      { workspaceId: ctx.workspaceId, workspaceName: ctx.workspaceName, scope, sessionId, oriented }
+    )
+  };
+}
+var STAGE_LABELS = {
+  blank: "Blank",
+  seeded: "Seeded",
+  grounded: "Grounded",
+  connected: "Connected"
+};
+var STAGE_DESCRIPTIONS = {
+  blank: "No knowledge captured yet.",
+  seeded: "Early knowledge is in place \u2014 keep building.",
+  grounded: "Solid foundations \u2014 a few gaps remain.",
+  connected: "Well-connected knowledge graph \u2014 your Brain is useful."
+};
+async function handleWorkspaceStatus() {
+  const result = await mcpQuery("chain.workspaceReadiness");
+  const { score, totalChecks, passedChecks, checks, gaps, stats, governanceMode } = result;
+  const scoringVersion = result.scoringVersion ?? "v1";
+  const stage = result.stage ?? "seeded";
+  const stageLabel = STAGE_LABELS[stage] ?? stage;
+  const stageDescription = STAGE_DESCRIPTIONS[stage] ?? "";
+  const scoreBar = "\u2588".repeat(Math.round(score / 10)) + "\u2591".repeat(10 - Math.round(score / 10));
+  const lines = [
+    `# Brain Status: ${stageLabel}`,
+    `_${stageDescription}_`,
+    "",
+    `${scoreBar} ${stageLabel} \xB7 ${score}%`,
+    `**Governance:** ${governanceMode ?? "open"}${(governanceMode ?? "open") !== "open" ? " (commits require proposal)" : ""}`,
+    "",
+    "## Stats",
+    `- **Entries:** ${stats.totalEntries} (${stats.activeCount} active, ${stats.draftCount} draft)`,
+    `- **Relations:** ${stats.totalRelations}`,
+    `- **Collections:** ${stats.collectionCount}`,
+    `- **Orphaned:** ${stats.orphanedCount} committed entries with no relations`,
+    ""
+  ];
+  if (gaps.length > 0) {
+    lines.push("## Gaps");
+    for (const gap of gaps) {
+      const action = gap.capabilityGuidance ?? gap.guidance;
+      lines.push(`- [ ] **${gap.label}**`);
+      lines.push(`  _${action}_`);
+    }
+    lines.push("");
+  }
+  const passed = checks.filter((c) => c.passed);
+  if (passed.length > 0) {
+    lines.push("## Passing checks");
+    for (const check of passed) {
+      lines.push(`- [x] ${check.label} (${check.current}/${check.required})`);
+    }
+    lines.push("");
+  }
+  const orgHealth = await fetchOrganisationHealth();
+  if (orgHealth && orgHealth.reviewed > 0) {
+    lines.push("## Organisation Health");
+    lines.push(...formatOrgHealthLines(orgHealth));
+    lines.push("");
+  }
+  const statusData = {
+    stage,
+    scoringVersion,
+    readinessScore: score,
+    activeEntries: stats.activeCount,
+    totalRelations: stats.totalRelations,
+    orphanedEntries: stats.orphanedCount,
+    gaps: gaps.map((g) => ({
+      id: g.id,
+      label: g.label,
+      guidance: g.capabilityGuidance ?? g.guidance
+    })),
+    ...orgHealth && { organisationHealth: orgHealth }
+  };
+  return {
+    content: [{ type: "text", text: lines.join("\n") }],
+    structuredContent: success(
+      `Brain: ${stageLabel} (${score}%). ${stats.activeCount} active entries, ${gaps.length} gap(s).`,
+      statusData
+    )
+  };
+}
+async function handleAudit(limit) {
+  const log = getAuditLog();
+  const recent = log.slice(-limit);
+  if (recent.length === 0) {
+    return successResult("No calls recorded yet this session.", "No calls recorded yet this session.", { totalCalls: 0, calls: [] });
+  }
+  const summary = buildSessionSummary(log);
+  const logLines = [`# Audit Log (last ${recent.length} of ${log.length} total)
+`];
+  for (const entry of recent) {
+    const icon = entry.status === "ok" ? "\u2713" : "\u2717";
+    const errPart = entry.error ? ` \u2014 ${entry.error}` : "";
+    const toolPart = entry.toolContext ? ` [${entry.toolContext.tool}${entry.toolContext.action ? ` action=${entry.toolContext.action}` : ""}]` : "";
+    logLines.push(`${icon} \`${entry.fn}\`${toolPart} ${entry.durationMs}ms ${entry.status}${errPart}`);
+  }
+  const auditData = {
+    totalCalls: log.length,
+    calls: recent.map((entry) => ({
+      tool: entry.fn,
+      ...entry.toolContext?.action && { action: entry.toolContext.action },
+      timestamp: entry.ts,
+      ...entry.durationMs != null && { durationMs: entry.durationMs }
+    }))
+  };
+  return {
+    content: [{ type: "text", text: `${summary}
+
+---
+
+${logLines.join("\n")}` }],
+    structuredContent: success(
+      `Audit: ${log.length} total calls, showing last ${recent.length}.`,
+      auditData
+    )
+  };
+}
+var HEALTH_ACTIONS = ["check", "whoami", "status", "audit", "self-test"];
+var healthSchema = z21.object({
+  action: z21.enum(HEALTH_ACTIONS).describe(
+    "'check': connectivity and workspace stats. 'whoami': session identity. 'status': workspace readiness. 'audit': session audit log. 'self-test': validate all tool schemas."
+  ),
+  limit: z21.number().min(1).max(50).default(20).optional().describe("For audit: how many recent calls to show (max 50)")
+});
+var healthCheckOutputSchema = z21.object({
+  healthy: z21.boolean(),
+  collections: z21.number(),
+  entries: z21.number(),
+  latencyMs: z21.number(),
+  workspace: z21.string()
+});
+var organisationHealthSchema = z21.object({
+  reviewed: z21.number(),
+  agreements: z21.number(),
+  disagreements: z21.number(),
+  abstentions: z21.number(),
+  agreementRate: z21.number(),
+  flags: z21.array(z21.object({
+    collection: z21.string(),
+    count: z21.number(),
+    suggestedCollection: z21.string()
+  }))
+});
+var healthStatusOutputSchema = z21.object({
+  stage: z21.enum(["blank", "seeded", "grounded", "connected"]).optional().default("seeded"),
+  scoringVersion: z21.enum(["v1", "v2"]).optional().default("v1"),
+  readinessScore: z21.number(),
+  activeEntries: z21.number(),
+  totalRelations: z21.number(),
+  orphanedEntries: z21.number(),
+  gaps: z21.array(z21.object({ id: z21.string(), label: z21.string(), guidance: z21.string() })),
+  organisationHealth: organisationHealthSchema.optional()
+});
+var healthAuditOutputSchema = z21.object({
+  totalCalls: z21.number(),
+  calls: z21.array(z21.object({
+    tool: z21.string(),
+    action: z21.string().optional(),
+    timestamp: z21.string(),
+    durationMs: z21.number().optional()
+  }))
+});
+var healthWhoamiOutputSchema = z21.object({
+  workspaceId: z21.string(),
+  workspaceName: z21.string(),
+  scope: z21.string(),
+  sessionId: z21.union([z21.string(), z21.null()]),
+  oriented: z21.boolean()
+});
+var ALL_TOOL_SCHEMAS = [
+  { name: "entries", schema: entriesSchema },
+  { name: "relations", schema: relationsSchema },
+  { name: "graph", schema: graphSchema },
+  { name: "context", schema: contextSchema },
+  { name: "collections", schema: collectionsSchema },
+  { name: "session", schema: sessionSchema },
+  { name: "health", schema: healthSchema },
+  { name: "orient", schema: orientSchema },
+  { name: "quality", schema: qualitySchema },
+  { name: "workflows", schema: workflowsSchema },
+  { name: "session-wrapup", schema: wrapupSchema },
+  { name: "labels", schema: labelsSchema },
+  { name: "verify", schema: verifySchema },
+  { name: "capture", schema: captureSchema },
+  { name: "batch-capture", schema: batchCaptureSchema },
+  { name: "update-entry", schema: updateEntrySchema },
+  { name: "get-history", schema: getHistorySchema },
+  { name: "commit-entry", schema: commitEntrySchema },
+  { name: "start", schema: startSchema },
+  { name: "get-usage-summary", schema: usageSummarySchema },
+  { name: "chain", schema: chainSchema },
+  { name: "chain-version", schema: chainVersionSchema },
+  { name: "chain-branch", schema: chainBranchSchema },
+  { name: "chain-review", schema: chainReviewSchema },
+  { name: "create-audience-map-set", schema: createAudienceMapSetSchema },
+  { name: "map", schema: mapSchema },
+  { name: "map-slot", schema: mapSlotSchema },
+  { name: "map-version", schema: mapVersionSchema },
+  { name: "map-suggest", schema: mapSuggestSchema },
+  { name: "architecture", schema: architectureSchema },
+  { name: "architecture-admin", schema: architectureAdminSchema },
+  { name: "facilitate", schema: facilitateSchema }
+];
+var selfTestOutputSchema = z21.object({
+  passed: z21.number(),
+  failed: z21.number(),
+  total: z21.number(),
+  results: z21.array(z21.object({
+    tool: z21.string(),
+    valid: z21.boolean(),
+    error: z21.string().optional()
+  }))
+});
+function handleSelfTest() {
+  const results = [];
+  for (const { name, schema } of ALL_TOOL_SCHEMAS) {
+    try {
+      if (!schema || typeof schema.safeParse !== "function") {
+        results.push({ tool: name, valid: false, error: "Schema is not a valid Zod object" });
+        continue;
+      }
+      const test = schema.safeParse({});
+      if (test.success || test.error) {
+        results.push({ tool: name, valid: true });
       }
-      return {
-        content: [{ type: "text", text: lines.join("\n") }],
-        structuredContent: success(
-          `Oriented (full). Stage: ${orientStage}. ${isLowReadiness ? "Low readiness \u2014 gaps remain." : "Ready."}`,
-          { mode: "full", stage: orientStage, oriented: isSessionOriented(), sessionId: agentSessionId }
-        )
-      };
+    } catch (e) {
+      results.push({ tool: name, valid: false, error: e instanceof Error ? e.message : String(e) });
+    }
+  }
+  const passed = results.filter((r) => r.valid).length;
+  const failed = results.filter((r) => !r.valid).length;
+  const total = results.length;
+  const lines = [
+    `# Self-Test: Tool Schema Validation`,
+    `**Result:** ${failed === 0 ? "ALL PASS" : `${failed} FAILED`}`,
+    `**Schemas validated:** ${passed}/${total}`,
+    ""
+  ];
+  if (failed > 0) {
+    lines.push("## Failures");
+    for (const r of results.filter((r2) => !r2.valid)) {
+      lines.push(`- **${r.tool}**: ${r.error}`);
+    }
+    lines.push("");
+  }
+  lines.push("## All Tools");
+  for (const r of results) {
+    lines.push(`- ${r.valid ? "PASS" : "FAIL"} \`${r.tool}\``);
+  }
+  return {
+    content: [{ type: "text", text: lines.join("\n") }],
+    structuredContent: success(
+      failed === 0 ? `Self-test: all ${total} schemas valid.` : `Self-test: ${failed}/${total} schemas failed.`,
+      { passed, failed, total, results }
+    )
+  };
+}
+function registerHealthTools(server) {
+  server.registerTool(
+    "health",
+    {
+      title: "Health",
+      description: "Diagnostics and session identity. Four actions:\n\n- **check**: Verify connectivity \u2014 workspace, collections, entries, latency.\n- **whoami**: Session identity \u2014 workspace ID, slug, name.\n- **status**: Workspace readiness \u2014 score, gaps, stats (entries, relations, orphans).\n- **audit**: Session audit log \u2014 last N backend calls with summary.",
+      inputSchema: healthSchema,
+      annotations: { readOnlyHint: true, idempotentHint: true, openWorldHint: false }
+    },
+    withEnvelope(async (args) => {
+      const parsed = parseOrFail(healthSchema, args);
+      if (!parsed.ok) return parsed.result;
+      const { action, limit } = parsed.data;
+      return runWithToolContext({ tool: "health", action }, async () => {
+        if (action === "check") return handleHealthCheck();
+        if (action === "whoami") return handleWhoami();
+        if (action === "status") return handleWorkspaceStatus();
+        if (action === "audit") return handleAudit(limit ?? 20);
+        if (action === "self-test") return handleSelfTest();
+        return unknownAction(action, HEALTH_ACTIONS);
+      });
     })
   );
 }
@@ -11545,12 +11784,197 @@ ${entry.labels.map((l) => `- ${l.name ?? l.slug}`).join("\n")}`);
 }
 
 // src/prompts/index.ts
-import { z as z21 } from "zod";
+import { z as z23 } from "zod";
+
+// src/tools/project-scan.ts
+import { z as z22 } from "zod";
+var scanExtractionSchema = z22.object({
+  vision: z22.string().min(10).optional().describe("Product purpose from README"),
+  audience: z22.string().optional().describe("Primary user or customer segment"),
+  techStack: z22.array(z22.string()).optional().describe("Key technologies from package.json"),
+  modules: z22.array(z22.object({ name: z22.string(), purpose: z22.string() })).max(8).optional().describe("Top-level modules from folder structure"),
+  businessRules: z22.array(z22.string()).max(10).optional().describe("System constraints from .cursorrules/AGENTS.md/CLAUDE.md"),
+  conventions: z22.array(z22.string()).max(8).optional().describe("Coding or process standards from .cursorrules"),
+  keyDecisions: z22.array(z22.string()).optional().describe("Significant architectural decisions from git log or README"),
+  tensions: z22.array(z22.string()).optional().describe("Friction points or known trade-offs"),
+  keyTerms: z22.array(z22.string()).optional().describe("Domain-specific vocabulary found in files")
+});
+var COLLECTION_PRIORITY = {
+  strategy: 0,
+  audiences: 1,
+  architecture: 2,
+  decisions: 3,
+  "business-rules": 4,
+  standards: 5,
+  glossary: 6,
+  tensions: 7
+};
+var GENERIC_MODULE_NAMES = /* @__PURE__ */ new Set(["src", "lib", "utils"]);
+function truncate(str, maxLen) {
+  return str.length <= maxLen ? str : str.slice(0, maxLen);
+}
+function firstNWords(str, n) {
+  return str.split(/\s+/).slice(0, n).join(" ");
+}
+function scanToBatchEntries(extracted) {
+  const entries = [];
+  const techStackGlossaryNames = /* @__PURE__ */ new Set();
+  if (extracted.vision) {
+    entries.push({
+      collection: "strategy",
+      name: "Product Vision",
+      description: extracted.vision
+    });
+  }
+  if (extracted.audience) {
+    entries.push({
+      collection: "audiences",
+      name: firstNWords(extracted.audience, 6),
+      description: extracted.audience
+    });
+  }
+  if (extracted.techStack && extracted.techStack.length > 0) {
+    entries.push({
+      collection: "architecture",
+      name: "Tech Stack",
+      description: `Technology choices: ${extracted.techStack.join(", ")}`
+    });
+    for (const tech of extracted.techStack.slice(0, 3)) {
+      const name = tech;
+      techStackGlossaryNames.add(name.toLowerCase());
+      entries.push({
+        collection: "glossary",
+        name,
+        description: `${tech} \u2014 part of the tech stack`
+      });
+    }
+  }
+  if (extracted.modules) {
+    let count = 0;
+    for (const mod of extracted.modules) {
+      if (count >= 5) break;
+      if (GENERIC_MODULE_NAMES.has(mod.name.toLowerCase())) continue;
+      entries.push({
+        collection: "architecture",
+        name: mod.name,
+        description: mod.purpose
+      });
+      count++;
+    }
+  }
+  for (const rule of extracted.businessRules ?? []) {
+    entries.push({
+      collection: "business-rules",
+      name: truncate(rule, 70),
+      description: rule
+    });
+  }
+  for (const convention of extracted.conventions ?? []) {
+    entries.push({
+      collection: "standards",
+      name: truncate(convention, 70),
+      description: convention
+    });
+  }
+  for (const decision of extracted.keyDecisions ?? []) {
+    entries.push({
+      collection: "decisions",
+      name: truncate(decision, 80),
+      description: decision
+    });
+  }
+  for (const tension of extracted.tensions ?? []) {
+    entries.push({
+      collection: "tensions",
+      name: truncate(tension, 80),
+      description: tension
+    });
+  }
+  for (const term of extracted.keyTerms ?? []) {
+    if (techStackGlossaryNames.has(term.toLowerCase())) continue;
+    entries.push({
+      collection: "glossary",
+      name: term,
+      description: `Core domain term: ${term}`
+    });
+  }
+  const seen = /* @__PURE__ */ new Set();
+  const deduped = entries.filter((e) => {
+    const key = `${e.collection}:${e.name.toLowerCase()}`;
+    if (seen.has(key)) return false;
+    seen.add(key);
+    return true;
+  });
+  if (deduped.length <= 30) return deduped;
+  return deduped.sort((a, b) => {
+    const pa = COLLECTION_PRIORITY[a.collection] ?? 99;
+    const pb = COLLECTION_PRIORITY[b.collection] ?? 99;
+    return pa - pb;
+  }).slice(0, 30);
+}
+
+// src/tools/draft-review.ts
+var REVIEW_COLLECTION_ORDER = [
+  "strategy",
+  "chains",
+  "audiences",
+  "architecture",
+  "decisions",
+  "business-rules",
+  "standards",
+  "glossary",
+  "tensions"
+];
+function groupDraftsByCollection(drafts) {
+  const buckets = /* @__PURE__ */ new Map();
+  for (const draft of drafts) {
+    const existing = buckets.get(draft.collection);
+    if (existing) {
+      existing.push(draft);
+    } else {
+      buckets.set(draft.collection, [draft]);
+    }
+  }
+  const knownKeys = REVIEW_COLLECTION_ORDER.filter((k) => buckets.has(k));
+  const unknownKeys = [...buckets.keys()].filter((k) => !REVIEW_COLLECTION_ORDER.includes(k)).sort();
+  const ordered = /* @__PURE__ */ new Map();
+  for (const key of [...knownKeys, ...unknownKeys]) {
+    ordered.set(key, buckets.get(key));
+  }
+  return ordered;
+}
+var COLLECTION_DISPLAY_NAMES = {
+  "business-rules": "Business Rules",
+  "tracking-events": "Tracking Events"
+};
+function collectionLabel(slug) {
+  return COLLECTION_DISPLAY_NAMES[slug] ?? slug.charAt(0).toUpperCase() + slug.slice(1);
+}
+function formatDraftGroups(grouped, total) {
+  if (total === 0) {
+    return "No drafts to review \u2014 your workspace is fully committed.";
+  }
+  const lines = [`## Drafts Ready for Review (${total} total)`];
+  let counter = 1;
+  for (const [collection, entries] of grouped) {
+    const label = collectionLabel(collection);
+    const count = entries.length;
+    lines.push(`
+### ${label} (${count} ${count === 1 ? "entry" : "entries"})`);
+    for (const entry of entries) {
+      lines.push(`${counter}. ${entry.name} [${entry.entryId}]`);
+      counter++;
+    }
+  }
+  return lines.join("\n");
+}
+
+// src/prompts/index.ts
 function registerPrompts(server) {
   server.prompt(
     "review-against-rules",
     "Review code or a design decision against all business rules for a given domain. Fetches the rules and asks you to do a structured compliance review.",
-    { domain: z21.string().describe("Business rule domain (e.g. 'Identity & Access', 'Governance & Decision-Making')") },
+    { domain: z23.string().describe("Business rule domain (e.g. 'Identity & Access', 'Governance & Decision-Making')") },
     async ({ domain }) => {
       const entries = await mcpQuery("chain.listEntries", { collectionSlug: "business-rules" });
       const rules = entries.filter((e) => e.data?.domain === domain);
@@ -11603,7 +12027,7 @@ Provide a structured review with a compliance status for each rule (COMPLIANT /
   server.prompt(
     "name-check",
     "Check variable names, field names, or API names against the glossary for terminology alignment. Flags drift from canonical terms.",
-    { names: z21.string().describe("Comma-separated list of names to check (e.g. 'vendor_id, compliance_level, formulator_type')") },
+    { names: z23.string().describe("Comma-separated list of names to check (e.g. 'vendor_id, compliance_level, formulator_type')") },
     async ({ names }) => {
       const terms = await mcpQuery("chain.listEntries", { collectionSlug: "glossary" });
       const glossaryContext = terms.map(
@@ -11639,7 +12063,7 @@ Format as a table: Name | Status | Canonical Form | Action Needed`
   server.prompt(
     "draft-decision-record",
     "Draft a structured decision record from a description of what was decided. Includes context from recent decisions and relevant rules.",
-    { context: z21.string().describe("Description of the decision (e.g. 'We decided to use MRSL v3.1 as the conformance baseline because...')") },
+    { context: z23.string().describe("Description of the decision (e.g. 'We decided to use MRSL v3.1 as the conformance baseline because...')") },
     async ({ context }) => {
       const recentDecisions = await mcpQuery("chain.listEntries", { collectionSlug: "decisions" });
       const sorted = [...recentDecisions].sort((a, b) => (b.data?.date ?? "") > (a.data?.date ?? "") ? 1 : -1).slice(0, 5);
@@ -11677,8 +12101,8 @@ After drafting, I can log it using the capture tool with collection "decisions".
     "draft-rule-from-context",
     "Draft a new business rule from an observation or discovery made while coding. Fetches existing rules for the domain to ensure consistency.",
     {
-      observation: z21.string().describe("What you observed or discovered (e.g. 'Suppliers can have multiple org types in Gateway')"),
-      domain: z21.string().describe("Which domain this rule belongs to (e.g. 'Governance & Decision-Making')")
+      observation: z23.string().describe("What you observed or discovered (e.g. 'Suppliers can have multiple org types in Gateway')"),
+      domain: z23.string().describe("Which domain this rule belongs to (e.g. 'Governance & Decision-Making')")
     },
     async ({ observation, domain }) => {
       const allRules = await mcpQuery("chain.listEntries", { collectionSlug: "business-rules" });
@@ -11719,10 +12143,10 @@ Make sure the rule is consistent with existing rules and doesn't contradict them
     "run-workflow",
     "Launch any registered Chainwork workflow in Facilitator Mode. Returns the full workflow definition, facilitation instructions, and round structure. The agent enters Facilitator Mode and guides the participant through each round.",
     {
-      workflow: z21.string().describe(
+      workflow: z23.string().describe(
         "Workflow ID to run. Available: " + listWorkflows().map((w) => `'${w.id}' (${w.name})`).join(", ")
       ),
-      context: z21.string().optional().describe(
+      context: z23.string().optional().describe(
         "Optional context from the participant (e.g., 'retro on last sprint', 'shape the Chainwork API bet')"
       )
     },
@@ -11867,7 +12291,7 @@ ${wf.errorRecovery}
     "shape-a-bet",
     "Launch a coached shaping session powered by the facilitate tool. Dynamically loads workspace context, governance constraints, and coaching rubrics. Use when the user wants to shape a bet, define a pitch, or scope work.",
     {
-      idea: z21.string().describe("Brief description of the idea or feature to shape (e.g. 'Improve the glossary editing flow')")
+      idea: z23.string().describe("Brief description of the idea or feature to shape (e.g. 'Improve the glossary editing flow')")
     },
     async ({ idea }) => {
       let strategicContext = "";
@@ -12028,9 +12452,9 @@ Walk away mid-session and everything captured so far exists as drafts. \`facilit
     "capture-and-connect",
     "Guided workflow: capture a knowledge entry, discover graph connections, create relations, and prepare for commit. Encodes the capture \u2192 suggest \u2192 batch-create \u2192 commit choreography as a step-by-step guide.",
     {
-      collection: z21.string().describe("Collection slug (e.g. 'glossary', 'business-rules', 'decisions', 'tensions')"),
-      name: z21.string().describe("Entry name"),
-      description: z21.string().describe("Entry description")
+      collection: z23.string().describe("Collection slug (e.g. 'glossary', 'business-rules', 'decisions', 'tensions')"),
+      name: z23.string().describe("Entry name"),
+      description: z23.string().describe("Entry description")
     },
     async ({ collection, name, description }) => {
       const collections = await mcpQuery("chain.listCollections");
@@ -12084,7 +12508,7 @@ Only call \`commit-entry\` when the user explicitly confirms.
     "deep-dive",
     "Explore everything the Chain knows about a topic or entry. Assembles entry details, graph context, related business rules, and glossary terms into a comprehensive briefing.",
     {
-      topic: z21.string().describe("Entry ID (e.g. 'BR-001') or topic to explore (e.g. 'authentication')")
+      topic: z23.string().describe("Entry ID (e.g. 'BR-001') or topic to explore (e.g. 'authentication')")
     },
     async ({ topic }) => {
       const isEntryId = /^[A-Z]+-\d+$/i.test(topic) || /^[A-Z]+-[a-z0-9]+$/i.test(topic);
@@ -12167,7 +12591,7 @@ ${contextInstructions}`
     "pre-commit-check",
     "Run a readiness check before committing an entry to the Chain. Validates quality score, required relations, and business rule compliance.",
     {
-      entryId: z21.string().describe("Entry ID to check (e.g. 'GT-019', 'DEC-005')")
+      entryId: z23.string().describe("Entry ID to check (e.g. 'GT-019', 'DEC-005')")
     },
     async ({ entryId }) => {
       return {
@@ -12223,9 +12647,9 @@ If ready, ask the user to confirm. If not, suggest specific improvements.
   );
   server.prompt(
     "project-scan",
-    "Scan local project files to extract structured knowledge for Product Brain. The IDE agent reads README.md, package.json, .cursorrules, folder structure, and recent git history, then extracts vision, tech stack, key terms, and decisions into batch-capture entries. The trust boundary is confirmation before capture: only capture entries the user explicitly keeps, then let normal workspace governance apply.",
+    "Scan local project files to extract structured knowledge for Product Brain. The IDE agent reads README.md, package.json, .cursorrules, folder structure, and recent git history, then extracts vision, tech stack, modules, business rules, conventions, decisions, and domain terms into batch-capture entries. The trust boundary is confirmation before capture: only capture entries the user explicitly keeps, then let normal workspace governance apply.",
     {
-      workspaceContext: z21.string().optional().describe("Optional context about the workspace preset and existing collections (paste from start/orient output)")
+      workspaceContext: z23.string().optional().describe("Optional context about the workspace preset and existing collections (paste from start/orient output)")
     },
     async ({ workspaceContext }) => {
       let collectionsContext = "";
@@ -12240,17 +12664,19 @@ ${colList}
         }
       } catch {
       }
-      const schemaFields = Object.entries(interviewExtractionSchema.shape).map(([key, field]) => `- \`${key}\`: ${field.description ?? ""}`).join("\n");
-      const exampleExtraction = {
-        vision: "A task management app for solo developers who work with AI coding assistants",
+      const schemaFields = Object.entries(scanExtractionSchema.shape).map(([key, field]) => `- \`${key}\`: ${field.description ?? ""}`).join("\n");
+      const exampleEntries = scanToBatchEntries({
+        vision: "A knowledge management tool for solo developers working with AI coding assistants",
         audience: "Solo developers using Cursor, Claude Code, or similar AI IDEs",
         techStack: ["SvelteKit", "Convex", "TypeScript"],
+        modules: [{ name: "Product Brain MCP", purpose: "MCP server that exposes knowledge capture tools to the IDE agent" }],
+        businessRules: ["All public functions must validate arguments with Zod before processing"],
+        conventions: ["Use batch-capture for multi-entry writes; never call capture in a loop"],
+        keyDecisions: ["Use Convex for real-time backend \u2014 avoids managing infrastructure"],
         keyTerms: ["Chain", "Capture", "Orientation"],
-        keyDecisions: ["Use Convex for real-time backend to avoid managing infrastructure"],
-        tensions: ["Activation requires skill \u2014 users need to know what to capture"]
-      };
-      const exampleEntries = extractionToBatchEntries(exampleExtraction);
-      const exampleOutput = JSON.stringify({ entries: exampleEntries.slice(0, 4) }, null, 2);
+        tensions: ["Activation requires skill \u2014 users need to know what to capture before value compounds"]
+      });
+      const exampleOutput = JSON.stringify({ entries: exampleEntries.slice(0, 5) }, null, 2);
       return {
         messages: [{
           role: "user",
@@ -12259,84 +12685,94 @@ ${colList}
             text: `# Project Scan \u2014 Agent-Side Knowledge Extraction
 
 You are scanning the user's local project to extract structured knowledge for Product Brain.
-PB runs remotely \u2014 you do the file reading and extraction, then call \`batch-capture\`.
+PB runs remotely \u2014 you read the files and extract, then call \`batch-capture\` after confirmation.
 
 ` + (workspaceContext ? `## Workspace Context
 ${workspaceContext}
 
 ` : "") + collectionsContext + `## Step 1: Read Project Files
 
-Read these files in this order (skip gracefully if not present):
-1. \`README.md\` or \`readme.md\` \u2014 product description, purpose, setup
-2. \`package.json\` \u2014 name, description, dependencies (framework, database, auth)
-3. \`tsconfig.json\` or \`tsconfig.app.json\` \u2014 compilation target, paths
-4. Top-level folder structure (list directories only, max 2 levels deep)
-5. \`.cursorrules\` or \`CLAUDE.md\` or \`AGENTS.md\` \u2014 project conventions, constraints
-6. \`git log --oneline -20\` \u2014 recent commit messages for decisions/tensions
+Read these files in order. Skip gracefully if not present.
 
-**ICP stack only (V1):** README, package.json, tsconfig, folder structure, .cursorrules/CLAUDE.md, git log.
-Do not attempt to read Python, Rust, Go, or mobile-specific files in this pass.
+1. **\`README.md\`** \u2014 Look for: product purpose (vision), who it's for (audience), key concepts, architecture notes, known issues
+2. **\`package.json\`** \u2014 Look for: \`name\`, \`description\`, and **dependencies** \u2014 identify the framework, database, auth library, UI library (these become tech stack + glossary). Ignore dev tools and test libraries.
+3. **\`tsconfig.json\` / \`tsconfig.app.json\`** \u2014 Look for: path aliases (e.g. \`@/\`) that hint at module structure
+4. **Top-level folder structure** (list directories only, max 2 levels) \u2014 Look for: named modules, feature folders, service boundaries. Note names that are specific enough to be meaningful.
+5. **\`.cursorrules\` / \`CLAUDE.md\` / \`AGENTS.md\`** \u2014 Look for: **business rules** (constraints the system enforces), **conventions** (how work is done here), no-gos, domain vocabulary
+6. **\`git log --oneline -20\`** \u2014 Look for: commits that imply decisions ("migrate from X to Y", "switch to Z for reason"), repeated friction ("fix broken", "revert", "hotfix same area twice")
+
+**ICP stack only (V1):** README, package.json, tsconfig, folder structure, .cursorrules/CLAUDE.md/AGENTS.md, git log.
+Do not attempt Python, Rust, Go, or mobile-specific files in this pass.
 
 ## Step 2: Extract Structured Data
 
-After reading, extract the following schema:
+After reading all files, extract into this schema:
 
 \`\`\`
 ${schemaFields}
 \`\`\`
 
+**Field-by-field guidance:**
+- \`vision\`: one sentence product purpose. Source: README intro or package.json description. Required if README exists.
+- \`audience\`: who it's for. Source: README target-user section or "built for" language.
+- \`techStack\`: main runtime dependencies only \u2014 framework, database, auth, UI. Max 8. Not dev tools, test libs, or linters.
+- \`modules\`: named subsystems with clear purposes. Source: folder structure + tsconfig path aliases. Skip generic names (src, lib, utils alone). Max 5.
+- \`businessRules\`: constraints the system enforces. Source: .cursorrules/AGENTS.md. Write as: "All X must Y" or "The system must Z". Keep as written.
+- \`conventions\`: how work is done here. Source: .cursorrules standards sections. Write as: "Use X not Y" or "Always do Z".
+- \`keyDecisions\`: architectural choices made, preferably with rationale. Source: git log patterns, README architecture notes. Each as a declarative statement ("Use Convex for real-time backend").
+- \`tensions\`: known friction or trade-offs. Source: git log hotfixes/reverts, README "known issues".
+- \`keyTerms\`: domain vocabulary specific to this project \u2014 not tech names, but product/business terms. Source: README, .cursorrules.
+
 **Quality rules (RH2 mitigation):**
-- Prefer 8 good entries over 20 mediocre ones
-- Only include terms you have direct evidence for from the files
-- Skip fields you cannot confidently fill \u2014 empty arrays > hallucinated data
-- Keep descriptions concise: 1\u20132 sentences max
+- Only include items with direct evidence from the files \u2014 no inference, no hallucination
+- Prefer 8 precise entries over 20 vague ones
+- Business rules and conventions must be actual constraints, not generic advice
+- Empty arrays beat fabricated data
 
-## Step 3: Validate Before Capture
+## Step 3: Validate Before Presenting
 
-Before calling batch-capture, check your extraction:
-- vision is present and at least 10 characters
-- each entry has a non-empty name and description
+Before presenting, check each entry:
+- vision is at least 10 characters if present
 - no duplicate names within the same collection
-- if techStack is present, at least one glossary entry per technology
+- each entry has a non-empty name and description
+- techStack items are actual technologies, not version strings or config flags
+- module names are specific (not just "src", "lib", "utils")
 
-If validation fails for any entry, drop it rather than sending malformed data.
+Drop any entry that fails. If no vision AND no techStack exist, the scan is too sparse \u2014 tell the user which files were missing and stop.
 
-Then present the inferred entries as a numbered list. Ask which to keep, and do NOT call batch-capture yet.
-Only after the user confirms which entries to keep should you capture the confirmed entries.
+## Step 4: Present for Confirmation
 
-## Step 4: Map to batch-capture
+Present inferred entries as a numbered list grouped by collection. Ask which to keep.
+**Do NOT call batch-capture yet.** Only after the user confirms.
 
-Map your extracted data to entries using these rules:
-- \`vision\` \u2192 strategy collection, name: "Product Vision"
-- \`audience\` \u2192 audiences collection
-- \`techStack\` \u2192 architecture collection ("Tech Stack") + top 3 items \u2192 glossary
-- \`keyTerms\` \u2192 glossary collection (1 entry per term)
-- \`keyDecisions\` \u2192 decisions collection (1 entry per decision)
-- \`tensions\` \u2192 tensions collection (1 entry per tension)
+## Step 5: Map to batch-capture
+
+After confirmation, map entries using these rules:
+- \`vision\` \u2192 strategy, name: "Product Vision"
+- \`audience\` \u2192 audiences
+- \`techStack\` \u2192 architecture ("Tech Stack") + top 3 items individually \u2192 glossary
+- \`modules\` \u2192 architecture (1 per module, max 5)
+- \`businessRules\` \u2192 business-rules (1 per rule)
+- \`conventions\` \u2192 standards (1 per convention)
+- \`keyDecisions\` \u2192 decisions (1 per decision)
+- \`tensions\` \u2192 tensions (1 per tension)
+- \`keyTerms\` \u2192 glossary (skip names already added from techStack)
 
 **Example output:**
 \`\`\`json
 ${exampleOutput}
 \`\`\`
 
-## Step 5: Call batch-capture
-
-After the user confirms which entries to keep, call batch-capture with only those confirmed entries.
-Omit \`autoCommit\` to let normal workspace governance apply.
-
-\`\`\`
-batch-capture entries=[...your confirmed entries...]
-\`\`\`
-
-If \`failed > 0\` in the response, inspect \`failedEntries\` and retry those individually.
+Call batch-capture with confirmed entries only. Omit \`autoCommit\` to follow workspace governance.
+If \`failed > 0\`, inspect \`failedEntries\` and retry those individually.
 
 ## Step 6: Connect + Prove Value
 
 After capture:
 1. Call \`graph action=suggest\` on 2\u20133 key entries (vision, architecture, a decision)
-2. Invent a plausible next task and call \`context action=gather task="<that task>"\`
+2. Invent a plausible next task the user might actually do and call \`context action=gather task="<that task>"\`
 3. Present what Product Brain now knows in that task context \u2014 this is the proof moment
-4. Then show one clear result summary so the user sees exactly what was added
+4. Show one clear result summary so the user sees exactly what was added
 
 **Begin with Step 1 now.** Read the files, then report what you found before extracting.`
           }
@@ -12344,6 +12780,108 @@ After capture:
       };
     }
   );
+  server.prompt(
+    "review-drafts",
+    "Review all uncommitted workspace drafts grouped by collection and commit them in batches. After each committed batch, surfaces the most non-obvious graph connection found as the WOW moment \u2014 the signal that Product Brain has started compounding.",
+    {
+      focus: z23.string().optional().describe("Optional: a specific collection to review first (e.g. 'glossary', 'decisions')")
+    },
+    async ({ focus }) => {
+      let allDrafts = [];
+      try {
+        const raw = await mcpQuery("chain.listEntries", { status: "draft" });
+        if (Array.isArray(raw)) {
+          allDrafts = raw.filter(
+            (e) => typeof e === "object" && e !== null && typeof e.entryId === "string" && typeof e.name === "string" && typeof e.collection === "string"
+          );
+        }
+      } catch {
+      }
+      if (focus) {
+        allDrafts.sort((a, b) => {
+          const aMatch = a.collection === focus ? -1 : 0;
+          const bMatch = b.collection === focus ? -1 : 0;
+          return aMatch - bMatch;
+        });
+      }
+      const grouped = groupDraftsByCollection(allDrafts);
+      const draftList = formatDraftGroups(grouped, allDrafts.length);
+      const hasDrafts = allDrafts.length > 0;
+      return {
+        messages: [{
+          role: "user",
+          content: {
+            type: "text",
+            text: `# Review Drafts \u2014 Batch Commit Queue
+
+` + (hasDrafts ? draftList + "\n\n" : "No drafts found in this workspace. Everything is already committed.\n\n") + (hasDrafts ? `---
+
+## How to proceed
+
+Work through each collection group with the user. The goal is: every entry the user wants to keep gets committed.
+
+**Step 1 \u2014 Offer a starting point**
+
+Ask the user which group to tackle first, or suggest the most important one. A good default: start with Strategy and Decisions \u2014 these are high-signal and there are usually few of them. Glossary and Architecture entries can be batched quickly afterward.
+
+**Step 2 \u2014 Confirm, then commit**
+
+For each group the user confirms, call \`commit-entry\` once per entry. These must be sequential \u2014 commit each before moving to the next.
+
+\`\`\`
+commit-entry entryId="[ID]"
+\`\`\`
+
+Report any failures and skip rather than block. If commit returns \`proposal_created\`, tell the user \u2014 this workspace uses governed commits and proposals need approval.
+
+**Step 3 \u2014 Surface the WOW connection (once per committed batch)**
+
+After finishing a collection group, call \`graph action=suggest\` on up to 2 of the most important entries you just committed:
+- First choice: any strategy entry
+- Second choice: architecture or decisions entries
+- Maximum: 2 \`graph action=suggest\` calls per batch \u2014 not one per entry
+
+From the suggestions returned, pick the **most non-obvious connection** \u2014 the one that crosses collection boundaries (e.g. a vision entry connecting to a decision, not just two glossary terms). Prefer suggestions with specific reasoning over generic ones. Ignore suggestions with no reasoning.
+
+If a strong connection exists, present it exactly like this:
+
+---
+**The graph noticed something.**
+
+Your **[Entry A]** connects to **[Entry B]** \u2014 [reasoning from the graph, in one sentence].
+
+You didn't explain this relationship. Product Brain inferred it from what you've built so far. This is the compounding starting.
+
+Want to add this link?
+\`\`\`
+relations action=create from=[A] to=[B] type=[relationType]
+\`\`\`
+---
+
+If there are no specific suggestions (or all reasoning is generic), skip this step silently. Do not fabricate a connection.
+
+**Step 4 \u2014 The offer**
+
+After the first batch is committed (especially if it includes a strategy or decisions entry), offer:
+
+> "Ask me anything about your product \u2014 I'll answer using everything you just committed."
+
+This is not a formality. If the user asks a question, actually answer it using \`context action=gather task="<their question>"\`. Show them what the Brain now knows, not just that it captured the data.
+
+**Step 5 \u2014 Continue or wrap**
+
+After each batch, ask if the user wants to continue with the next group. Once all groups are done, close with a summary:
+
+- How many entries were committed this session
+- Which collections are now populated
+- One sentence: what Product Brain now knows about their product
+
+End with: **"Your Brain is ready."**` : `Your workspace has no uncommitted entries. If you recently captured new knowledge, check that \`batch-capture\` completed successfully and try \`entries action=list status=draft\`.`)
+          }
+        }]
+      };
+    }
+  );
 }
 
 // src/server.ts
@@ -12438,6 +12976,7 @@ function createProductBrainServer() {
   registerKnowledgeTools(server);
   registerLabelTools(server);
   registerHealthTools(server);
+  registerOrientTool(server);
   registerVerifyTools(server);
   registerSmartCaptureTools(server);
   registerQualityTools(server);
@@ -12457,4 +12996,4 @@ export {
   SERVER_VERSION,
   createProductBrainServer
 };
-//# sourceMappingURL=chunk-JOJWCU7A.js.map
+//# sourceMappingURL=chunk-ZPEIKRYG.js.map