reasonix 0.2.0 → 0.3.0-alpha.1

package/dist/cli/index.js

@@ -1360,6 +1360,14 @@ function recordFromLoopEvent(ev, extra) {
   if (ev.toolName !== void 0) rec.tool = ev.toolName;
   if (ev.toolArgs !== void 0) rec.args = ev.toolArgs;
   if (ev.error !== void 0) rec.error = ev.error;
+  if (ev.planState && !isPlanStateEmptyShape(ev.planState)) {
+    rec.planState = {
+      subgoals: [...ev.planState.subgoals],
+      hypotheses: [...ev.planState.hypotheses],
+      uncertainties: [...ev.planState.uncertainties],
+      rejectedPaths: [...ev.planState.rejectedPaths]
+    };
+  }
   if (ev.stats) {
     rec.usage = {
       prompt_tokens: ev.stats.usage.promptTokens,
@@ -1395,6 +1403,9 @@ function readTranscript(path) {
   const raw = readFileSync3(path, "utf8");
   return parseTranscript(raw);
 }
+function isPlanStateEmptyShape(s) {
+  return s.subgoals.length === 0 && s.hypotheses.length === 0 && s.uncertainties.length === 0 && s.rejectedPaths.length === 0;
+}
 function parseTranscript(raw) {
   const out = { meta: null, records: [] };
   for (const line of raw.split(/\r?\n/)) {
@@ -1420,6 +1431,24 @@ function parseTranscript(raw) {
 }
 
 // src/replay.ts
+function groupRecordsByTurn(records) {
+  const byTurn = /* @__PURE__ */ new Map();
+  for (const rec of records) {
+    const list = byTurn.get(rec.turn);
+    if (list) list.push(rec);
+    else byTurn.set(rec.turn, [rec]);
+  }
+  return [...byTurn.entries()].sort(([a], [b]) => a - b).map(([turn, records2]) => ({ turn, records: records2 }));
+}
+function computeCumulativeStats(pages, upToIdx) {
+  if (upToIdx < 0) return computeReplayStats([]);
+  const flat = [];
+  for (let i = 0; i <= upToIdx && i < pages.length; i++) {
+    const records = pages[i]?.records;
+    if (records) flat.push(...records);
+  }
+  return computeReplayStats(flat);
+}
 function replayFromFile(path) {
   const parsed = readTranscript(path);
   return { parsed, stats: computeReplayStats(parsed.records) };
@@ -1430,12 +1459,20 @@ function computeReplayStats(records) {
   const prefixHashes = /* @__PURE__ */ new Set();
   let userTurns = 0;
   let toolCalls = 0;
+  let harvestedTurns = 0;
+  let totalUncertainties = 0;
+  let totalSubgoals = 0;
   for (const rec of records) {
     if (rec.role === "user") userTurns++;
     else if (rec.role === "tool") toolCalls++;
     else if (rec.role === "assistant_final") {
       if (rec.model) models.add(rec.model);
       if (rec.prefixHash) prefixHashes.add(rec.prefixHash);
+      if (rec.planState) {
+        harvestedTurns++;
+        totalUncertainties += rec.planState.uncertainties.length;
+        totalSubgoals += rec.planState.subgoals.length;
+      }
       if (rec.usage && rec.model) {
         const u = new Usage(
           rec.usage.prompt_tokens ?? 0,
@@ -1463,6 +1500,9 @@ function computeReplayStats(records) {
     prefixHashes: [...prefixHashes],
     userTurns,
     toolCalls,
+    harvestedTurns,
+    totalUncertainties,
+    totalSubgoals,
     ...summarizeTurns(turns)
   };
 }
@@ -1491,6 +1531,19 @@ function round2(n, digits) {
 }
 
 // src/diff.ts
+function findNextDivergence(pairs, fromIdx) {
+  for (let i = fromIdx + 1; i < pairs.length; i++) {
+    if (pairs[i].kind !== "match") return i;
+  }
+  return -1;
+}
+function findPrevDivergence(pairs, fromIdx) {
+  const start = Math.min(fromIdx - 1, pairs.length - 1);
+  for (let i = start; i >= 0; i--) {
+    if (pairs[i].kind !== "match") return i;
+  }
+  return -1;
+}
 function diffTranscripts(a, b) {
   const aSide = {
     label: a.label,
@@ -1633,6 +1686,41 @@ function renderSummaryTable(report, _opts = {}) {
     )
   );
   lines.push(statRow("prefix hashes", a.stats.prefixHashes.length, b.stats.prefixHashes.length));
+  if (a.stats.harvestedTurns > 0 || b.stats.harvestedTurns > 0) {
+    lines.push(
+      row(
+        [
+          "harvest turns",
+          `${a.stats.harvestedTurns}`,
+          `${b.stats.harvestedTurns}`,
+          signed(b.stats.harvestedTurns - a.stats.harvestedTurns)
+        ],
+        [20, 14, 14, 14]
+      )
+    );
+    lines.push(
+      row(
+        [
+          "  subgoals",
+          `${a.stats.totalSubgoals}`,
+          `${b.stats.totalSubgoals}`,
+          signed(b.stats.totalSubgoals - a.stats.totalSubgoals)
+        ],
+        [20, 14, 14, 14]
+      )
+    );
+    lines.push(
+      row(
+        [
+          "  uncertainties",
+          `${a.stats.totalUncertainties}`,
+          `${b.stats.totalUncertainties}`,
+          signed(b.stats.totalUncertainties - a.stats.totalUncertainties)
+        ],
+        [20, 14, 14, 14]
+      )
+    );
+  }
   lines.push("");
   const aPrefixStable = a.stats.prefixHashes.length <= 1;
   const bPrefixStable = b.stats.prefixHashes.length <= 1;
@@ -1704,6 +1792,17 @@ function renderMarkdown(report) {
   out.push(
     `| prefix hashes | ${a.stats.prefixHashes.length} | ${b.stats.prefixHashes.length} | \u2014 |`
   );
+  if (a.stats.harvestedTurns > 0 || b.stats.harvestedTurns > 0) {
+    out.push(
+      `| harvest turns | ${a.stats.harvestedTurns} | ${b.stats.harvestedTurns} | ${signed(b.stats.harvestedTurns - a.stats.harvestedTurns)} |`
+    );
+    out.push(
+      `| harvest subgoals | ${a.stats.totalSubgoals} | ${b.stats.totalSubgoals} | ${signed(b.stats.totalSubgoals - a.stats.totalSubgoals)} |`
+    );
+    out.push(
+      `| harvest uncertainties | ${a.stats.totalUncertainties} | ${b.stats.totalUncertainties} | ${signed(b.stats.totalUncertainties - a.stats.totalUncertainties)} |`
+    );
+  }
   out.push("");
   out.push("## Turn-by-turn");
   out.push("");
@@ -1771,6 +1870,258 @@ function truncate(s, n) {
   return s.length > n ? `${s.slice(0, n)}\u2026` : s;
 }
 
+// src/mcp/types.ts
+var MCP_PROTOCOL_VERSION = "2024-11-05";
+function isJsonRpcError(msg) {
+  return "error" in msg;
+}
+
+// src/mcp/client.ts
+var McpClient = class {
+  transport;
+  clientInfo;
+  requestTimeoutMs;
+  pending = /* @__PURE__ */ new Map();
+  nextId = 1;
+  readerStarted = false;
+  initialized = false;
+  _serverCapabilities = {};
+  constructor(opts) {
+    this.transport = opts.transport;
+    this.clientInfo = opts.clientInfo ?? { name: "reasonix", version: "0.3.0-dev" };
+    this.requestTimeoutMs = opts.requestTimeoutMs ?? 6e4;
+  }
+  /** Server's advertised capabilities, available after initialize(). */
+  get serverCapabilities() {
+    return this._serverCapabilities;
+  }
+  /**
+   * Complete the initialize → initialized handshake. Must be called
+   * before any other method (otherwise compliant servers reject).
+   */
+  async initialize() {
+    if (this.initialized) throw new Error("MCP client already initialized");
+    this.startReaderIfNeeded();
+    const result = await this.request("initialize", {
+      protocolVersion: MCP_PROTOCOL_VERSION,
+      capabilities: { tools: {} },
+      clientInfo: this.clientInfo
+    });
+    this._serverCapabilities = result.capabilities ?? {};
+    await this.transport.send({
+      jsonrpc: "2.0",
+      method: "notifications/initialized"
+    });
+    this.initialized = true;
+    return result;
+  }
+  /** List tools the server exposes. */
+  async listTools() {
+    this.assertInitialized();
+    return this.request("tools/list", {});
+  }
+  /** Invoke a tool by name. Returns the raw MCP result (caller unwraps content). */
+  async callTool(name, args) {
+    this.assertInitialized();
+    return this.request("tools/call", {
+      name,
+      arguments: args ?? {}
+    });
+  }
+  /** Close the transport and reject any outstanding requests. */
+  async close() {
+    for (const [, pending] of this.pending) {
+      clearTimeout(pending.timeout);
+      pending.reject(new Error("MCP client closed"));
+    }
+    this.pending.clear();
+    await this.transport.close();
+  }
+  // ---------- internals ----------
+  assertInitialized() {
+    if (!this.initialized) throw new Error("MCP client not initialized \u2014 call initialize() first");
+  }
+  async request(method, params) {
+    const id = this.nextId++;
+    const frame = { jsonrpc: "2.0", id, method, params };
+    const promise = new Promise((resolve2, reject) => {
+      const timeout = setTimeout(() => {
+        this.pending.delete(id);
+        reject(
+          new Error(`MCP request ${method} (id=${id}) timed out after ${this.requestTimeoutMs}ms`)
+        );
+      }, this.requestTimeoutMs);
+      this.pending.set(id, {
+        resolve: resolve2,
+        reject,
+        timeout
+      });
+    });
+    await this.transport.send(frame);
+    return promise;
+  }
+  startReaderIfNeeded() {
+    if (this.readerStarted) return;
+    this.readerStarted = true;
+    void this.readLoop();
+  }
+  async readLoop() {
+    try {
+      for await (const msg of this.transport.messages()) {
+        this.dispatch(msg);
+      }
+    } catch (err) {
+      for (const [, pending] of this.pending) {
+        clearTimeout(pending.timeout);
+        pending.reject(err);
+      }
+      this.pending.clear();
+    }
+  }
+  dispatch(msg) {
+    if (!("id" in msg) || msg.id === null || msg.id === void 0) return;
+    if (!("result" in msg) && !("error" in msg)) return;
+    const pending = this.pending.get(msg.id);
+    if (!pending) return;
+    this.pending.delete(msg.id);
+    clearTimeout(pending.timeout);
+    const resp = msg;
+    if (isJsonRpcError(resp)) {
+      pending.reject(new Error(`MCP ${resp.error.code}: ${resp.error.message}`));
+    } else {
+      pending.resolve(resp.result);
+    }
+  }
+};
+
+// src/mcp/stdio.ts
+import { spawn } from "child_process";
+var StdioTransport = class {
+  child;
+  queue = [];
+  waiters = [];
+  closed = false;
+  stdoutBuffer = "";
+  constructor(opts) {
+    const env = opts.replaceEnv ? { ...opts.env ?? {} } : { ...process.env, ...opts.env ?? {} };
+    this.child = spawn(opts.command, opts.args ?? [], {
+      env,
+      cwd: opts.cwd,
+      stdio: ["pipe", "pipe", "inherit"]
+    });
+    this.child.stdout.setEncoding("utf8");
+    this.child.stdout.on("data", (chunk) => this.onStdout(chunk));
+    this.child.on("close", () => this.onClose());
+    this.child.on("error", (err) => {
+      this.push({
+        jsonrpc: "2.0",
+        id: null,
+        error: { code: -32e3, message: `transport error: ${err.message}` }
+      });
+    });
+  }
+  async send(message) {
+    if (this.closed) throw new Error("MCP transport is closed");
+    return new Promise((resolve2, reject) => {
+      const line = `${JSON.stringify(message)}
+`;
+      this.child.stdin.write(line, "utf8", (err) => {
+        if (err) reject(err);
+        else resolve2();
+      });
+    });
+  }
+  async *messages() {
+    while (true) {
+      if (this.queue.length > 0) {
+        yield this.queue.shift();
+        continue;
+      }
+      if (this.closed) return;
+      const next = await new Promise((resolve2) => {
+        this.waiters.push(resolve2);
+      });
+      if (next === null) return;
+      yield next;
+    }
+  }
+  async close() {
+    if (this.closed) return;
+    this.closed = true;
+    while (this.waiters.length > 0) this.waiters.shift()(null);
+    try {
+      this.child.stdin.end();
+    } catch {
+    }
+    if (this.child.exitCode === null && !this.child.killed) {
+      this.child.kill("SIGTERM");
+    }
+  }
+  /** Parse incoming stdout chunks into NDJSON messages. */
+  onStdout(chunk) {
+    this.stdoutBuffer += chunk;
+    let newlineIdx;
+    while ((newlineIdx = this.stdoutBuffer.indexOf("\n")) !== -1) {
+      const line = this.stdoutBuffer.slice(0, newlineIdx).trim();
+      this.stdoutBuffer = this.stdoutBuffer.slice(newlineIdx + 1);
+      if (!line) continue;
+      try {
+        const msg = JSON.parse(line);
+        this.push(msg);
+      } catch {
+      }
+    }
+  }
+  onClose() {
+    this.closed = true;
+    while (this.waiters.length > 0) this.waiters.shift()(null);
+  }
+  push(msg) {
+    const waiter = this.waiters.shift();
+    if (waiter) waiter(msg);
+    else this.queue.push(msg);
+  }
+};
+
+// src/mcp/registry.ts
+async function bridgeMcpTools(client, opts = {}) {
+  const registry = opts.registry ?? new ToolRegistry({ autoFlatten: opts.autoFlatten });
+  const prefix = opts.namePrefix ?? "";
+  const result = { registry, registeredNames: [], skipped: [] };
+  const listed = await client.listTools();
+  for (const mcpTool of listed.tools) {
+    if (!mcpTool.name) {
+      result.skipped.push({ name: "?", reason: "empty tool name" });
+      continue;
+    }
+    const registeredName = `${prefix}${mcpTool.name}`;
+    registry.register({
+      name: registeredName,
+      description: mcpTool.description ?? "",
+      parameters: mcpTool.inputSchema,
+      fn: async (args) => {
+        const toolResult = await client.callTool(mcpTool.name, args);
+        return flattenMcpResult(toolResult);
+      }
+    });
+    result.registeredNames.push(registeredName);
+  }
+  return result;
+}
+function flattenMcpResult(result) {
+  const parts = result.content.map(blockToString);
+  const joined = parts.join("\n").trim();
+  if (result.isError) {
+    return `ERROR: ${joined || "(no error message from server)"}`;
+  }
+  return joined;
+}
+function blockToString(block) {
+  if (block.type === "text") return block.text;
+  if (block.type === "image") return `[image ${block.mimeType}, ${block.data.length} chars base64]`;
+  return `[unknown block: ${JSON.stringify(block)}]`;
+}
+
 // src/config.ts
 import { chmodSync as chmodSync2, mkdirSync as mkdirSync2, readFileSync as readFileSync4, writeFileSync } from "fs";
 import { homedir as homedir2 } from "os";
@@ -1815,23 +2166,93 @@ function redactKey(key) {
 }
 
 // src/index.ts
-var VERSION = "0.2.0";
+var VERSION = "0.3.0-alpha.1";
 
 // src/cli/commands/chat.tsx
 import { render } from "ink";
-import React7, { useState as useState4 } from "react";
+import React8, { useState as useState4 } from "react";
+
+// src/mcp/shell-split.ts
+function shellSplit(input) {
+  const tokens = [];
+  let cur = "";
+  let quote = null;
+  let i = 0;
+  const s = input;
+  while (i < s.length) {
+    const ch = s[i];
+    if (quote) {
+      if (ch === quote) {
+        quote = null;
+        i++;
+        continue;
+      }
+      if (ch === "\\" && quote === '"' && i + 1 < s.length) {
+        cur += s[i + 1];
+        i += 2;
+        continue;
+      }
+      cur += ch;
+      i++;
+      continue;
+    }
+    if (ch === '"' || ch === "'") {
+      quote = ch;
+      i++;
+      continue;
+    }
+    if (ch === "\\" && i + 1 < s.length) {
+      cur += s[i + 1];
+      i += 2;
+      continue;
+    }
+    if (ch === " " || ch === "	") {
+      if (cur.length > 0) {
+        tokens.push(cur);
+        cur = "";
+      }
+      i++;
+      continue;
+    }
+    cur += ch;
+    i++;
+  }
+  if (quote) {
+    throw new Error(
+      `shellSplit: unterminated ${quote === '"' ? "double" : "single"} quote in input`
+    );
+  }
+  if (cur.length > 0) tokens.push(cur);
+  return tokens;
+}
 
 // src/cli/ui/App.tsx
-import { Box as Box5, Static, Text as Text5, useApp } from "ink";
-import React5, { useCallback, useEffect as useEffect2, useMemo, useRef, useState as useState2 } from "react";
+import { Box as Box6, Static, Text as Text6, useApp } from "ink";
+import React6, { useCallback, useEffect as useEffect2, useMemo, useRef, useState as useState2 } from "react";
 
 // src/cli/ui/EventLog.tsx
-import { Box as Box2, Text as Text2 } from "ink";
-import React2, { useEffect, useState } from "react";
+import { Box as Box3, Text as Text3 } from "ink";
+import React3, { useEffect, useState } from "react";
 
-// src/cli/ui/markdown.tsx
+// src/cli/ui/PlanStateBlock.tsx
 import { Box, Text } from "ink";
 import React from "react";
+function PlanStateBlock({ planState }) {
+  const fields = [];
+  if (planState.subgoals.length) fields.push(["subgoals", planState.subgoals, "cyan", false]);
+  if (planState.hypotheses.length)
+    fields.push(["hypotheses", planState.hypotheses, "green", false]);
+  if (planState.uncertainties.length)
+    fields.push(["uncertainties", planState.uncertainties, "yellow", false]);
+  if (planState.rejectedPaths.length)
+    fields.push(["rejected", planState.rejectedPaths, "red", true]);
+  if (fields.length === 0) return null;
+  return /* @__PURE__ */ React.createElement(Box, { flexDirection: "column", marginBottom: 1 }, fields.map(([label, items, color, dim]) => /* @__PURE__ */ React.createElement(Text, { key: label }, /* @__PURE__ */ React.createElement(Text, { color, bold: true, dimColor: dim }, "\u2039 ", label), /* @__PURE__ */ React.createElement(Text, { dimColor: true }, ` (${items.length})`), /* @__PURE__ */ React.createElement(Text, null, `: ${items.join(" \xB7 ")}`))));
+}
+
+// src/cli/ui/markdown.tsx
+import { Box as Box2, Text as Text2 } from "ink";
+import React2 from "react";
 var SUPERSCRIPT = {
   "0": "\u2070",
   "1": "\xB9",
@@ -1888,27 +2309,27 @@ function InlineMd({ text }) {
   for (const m of text.matchAll(INLINE_RE)) {
     const start = m.index ?? 0;
     if (start > last) {
-      parts.push(/* @__PURE__ */ React.createElement(Text, { key: `t${idx++}` }, text.slice(last, start)));
+      parts.push(/* @__PURE__ */ React2.createElement(Text2, { key: `t${idx++}` }, text.slice(last, start)));
     }
     if (m[2] !== void 0) {
       parts.push(
-        /* @__PURE__ */ React.createElement(Text, { key: `b${idx++}`, bold: true }, m[2])
+        /* @__PURE__ */ React2.createElement(Text2, { key: `b${idx++}`, bold: true }, m[2])
       );
     } else if (m[3] !== void 0) {
       parts.push(
-        /* @__PURE__ */ React.createElement(Text, { key: `c${idx++}`, color: "yellow" }, m[3])
+        /* @__PURE__ */ React2.createElement(Text2, { key: `c${idx++}`, color: "yellow" }, m[3])
       );
     } else if (m[4] !== void 0) {
       parts.push(
-        /* @__PURE__ */ React.createElement(Text, { key: `i${idx++}`, italic: true }, m[4])
+        /* @__PURE__ */ React2.createElement(Text2, { key: `i${idx++}`, italic: true }, m[4])
       );
     }
     last = start + m[0].length;
   }
   if (last < text.length) {
-    parts.push(/* @__PURE__ */ React.createElement(Text, { key: `t${idx++}` }, text.slice(last)));
+    parts.push(/* @__PURE__ */ React2.createElement(Text2, { key: `t${idx++}` }, text.slice(last)));
   }
-  return /* @__PURE__ */ React.createElement(Text, null, parts);
+  return /* @__PURE__ */ React2.createElement(Text2, null, parts);
 }
 function parseBlocks(raw) {
   const lines = raw.split(/\r?\n/);
@@ -2002,42 +2423,42 @@ function parseBlocks(raw) {
 function BlockView({ block }) {
   switch (block.kind) {
     case "heading":
-      return /* @__PURE__ */ React.createElement(Text, { bold: true, color: "cyan" }, /* @__PURE__ */ React.createElement(InlineMd, { text: block.text }));
+      return /* @__PURE__ */ React2.createElement(Text2, { bold: true, color: "cyan" }, /* @__PURE__ */ React2.createElement(InlineMd, { text: block.text }));
     case "paragraph":
-      return /* @__PURE__ */ React.createElement(InlineMd, { text: block.text });
+      return /* @__PURE__ */ React2.createElement(InlineMd, { text: block.text });
     case "bullet":
-      return /* @__PURE__ */ React.createElement(Box, { flexDirection: "column" }, block.items.map((item, i) => /* @__PURE__ */ React.createElement(Box, { key: `${i}-${item.slice(0, 24)}` }, /* @__PURE__ */ React.createElement(Text, { color: "cyan" }, block.ordered ? ` ${block.start + i}. ` : "  \u2022 "), /* @__PURE__ */ React.createElement(InlineMd, { text: item }))));
+      return /* @__PURE__ */ React2.createElement(Box2, { flexDirection: "column" }, block.items.map((item, i) => /* @__PURE__ */ React2.createElement(Box2, { key: `${i}-${item.slice(0, 24)}` }, /* @__PURE__ */ React2.createElement(Text2, { color: "cyan" }, block.ordered ? ` ${block.start + i}. ` : "  \u2022 "), /* @__PURE__ */ React2.createElement(InlineMd, { text: item }))));
     case "code":
-      return /* @__PURE__ */ React.createElement(Box, { borderStyle: "single", borderColor: "gray", paddingX: 1 }, /* @__PURE__ */ React.createElement(Text, { color: "yellow" }, block.text));
+      return /* @__PURE__ */ React2.createElement(Box2, { borderStyle: "single", borderColor: "gray", paddingX: 1 }, /* @__PURE__ */ React2.createElement(Text2, { color: "yellow" }, block.text));
     case "hr":
-      return /* @__PURE__ */ React.createElement(Text, { dimColor: true }, "\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500");
+      return /* @__PURE__ */ React2.createElement(Text2, { dimColor: true }, "\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500");
   }
 }
 function Markdown({ text }) {
   const cleaned = stripMath(text);
-  const blocks = React.useMemo(() => parseBlocks(cleaned), [cleaned]);
-  return /* @__PURE__ */ React.createElement(Box, { flexDirection: "column", gap: 1 }, blocks.map((b, i) => /* @__PURE__ */ React.createElement(BlockView, { key: `${i}-${b.kind}`, block: b })));
+  const blocks = React2.useMemo(() => parseBlocks(cleaned), [cleaned]);
+  return /* @__PURE__ */ React2.createElement(Box2, { flexDirection: "column", gap: 1 }, blocks.map((b, i) => /* @__PURE__ */ React2.createElement(BlockView, { key: `${i}-${b.kind}`, block: b })));
 }
 
 // src/cli/ui/EventLog.tsx
-var EventRow = React2.memo(function EventRow2({ event }) {
+var EventRow = React3.memo(function EventRow2({ event }) {
   if (event.role === "user") {
-    return /* @__PURE__ */ React2.createElement(Box2, null, /* @__PURE__ */ React2.createElement(Text2, { bold: true, color: "cyan" }, "you \u203A", " "), /* @__PURE__ */ React2.createElement(Text2, null, event.text));
+    return /* @__PURE__ */ React3.createElement(Box3, null, /* @__PURE__ */ React3.createElement(Text3, { bold: true, color: "cyan" }, "you \u203A", " "), /* @__PURE__ */ React3.createElement(Text3, null, event.text));
   }
   if (event.role === "assistant") {
-    if (event.streaming) return /* @__PURE__ */ React2.createElement(StreamingAssistant, { event });
-    return /* @__PURE__ */ React2.createElement(Box2, { flexDirection: "column", marginTop: 1 }, /* @__PURE__ */ React2.createElement(Box2, null, /* @__PURE__ */ React2.createElement(Text2, { bold: true, color: "green" }, "assistant")), event.branch ? /* @__PURE__ */ React2.createElement(BranchBlock, { branch: event.branch }) : null, event.reasoning ? /* @__PURE__ */ React2.createElement(ReasoningBlock, { reasoning: event.reasoning }) : null, !isPlanStateEmpty(event.planState) ? /* @__PURE__ */ React2.createElement(PlanStateBlock, { planState: event.planState }) : null, event.text ? /* @__PURE__ */ React2.createElement(Markdown, { text: event.text }) : /* @__PURE__ */ React2.createElement(Text2, { dimColor: true }, "(no content)"), event.stats ? /* @__PURE__ */ React2.createElement(StatsLine, { stats: event.stats }) : null, event.repair ? /* @__PURE__ */ React2.createElement(Text2, { color: "magenta" }, event.repair) : null);
+    if (event.streaming) return /* @__PURE__ */ React3.createElement(StreamingAssistant, { event });
+    return /* @__PURE__ */ React3.createElement(Box3, { flexDirection: "column", marginTop: 1 }, /* @__PURE__ */ React3.createElement(Box3, null, /* @__PURE__ */ React3.createElement(Text3, { bold: true, color: "green" }, "assistant")), event.branch ? /* @__PURE__ */ React3.createElement(BranchBlock, { branch: event.branch }) : null, event.reasoning ? /* @__PURE__ */ React3.createElement(ReasoningBlock, { reasoning: event.reasoning }) : null, !isPlanStateEmpty(event.planState) ? /* @__PURE__ */ React3.createElement(PlanStateBlock, { planState: event.planState }) : null, event.text ? /* @__PURE__ */ React3.createElement(Markdown, { text: event.text }) : /* @__PURE__ */ React3.createElement(Text3, { dimColor: true }, "(no content)"), event.stats ? /* @__PURE__ */ React3.createElement(StatsLine, { stats: event.stats }) : null, event.repair ? /* @__PURE__ */ React3.createElement(Text3, { color: "magenta" }, event.repair) : null);
   }
   if (event.role === "tool") {
-    return /* @__PURE__ */ React2.createElement(Box2, { flexDirection: "column", marginTop: 1 }, /* @__PURE__ */ React2.createElement(Text2, { color: "yellow" }, `tool<${event.toolName ?? "?"}>  \u2192`), /* @__PURE__ */ React2.createElement(Text2, { dimColor: true }, " ", truncate2(event.text, 400)));
+    return /* @__PURE__ */ React3.createElement(Box3, { flexDirection: "column", marginTop: 1 }, /* @__PURE__ */ React3.createElement(Text3, { color: "yellow" }, `tool<${event.toolName ?? "?"}>  \u2192`), /* @__PURE__ */ React3.createElement(Text3, { dimColor: true }, " ", truncate2(event.text, 400)));
   }
   if (event.role === "error") {
-    return /* @__PURE__ */ React2.createElement(Box2, { marginTop: 1 }, /* @__PURE__ */ React2.createElement(Text2, { color: "red", bold: true }, "error", " "), /* @__PURE__ */ React2.createElement(Text2, { color: "red" }, event.text));
+    return /* @__PURE__ */ React3.createElement(Box3, { marginTop: 1 }, /* @__PURE__ */ React3.createElement(Text3, { color: "red", bold: true }, "error", " "), /* @__PURE__ */ React3.createElement(Text3, { color: "red" }, event.text));
   }
   if (event.role === "info") {
-    return /* @__PURE__ */ React2.createElement(Box2, null, /* @__PURE__ */ React2.createElement(Text2, { dimColor: true }, event.text));
+    return /* @__PURE__ */ React3.createElement(Box3, null, /* @__PURE__ */ React3.createElement(Text3, { dimColor: true }, event.text));
   }
-  return /* @__PURE__ */ React2.createElement(Box2, null, /* @__PURE__ */ React2.createElement(Text2, null, event.text));
+  return /* @__PURE__ */ React3.createElement(Box3, null, /* @__PURE__ */ React3.createElement(Text3, null, event.text));
 });
 function BranchBlock({ branch }) {
   const per = branch.uncertainties.map((u, i) => {
@@ -2045,21 +2466,13 @@ function BranchBlock({ branch }) {
     const t = (branch.temperatures[i] ?? 0).toFixed(1);
     return `${marker} #${i} T=${t} u=${u}`;
   }).join("  ");
-  return /* @__PURE__ */ React2.createElement(Box2, null, /* @__PURE__ */ React2.createElement(Text2, { color: "blue" }, "\u{1F500} branched ", /* @__PURE__ */ React2.createElement(Text2, { bold: true }, branch.budget), ` samples \u2192 picked #${branch.chosenIndex}   `, /* @__PURE__ */ React2.createElement(Text2, { dimColor: true }, per)));
-}
-function PlanStateBlock({ planState }) {
-  const lines = [];
-  if (planState.subgoals.length) lines.push(["subgoals", planState.subgoals]);
-  if (planState.hypotheses.length) lines.push(["hypotheses", planState.hypotheses]);
-  if (planState.uncertainties.length) lines.push(["uncertainties", planState.uncertainties]);
-  if (planState.rejectedPaths.length) lines.push(["rejected", planState.rejectedPaths]);
-  return /* @__PURE__ */ React2.createElement(Box2, { flexDirection: "column", marginBottom: 1 }, lines.map(([label, items]) => /* @__PURE__ */ React2.createElement(Text2, { key: label, color: "magenta" }, "\u2039 ", /* @__PURE__ */ React2.createElement(Text2, { bold: true }, label), ` (${items.length}): ${items.join(" \xB7 ")}`)));
+  return /* @__PURE__ */ React3.createElement(Box3, null, /* @__PURE__ */ React3.createElement(Text3, { color: "blue" }, "\u{1F500} branched ", /* @__PURE__ */ React3.createElement(Text3, { bold: true }, branch.budget), ` samples \u2192 picked #${branch.chosenIndex}   `, /* @__PURE__ */ React3.createElement(Text3, { dimColor: true }, per)));
 }
 function ReasoningBlock({ reasoning }) {
   const max = 220;
   const flat = reasoning.replace(/\s+/g, " ").trim();
   const preview = flat.length <= max ? flat : `${flat.slice(0, max)}\u2026 (+${flat.length - max} chars)`;
-  return /* @__PURE__ */ React2.createElement(Box2, { marginBottom: 1 }, /* @__PURE__ */ React2.createElement(Text2, { dimColor: true, italic: true }, "\u21B3 thinking: ", preview));
+  return /* @__PURE__ */ React3.createElement(Box3, { marginBottom: 1 }, /* @__PURE__ */ React3.createElement(Text3, { dimColor: true, italic: true }, "\u21B3 thinking: ", preview));
 }
 function Elapsed() {
   const [s, setS] = useState(0);
@@ -2070,20 +2483,20 @@ function Elapsed() {
   }, []);
   const mm = String(Math.floor(s / 60)).padStart(2, "0");
   const ss = String(s % 60).padStart(2, "0");
-  return /* @__PURE__ */ React2.createElement(Text2, { dimColor: true }, `${mm}:${ss}`);
+  return /* @__PURE__ */ React3.createElement(Text3, { dimColor: true }, `${mm}:${ss}`);
 }
 function StreamingAssistant({ event }) {
   if (event.branchProgress) {
     const p = event.branchProgress;
     if (p.completed === 0) {
-      return /* @__PURE__ */ React2.createElement(Box2, { flexDirection: "column", marginTop: 1 }, /* @__PURE__ */ React2.createElement(Box2, null, /* @__PURE__ */ React2.createElement(Text2, { bold: true, color: "green" }, "assistant", " "), /* @__PURE__ */ React2.createElement(Text2, { color: "blue" }, "\u{1F500} launching ", p.total, " parallel samples (R1 thinking in parallel)\u2026", " "), /* @__PURE__ */ React2.createElement(Elapsed, null)), /* @__PURE__ */ React2.createElement(Text2, { dimColor: true }, "  ", "spread across T=0.0/0.5/1.0 \xB7 typical wait 30-90s for reasoner"));
+      return /* @__PURE__ */ React3.createElement(Box3, { flexDirection: "column", marginTop: 1 }, /* @__PURE__ */ React3.createElement(Box3, null, /* @__PURE__ */ React3.createElement(Text3, { bold: true, color: "green" }, "assistant", " "), /* @__PURE__ */ React3.createElement(Text3, { color: "blue" }, "\u{1F500} launching ", p.total, " parallel samples (R1 thinking in parallel)\u2026", " "), /* @__PURE__ */ React3.createElement(Elapsed, null)), /* @__PURE__ */ React3.createElement(Text3, { dimColor: true }, "  ", "spread across T=0.0/0.5/1.0 \xB7 typical wait 30-90s for reasoner"));
     }
     const pct2 = Math.round(p.completed / p.total * 100);
-    return /* @__PURE__ */ React2.createElement(Box2, { flexDirection: "column", marginTop: 1 }, /* @__PURE__ */ React2.createElement(Box2, null, /* @__PURE__ */ React2.createElement(Text2, { bold: true, color: "green" }, "assistant", " "), /* @__PURE__ */ React2.createElement(Text2, { color: "blue" }, "\u{1F500} branching ", p.completed, "/", p.total, " (", pct2, "%)", " "), /* @__PURE__ */ React2.createElement(Elapsed, null)), /* @__PURE__ */ React2.createElement(Text2, { dimColor: true }, "  latest #", p.latestIndex, " T=", p.latestTemperature.toFixed(1), " u=", p.latestUncertainties, p.completed < p.total ? "  \xB7 waiting for other samples\u2026" : "  \xB7 selecting winner\u2026"));
+    return /* @__PURE__ */ React3.createElement(Box3, { flexDirection: "column", marginTop: 1 }, /* @__PURE__ */ React3.createElement(Box3, null, /* @__PURE__ */ React3.createElement(Text3, { bold: true, color: "green" }, "assistant", " "), /* @__PURE__ */ React3.createElement(Text3, { color: "blue" }, "\u{1F500} branching ", p.completed, "/", p.total, " (", pct2, "%)", " "), /* @__PURE__ */ React3.createElement(Elapsed, null)), /* @__PURE__ */ React3.createElement(Text3, { dimColor: true }, "  latest #", p.latestIndex, " T=", p.latestTemperature.toFixed(1), " u=", p.latestUncertainties, p.completed < p.total ? "  \xB7 waiting for other samples\u2026" : "  \xB7 selecting winner\u2026"));
   }
   const tail = lastLine(event.text, 140);
   const reasoningTail = event.reasoning ? lastLine(event.reasoning, 120) : "";
-  return /* @__PURE__ */ React2.createElement(Box2, { flexDirection: "column", marginTop: 1 }, /* @__PURE__ */ React2.createElement(Box2, null, /* @__PURE__ */ React2.createElement(Text2, { bold: true, color: "green" }, "assistant", " "), /* @__PURE__ */ React2.createElement(Text2, { dimColor: true }, "(streaming \xB7 ", event.text.length, event.reasoning ? ` + think ${event.reasoning.length}` : "", " chars)", " "), /* @__PURE__ */ React2.createElement(Elapsed, null)), reasoningTail ? /* @__PURE__ */ React2.createElement(Text2, { dimColor: true, italic: true }, "\u21B3 thinking: ", reasoningTail) : null, tail ? /* @__PURE__ */ React2.createElement(Text2, { dimColor: true }, "\u25B8 ", tail) : /* @__PURE__ */ React2.createElement(Text2, { dimColor: true, italic: true }, "  (waiting for first token\u2026)"));
+  return /* @__PURE__ */ React3.createElement(Box3, { flexDirection: "column", marginTop: 1 }, /* @__PURE__ */ React3.createElement(Box3, null, /* @__PURE__ */ React3.createElement(Text3, { bold: true, color: "green" }, "assistant", " "), /* @__PURE__ */ React3.createElement(Text3, { dimColor: true }, "(streaming \xB7 ", event.text.length, event.reasoning ? ` + think ${event.reasoning.length}` : "", " chars)", " "), /* @__PURE__ */ React3.createElement(Elapsed, null)), reasoningTail ? /* @__PURE__ */ React3.createElement(Text3, { dimColor: true, italic: true }, "\u21B3 thinking: ", reasoningTail) : null, tail ? /* @__PURE__ */ React3.createElement(Text3, { dimColor: true }, "\u25B8 ", tail) : /* @__PURE__ */ React3.createElement(Text3, { dimColor: true, italic: true }, "  (waiting for first token\u2026)"));
 }
 function lastLine(s, maxChars) {
   const flat = s.replace(/\s+/g, " ").trim();
@@ -2092,16 +2505,16 @@ function lastLine(s, maxChars) {
 }
 function StatsLine({ stats }) {
   const hit = (stats.cacheHitRatio * 100).toFixed(1);
-  return /* @__PURE__ */ React2.createElement(Text2, { dimColor: true }, "  \u21B3 cache ", hit, "% \xB7 tokens ", stats.usage.promptTokens, "\u2192", stats.usage.completionTokens, " \xB7 $", stats.cost.toFixed(6));
+  return /* @__PURE__ */ React3.createElement(Text3, { dimColor: true }, "  \u21B3 cache ", hit, "% \xB7 tokens ", stats.usage.promptTokens, "\u2192", stats.usage.completionTokens, " \xB7 $", stats.cost.toFixed(6));
 }
 function truncate2(s, max) {
   return s.length <= max ? s : `${s.slice(0, max)}\u2026 (+${s.length - max} chars)`;
 }
 
 // src/cli/ui/PromptInput.tsx
-import { Box as Box3, Text as Text3 } from "ink";
+import { Box as Box4, Text as Text4 } from "ink";
 import TextInput from "ink-text-input";
-import React3 from "react";
+import React4 from "react";
 function PromptInput({
   value,
   onChange,
@@ -2110,7 +2523,7 @@ function PromptInput({
   placeholder
 }) {
   const effectivePlaceholder = disabled ? placeholder ?? "\u2026waiting for response\u2026" : placeholder ?? "type a message, or /command";
-  return /* @__PURE__ */ React3.createElement(Box3, { borderStyle: "round", borderColor: disabled ? "gray" : "cyan", paddingX: 1 }, /* @__PURE__ */ React3.createElement(Text3, { bold: true, color: disabled ? "gray" : "cyan" }, "you \u203A", " "), /* @__PURE__ */ React3.createElement(
+  return /* @__PURE__ */ React4.createElement(Box4, { borderStyle: "round", borderColor: disabled ? "gray" : "cyan", paddingX: 1 }, /* @__PURE__ */ React4.createElement(Text4, { bold: true, color: disabled ? "gray" : "cyan" }, "you \u203A", " "), /* @__PURE__ */ React4.createElement(
     TextInput,
     {
       value,
@@ -2123,8 +2536,8 @@ function PromptInput({
 }
 
 // src/cli/ui/StatsPanel.tsx
-import { Box as Box4, Text as Text4 } from "ink";
-import React4 from "react";
+import { Box as Box5, Text as Text5 } from "ink";
+import React5 from "react";
 function StatsPanel({
   summary,
   model,
@@ -2135,7 +2548,7 @@ function StatsPanel({
   const hitPct = (summary.cacheHitRatio * 100).toFixed(1);
   const hitColor = summary.cacheHitRatio >= 0.7 ? "green" : summary.cacheHitRatio >= 0.4 ? "yellow" : "red";
   const branchOn = (branchBudget ?? 1) > 1;
-  return /* @__PURE__ */ React4.createElement(Box4, { borderStyle: "round", borderColor: "cyan", flexDirection: "column", paddingX: 1 }, /* @__PURE__ */ React4.createElement(Box4, { justifyContent: "space-between" }, /* @__PURE__ */ React4.createElement(Text4, null, /* @__PURE__ */ React4.createElement(Text4, { color: "cyan", bold: true }, "Reasonix"), /* @__PURE__ */ React4.createElement(Text4, { dimColor: true }, " \xB7 model "), /* @__PURE__ */ React4.createElement(Text4, { color: "yellow" }, model), /* @__PURE__ */ React4.createElement(Text4, { dimColor: true }, " \xB7 prefix "), /* @__PURE__ */ React4.createElement(Text4, { dimColor: true }, prefixHash), harvestOn ? /* @__PURE__ */ React4.createElement(Text4, { color: "magenta" }, " \xB7 harvest") : null, branchOn ? /* @__PURE__ */ React4.createElement(Text4, { color: "blue" }, " \xB7 branch", branchBudget) : null), /* @__PURE__ */ React4.createElement(Text4, { dimColor: true }, "turns ", summary.turns, " \xB7 type /help")), /* @__PURE__ */ React4.createElement(Box4, { marginTop: 1, gap: 3 }, /* @__PURE__ */ React4.createElement(Text4, null, /* @__PURE__ */ React4.createElement(Text4, { dimColor: true }, "cache hit "), /* @__PURE__ */ React4.createElement(Text4, { color: hitColor, bold: true }, hitPct, "%")), /* @__PURE__ */ React4.createElement(Text4, null, /* @__PURE__ */ React4.createElement(Text4, { dimColor: true }, "cost "), /* @__PURE__ */ React4.createElement(Text4, { color: "green" }, "$", summary.totalCostUsd.toFixed(6))), /* @__PURE__ */ React4.createElement(Text4, null, /* @__PURE__ */ React4.createElement(Text4, { dimColor: true }, "vs Claude "), /* @__PURE__ */ React4.createElement(Text4, null, "$", summary.claudeEquivalentUsd.toFixed(6))), /* @__PURE__ */ React4.createElement(Text4, null, /* @__PURE__ */ React4.createElement(Text4, { dimColor: true }, "saving "), /* @__PURE__ */ React4.createElement(Text4, { color: "green", bold: true }, summary.savingsVsClaudePct.toFixed(1), "%"))));
+  return /* @__PURE__ */ React5.createElement(Box5, { borderStyle: "round", borderColor: "cyan", flexDirection: "column", paddingX: 1 }, /* @__PURE__ */ React5.createElement(Box5, { justifyContent: "space-between" }, /* @__PURE__ */ React5.createElement(Text5, null, /* @__PURE__ */ React5.createElement(Text5, { color: "cyan", bold: true }, "Reasonix"), /* @__PURE__ */ React5.createElement(Text5, { dimColor: true }, " \xB7 model "), /* @__PURE__ */ React5.createElement(Text5, { color: "yellow" }, model), /* @__PURE__ */ React5.createElement(Text5, { dimColor: true }, " \xB7 prefix "), /* @__PURE__ */ React5.createElement(Text5, { dimColor: true }, prefixHash), harvestOn ? /* @__PURE__ */ React5.createElement(Text5, { color: "magenta" }, " \xB7 harvest") : null, branchOn ? /* @__PURE__ */ React5.createElement(Text5, { color: "blue" }, " \xB7 branch", branchBudget) : null), /* @__PURE__ */ React5.createElement(Text5, { dimColor: true }, "turns ", summary.turns, " \xB7 type /help")), /* @__PURE__ */ React5.createElement(Box5, { marginTop: 1, gap: 3 }, /* @__PURE__ */ React5.createElement(Text5, null, /* @__PURE__ */ React5.createElement(Text5, { dimColor: true }, "cache hit "), /* @__PURE__ */ React5.createElement(Text5, { color: hitColor, bold: true }, hitPct, "%")), /* @__PURE__ */ React5.createElement(Text5, null, /* @__PURE__ */ React5.createElement(Text5, { dimColor: true }, "cost "), /* @__PURE__ */ React5.createElement(Text5, { color: "green" }, "$", summary.totalCostUsd.toFixed(6))), /* @__PURE__ */ React5.createElement(Text5, null, /* @__PURE__ */ React5.createElement(Text5, { dimColor: true }, "vs Claude "), /* @__PURE__ */ React5.createElement(Text5, null, "$", summary.claudeEquivalentUsd.toFixed(6))), /* @__PURE__ */ React5.createElement(Text5, null, /* @__PURE__ */ React5.createElement(Text5, { dimColor: true }, "saving "), /* @__PURE__ */ React5.createElement(Text5, { color: "green", bold: true }, summary.savingsVsClaudePct.toFixed(1), "%"))));
 }
 
 // src/cli/ui/slash.ts
@@ -2268,7 +2681,7 @@ function handleSlash(cmd, args, loop) {
 
 // src/cli/ui/App.tsx
 var FLUSH_INTERVAL_MS = 60;
-function App({ model, system, transcript, harvest: harvest2, branch, session }) {
+function App({ model, system, transcript, harvest: harvest2, branch, session, tools }) {
   const { exit } = useApp();
   const [historical, setHistorical] = useState2([]);
   const [streaming, setStreaming] = useState2(null);
@@ -2299,11 +2712,14 @@ function App({ model, system, transcript, harvest: harvest2, branch, session })
   const loop = useMemo(() => {
     if (loopRef.current) return loopRef.current;
     const client = new DeepSeekClient();
-    const prefix = new ImmutablePrefix({ system });
-    const l = new CacheFirstLoop({ client, prefix, model, harvest: harvest2, branch, session });
+    const prefix = new ImmutablePrefix({
+      system,
+      toolSpecs: tools?.specs()
+    });
+    const l = new CacheFirstLoop({ client, prefix, tools, model, harvest: harvest2, branch, session });
     loopRef.current = l;
     return l;
-  }, [model, system, harvest2, branch, session]);
+  }, [model, system, harvest2, branch, session, tools]);
   const sessionBannerShown = useRef(false);
   useEffect2(() => {
     if (sessionBannerShown.current) return;
@@ -2466,7 +2882,7 @@ function App({ model, system, transcript, harvest: harvest2, branch, session })
     },
     [busy, exit, loop, writeTranscript]
   );
-  return /* @__PURE__ */ React5.createElement(Box5, { flexDirection: "column" }, /* @__PURE__ */ React5.createElement(
+  return /* @__PURE__ */ React6.createElement(Box6, { flexDirection: "column" }, /* @__PURE__ */ React6.createElement(
     StatsPanel,
     {
       summary,
@@ -2475,10 +2891,10 @@ function App({ model, system, transcript, harvest: harvest2, branch, session })
       harvestOn: loop.harvestEnabled,
       branchBudget: loop.branchOptions.budget
     }
-  ), /* @__PURE__ */ React5.createElement(Static, { items: historical }, (item) => /* @__PURE__ */ React5.createElement(EventRow, { key: item.id, event: item })), streaming ? /* @__PURE__ */ React5.createElement(Box5, { marginY: 1 }, /* @__PURE__ */ React5.createElement(EventRow, { event: streaming })) : null, /* @__PURE__ */ React5.createElement(PromptInput, { value: input, onChange: setInput, onSubmit: handleSubmit, disabled: busy }), /* @__PURE__ */ React5.createElement(CommandStrip, null));
+  ), /* @__PURE__ */ React6.createElement(Static, { items: historical }, (item) => /* @__PURE__ */ React6.createElement(EventRow, { key: item.id, event: item })), streaming ? /* @__PURE__ */ React6.createElement(Box6, { marginY: 1 }, /* @__PURE__ */ React6.createElement(EventRow, { event: streaming })) : null, /* @__PURE__ */ React6.createElement(PromptInput, { value: input, onChange: setInput, onSubmit: handleSubmit, disabled: busy }), /* @__PURE__ */ React6.createElement(CommandStrip, null));
 }
 function CommandStrip() {
-  return /* @__PURE__ */ React5.createElement(Box5, { paddingX: 2 }, /* @__PURE__ */ React5.createElement(Text5, { dimColor: true }, "/help \xB7 /preset ", "<fast|smart|max>", " \xB7 /sessions \xB7 /model \xB7 /harvest \xB7 /branch \xB7 /clear \xB7 /exit"));
+  return /* @__PURE__ */ React6.createElement(Box6, { paddingX: 2 }, /* @__PURE__ */ React6.createElement(Text6, { dimColor: true }, "/help \xB7 /preset ", "<fast|smart|max>", " \xB7 /sessions \xB7 /model \xB7 /harvest \xB7 /branch \xB7 /clear \xB7 /exit"));
 }
 function describeRepair(repair) {
   const parts = [];
@@ -2489,9 +2905,9 @@ function describeRepair(repair) {
 }
 
 // src/cli/ui/Setup.tsx
-import { Box as Box6, Text as Text6, useApp as useApp2 } from "ink";
+import { Box as Box7, Text as Text7, useApp as useApp2 } from "ink";
 import TextInput2 from "ink-text-input";
-import React6, { useState as useState3 } from "react";
+import React7, { useState as useState3 } from "react";
 function Setup({ onReady }) {
   const [value, setValue] = useState3("");
   const [error, setError] = useState3(null);
@@ -2515,7 +2931,7 @@ function Setup({ onReady }) {
     }
     onReady(trimmed);
   };
-  return /* @__PURE__ */ React6.createElement(Box6, { flexDirection: "column", borderStyle: "round", borderColor: "cyan", paddingX: 1 }, /* @__PURE__ */ React6.createElement(Text6, { bold: true, color: "cyan" }, "Welcome to Reasonix."), /* @__PURE__ */ React6.createElement(Box6, { marginTop: 1 }, /* @__PURE__ */ React6.createElement(Text6, null, "Paste your DeepSeek API key to get started.")), /* @__PURE__ */ React6.createElement(Text6, { dimColor: true }, "Get one (free credit on signup): https://platform.deepseek.com/api_keys"), /* @__PURE__ */ React6.createElement(Text6, { dimColor: true }, "Saved locally to ", defaultConfigPath()), /* @__PURE__ */ React6.createElement(Box6, { marginTop: 1 }, /* @__PURE__ */ React6.createElement(Text6, { bold: true, color: "cyan" }, "key \u203A "), /* @__PURE__ */ React6.createElement(
+  return /* @__PURE__ */ React7.createElement(Box7, { flexDirection: "column", borderStyle: "round", borderColor: "cyan", paddingX: 1 }, /* @__PURE__ */ React7.createElement(Text7, { bold: true, color: "cyan" }, "Welcome to Reasonix."), /* @__PURE__ */ React7.createElement(Box7, { marginTop: 1 }, /* @__PURE__ */ React7.createElement(Text7, null, "Paste your DeepSeek API key to get started.")), /* @__PURE__ */ React7.createElement(Text7, { dimColor: true }, "Get one (free credit on signup): https://platform.deepseek.com/api_keys"), /* @__PURE__ */ React7.createElement(Text7, { dimColor: true }, "Saved locally to ", defaultConfigPath()), /* @__PURE__ */ React7.createElement(Box7, { marginTop: 1 }, /* @__PURE__ */ React7.createElement(Text7, { bold: true, color: "cyan" }, "key \u203A "), /* @__PURE__ */ React7.createElement(
     TextInput2,
     {
       value,
@@ -2524,14 +2940,14 @@ function Setup({ onReady }) {
       mask: "\u2022",
       placeholder: "sk-..."
     }
-  )), error ? /* @__PURE__ */ React6.createElement(Box6, { marginTop: 1 }, /* @__PURE__ */ React6.createElement(Text6, { color: "red" }, error)) : value ? /* @__PURE__ */ React6.createElement(Box6, { marginTop: 1 }, /* @__PURE__ */ React6.createElement(Text6, { dimColor: true }, "preview: ", redactKey(value))) : null, /* @__PURE__ */ React6.createElement(Box6, { marginTop: 1 }, /* @__PURE__ */ React6.createElement(Text6, { dimColor: true }, "(Type /exit to abort.)")));
+  )), error ? /* @__PURE__ */ React7.createElement(Box7, { marginTop: 1 }, /* @__PURE__ */ React7.createElement(Text7, { color: "red" }, error)) : value ? /* @__PURE__ */ React7.createElement(Box7, { marginTop: 1 }, /* @__PURE__ */ React7.createElement(Text7, { dimColor: true }, "preview: ", redactKey(value))) : null, /* @__PURE__ */ React7.createElement(Box7, { marginTop: 1 }, /* @__PURE__ */ React7.createElement(Text7, { dimColor: true }, "(Type /exit to abort.)")));
 }
 
 // src/cli/commands/chat.tsx
-function Root({ initialKey, ...appProps }) {
+function Root({ initialKey, tools, ...appProps }) {
   const [key, setKey] = useState4(initialKey);
   if (!key) {
-    return /* @__PURE__ */ React7.createElement(
+    return /* @__PURE__ */ React8.createElement(
       Setup,
       {
         onReady: (k) => {
@@ -2542,7 +2958,7 @@ function Root({ initialKey, ...appProps }) {
     );
   }
   process.env.DEEPSEEK_API_KEY = key;
-  return /* @__PURE__ */ React7.createElement(
+  return /* @__PURE__ */ React8.createElement(
     App,
     {
       model: appProps.model,
@@ -2550,40 +2966,282 @@ function Root({ initialKey, ...appProps }) {
       transcript: appProps.transcript,
       harvest: appProps.harvest,
       branch: appProps.branch,
-      session: appProps.session
+      session: appProps.session,
+      tools
     }
   );
 }
 async function chatCommand(opts) {
   loadDotenv();
   const initialKey = loadApiKey();
-  const { waitUntilExit } = render(/* @__PURE__ */ React7.createElement(Root, { initialKey, ...opts }), {
+  let mcp;
+  let tools;
+  if (opts.mcp) {
+    const argv = shellSplit(opts.mcp);
+    if (argv.length === 0) {
+      process.stderr.write("error: --mcp requires a command\n");
+      process.exit(2);
+    }
+    const [command, ...args] = argv;
+    if (!command) {
+      process.stderr.write("error: --mcp command is empty\n");
+      process.exit(2);
+    }
+    const transport = new StdioTransport({ command, args });
+    mcp = new McpClient({ transport });
+    try {
+      await mcp.initialize();
+      const bridge = await bridgeMcpTools(mcp, { namePrefix: opts.mcpPrefix });
+      tools = bridge.registry;
+      process.stderr.write(
+        `\u25B8 MCP: ${bridge.registeredNames.length} tool(s) from ${argv.join(" ")}
+`
+      );
+    } catch (err) {
+      process.stderr.write(`MCP setup failed: ${err.message}
+`);
+      await mcp.close();
+      process.exit(1);
+    }
+  }
+  const { waitUntilExit } = render(/* @__PURE__ */ React8.createElement(Root, { initialKey, tools, ...opts }), {
     exitOnCtrlC: true
   });
-  await waitUntilExit();
+  try {
+    await waitUntilExit();
+  } finally {
+    await mcp?.close();
+  }
 }
 
 // src/cli/commands/diff.ts
 import { writeFileSync as writeFileSync2 } from "fs";
 import { basename } from "path";
-function diffCommand(opts) {
+import { render as render2 } from "ink";
+import React11 from "react";
+
+// src/cli/ui/DiffApp.tsx
+import { Box as Box9, Static as Static2, Text as Text9, useApp as useApp3, useInput } from "ink";
+import React10, { useState as useState5 } from "react";
+
+// src/cli/ui/RecordView.tsx
+import { Box as Box8, Text as Text8 } from "ink";
+import React9 from "react";
+function RecordView({ rec, compact = false }) {
+  const toolArgsMax = compact ? 120 : 200;
+  const toolContentMax = compact ? 200 : 400;
+  if (rec.role === "user") {
+    return /* @__PURE__ */ React9.createElement(Box8, { marginTop: 1 }, /* @__PURE__ */ React9.createElement(Text8, { bold: true, color: "cyan" }, "you \u203A", " "), /* @__PURE__ */ React9.createElement(Text8, null, rec.content));
+  }
+  if (rec.role === "assistant_final") {
+    return /* @__PURE__ */ React9.createElement(Box8, { flexDirection: "column", marginTop: 1 }, /* @__PURE__ */ React9.createElement(Box8, null, /* @__PURE__ */ React9.createElement(Text8, { bold: true, color: "green" }, "assistant"), rec.cost !== void 0 ? /* @__PURE__ */ React9.createElement(Text8, { dimColor: true }, "  $", rec.cost.toFixed(6)) : null, rec.usage ? /* @__PURE__ */ React9.createElement(CacheBadge, { usage: rec.usage }) : null), rec.planState ? /* @__PURE__ */ React9.createElement(PlanStateBlock, { planState: rec.planState }) : null, rec.content ? /* @__PURE__ */ React9.createElement(Text8, null, rec.content) : /* @__PURE__ */ React9.createElement(Text8, { dimColor: true, italic: true }, "(tool-call response only)"));
+  }
+  if (rec.role === "tool") {
+    return /* @__PURE__ */ React9.createElement(Box8, { flexDirection: "column", marginTop: 1 }, /* @__PURE__ */ React9.createElement(Text8, { color: "yellow" }, "tool<", rec.tool ?? "?", ">"), rec.args ? /* @__PURE__ */ React9.createElement(Text8, { dimColor: true }, "  args: ", truncate3(rec.args, toolArgsMax)) : null, /* @__PURE__ */ React9.createElement(Text8, { dimColor: true }, "  \u2192 ", truncate3(rec.content, toolContentMax)));
+  }
+  if (rec.role === "error") {
+    return /* @__PURE__ */ React9.createElement(Box8, { marginTop: 1 }, /* @__PURE__ */ React9.createElement(Text8, { color: "red", bold: true }, "error", " "), /* @__PURE__ */ React9.createElement(Text8, { color: "red" }, rec.error ?? rec.content));
+  }
+  if (rec.role === "done" || rec.role === "assistant_delta") {
+    return null;
+  }
+  return /* @__PURE__ */ React9.createElement(Box8, null, /* @__PURE__ */ React9.createElement(Text8, { dimColor: true }, "[", rec.role, "] ", rec.content));
+}
+function CacheBadge({ usage }) {
+  const hit = usage.prompt_cache_hit_tokens ?? 0;
+  const miss = usage.prompt_cache_miss_tokens ?? 0;
+  const total = hit + miss;
+  if (total === 0) return null;
+  const pct2 = hit / total * 100;
+  const color = pct2 >= 70 ? "green" : pct2 >= 40 ? "yellow" : "red";
+  return /* @__PURE__ */ React9.createElement(Text8, null, /* @__PURE__ */ React9.createElement(Text8, { dimColor: true }, "  \xB7 cache "), /* @__PURE__ */ React9.createElement(Text8, { color }, pct2.toFixed(1), "%"));
+}
+function truncate3(s, max) {
+  return s.length <= max ? s : `${s.slice(0, max)}\u2026 (+${s.length - max} chars)`;
+}
+
+// src/cli/ui/DiffApp.tsx
+function DiffApp({ report }) {
+  const { exit } = useApp3();
+  const maxIdx = Math.max(0, report.pairs.length - 1);
+  const initialIdx = report.firstDivergenceTurn ? report.pairs.findIndex((p) => p.turn === report.firstDivergenceTurn) : 0;
+  const [idx, setIdx] = useState5(Math.max(0, initialIdx));
+  useInput((input, key) => {
+    if (input === "q" || key.ctrl && input === "c") {
+      exit();
+      return;
+    }
+    if (input === "j" || key.downArrow || input === " " || key.return) {
+      setIdx((i) => Math.min(maxIdx, i + 1));
+    } else if (input === "k" || key.upArrow) {
+      setIdx((i) => Math.max(0, i - 1));
+    } else if (input === "g") {
+      setIdx(0);
+    } else if (input === "G") {
+      setIdx(maxIdx);
+    } else if (input === "n") {
+      const next = findNextDivergence(report.pairs, idx);
+      if (next !== -1) setIdx(next);
+    } else if (input === "N" || input === "p") {
+      const prev = findPrevDivergence(report.pairs, idx);
+      if (prev !== -1) setIdx(prev);
+    }
+  });
+  const pair = report.pairs[idx];
+  return /* @__PURE__ */ React10.createElement(Box9, { flexDirection: "column" }, /* @__PURE__ */ React10.createElement(DiffHeader, { report }), /* @__PURE__ */ React10.createElement(Box9, { marginTop: 1, paddingX: 1, justifyContent: "space-between" }, /* @__PURE__ */ React10.createElement(Text9, { color: "cyan", bold: true }, "turn ", pair?.turn ?? "?", " (", idx + 1, " / ", report.pairs.length, ")"), /* @__PURE__ */ React10.createElement(Text9, null, pair ? /* @__PURE__ */ React10.createElement(KindBadge, { kind: pair.kind }) : null)), /* @__PURE__ */ React10.createElement(Box9, { flexDirection: "row", marginTop: 1 }, /* @__PURE__ */ React10.createElement(Pane, { label: report.a.label, headerColor: "blue", records: paneRecords(pair, "a") }), /* @__PURE__ */ React10.createElement(Pane, { label: report.b.label, headerColor: "magenta", records: paneRecords(pair, "b") })), pair?.divergenceNote ? /* @__PURE__ */ React10.createElement(Box9, { marginTop: 1, paddingX: 1 }, /* @__PURE__ */ React10.createElement(Text9, { color: "yellow" }, "\u2605 "), /* @__PURE__ */ React10.createElement(Text9, null, pair.divergenceNote)) : null, /* @__PURE__ */ React10.createElement(Box9, { marginTop: 1, paddingX: 1, borderStyle: "single", borderColor: "gray" }, /* @__PURE__ */ React10.createElement(Text9, { dimColor: true }, /* @__PURE__ */ React10.createElement(Text9, { bold: true }, "j"), "/", /* @__PURE__ */ React10.createElement(Text9, { bold: true }, "\u2193"), " next \xB7 ", /* @__PURE__ */ React10.createElement(Text9, { bold: true }, "k"), "/", /* @__PURE__ */ React10.createElement(Text9, { bold: true }, "\u2191"), " ", "prev \xB7 ", /* @__PURE__ */ React10.createElement(Text9, { bold: true }, "n"), " next-diverge \xB7 ", /* @__PURE__ */ React10.createElement(Text9, { bold: true }, "N"), "/", /* @__PURE__ */ React10.createElement(Text9, { bold: true }, "p"), " ", "prev-diverge \xB7 ", /* @__PURE__ */ React10.createElement(Text9, { bold: true }, "g"), "/", /* @__PURE__ */ React10.createElement(Text9, { bold: true }, "G"), " first/last \xB7 ", /* @__PURE__ */ React10.createElement(Text9, { bold: true }, "q"), " ", "quit")));
+}
+function DiffHeader({ report }) {
+  const a = report.a;
+  const b = report.b;
+  const cacheDelta = b.stats.cacheHitRatio - a.stats.cacheHitRatio;
+  const costDelta2 = a.stats.totalCostUsd > 0 ? (b.stats.totalCostUsd - a.stats.totalCostUsd) / a.stats.totalCostUsd * 100 : 0;
+  const aStable = a.stats.prefixHashes.length <= 1;
+  const bStable = b.stats.prefixHashes.length <= 1;
+  let prefixLine = null;
+  if (aStable !== bStable) {
+    const stableLabel = aStable ? report.a.label : report.b.label;
+    const churnLabel = aStable ? report.b.label : report.a.label;
+    const churnCount = aStable ? b.stats.prefixHashes.length : a.stats.prefixHashes.length;
+    prefixLine = `${stableLabel} stayed byte-stable; ${churnLabel} churned ${churnCount} distinct prefixes.`;
+  } else if (a.stats.prefixHashes[0] && a.stats.prefixHashes[0] === b.stats.prefixHashes[0]) {
+    prefixLine = `shared prefix hash ${a.stats.prefixHashes[0].slice(0, 12)}\u2026 \u2014 cache delta attributable to log stability, not prompt change.`;
+  }
+  return /* @__PURE__ */ React10.createElement(Box9, { flexDirection: "column", borderStyle: "round", borderColor: "cyan", paddingX: 1 }, /* @__PURE__ */ React10.createElement(Box9, { justifyContent: "space-between" }, /* @__PURE__ */ React10.createElement(Text9, null, /* @__PURE__ */ React10.createElement(Text9, { color: "cyan", bold: true }, "reasonix diff"), /* @__PURE__ */ React10.createElement(Text9, { dimColor: true }, " \xB7 A="), /* @__PURE__ */ React10.createElement(Text9, { color: "blue" }, a.label), /* @__PURE__ */ React10.createElement(Text9, { dimColor: true }, " vs B="), /* @__PURE__ */ React10.createElement(Text9, { color: "magenta" }, b.label)), /* @__PURE__ */ React10.createElement(Text9, { dimColor: true }, report.pairs.length, " turns aligned")), /* @__PURE__ */ React10.createElement(Box9, { marginTop: 1, gap: 3 }, /* @__PURE__ */ React10.createElement(Text9, null, /* @__PURE__ */ React10.createElement(Text9, { dimColor: true }, "cache "), /* @__PURE__ */ React10.createElement(Text9, null, (a.stats.cacheHitRatio * 100).toFixed(1), "%"), /* @__PURE__ */ React10.createElement(Text9, { dimColor: true }, " \u2192 "), /* @__PURE__ */ React10.createElement(Text9, null, (b.stats.cacheHitRatio * 100).toFixed(1), "%"), /* @__PURE__ */ React10.createElement(Text9, { color: cacheDelta >= 0 ? "green" : "red", bold: true }, "  ", cacheDelta >= 0 ? "+" : "", (cacheDelta * 100).toFixed(1), "pp")), /* @__PURE__ */ React10.createElement(Text9, null, /* @__PURE__ */ React10.createElement(Text9, { dimColor: true }, "cost "), /* @__PURE__ */ React10.createElement(Text9, null, "$", a.stats.totalCostUsd.toFixed(6)), /* @__PURE__ */ React10.createElement(Text9, { dimColor: true }, " \u2192 "), /* @__PURE__ */ React10.createElement(Text9, null, "$", b.stats.totalCostUsd.toFixed(6)), /* @__PURE__ */ React10.createElement(Text9, { color: costDelta2 <= 0 ? "green" : "red", bold: true }, "  ", costDelta2 >= 0 ? "+" : "", costDelta2.toFixed(1), "%")), /* @__PURE__ */ React10.createElement(Text9, null, /* @__PURE__ */ React10.createElement(Text9, { dimColor: true }, "model calls "), /* @__PURE__ */ React10.createElement(Text9, null, a.stats.turns, " \u2192 ", b.stats.turns))), prefixLine ? /* @__PURE__ */ React10.createElement(Box9, { marginTop: 1 }, /* @__PURE__ */ React10.createElement(Text9, { dimColor: true, italic: true }, prefixLine)) : null);
+}
+function Pane({
+  label,
+  headerColor,
+  records
+}) {
+  return /* @__PURE__ */ React10.createElement(
+    Box9,
+    {
+      flexDirection: "column",
+      flexGrow: 1,
+      paddingX: 1,
+      borderStyle: "single",
+      borderColor: headerColor
+    },
+    /* @__PURE__ */ React10.createElement(Text9, { color: headerColor, bold: true }, label),
+    records.length === 0 ? /* @__PURE__ */ React10.createElement(Box9, { marginTop: 1 }, /* @__PURE__ */ React10.createElement(Text9, { dimColor: true, italic: true }, "(no records on this side for this turn)")) : /* @__PURE__ */ React10.createElement(Static2, { items: records.map((rec, i) => ({ key: `${label}-${i}`, rec })) }, ({ key, rec }) => /* @__PURE__ */ React10.createElement(RecordView, { key, rec, compact: true }))
+  );
+}
+function KindBadge({ kind }) {
+  if (kind === "match") {
+    return /* @__PURE__ */ React10.createElement(Text9, { color: "green" }, "\u2713 match");
+  }
+  if (kind === "diverge") {
+    return /* @__PURE__ */ React10.createElement(Text9, { color: "yellow" }, "\u2605 diverge");
+  }
+  if (kind === "only_in_a") {
+    return /* @__PURE__ */ React10.createElement(Text9, { color: "blue" }, "\u2190 only in A");
+  }
+  return /* @__PURE__ */ React10.createElement(Text9, { color: "magenta" }, "\u2192 only in B");
+}
+function paneRecords(pair, side) {
+  if (!pair) return [];
+  const tools = side === "a" ? pair.aTools : pair.bTools;
+  const assistant = side === "a" ? pair.aAssistant : pair.bAssistant;
+  const out = [...tools];
+  if (assistant) out.push(assistant);
+  return out;
+}
+
+// src/cli/commands/diff.ts
+async function diffCommand(opts) {
   const aParsed = readTranscript(opts.a);
   const bParsed = readTranscript(opts.b);
   const report = diffTranscripts(
     { label: opts.labelA ?? basename(opts.a), parsed: aParsed },
     { label: opts.labelB ?? basename(opts.b), parsed: bParsed }
   );
-  console.log(renderSummaryTable(report));
-  if (opts.mdPath) {
+  const wantMarkdown = !!opts.mdPath;
+  const wantPrint = opts.print || !process.stdout.isTTY;
+  const wantTui = opts.tui || !wantPrint && !wantMarkdown;
+  if (wantMarkdown) {
+    console.log(renderSummaryTable(report));
     const md = renderMarkdown(report);
     writeFileSync2(opts.mdPath, md, "utf8");
     console.log(`
 markdown report written to ${opts.mdPath}`);
+    return;
   }
+  if (wantTui) {
+    const { waitUntilExit } = render2(React11.createElement(DiffApp, { report }), {
+      exitOnCtrlC: true
+    });
+    await waitUntilExit();
+    return;
+  }
+  console.log(renderSummaryTable(report));
 }
 
 // src/cli/commands/replay.ts
-function replayCommand(opts) {
+import { render as render3 } from "ink";
+import React13 from "react";
+
+// src/cli/ui/ReplayApp.tsx
+import { Box as Box10, Static as Static3, Text as Text10, useApp as useApp4, useInput as useInput2 } from "ink";
+import React12, { useMemo as useMemo2, useState as useState6 } from "react";
+function ReplayApp({ meta, pages }) {
+  const { exit } = useApp4();
+  const maxIdx = Math.max(0, pages.length - 1);
+  const [idx, setIdx] = useState6(maxIdx);
+  useInput2((input, key) => {
+    if (input === "q" || key.ctrl && input === "c") {
+      exit();
+      return;
+    }
+    if (input === "j" || key.downArrow || input === " " || key.return) {
+      setIdx((i) => Math.min(maxIdx, i + 1));
+    } else if (input === "k" || key.upArrow) {
+      setIdx((i) => Math.max(0, i - 1));
+    } else if (input === "g") {
+      setIdx(0);
+    } else if (input === "G") {
+      setIdx(maxIdx);
+    } else if (input === "h" || key.leftArrow) {
+      setIdx(0);
+    } else if (input === "l" || key.rightArrow) {
+      setIdx(maxIdx);
+    }
+  });
+  const cumStats = useMemo2(() => computeCumulativeStats(pages, idx), [pages, idx]);
+  const summary = {
+    turns: cumStats.turns,
+    totalCostUsd: cumStats.totalCostUsd,
+    claudeEquivalentUsd: cumStats.claudeEquivalentUsd,
+    savingsVsClaudePct: cumStats.savingsVsClaudePct,
+    cacheHitRatio: cumStats.cacheHitRatio
+  };
+  const prefixHash = cumStats.prefixHashes.length === 1 ? cumStats.prefixHashes[0].slice(0, 16) : cumStats.prefixHashes.length === 0 ? "(untracked)" : `(churned \xD7${cumStats.prefixHashes.length})`;
+  const currentPage = pages[idx];
+  const progressLabel = pages.length === 0 ? "empty transcript" : `turn ${idx + 1} / ${pages.length}`;
+  return /* @__PURE__ */ React12.createElement(Box10, { flexDirection: "column" }, /* @__PURE__ */ React12.createElement(
+    StatsPanel,
+    {
+      summary,
+      model: cumStats.models[0] ?? meta?.model ?? "?",
+      prefixHash
+    }
+  ), /* @__PURE__ */ React12.createElement(Box10, { flexDirection: "column", marginTop: 1, paddingX: 1 }, /* @__PURE__ */ React12.createElement(Box10, { justifyContent: "space-between" }, /* @__PURE__ */ React12.createElement(Text10, { color: "cyan", bold: true }, progressLabel), meta ? /* @__PURE__ */ React12.createElement(Text10, { dimColor: true }, meta.source, meta.task ? ` \xB7 ${meta.task}` : "", meta.mode ? ` \xB7 ${meta.mode}` : "") : null), currentPage ? /* @__PURE__ */ React12.createElement(Static3, { items: currentPage.records.map((rec, i) => ({ key: `${idx}-${i}`, rec })) }, ({ key, rec }) => /* @__PURE__ */ React12.createElement(RecordView, { key, rec })) : /* @__PURE__ */ React12.createElement(Text10, { dimColor: true, italic: true }, "no records")), /* @__PURE__ */ React12.createElement(Box10, { marginTop: 1, paddingX: 1, borderStyle: "single", borderColor: "gray" }, /* @__PURE__ */ React12.createElement(Text10, { dimColor: true }, /* @__PURE__ */ React12.createElement(Text10, { bold: true }, "j"), "/", /* @__PURE__ */ React12.createElement(Text10, { bold: true }, "\u2193"), "/", /* @__PURE__ */ React12.createElement(Text10, { bold: true }, "space"), " next \xB7 ", /* @__PURE__ */ React12.createElement(Text10, { bold: true }, "k"), "/", /* @__PURE__ */ React12.createElement(Text10, { bold: true }, "\u2191"), " prev \xB7 ", /* @__PURE__ */ React12.createElement(Text10, { bold: true }, "g"), " first \xB7 ", /* @__PURE__ */ React12.createElement(Text10, { bold: true }, "G"), " last \xB7", " ", /* @__PURE__ */ React12.createElement(Text10, { bold: true }, "q"), " quit")));
+}
+
+// src/cli/commands/replay.ts
+async function replayCommand(opts) {
+  const wantPrint = opts.print || !process.stdout.isTTY || opts.head !== void 0 || opts.tail !== void 0;
+  if (wantPrint) {
+    printReplay(opts);
+    return;
+  }
+  const { parsed } = replayFromFile(opts.path);
+  const pages = groupRecordsByTurn(parsed.records);
+  const { waitUntilExit } = render3(React13.createElement(ReplayApp, { meta: parsed.meta, pages }), {
+    exitOnCtrlC: true
+  });
+  await waitUntilExit();
+}
+function printReplay(opts) {
   const { parsed, stats } = replayFromFile(opts.path);
   if (parsed.meta) {
     const m = parsed.meta;
@@ -2616,6 +3274,11 @@ function replayCommand(opts) {
   } else if (stats.prefixHashes.length > 1) {
     console.log("  (prefix churned \u2014 cache-hostile session)");
   }
+  if (stats.harvestedTurns > 0) {
+    console.log(`harvest (Pillar 2): ${stats.harvestedTurns} turn(s) produced plan state`);
+    console.log(`  subgoals:          ${stats.totalSubgoals}`);
+    console.log(`  uncertainties:     ${stats.totalUncertainties}`);
+  }
 }
 function sliceRecords(records, opts) {
   if (opts.head !== void 0 && opts.head > 0) return records.slice(0, opts.head);
@@ -2635,6 +3298,21 @@ function renderRecord(rec) {
       return total > 0 ? ` cache=${(hit / total * 100).toFixed(1)}%` : "";
     })() : "";
     console.log(`${turn} AGENT:${cost}${cache} ${oneLine(rec.content)}`);
+    if (rec.planState) {
+      const ps = rec.planState;
+      if (ps.subgoals.length)
+        console.log(`   \u2039 subgoals     (${ps.subgoals.length}): ${ps.subgoals.join(" \xB7 ")}`);
+      if (ps.hypotheses.length)
+        console.log(`   \u2039 hypotheses   (${ps.hypotheses.length}): ${ps.hypotheses.join(" \xB7 ")}`);
+      if (ps.uncertainties.length)
+        console.log(
+          `   \u2039 uncertainties(${ps.uncertainties.length}): ${ps.uncertainties.join(" \xB7 ")}`
+        );
+      if (ps.rejectedPaths.length)
+        console.log(
+          `   \u2039 rejected     (${ps.rejectedPaths.length}): ${ps.rejectedPaths.join(" \xB7 ")}`
+        );
+    }
   } else if (rec.role === "tool") {
     const args = rec.args ? ` args=${oneLine(rec.args, 80)}` : "";
     console.log(`${turn} TOOL ${rec.tool ?? "?"}:${args} \u2192 ${oneLine(rec.content, 120)}`);
@@ -2688,18 +3366,76 @@ async function runCommand(opts) {
   loadDotenv();
   const apiKey = await ensureApiKey();
   process.env.DEEPSEEK_API_KEY = apiKey;
+  let mcp;
+  let tools;
+  if (opts.mcp) {
+    const argv = shellSplit(opts.mcp);
+    const [command, ...args] = argv;
+    if (!command) {
+      process.stderr.write("error: --mcp command is empty\n");
+      process.exit(2);
+    }
+    mcp = new McpClient({ transport: new StdioTransport({ command, args }) });
+    try {
+      await mcp.initialize();
+      const bridge = await bridgeMcpTools(mcp, { namePrefix: opts.mcpPrefix });
+      tools = bridge.registry;
+      process.stderr.write(
+        `\u25B8 MCP: ${bridge.registeredNames.length} tool(s) from ${argv.join(" ")}
+`
+      );
+    } catch (err) {
+      process.stderr.write(`MCP setup failed: ${err.message}
+`);
+      await mcp.close();
+      process.exit(1);
+    }
+  }
   const client = new DeepSeekClient();
-  const prefix = new ImmutablePrefix({ system: opts.system });
-  const loop = new CacheFirstLoop({ client, prefix, model: opts.model });
-  for await (const ev of loop.step(opts.task)) {
-    if (ev.role === "assistant_delta" && ev.content) process.stdout.write(ev.content);
-    if (ev.role === "tool") process.stdout.write(`
+  const prefix = new ImmutablePrefix({
+    system: opts.system,
+    toolSpecs: tools?.specs()
+  });
+  const loop = new CacheFirstLoop({
+    client,
+    prefix,
+    tools,
+    model: opts.model,
+    harvest: opts.harvest,
+    branch: opts.branch
+  });
+  const prefixHash = prefix.fingerprint;
+  let transcriptStream = null;
+  if (opts.transcript) {
+    transcriptStream = openTranscriptFile(opts.transcript, {
+      version: 1,
+      source: "reasonix run",
+      model: opts.model,
+      startedAt: (/* @__PURE__ */ new Date()).toISOString()
+    });
+    writeRecord(transcriptStream, {
+      ts: (/* @__PURE__ */ new Date()).toISOString(),
+      turn: 1,
+      role: "user",
+      content: opts.task
+    });
+  }
+  try {
+    for await (const ev of loop.step(opts.task)) {
+      if (ev.role === "assistant_delta" && ev.content) process.stdout.write(ev.content);
+      if (ev.role === "tool") process.stdout.write(`
 [tool ${ev.toolName}] ${ev.content}
 `);
-    if (ev.role === "error") process.stderr.write(`
+      if (ev.role === "error") process.stderr.write(`
 [error] ${ev.error}
 `);
-    if (ev.role === "done") process.stdout.write("\n");
+      if (ev.role === "done") process.stdout.write("\n");
+      if (transcriptStream && ev.role !== "assistant_delta") {
+        writeRecord(transcriptStream, recordFromLoopEvent(ev, { model: opts.model, prefixHash }));
+      }
+    }
+  } finally {
+    transcriptStream?.end();
   }
   const s = loop.stats.summary();
   process.stdout.write(
@@ -2707,6 +3443,90 @@ async function runCommand(opts) {
 \u2014 turns:${s.turns} cache:${(s.cacheHitRatio * 100).toFixed(1)}% cost:$${s.totalCostUsd.toFixed(6)} save-vs-claude:${s.savingsVsClaudePct.toFixed(1)}%
 `
   );
+  if (opts.transcript) {
+    process.stdout.write(`
+transcript: ${opts.transcript}
+`);
+    process.stdout.write(`  \u2192 npx reasonix replay ${opts.transcript}
+`);
+  }
+  await mcp?.close();
+}
+
+// src/cli/commands/sessions.ts
+function sessionsCommand(opts) {
+  if (opts.name) {
+    inspectSession(opts.name, !!opts.verbose);
+  } else {
+    listAll();
+  }
+}
+function listAll() {
+  const items = listSessions();
+  if (items.length === 0) {
+    console.log(
+      "no saved sessions yet \u2014 run `reasonix chat` (sessions are auto-saved unless --no-session)."
+    );
+    return;
+  }
+  console.log("Saved sessions (~/.reasonix/sessions/):");
+  console.log("");
+  console.log(`  ${"name".padEnd(22)} ${"msgs".padStart(6)}  ${"size".padStart(8)}  modified`);
+  console.log(`  ${"\u2500".repeat(60)}`);
+  for (const s of items) {
+    const sizeKb = `${(s.size / 1024).toFixed(1)} KB`;
+    const when = s.mtime.toISOString().replace("T", " ").slice(0, 16);
+    console.log(
+      `  ${s.name.padEnd(22)} ${String(s.messageCount).padStart(6)}  ${sizeKb.padStart(8)}  ${when}`
+    );
+  }
+  console.log("");
+  console.log("Inspect:  reasonix sessions <name>");
+  console.log("Resume:   reasonix chat --session <name>");
+}
+function inspectSession(name, verbose) {
+  const path = sessionPath(name);
+  const messages = loadSessionMessages(name);
+  if (messages.length === 0) {
+    console.error(`no session named "${name}" (or it's empty).`);
+    console.error(`looked at: ${path}`);
+    process.exit(1);
+  }
+  console.log(`[session] ${name}   ${messages.length} messages   ${path}`);
+  console.log("");
+  let turnIndex = 0;
+  for (const msg of messages) {
+    renderMessage(msg, turnIndex, verbose);
+    if (msg.role === "user") turnIndex++;
+  }
+}
+function renderMessage(msg, turnIdx, verbose) {
+  const turn = turnIdx > 0 ? `[t${turnIdx}]` : "[start]";
+  const content = typeof msg.content === "string" ? msg.content : "";
+  const flat = oneLine2(content);
+  if (msg.role === "user") {
+    console.log(`${turn} USER: ${flat}`);
+  } else if (msg.role === "assistant") {
+    console.log(`${turn} AGENT: ${flat || "(tool call only)"}`);
+    if (verbose && msg.tool_calls?.length) {
+      for (const tc of msg.tool_calls) {
+        console.log(
+          `         \u2192 call ${tc.function?.name} ${truncate4(tc.function?.arguments ?? "", 80)}`
+        );
+      }
+    }
+  } else if (msg.role === "tool") {
+    console.log(`${turn} TOOL ${msg.name ?? "?"}: ${truncate4(flat, 160)}`);
+  } else if (msg.role === "system") {
+    if (verbose) console.log(`${turn} SYSTEM: ${truncate4(flat, 160)}`);
+  }
+}
+function oneLine2(s, max = 200) {
+  const collapsed = s.replace(/\s+/g, " ").trim();
+  return collapsed.length > max ? `${collapsed.slice(0, max)}\u2026` : collapsed;
+}
+function truncate4(s, max) {
+  return s.length <= max ? s : `${s.slice(0, max)}\u2026`;
 }
 
 // src/cli/commands/stats.ts
@@ -2754,7 +3574,10 @@ program.command("chat").description("Interactive Ink TUI with live cache/cost pa
 ).option(
   "--session <name>",
   "Use a named session (default: 'default'). Resume the same session next time."
-).option("--no-session", "Disable session persistence for this run (ephemeral chat)").action(async (opts) => {
+).option("--no-session", "Disable session persistence for this run (ephemeral chat)").option(
+  "--mcp <command>",
+  'Spawn an MCP server and bridge its tools. Shell-quoted: --mcp "npx -y @scope/server-x /path"'
+).option("--mcp-prefix <str>", "Prefix prepended to every MCP tool name (avoid collisions)").action(async (opts) => {
   let session;
   if (opts.session === false) {
     session = void 0;
@@ -2769,26 +3592,61 @@ program.command("chat").description("Interactive Ink TUI with live cache/cost pa
     transcript: opts.transcript,
     harvest: !!opts.harvest,
     branch: Number.isFinite(opts.branch) && opts.branch > 1 ? opts.branch : void 0,
-    session
+    session,
+    mcp: opts.mcp,
+    mcpPrefix: opts.mcpPrefix
   });
 });
-program.command("run <task>").description("Run a single task non-interactively, streaming output.").option("-m, --model <id>", "DeepSeek model id", "deepseek-chat").option("-s, --system <prompt>", "System prompt", DEFAULT_SYSTEM).action(async (task, opts) => {
-  await runCommand({ task, model: opts.model, system: opts.system });
+program.command("run <task>").description("Run a single task non-interactively, streaming output.").option("-m, --model <id>", "DeepSeek model id", "deepseek-chat").option("-s, --system <prompt>", "System prompt", DEFAULT_SYSTEM).option(
+  "--harvest",
+  "Extract typed plan state from R1 reasoning (Pillar 2, adds a cheap V3 call per turn)"
+).option(
+  "--branch <n>",
+  "Self-consistency: run N parallel samples per turn and pick the most confident",
+  (v) => Number.parseInt(v, 10)
+).option("--transcript <path>", "Write a JSONL transcript to this path for replay/diff").option(
+  "--mcp <command>",
+  'Spawn an MCP server and bridge its tools. Shell-quoted: --mcp "npx -y @scope/server-x /path"'
+).option("--mcp-prefix <str>", "Prefix prepended to every MCP tool name (avoid collisions)").action(async (task, opts) => {
+  await runCommand({
+    task,
+    model: opts.model,
+    system: opts.system,
+    harvest: !!opts.harvest,
+    branch: Number.isFinite(opts.branch) && opts.branch > 1 ? opts.branch : void 0,
+    transcript: opts.transcript,
+    mcp: opts.mcp,
+    mcpPrefix: opts.mcpPrefix
+  });
 });
 program.command("stats <transcript>").description("Summarize a JSONL transcript produced by `reasonix chat --transcript`.").action((transcript) => {
   statsCommand({ transcript });
 });
+program.command("sessions [name]").description("List saved chat sessions, or inspect one by name.").option("-v, --verbose", "Include system prompts + tool-call metadata when inspecting").action((name, opts) => {
+  sessionsCommand({ name, verbose: !!opts.verbose });
+});
 program.command("replay <transcript>").description(
-  "Pretty-print a transcript + rebuild its session summary (cost, cache, prefix stability). No API calls."
-).option("--head <n>", "Show only the first N records", (v) => Number.parseInt(v, 10)).option("--tail <n>", "Show only the last N records", (v) => Number.parseInt(v, 10)).action((transcript, opts) => {
-  replayCommand({
+  "Interactive Ink TUI to scrub through a transcript + rebuild its session summary (cost, cache, prefix stability). No API calls."
+).option("--print", "Dump to stdout instead of mounting the TUI (auto when piped)").option("--head <n>", "stdout mode only \u2014 show first N records", (v) => Number.parseInt(v, 10)).option("--tail <n>", "stdout mode only \u2014 show last N records", (v) => Number.parseInt(v, 10)).action(async (transcript, opts) => {
+  await replayCommand({
     path: transcript,
+    print: !!opts.print,
     head: Number.isFinite(opts.head) ? opts.head : void 0,
     tail: Number.isFinite(opts.tail) ? opts.tail : void 0
   });
 });
-program.command("diff <a> <b>").description("Compare two transcripts: aggregate deltas + first divergence.").option("--md <path>", "Also write a markdown report (blog-ready) to this path").option("--label-a <label>", "Display label for transcript A (default: filename)").option("--label-b <label>", "Display label for transcript B (default: filename)").action((a, b, opts) => {
-  diffCommand({ a, b, mdPath: opts.md, labelA: opts.labelA, labelB: opts.labelB });
+program.command("diff <a> <b>").description(
+  "Compare two transcripts in a split-pane Ink TUI (default) or stdout table. Use n/N to jump across divergences."
+).option("--md <path>", "Write a markdown report (blog-ready) to this path").option("--print", "Force stdout table instead of the TUI (auto when piped)").option("--tui", "Force the TUI even when piped (rare)").option("--label-a <label>", "Display label for transcript A (default: filename)").option("--label-b <label>", "Display label for transcript B (default: filename)").action(async (a, b, opts) => {
+  await diffCommand({
+    a,
+    b,
+    mdPath: opts.md,
+    labelA: opts.labelA,
+    labelB: opts.labelB,
+    print: !!opts.print,
+    tui: !!opts.tui
+  });
 });
 program.command("version").description("Print Reasonix version.").action(versionCommand);
 program.parseAsync(process.argv).catch((err) => {