reasonix 0.5.13 → 0.5.20

package/dist/cli/index.js

@@ -1642,6 +1642,11 @@ function deleteSession(name) {
   const path = sessionPath(name);
   try {
     unlinkSync(path);
+    const sidecar = path.replace(/\.jsonl$/, ".pending.json");
+    try {
+      unlinkSync(sidecar);
+    } catch {
+    }
     return true;
   } catch {
     return false;
@@ -1669,13 +1674,18 @@ function countLines(path) {
 
 // src/telemetry.ts
 var DEEPSEEK_PRICING = {
-  "deepseek-chat": { inputCacheHit: 0.028, inputCacheMiss: 0.28, output: 0.42 },
-  "deepseek-reasoner": { inputCacheHit: 0.028, inputCacheMiss: 0.28, output: 0.42 }
+  "deepseek-v4-flash": { inputCacheHit: 0.028, inputCacheMiss: 0.139, output: 0.278 },
+  "deepseek-v4-pro": { inputCacheHit: 0.139, inputCacheMiss: 1.667, output: 3.333 },
+  // Compat aliases — priced as v4-flash per the deprecation notice.
+  "deepseek-chat": { inputCacheHit: 0.028, inputCacheMiss: 0.139, output: 0.278 },
+  "deepseek-reasoner": { inputCacheHit: 0.028, inputCacheMiss: 0.139, output: 0.278 }
 };
 var CLAUDE_SONNET_PRICING = { input: 3, output: 15 };
 var DEEPSEEK_CONTEXT_TOKENS = {
-  "deepseek-chat": 131072,
-  "deepseek-reasoner": 131072
+  "deepseek-v4-flash": 1e6,
+  "deepseek-v4-pro": 1e6,
+  "deepseek-chat": 1e6,
+  "deepseek-reasoner": 1e6
 };
 var DEFAULT_CONTEXT_TOKENS = 131072;
 function costUsd(model, usage) {
@@ -2003,7 +2013,7 @@ var CacheFirstLoop = class {
           content: `aborted at iter ${iter}/${this.maxToolIters} \u2014 stopped without producing a summary (press \u2191 + Enter or /retry to resume)`
         };
         const stoppedMsg = "[aborted by user (Esc) \u2014 no summary produced. Ask again or /retry when ready; prior tool output is still in the log.]";
-        this.appendAndPersist({ role: "assistant", content: stoppedMsg });
+        this.appendAndPersist(this.syntheticAssistantMessage(stoppedMsg));
         yield {
           turn: this._turn,
           role: "assistant_final",
@@ -2139,6 +2149,7 @@ var CacheFirstLoop = class {
           };
         } else if (this.stream) {
           const callBuf = /* @__PURE__ */ new Map();
+          const readyIndices = /* @__PURE__ */ new Set();
           for await (const chunk of this.client.stream({
             model: this.model,
             messages,
@@ -2174,13 +2185,18 @@ var CacheFirstLoop = class {
               if (d.argumentsDelta)
                 cur.function.arguments = (cur.function.arguments ?? "") + d.argumentsDelta;
               callBuf.set(d.index, cur);
+              if (!readyIndices.has(d.index) && cur.function.name && looksLikeCompleteJson(cur.function.arguments ?? "")) {
+                readyIndices.add(d.index);
+              }
               if (cur.function.name) {
                 yield {
                   turn: this._turn,
                   role: "tool_call_delta",
                   content: "",
                   toolName: cur.function.name,
-                  toolCallArgsChars: (cur.function.arguments ?? "").length
+                  toolCallArgsChars: (cur.function.arguments ?? "").length,
+                  toolCallIndex: d.index,
+                  toolCallReadyCount: readyIndices.size
                 };
               }
             }
@@ -2231,7 +2247,9 @@ var CacheFirstLoop = class {
         reasoningContent || null,
         assistantContent || null
       );
-      this.appendAndPersist(this.assistantMessage(assistantContent, repairedCalls));
+      this.appendAndPersist(
+        this.assistantMessage(assistantContent, repairedCalls, reasoningContent)
+      );
       yield {
         turn: this._turn,
         role: "assistant_final",
@@ -2393,7 +2411,7 @@ ${reason}`;
 
 ${summary}`;
       const summaryStats = this.stats.record(this._turn, this.model, resp.usage ?? new Usage());
-      this.appendAndPersist({ role: "assistant", content: summary });
+      this.appendAndPersist(this.assistantMessage(summary, [], resp.reasoningContent ?? void 0));
       yield {
         turn: this._turn,
         role: "assistant_final",
@@ -2422,12 +2440,35 @@ ${summary}`;
     }
     return final;
   }
-  assistantMessage(content, toolCalls) {
+  assistantMessage(content, toolCalls, reasoningContent) {
     const msg = { role: "assistant", content };
     if (toolCalls.length > 0) msg.tool_calls = toolCalls;
+    if (reasoningContent && reasoningContent.length > 0) {
+      msg.reasoning_content = reasoningContent;
+    }
+    return msg;
+  }
+  /**
+   * Build a synthetic assistant message we insert into the log without
+   * a real API round trip (abort notices, future system injections).
+   * Reasoner models reject follow-up requests whose assistant history
+   * is missing `reasoning_content`, so we stamp an empty-string
+   * placeholder on reasoner sessions to satisfy the validator. V3
+   * doesn't care — field stays absent there.
+   */
+  syntheticAssistantMessage(content) {
+    const msg = { role: "assistant", content };
+    if (isThinkingModeModel(this.model)) {
+      msg.reasoning_content = "";
+    }
     return msg;
   }
 };
+function isThinkingModeModel(model) {
+  if (model.includes("reasoner")) return true;
+  if (model === "deepseek-v4-flash" || model === "deepseek-v4-pro") return true;
+  return false;
+}
 function stripHallucinatedToolMarkup(s) {
   let out = s;
   out = out.replace(/<｜DSML｜function_calls>[\s\S]*?<\/?｜DSML｜function_calls>/g, "");
@@ -2443,6 +2484,15 @@ function safeParseToolArgs(raw) {
     return raw;
   }
 }
+function looksLikeCompleteJson(s) {
+  if (!s || !s.trim()) return false;
+  try {
+    JSON.parse(s);
+    return true;
+  } catch {
+    return false;
+  }
+}
 function* hookWarnings(outcomes, turn) {
   for (const o of outcomes) {
     if (o.decision === "pass") continue;
@@ -3457,11 +3507,14 @@ async function spawnSubagent(opts) {
   const maxToolIters = opts.maxToolIters ?? DEFAULT_MAX_ITERS;
   const maxResultChars = opts.maxResultChars ?? DEFAULT_MAX_RESULT_CHARS2;
   const sink = opts.sink;
+  const skillName = opts.skillName;
   const startedAt = Date.now();
   const taskPreview = opts.task.length > 30 ? `${opts.task.slice(0, 30)}\u2026` : opts.task;
   sink?.current?.({
     kind: "start",
     task: taskPreview,
+    skillName,
+    model,
     iter: 0,
     elapsedMs: 0
   });
@@ -3491,6 +3544,8 @@ async function spawnSubagent(opts) {
         sink?.current?.({
           kind: "progress",
           task: taskPreview,
+          skillName,
+          model,
           iter: toolIter,
           elapsedMs: Date.now() - startedAt
         });
@@ -3513,17 +3568,22 @@ async function spawnSubagent(opts) {
   const elapsedMs = Date.now() - startedAt;
   const turns = childLoop.stats.turns.length;
   const costUsd2 = childLoop.stats.totalCost;
+  const usage = aggregateChildUsage(childLoop);
   const truncated = final.length > maxResultChars ? `${final.slice(0, maxResultChars)}
 
 [\u2026truncated ${final.length - maxResultChars} chars; ask the subagent for a tighter summary if you need more.]` : final;
   sink?.current?.({
     kind: "end",
     task: taskPreview,
+    skillName,
+    model,
     iter: toolIter,
     elapsedMs,
     summary: errorMessage ? void 0 : truncated.slice(0, 120),
     error: errorMessage,
-    turns
+    turns,
+    costUsd: costUsd2,
+    usage
   });
   return {
     success: !errorMessage,
@@ -3532,9 +3592,23 @@ async function spawnSubagent(opts) {
     turns,
     toolIters: toolIter,
     elapsedMs,
-    costUsd: costUsd2
+    costUsd: costUsd2,
+    model,
+    skillName,
+    usage
   };
 }
+function aggregateChildUsage(loop) {
+  const agg = new Usage();
+  for (const t of loop.stats.turns) {
+    agg.promptTokens += t.usage.promptTokens;
+    agg.completionTokens += t.usage.completionTokens;
+    agg.totalTokens += t.usage.totalTokens;
+    agg.promptCacheHitTokens += t.usage.promptCacheHitTokens;
+    agg.promptCacheMissTokens += t.usage.promptCacheMissTokens;
+  }
+  return agg;
+}
 function formatSubagentResult(r) {
   if (!r.success) {
     return JSON.stringify({
@@ -5529,6 +5603,8 @@ function appendUsage(input) {
     costUsd: costUsd(input.model, input.usage),
     claudeEquivUsd: claudeEquivalentCost(input.usage)
   };
+  if (input.kind === "subagent") record.kind = "subagent";
+  if (input.subagent) record.subagent = input.subagent;
   const path = input.path ?? defaultUsageLogPath();
   try {
     mkdirSync5(dirname7(path), { recursive: true });
@@ -5602,6 +5678,10 @@ function aggregateUsage(records, opts = {}) {
   const sessionCounts = /* @__PURE__ */ new Map();
   let firstSeen = null;
   let lastSeen = null;
+  const skillCounts = /* @__PURE__ */ new Map();
+  let subagentTotal = 0;
+  let subagentCost = 0;
+  let subagentDuration = 0;
   for (const r of records) {
     addToBucket(all, r);
     if (r.ts >= today.since) addToBucket(today, r);
@@ -5612,15 +5692,34 @@ function aggregateUsage(records, opts = {}) {
     sessionCounts.set(sessKey, (sessionCounts.get(sessKey) ?? 0) + 1);
     if (firstSeen === null || r.ts < firstSeen) firstSeen = r.ts;
     if (lastSeen === null || r.ts > lastSeen) lastSeen = r.ts;
+    if (r.kind === "subagent") {
+      subagentTotal += 1;
+      subagentCost += r.costUsd;
+      const dur = r.subagent?.durationMs ?? 0;
+      subagentDuration += dur;
+      const key = r.subagent?.skillName?.trim() || "(adhoc)";
+      const prev = skillCounts.get(key) ?? { count: 0, costUsd: 0, durationMs: 0 };
+      prev.count += 1;
+      prev.costUsd += r.costUsd;
+      prev.durationMs += dur;
+      skillCounts.set(key, prev);
+    }
   }
   const byModel = Array.from(modelCounts.entries()).map(([model, turns]) => ({ model, turns })).sort((a, b) => b.turns - a.turns);
   const bySession = Array.from(sessionCounts.entries()).map(([session, turns]) => ({ session, turns })).sort((a, b) => b.turns - a.turns);
+  const subagents = subagentTotal > 0 ? {
+    total: subagentTotal,
+    costUsd: subagentCost,
+    totalDurationMs: subagentDuration,
+    bySkill: Array.from(skillCounts.entries()).map(([skillName, v]) => ({ skillName, ...v })).sort((a, b) => b.count - a.count)
+  } : void 0;
   return {
     buckets: [today, week, month, all],
     byModel,
     bySession,
     firstSeen,
-    lastSeen
+    lastSeen,
+    subagents
   };
 }
 function formatLogSize(path = defaultUsageLogPath()) {
@@ -5637,7 +5736,7 @@ function formatLogSize(path = defaultUsageLogPath()) {
 }
 
 // src/cli/commands/chat.tsx
-import { existsSync as existsSync10, statSync as statSync6 } from "fs";
+import { existsSync as existsSync11, statSync as statSync6 } from "fs";
 import { render } from "ink";
 import React17, { useState as useState7 } from "react";
 
@@ -5714,6 +5813,58 @@ function capLines(lines, maxLines, indent) {
   return head;
 }
 
+// src/code/pending-edits.ts
+import { existsSync as existsSync9, mkdirSync as mkdirSync6, readFileSync as readFileSync11, unlinkSync as unlinkSync3, writeFileSync as writeFileSync5 } from "fs";
+import { dirname as dirname8, join as join9 } from "path";
+function pendingEditsPath(sessionName) {
+  return join9(sessionsDir(), `${sanitizeName(sessionName)}.pending.json`);
+}
+function savePendingEdits(sessionName, blocks) {
+  if (!sessionName) return;
+  const path = pendingEditsPath(sessionName);
+  try {
+    if (blocks.length === 0) {
+      if (existsSync9(path)) unlinkSync3(path);
+      return;
+    }
+    mkdirSync6(dirname8(path), { recursive: true });
+    writeFileSync5(path, JSON.stringify(blocks, null, 2), "utf8");
+  } catch {
+  }
+}
+function loadPendingEdits(sessionName) {
+  if (!sessionName) return null;
+  const path = pendingEditsPath(sessionName);
+  if (!existsSync9(path)) return null;
+  let raw;
+  try {
+    raw = readFileSync11(path, "utf8");
+  } catch {
+    return null;
+  }
+  try {
+    const parsed = JSON.parse(raw);
+    if (!Array.isArray(parsed)) return null;
+    const out = [];
+    for (const item of parsed) {
+      if (item && typeof item === "object" && typeof item.path === "string" && typeof item.search === "string" && typeof item.replace === "string" && typeof item.offset === "number") {
+        out.push(item);
+      }
+    }
+    return out;
+  } catch {
+    return null;
+  }
+}
+function clearPendingEdits(sessionName) {
+  if (!sessionName) return;
+  const path = pendingEditsPath(sessionName);
+  try {
+    if (existsSync9(path)) unlinkSync3(path);
+  } catch {
+  }
+}
+
 // src/tools/skills.ts
 function registerSkillTools(registry, opts = {}) {
   const store = new SkillStore({
@@ -5835,8 +5986,8 @@ function PlanStateBlock({ planState }) {
 }
 
 // src/cli/ui/markdown.tsx
-import { readFileSync as readFileSync11, statSync as statSync5 } from "fs";
-import { isAbsolute as isAbsolute4, join as join9 } from "path";
+import { readFileSync as readFileSync12, statSync as statSync5 } from "fs";
+import { isAbsolute as isAbsolute4, join as join10 } from "path";
 import { Box as Box3, Text as Text3 } from "ink";
 import React3 from "react";
 var SUPERSCRIPT = {
@@ -5914,7 +6065,8 @@ function parseCitationUrl(url) {
 function validateCitation(url, projectRoot) {
   const parts = parseCitationUrl(url);
   if (!parts || !parts.path) return { ok: false, reason: "empty path" };
-  const fullPath = isAbsolute4(parts.path) ? parts.path : join9(projectRoot, parts.path);
+  const normalized = parts.path.replace(/^[/\\]+/, "");
+  const fullPath = isAbsolute4(normalized) ? normalized : join10(projectRoot, normalized);
   let stat;
   try {
     stat = statSync5(fullPath);
@@ -5925,7 +6077,7 @@ function validateCitation(url, projectRoot) {
   if (parts.startLine === void 0) return { ok: true };
   let lineCount;
   try {
-    lineCount = readFileSync11(fullPath, "utf8").split("\n").length;
+    lineCount = readFileSync12(fullPath, "utf8").split("\n").length;
   } catch {
     return { ok: false, reason: "unreadable" };
   }
@@ -6417,13 +6569,15 @@ function StreamingAssistant({ event }) {
     label = `R1 reasoning \xB7 ${event.reasoning?.length ?? 0} chars of thought`;
     labelColor = "cyan";
   } else if (toolCallOnly) {
-    label = `assembling tool call <${toolCallBuild.name}> \xB7 ${toolCallBuild.chars} chars of arguments`;
+    label = `assembling tool call${formatToolCallIndex(toolCallBuild)} <${toolCallBuild.name}> \xB7 ${toolCallBuild.chars} chars of arguments${formatReadyTail(toolCallBuild)}`;
     labelColor = "magenta";
   } else {
     const parts = [`writing response \xB7 ${event.text.length} chars`];
     if (event.reasoning) parts.push(`after ${event.reasoning.length} chars of reasoning`);
     if (toolCallBuild) {
-      parts.push(`building tool call <${toolCallBuild.name}> \xB7 ${toolCallBuild.chars} chars`);
+      parts.push(
+        `building tool call${formatToolCallIndex(toolCallBuild)} <${toolCallBuild.name}> \xB7 ${toolCallBuild.chars} chars${formatReadyTail(toolCallBuild)}`
+      );
     }
     label = parts.join(" \xB7 ");
     labelColor = "green";
@@ -6439,6 +6593,16 @@ function Pulse() {
   const frames = ["\u280B", "\u2819", "\u2839", "\u2838", "\u283C", "\u2834", "\u2826", "\u2827", "\u2807", "\u280F"];
   return /* @__PURE__ */ React5.createElement(Text4, { color: "cyan" }, frames[Math.floor(tick / 4) % frames.length]);
 }
+function formatToolCallIndex(tb) {
+  if (!tb || tb.index === void 0) return "";
+  if (tb.index === 0 && (tb.readyCount ?? 0) === 0) return "";
+  return ` (call ${tb.index + 1})`;
+}
+function formatReadyTail(tb) {
+  const n = tb?.readyCount ?? 0;
+  if (n <= 0) return "";
+  return ` \xB7 ${n} ready`;
+}
 function lastLine(s, maxChars) {
   const flat = s.replace(/\s+/g, " ").trim();
   if (!flat) return "";
@@ -6576,12 +6740,34 @@ function findNextEnabled(items, from, step) {
 
 // src/cli/ui/PlanConfirm.tsx
 var DEFAULT_MAX_RENDERED = 2400;
-function PlanConfirm({ plan, onChoose, maxRenderedChars, projectRoot }) {
+var PICKER_CHROME_ROWS = 18;
+var MARKDOWN_EXPANSION = 2;
+var MIN_BODY_ROWS = 4;
+function clampBodyByLines(text, maxLines) {
+  const lines = text.split("\n");
+  if (lines.length <= maxLines) return text;
+  const kept = lines.slice(0, maxLines).join("\n");
+  const dropped = lines.length - maxLines;
+  return `${kept}
+
+\u2026 (${dropped} more lines truncated \u2014 resize the terminal to see more, or /tool for the full proposal)`;
+}
+function PlanConfirmInner({
+  plan,
+  onChoose,
+  maxRenderedChars,
+  projectRoot,
+  terminalRows
+}) {
   const cap = maxRenderedChars ?? DEFAULT_MAX_RENDERED;
-  const tooLong = plan.length > cap;
-  const visible = tooLong ? `${plan.slice(0, cap)}
+  const charTrunc = plan.length > cap;
+  const charCapped = charTrunc ? `${plan.slice(0, cap)}
 
 \u2026 (${plan.length - cap} chars truncated \u2014 use /tool to view the full proposal)` : plan;
+  const rows = terminalRows ?? process.stdout?.rows ?? 24;
+  const renderedBudget = Math.max(MIN_BODY_ROWS * MARKDOWN_EXPANSION, rows - PICKER_CHROME_ROWS);
+  const sourceLineBudget = Math.max(MIN_BODY_ROWS, Math.floor(renderedBudget / MARKDOWN_EXPANSION));
+  const visible = clampBodyByLines(charCapped, sourceLineBudget);
   const hasOpenQuestions = /^#{1,6}\s*(open[-\s]?questions?|risks?|unknowns?|assumptions?|unclear)/im.test(plan) || /^#{1,6}\s*(待确认|开放问题|风险|未知|假设|不确定)/im.test(plan);
   return /* @__PURE__ */ React7.createElement(Box6, { flexDirection: "column", borderStyle: "round", borderColor: "cyan", paddingX: 1, marginY: 1 }, /* @__PURE__ */ React7.createElement(Box6, null, /* @__PURE__ */ React7.createElement(Text6, { bold: true, color: "cyan" }, "\u25B8 plan submitted \u2014 awaiting your review")), /* @__PURE__ */ React7.createElement(Box6, null, /* @__PURE__ */ React7.createElement(Text6, { color: "cyan", 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\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500")), /* @__PURE__ */ React7.createElement(Box6, { marginTop: 1, flexDirection: "column" }, /* @__PURE__ */ React7.createElement(Markdown, { text: visible, projectRoot })), hasOpenQuestions ? /* @__PURE__ */ React7.createElement(Box6, { marginTop: 1 }, /* @__PURE__ */ React7.createElement(Text6, { color: "yellow" }, "\u25B2 the plan has open questions or flagged risks \u2014 pick", " ", /* @__PURE__ */ React7.createElement(Text6, { bold: true }, "Refine / answer questions"), " to write concrete answers before the model moves on.")) : null, /* @__PURE__ */ React7.createElement(Box6, { marginTop: 1 }, /* @__PURE__ */ React7.createElement(
     SingleSelect,
@@ -6610,6 +6796,7 @@ function PlanConfirm({ plan, onChoose, maxRenderedChars, projectRoot }) {
     }
   )));
 }
+var PlanConfirm = React7.memo(PlanConfirmInner);
 
 // src/cli/ui/PlanRefineInput.tsx
 import { Box as Box7, Text as Text7, useInput as useInput2 } from "ink";
@@ -7146,6 +7333,178 @@ function formatBangUserMessage(cmd, output) {
 ${output}`;
 }
 
+// src/cli/ui/mcp-browse.ts
+function formatResourceList(servers) {
+  const lines = [];
+  let total = 0;
+  for (const s of servers) {
+    if (!s.report.resources.supported) continue;
+    const items = s.report.resources.items;
+    if (items.length === 0) continue;
+    lines.push(`[${s.label}] ${items.length} resource(s):`);
+    for (const r of items.slice(0, 20)) {
+      const name = r.name && r.name !== r.uri ? `  ${r.name}` : "";
+      const mime = r.mimeType ? ` \xB7 ${r.mimeType}` : "";
+      lines.push(`  \xB7 ${r.uri}${name}${mime}`);
+      total++;
+    }
+    if (items.length > 20) lines.push(`  (+${items.length - 20} more)`);
+    lines.push("");
+  }
+  if (total === 0) {
+    return "No resources on any connected MCP server (or no servers connected). `/mcp` shows the current set.";
+  }
+  lines.push("Read one: `/resource <uri>` \u2014 or use Tab in the picker.");
+  return lines.join("\n");
+}
+function formatPromptList(servers) {
+  const lines = [];
+  let total = 0;
+  for (const s of servers) {
+    if (!s.report.prompts.supported) continue;
+    const items = s.report.prompts.items;
+    if (items.length === 0) continue;
+    lines.push(`[${s.label}] ${items.length} prompt(s):`);
+    for (const p of items.slice(0, 20)) {
+      const desc = p.description ? ` \u2014 ${p.description}` : "";
+      const argHint = p.arguments && p.arguments.length > 0 ? ` (args: ${p.arguments.map((a) => a.name + (a.required ? "*" : "?")).join(", ")})` : "";
+      lines.push(`  \xB7 ${p.name}${argHint}${desc}`);
+      total++;
+    }
+    if (items.length > 20) lines.push(`  (+${items.length - 20} more)`);
+    lines.push("");
+  }
+  if (total === 0) {
+    return "No prompts on any connected MCP server (or no servers connected). `/mcp` shows the current set.";
+  }
+  lines.push(
+    "Fetch one: `/prompt <name>` \u2014 args are not supported yet; prompts with required args will surface an error from the server."
+  );
+  return lines.join("\n");
+}
+function findServerForResource(servers, uri) {
+  for (const s of servers) {
+    if (!s.report.resources.supported) continue;
+    if (s.report.resources.items.some((r) => r.uri === uri)) return s;
+  }
+  return null;
+}
+function findServerForPrompt(servers, name) {
+  for (const s of servers) {
+    if (!s.report.prompts.supported) continue;
+    if (s.report.prompts.items.some((p) => p.name === name)) return s;
+  }
+  return null;
+}
+function formatResourceContents(uri, result) {
+  const lines = [`Resource ${uri} (${result.contents.length} content block(s)):`, ""];
+  for (let i = 0; i < result.contents.length; i++) {
+    const c = result.contents[i];
+    const header2 = `\u2014 block ${i + 1}${c.mimeType ? ` \xB7 ${c.mimeType}` : ""}`;
+    lines.push(header2);
+    lines.push(formatOneResourceContent(c));
+    lines.push("");
+  }
+  return lines.join("\n").trimEnd();
+}
+function formatOneResourceContent(c) {
+  if ("text" in c) {
+    const MAX = 8e3;
+    if (c.text.length > MAX) {
+      return `${c.text.slice(0, MAX)}
+
+[\u2026truncated ${c.text.length - MAX} chars; full contents available via McpClient.readResource in library mode.]`;
+    }
+    return c.text;
+  }
+  const bytes = typeof c.blob === "string" ? approximateBase64ByteSize(c.blob) : 0;
+  return `[binary \xB7 ~${bytes.toLocaleString()} bytes \xB7 base64]`;
+}
+function approximateBase64ByteSize(b64) {
+  const padding = b64.endsWith("==") ? 2 : b64.endsWith("=") ? 1 : 0;
+  return Math.floor(b64.length * 3 / 4) - padding;
+}
+function formatPromptMessages(name, result) {
+  const lines = [
+    `Prompt ${name}${result.description ? ` \u2014 ${result.description}` : ""}`,
+    `(${result.messages.length} message(s))`,
+    ""
+  ];
+  for (let i = 0; i < result.messages.length; i++) {
+    const m = result.messages[i];
+    lines.push(`\u2014 ${i + 1}. ${m.role}`);
+    lines.push(formatOnePromptMessage(m));
+    lines.push("");
+  }
+  return lines.join("\n").trimEnd();
+}
+function formatOnePromptMessage(m) {
+  const block = m.content;
+  if (block.type === "text" && typeof block.text === "string") return block.text;
+  if (block.type === "resource" && block.resource) {
+    return `[resource: ${block.resource.uri}]
+${formatOneResourceContent(block.resource)}`;
+  }
+  return `[non-text content: ${block.type ?? "unknown"}]`;
+}
+async function handleMcpBrowseSlash(kind, arg, servers, setHistorical) {
+  const ts = Date.now();
+  const push = (role, text) => {
+    setHistorical((prev) => [...prev, { id: `mcp-${role}-${ts}-${prev.length}`, role, text }]);
+  };
+  if (!arg) {
+    push("info", kind === "resource" ? formatResourceList(servers) : formatPromptList(servers));
+    return;
+  }
+  if (kind === "resource") {
+    const server2 = findServerForResource(servers, arg);
+    if (!server2) {
+      push(
+        "warning",
+        `no server exposes resource "${arg}". \`/resource\` with no arg lists what's available.`
+      );
+      return;
+    }
+    const client2 = server2.client;
+    if (!client2) {
+      push(
+        "warning",
+        `server [${server2.label}] is not connected (display-only). Resource read requires a live MCP client.`
+      );
+      return;
+    }
+    try {
+      const result = await client2.readResource(arg);
+      push("info", formatResourceContents(arg, result));
+    } catch (err) {
+      push("warning", `readResource failed: ${err.message}`);
+    }
+    return;
+  }
+  const server = findServerForPrompt(servers, arg);
+  if (!server) {
+    push(
+      "warning",
+      `no server exposes prompt "${arg}". \`/prompt\` with no arg lists what's available.`
+    );
+    return;
+  }
+  const client = server.client;
+  if (!client) {
+    push(
+      "warning",
+      `server [${server.label}] is not connected (display-only). Prompt fetch requires a live MCP client.`
+    );
+    return;
+  }
+  try {
+    const result = await client.getPrompt(arg);
+    push("info", formatPromptMessages(arg, result));
+  } catch (err) {
+    push("warning", `getPrompt failed: ${err.message}`);
+  }
+}
+
 // src/cli/ui/paste-collapse.ts
 var DEFAULT_PASTE_LINE_THRESHOLD = 40;
 var DEFAULT_PASTE_CHAR_THRESHOLD = 2e3;
@@ -7182,7 +7541,7 @@ function formatBytes(n) {
 import { spawnSync } from "child_process";
 
 // src/cli/commands/stats.ts
-import { existsSync as existsSync9, readFileSync as readFileSync12 } from "fs";
+import { existsSync as existsSync10, readFileSync as readFileSync13 } from "fs";
 function statsCommand(opts) {
   if (opts.transcript) {
     transcriptSummary(opts.transcript);
@@ -7191,11 +7550,11 @@ function statsCommand(opts) {
   dashboard(opts);
 }
 function transcriptSummary(path) {
-  if (!existsSync9(path)) {
+  if (!existsSync10(path)) {
     console.error(`no such transcript: ${path}`);
     process.exit(1);
   }
-  const lines = readFileSync12(path, "utf8").split(/\r?\n/).filter(Boolean);
+  const lines = readFileSync13(path, "utf8").split(/\r?\n/).filter(Boolean);
   let assistantTurns = 0;
   let toolCalls = 0;
   let lastTurn = 0;
@@ -7254,6 +7613,28 @@ function renderDashboard(agg, logPath) {
   if (agg.firstSeen) {
     lines.push(`tracked since:     ${new Date(agg.firstSeen).toISOString().slice(0, 10)}`);
   }
+  if (agg.subagents) {
+    lines.push("");
+    lines.push(renderSubagentSection(agg.subagents));
+  }
+  return lines.join("\n");
+}
+function renderSubagentSection(sub) {
+  const lines = [];
+  const seconds = (sub.totalDurationMs / 1e3).toFixed(1);
+  lines.push(
+    `subagent activity: ${sub.total} run(s) \xB7 $${sub.costUsd.toFixed(6)} \xB7 ${seconds}s total`
+  );
+  const top = sub.bySkill.slice(0, 5);
+  for (const s of top) {
+    const sec = (s.durationMs / 1e3).toFixed(1);
+    lines.push(
+      `  ${pad(s.skillName, 18)} ${pad(`${s.count}`, 4, "right")}  $${s.costUsd.toFixed(6)}  ${sec}s`
+    );
+  }
+  if (sub.bySkill.length > top.length) {
+    lines.push(`  (+${sub.bySkill.length - top.length} more)`);
+  }
   return lines.join("\n");
 }
 function header() {
@@ -7317,6 +7698,18 @@ var SLASH_COMMANDS = [
     argCompleter: ["off", "2", "3", "4", "5"]
   },
   { cmd: "mcp", summary: "list MCP servers + tools attached to this session" },
+  {
+    cmd: "resource",
+    argsHint: "[uri]",
+    summary: "browse + read MCP resources (no arg \u2192 list URIs; <uri> \u2192 fetch contents)",
+    argCompleter: "mcp-resources"
+  },
+  {
+    cmd: "prompt",
+    argsHint: "[name]",
+    summary: "browse + fetch MCP prompts (no arg \u2192 list names; <name> \u2192 render prompt)",
+    argCompleter: "mcp-prompts"
+  },
   { cmd: "tool", argsHint: "[N]", summary: "dump full output of the Nth tool call (1=latest)" },
   {
     cmd: "memory",
@@ -7461,6 +7854,11 @@ function handleSlash(cmd, args, loop, ctx = {}) {
           "  Tab                    insert the highlighted item without submitting",
           "  Enter                  insert and (slash) run it, (@) keep editing",
           "",
+          "MCP exploration:",
+          "  /mcp                   servers + tool/resource/prompt counts",
+          "  /resource [uri]        browse & read resources exposed by your MCP servers",
+          "  /prompt [name]         browse & fetch prompts exposed by your MCP servers",
+          "",
           "Useful slashes: /help \xB7 /context \xB7 /stats \xB7 /compact \xB7 /new \xB7 /exit"
         ].join("\n")
       };
@@ -7477,6 +7875,8 @@ function handleSlash(cmd, args, loop, ctx = {}) {
           "  /harvest [on|off]        Pillar 2: structured plan-state extraction",
           "  /branch <N|off>          run N parallel samples (N>=2), pick most confident",
           "  /mcp                     list MCP servers + tools attached to this session",
+          "  /resource [uri]          browse + read MCP resources (no arg \u2192 list URIs; <uri> \u2192 fetch)",
+          "  /prompt [name]           browse + fetch MCP prompts (no arg \u2192 list names; <name> \u2192 render)",
           "  /setup                   (exit + reconfigure) \u2192 run `reasonix setup`",
           "  /compact [tokens]        shrink large tool results in history (default 4000 tokens/result)",
           "  /think                   dump the most recent turn's full R1 reasoning (reasoner only)",
@@ -7529,6 +7929,8 @@ function handleSlash(cmd, args, loop, ctx = {}) {
       }
       if (servers.length > 0) {
         const lines2 = [];
+        let anyResources = false;
+        let anyPrompts = false;
         for (const s of servers) {
           const { report } = s;
           const serverName = report.serverInfo.name || "(unknown)";
@@ -7537,11 +7939,20 @@ function handleSlash(cmd, args, loop, ctx = {}) {
           lines2.push(`  tools     ${s.toolCount}`);
           appendSection(lines2, "resources", report.resources);
           appendSection(lines2, "prompts  ", report.prompts);
+          if (report.resources.supported && report.resources.items.length > 0) anyResources = true;
+          if (report.prompts.supported && report.prompts.items.length > 0) anyPrompts = true;
           lines2.push("");
         }
-        lines2.push(
-          "Chat mode consumes tools today; resources+prompts are surfaced here for awareness."
-        );
+        if (anyResources || anyPrompts) {
+          const hints = [];
+          if (anyResources) hints.push("`/resource` to browse+read");
+          if (anyPrompts) hints.push("`/prompt` to browse+fetch");
+          lines2.push(hints.join(" \xB7 "));
+        } else {
+          lines2.push(
+            "Chat mode consumes tools today; resources+prompts are surfaced here for awareness."
+          );
+        }
         lines2.push(
           "Full catalog: `reasonix mcp list` \xB7 deeper diagnosis: `reasonix mcp inspect <spec>`."
         );
@@ -8476,8 +8887,30 @@ function App({
       if (!partial) return all.slice(0, 40);
       return all.filter((m) => m.toLowerCase().includes(needle)).slice(0, 40);
     }
+    if (completer === "mcp-resources") {
+      const uris = [];
+      const servers = mcpServers ?? [];
+      for (const s of servers) {
+        if (!s.report.resources.supported) continue;
+        for (const r of s.report.resources.items) uris.push(r.uri);
+      }
+      if (partial && uris.some((u) => u.toLowerCase() === needle)) return null;
+      if (!partial) return uris.slice(0, 40);
+      return uris.filter((u) => u.toLowerCase().includes(needle)).slice(0, 40);
+    }
+    if (completer === "mcp-prompts") {
+      const names = [];
+      const servers = mcpServers ?? [];
+      for (const s of servers) {
+        if (!s.report.prompts.supported) continue;
+        for (const p of s.report.prompts.items) names.push(p.name);
+      }
+      if (partial && names.some((n) => n.toLowerCase() === needle)) return null;
+      if (!partial) return names.slice(0, 40);
+      return names.filter((n) => n.toLowerCase().includes(needle)).slice(0, 40);
+    }
     return null;
-  }, [slashArgContext, models]);
+  }, [slashArgContext, models, mcpServers]);
   useEffect2(() => {
     setSlashArgSelected((prev) => {
       if (!slashArgMatches || slashArgMatches.length === 0) return 0;
@@ -8512,7 +8945,10 @@ function App({
             // Per-skill model override (frontmatter `model: ...`),
             // else falls through to spawnSubagent's default.
             model: skill.model,
-            sink: subagentSinkRef.current
+            sink: subagentSinkRef.current,
+            // Stamped onto every event so the TUI sink + usage log can
+            // attribute the run to a skill without extra bookkeeping.
+            skillName: skill.name
           });
           return formatSubagentResult(result);
         }
@@ -8606,7 +9042,8 @@ function App({
       }
       setSubagentActivity(null);
       const seconds = ((ev.elapsedMs ?? 0) / 1e3).toFixed(1);
-      const summary2 = ev.error ? `\u232C subagent "${ev.task}" failed after ${seconds}s \xB7 ${ev.iter ?? 0} tool call(s) \u2014 ${ev.error}` : `\u232C subagent "${ev.task}" done in ${seconds}s \xB7 ${ev.iter ?? 0} tool call(s) \xB7 ${ev.turns ?? 0} turn(s)`;
+      const costTail = ev.costUsd !== void 0 && ev.costUsd > 0 ? ` \xB7 $${ev.costUsd.toFixed(4)}` : "";
+      const summary2 = ev.error ? `\u232C subagent "${ev.task}" failed after ${seconds}s \xB7 ${ev.iter ?? 0} tool call(s) \u2014 ${ev.error}` : `\u232C subagent "${ev.task}" done in ${seconds}s \xB7 ${ev.iter ?? 0} tool call(s) \xB7 ${ev.turns ?? 0} turn(s)${costTail}`;
       setHistorical((prev) => [
         ...prev,
         {
@@ -8615,11 +9052,25 @@ function App({
           text: summary2
         }
       ]);
+      if (!ev.error && ev.usage && ev.model) {
+        appendUsage({
+          session: session ?? null,
+          model: ev.model,
+          usage: ev.usage,
+          kind: "subagent",
+          subagent: {
+            skillName: ev.skillName,
+            taskPreview: ev.task.slice(0, 60),
+            toolIters: ev.iter ?? 0,
+            durationMs: ev.elapsedMs ?? 0
+          }
+        });
+      }
     };
     return () => {
       subagentSinkRef.current.current = null;
     };
-  }, []);
+  }, [session]);
   const sessionBannerShown = useRef2(false);
   useEffect2(() => {
     if (sessionBannerShown.current) return;
@@ -8652,7 +9103,21 @@ function App({
         }
       ]);
     }
-  }, [session, loop]);
+    if (session && codeMode) {
+      const restored = loadPendingEdits(session);
+      if (restored && restored.length > 0) {
+        pendingEdits.current = restored;
+        setHistorical((prev) => [
+          ...prev,
+          {
+            id: `sys-pending-${Date.now()}`,
+            role: "info",
+            text: `\u25B8 restored ${restored.length} pending edit block(s) from an interrupted prior run \u2014 /apply to commit or /discard to drop.`
+          }
+        ]);
+      }
+    }
+  }, [session, loop, codeMode]);
   useInput4((_input, key) => {
     if (key.escape && busy) {
       if (abortedThisTurn.current) return;
@@ -8746,14 +9211,16 @@ function App({
     const anyApplied = results.some((r) => r.status === "applied" || r.status === "created");
     if (anyApplied) lastEditSnapshots.current = snaps;
     pendingEdits.current = [];
+    clearPendingEdits(session ?? null);
     return formatEditResults(results);
-  }, [codeMode]);
+  }, [codeMode, session]);
   const codeDiscard = useCallback(() => {
     const count = pendingEdits.current.length;
     if (count === 0) return "nothing pending to discard.";
     pendingEdits.current = [];
+    clearPendingEdits(session ?? null);
     return `\u25B8 discarded ${count} pending edit block(s). Nothing was written to disk.`;
-  }, []);
+  }, [session]);
   const prefixHash = loop.prefix.fingerprint;
   const writeTranscript = useCallback(
     (ev) => {
@@ -8833,7 +9300,7 @@ function App({
             ...prev,
             { id: `bang-o-${Date.now()}`, role: "info", text: formatted }
           ]);
-          loop.log.append({
+          loop.appendAndPersist({
             role: "user",
             content: formatBangUserMessage(bangCmd, formatted)
           });
@@ -8851,6 +9318,18 @@ function App({
         }
         return;
       }
+      const mcpBrowseMatch = /^\/(resource|prompt)(?:\s+([\s\S]*))?$/.exec(text);
+      if (mcpBrowseMatch) {
+        const kind = mcpBrowseMatch[1];
+        const arg = mcpBrowseMatch[2]?.trim() ?? "";
+        promptHistory.current.push(text);
+        setHistorical((prev) => [
+          ...prev,
+          { id: `mcp-u-${Date.now()}`, role: "user", text, leadSeparator: prev.length > 0 }
+        ]);
+        await handleMcpBrowseSlash(kind, arg, mcpServers ?? [], setHistorical);
+        return;
+      }
       const slash = parseSlash(text);
       if (slash) {
         const result = handleSlash(slash.cmd, slash.args, loop, {
@@ -8899,10 +9378,18 @@ function App({
               text: result.info
             }
           ]);
+          if (codeMode) {
+            pendingEdits.current = [];
+            clearPendingEdits(session ?? null);
+          }
           return;
         }
         if (result.clear) {
           setHistorical([]);
+          if (codeMode) {
+            pendingEdits.current = [];
+            clearPendingEdits(session ?? null);
+          }
           return;
         }
         if (result.info) {
@@ -9017,7 +9504,9 @@ function App({
             if (ev.toolName) {
               toolCallBuildBuf.current = {
                 name: ev.toolName,
-                chars: ev.toolCallArgsChars ?? 0
+                chars: ev.toolCallArgsChars ?? 0,
+                index: ev.toolCallIndex,
+                readyCount: ev.toolCallReadyCount
               };
             }
           } else if (ev.role === "branch_start") {
@@ -9076,6 +9565,7 @@ function App({
               const blocks = parseEditBlocks(finalText);
               if (blocks.length > 0) {
                 pendingEdits.current = blocks;
+                savePendingEdits(session ?? null, blocks);
                 setHistorical((prev) => [
                   ...prev,
                   {
@@ -9313,6 +9803,14 @@ ${body}`;
     },
     [pendingPlan, togglePlanMode, busy, loop, handleSubmit]
   );
+  const handlePlanConfirmRef = useRef2(handlePlanConfirm);
+  useEffect2(() => {
+    handlePlanConfirmRef.current = handlePlanConfirm;
+  }, [handlePlanConfirm]);
+  const stableHandlePlanConfirm = useCallback(
+    async (choice) => handlePlanConfirmRef.current(choice),
+    []
+  );
   const handleStagedInputSubmit = useCallback(
     async (feedback) => {
       const staged = stagedInput;
@@ -9366,7 +9864,7 @@ Stay in plan mode \u2014 address the feedback (explore more if needed), then sub
     if (stagedInput?.plan) setPendingPlan(stagedInput.plan);
     setStagedInput(null);
   }, [stagedInput]);
-  return /* @__PURE__ */ React14.createElement(TickerProvider, { disabled: PLAIN_UI }, /* @__PURE__ */ React14.createElement(Box13, { flexDirection: "column" }, /* @__PURE__ */ React14.createElement(
+  return /* @__PURE__ */ React14.createElement(TickerProvider, { disabled: PLAIN_UI || !!pendingPlan || !!pendingShell }, /* @__PURE__ */ React14.createElement(Box13, { flexDirection: "column" }, /* @__PURE__ */ React14.createElement(
     StatsPanel,
     {
       summary,
@@ -9386,7 +9884,14 @@ Stay in plan mode \u2014 address the feedback (explore more if needed), then sub
       onSubmit: handleStagedInputSubmit,
       onCancel: handleStagedInputCancel
     }
-  ) : pendingPlan ? /* @__PURE__ */ React14.createElement(PlanConfirm, { plan: pendingPlan, onChoose: handlePlanConfirm, projectRoot: hookCwd }) : pendingShell ? /* @__PURE__ */ React14.createElement(
+  ) : pendingPlan ? /* @__PURE__ */ React14.createElement(
+    PlanConfirm,
+    {
+      plan: pendingPlan,
+      onChoose: stableHandlePlanConfirm,
+      projectRoot: hookCwd
+    }
+  ) : pendingShell ? /* @__PURE__ */ React14.createElement(
     ShellConfirm,
     {
       command: pendingShell,
@@ -9717,7 +10222,8 @@ async function chatCommand(opts) {
           label,
           spec: raw,
           toolCount: bridge.registeredNames.length,
-          report
+          report,
+          client: mcp2
         });
       } catch (err) {
         const reason = err.message;
@@ -9747,7 +10253,7 @@ async function chatCommand(opts) {
     const prior = loadSessionMessages(opts.session);
     if (prior.length > 0) {
       const p = sessionPath(opts.session);
-      const mtime = existsSync10(p) ? statSync6(p).mtime : /* @__PURE__ */ new Date();
+      const mtime = existsSync11(p) ? statSync6(p).mtime : /* @__PURE__ */ new Date();
       sessionPreview = { messageCount: prior.length, lastActive: mtime };
     }
   } else if (opts.session && opts.forceNew) {
@@ -9801,7 +10307,7 @@ async function codeCommand(opts = {}) {
 `
   );
   await chatCommand({
-    model: opts.model ?? "deepseek-reasoner",
+    model: opts.model ?? "deepseek-v4-pro",
     harvest: opts.harvest ?? false,
     system: codeSystemPrompt2(rootDir),
     transcript: opts.transcript,
@@ -9814,7 +10320,7 @@ async function codeCommand(opts = {}) {
 }
 
 // src/cli/commands/diff.ts
-import { writeFileSync as writeFileSync5 } from "fs";
+import { writeFileSync as writeFileSync6 } from "fs";
 import { basename as basename2 } from "path";
 import { render as render2 } from "ink";
 import React20 from "react";
@@ -9960,7 +10466,7 @@ async function diffCommand(opts) {
   if (wantMarkdown) {
     console.log(renderSummaryTable(report));
     const md = renderMarkdown(report);
-    writeFileSync5(opts.mdPath, md, "utf8");
+    writeFileSync6(opts.mdPath, md, "utf8");
     console.log(`
 markdown report written to ${opts.mdPath}`);
     return;
@@ -10483,21 +10989,26 @@ import React23, { useState as useState10 } from "react";
 
 // src/cli/ui/presets.ts
 var PRESETS = {
+  // `deepseek-chat` / `deepseek-reasoner` are retained as the fast /
+  // smart models because they're deprecated-but-working compat aliases
+  // for v4-flash's non-thinking and thinking modes respectively. Same
+  // billing, smaller config churn for existing users. `max` promotes
+  // to v4-pro — 12× flash on input/output, reserved for hard tasks.
   fast: { model: "deepseek-chat", harvest: false, branch: 1 },
   smart: { model: "deepseek-reasoner", harvest: true, branch: 1 },
-  max: { model: "deepseek-reasoner", harvest: true, branch: 3 }
+  max: { model: "deepseek-v4-pro", harvest: true, branch: 3 }
 };
 var PRESET_DESCRIPTIONS = {
   fast: {
-    headline: "deepseek-chat, no reasoning harvest, no branching",
+    headline: "deepseek-chat (= v4-flash non-thinking), no harvest, no branching",
     cost: "~1\xA2 per 100 turns \xB7 default"
   },
   smart: {
-    headline: "deepseek-reasoner + Pillar 2 harvest",
-    cost: "~10\xD7 cost vs fast \xB7 slower \xB7 better on multi-step tasks"
+    headline: "deepseek-reasoner (= v4-flash thinking) + Pillar 2 harvest",
+    cost: "same price as fast \xB7 slower \xB7 better on multi-step tasks"
   },
   max: {
-    headline: "reasoner + harvest + self-consistency (3 branches)",
+    headline: "deepseek-v4-pro + harvest + self-consistency (3 branches)",
     cost: "~30\xD7 cost vs fast \xB7 slowest \xB7 for hard single-shots"
   }
 };