reasonix 0.4.28 → 0.5.2

package/dist/cli/index.js

@@ -233,6 +233,28 @@ var DeepSeekClient = class {
       return null;
     }
   }
+  /**
+   * Fetch the model catalog DeepSeek currently exposes. Today this is
+   * `deepseek-chat` (V3) and `deepseek-reasoner` (R1), but querying is
+   * the only way to learn about new ones without a Reasonix release.
+   * Returns null on any network/auth failure so callers can degrade
+   * gracefully — e.g. `/models` falls back to the hardcoded hint.
+   */
+  async listModels(opts = {}) {
+    try {
+      const resp = await this._fetch(`${this.baseUrl}/models`, {
+        method: "GET",
+        headers: { Authorization: `Bearer ${this.apiKey}` },
+        signal: opts.signal
+      });
+      if (!resp.ok) return null;
+      const data = await resp.json();
+      if (!data || !Array.isArray(data.data)) return null;
+      return data;
+    } catch {
+      return null;
+    }
+  }
   async chat(opts) {
     const ctrl = new AbortController();
     const timer = setTimeout(() => ctrl.abort(), this.timeoutMs);
@@ -674,6 +696,170 @@ async function runHooks(opts) {
   return { event, outcomes, blocked };
 }
 
+// src/tokenizer.ts
+import { readFileSync as readFileSync3 } from "fs";
+import { createRequire } from "module";
+import { dirname as dirname2, join as join3 } from "path";
+import { fileURLToPath } from "url";
+import { gunzipSync } from "zlib";
+function buildByteToChar() {
+  const result = new Array(256);
+  const bs = [];
+  for (let b = 33; b <= 126; b++) bs.push(b);
+  for (let b = 161; b <= 172; b++) bs.push(b);
+  for (let b = 174; b <= 255; b++) bs.push(b);
+  const cs = bs.slice();
+  let n = 0;
+  for (let b = 0; b < 256; b++) {
+    if (!bs.includes(b)) {
+      bs.push(b);
+      cs.push(256 + n);
+      n++;
+    }
+  }
+  for (let i = 0; i < bs.length; i++) {
+    result[bs[i]] = String.fromCodePoint(cs[i]);
+  }
+  return result;
+}
+var cached = null;
+function resolveDataPath() {
+  if (process.env.REASONIX_TOKENIZER_PATH) return process.env.REASONIX_TOKENIZER_PATH;
+  try {
+    const here = dirname2(fileURLToPath(import.meta.url));
+    return join3(here, "..", "data", "deepseek-tokenizer.json.gz");
+  } catch {
+    const req = createRequire(import.meta.url);
+    return join3(
+      dirname2(req.resolve("reasonix/package.json")),
+      "data",
+      "deepseek-tokenizer.json.gz"
+    );
+  }
+}
+function loadTokenizer() {
+  if (cached) return cached;
+  const buf = readFileSync3(resolveDataPath());
+  const json = gunzipSync(buf).toString("utf8");
+  const data = JSON.parse(json);
+  const mergeRank = /* @__PURE__ */ new Map();
+  for (let i = 0; i < data.model.merges.length; i++) {
+    mergeRank.set(data.model.merges[i], i);
+  }
+  const splitRegexes = [];
+  for (const p of data.pre_tokenizer.pretokenizers) {
+    if (p.type === "Split") {
+      splitRegexes.push(new RegExp(p.pattern.Regex, "gu"));
+    }
+  }
+  const addedMap = /* @__PURE__ */ new Map();
+  const addedContents = [];
+  for (const t of data.added_tokens) {
+    if (!t.special) {
+      addedMap.set(t.content, t.id);
+      addedContents.push(t.content);
+    }
+  }
+  addedContents.sort((a, b) => b.length - a.length);
+  const addedPattern = addedContents.length ? new RegExp(addedContents.map(escapeRegex).join("|"), "g") : null;
+  cached = {
+    vocab: data.model.vocab,
+    mergeRank,
+    splitRegexes,
+    byteToChar: buildByteToChar(),
+    addedPattern,
+    addedMap
+  };
+  return cached;
+}
+function escapeRegex(s) {
+  return s.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+}
+function applySplit(chunks, re) {
+  const out = [];
+  for (const chunk of chunks) {
+    if (!chunk) continue;
+    re.lastIndex = 0;
+    let last = 0;
+    for (const m of chunk.matchAll(re)) {
+      const idx = m.index ?? 0;
+      if (idx > last) out.push(chunk.slice(last, idx));
+      if (m[0].length > 0) out.push(m[0]);
+      last = idx + m[0].length;
+    }
+    if (last < chunk.length) out.push(chunk.slice(last));
+  }
+  return out;
+}
+function byteLevelEncode(s, byteToChar) {
+  const bytes = new TextEncoder().encode(s);
+  let out = "";
+  for (let i = 0; i < bytes.length; i++) out += byteToChar[bytes[i]];
+  return out;
+}
+function bpeEncode(piece, mergeRank) {
+  if (piece.length <= 1) return piece ? [piece] : [];
+  let word = Array.from(piece);
+  while (true) {
+    let bestIdx = -1;
+    let bestRank = Number.POSITIVE_INFINITY;
+    for (let i = 0; i < word.length - 1; i++) {
+      const pair = `${word[i]} ${word[i + 1]}`;
+      const rank = mergeRank.get(pair);
+      if (rank !== void 0 && rank < bestRank) {
+        bestRank = rank;
+        bestIdx = i;
+        if (rank === 0) break;
+      }
+    }
+    if (bestIdx < 0) break;
+    word = [
+      ...word.slice(0, bestIdx),
+      word[bestIdx] + word[bestIdx + 1],
+      ...word.slice(bestIdx + 2)
+    ];
+    if (word.length === 1) break;
+  }
+  return word;
+}
+function encode(text) {
+  if (!text) return [];
+  const t = loadTokenizer();
+  const ids = [];
+  const process2 = (segment) => {
+    if (!segment) return;
+    let chunks = [segment];
+    for (const re of t.splitRegexes) chunks = applySplit(chunks, re);
+    for (const chunk of chunks) {
+      if (!chunk) continue;
+      const byteLevel = byteLevelEncode(chunk, t.byteToChar);
+      const pieces = bpeEncode(byteLevel, t.mergeRank);
+      for (const p of pieces) {
+        const id = t.vocab[p];
+        if (id !== void 0) ids.push(id);
+      }
+    }
+  };
+  if (t.addedPattern) {
+    t.addedPattern.lastIndex = 0;
+    let last = 0;
+    for (const m of text.matchAll(t.addedPattern)) {
+      const idx = m.index ?? 0;
+      if (idx > last) process2(text.slice(last, idx));
+      const id = t.addedMap.get(m[0]);
+      if (id !== void 0) ids.push(id);
+      last = idx + m[0].length;
+    }
+    if (last < text.length) process2(text.slice(last));
+  } else {
+    process2(text);
+  }
+  return ids;
+}
+function countTokens(text) {
+  return encode(text).length;
+}
+
 // src/repair/flatten.ts
 function analyzeSchema(schema) {
   if (!schema) return { shouldFlatten: false, leafCount: 0, maxDepth: 0 };
@@ -823,7 +1009,15 @@ var ToolRegistry = class {
     }
     try {
       const result = await tool.fn(args, { signal: opts.signal });
-      return typeof result === "string" ? result : JSON.stringify(result);
+      const str = typeof result === "string" ? result : JSON.stringify(result);
+      let clipped = str;
+      if (opts.maxResultTokens !== void 0) {
+        clipped = truncateForModelByTokens(clipped, opts.maxResultTokens);
+      }
+      if (opts.maxResultChars !== void 0) {
+        clipped = truncateForModel(clipped, opts.maxResultChars);
+      }
+      return clipped;
     } catch (err) {
       const e = err;
       if (typeof e.toToolResult === "function") {
@@ -857,6 +1051,7 @@ function hasDotKey(obj) {
 
 // src/mcp/registry.ts
 var DEFAULT_MAX_RESULT_CHARS = 32e3;
+var DEFAULT_MAX_RESULT_TOKENS = 8e3;
 async function bridgeMcpTools(client, opts = {}) {
   const registry = opts.registry ?? new ToolRegistry({ autoFlatten: opts.autoFlatten });
   const prefix = opts.namePrefix ?? "";
@@ -913,6 +1108,61 @@ function truncateForModel(s, maxChars) {
 
 ${tail}`;
 }
+function truncateForModelByTokens(s, maxTokens) {
+  if (maxTokens <= 0) return "";
+  if (s.length <= maxTokens) return s;
+  if (s.length <= maxTokens * 4) {
+    const tokens = countTokens(s);
+    if (tokens <= maxTokens) return s;
+  }
+  const markerOverhead = 48;
+  const contentBudget = Math.max(0, maxTokens - markerOverhead);
+  const tailBudget = Math.min(256, Math.floor(contentBudget * 0.1));
+  const headBudget = Math.max(0, contentBudget - tailBudget);
+  const head = sizePrefixToTokens(s, headBudget);
+  const tail = sizeSuffixToTokens(s, tailBudget);
+  const droppedChars = s.length - head.length - tail.length;
+  const headTokens = head ? countTokens(head) : 0;
+  const tailTokens = tail ? countTokens(tail) : 0;
+  const sampleChars = head.length + tail.length;
+  const sampleTokens = headTokens + tailTokens;
+  const ratio = sampleChars > 0 ? sampleTokens / sampleChars : 0.3;
+  const estTotalTokens = Math.ceil(s.length * ratio);
+  const droppedTokens = Math.max(0, estTotalTokens - sampleTokens);
+  return `${head}
+
+[\u2026truncated ~${droppedTokens} tokens (${droppedChars} chars) \u2014 raise BridgeOptions.maxResultTokens, or call the tool with a narrower scope (filter, head, pagination)\u2026]
+
+${tail}`;
+}
+function sizePrefixToTokens(s, budget) {
+  if (budget <= 0 || s.length === 0) return "";
+  let size = Math.min(s.length, budget * 4);
+  for (let iter = 0; iter < 6; iter++) {
+    if (size <= 0) return "";
+    const slice = s.slice(0, size);
+    const count = countTokens(slice);
+    if (count <= budget) return slice;
+    const next = Math.floor(size * (budget / count) * 0.95);
+    if (next >= size) return s.slice(0, Math.max(0, size - 1));
+    size = next;
+  }
+  return s.slice(0, Math.max(0, size));
+}
+function sizeSuffixToTokens(s, budget) {
+  if (budget <= 0 || s.length === 0) return "";
+  let size = Math.min(s.length, budget * 4);
+  for (let iter = 0; iter < 6; iter++) {
+    if (size <= 0) return "";
+    const slice = s.slice(-size);
+    const count = countTokens(slice);
+    if (count <= budget) return slice;
+    const next = Math.floor(size * (budget / count) * 0.95);
+    if (next >= size) return s.slice(-Math.max(0, size - 1));
+    size = next;
+  }
+  return s.slice(-Math.max(0, size));
+}
 function blockToString(block) {
   if (block.type === "text") return block.text;
   if (block.type === "image") return `[image ${block.mimeType}, ${block.data.length} chars base64]`;
@@ -1298,19 +1548,19 @@ import {
   chmodSync as chmodSync2,
   existsSync as existsSync2,
   mkdirSync as mkdirSync2,
-  readFileSync as readFileSync3,
+  readFileSync as readFileSync4,
   readdirSync,
   statSync,
   unlinkSync,
   writeFileSync as writeFileSync2
 } from "fs";
 import { homedir as homedir3 } from "os";
-import { dirname as dirname2, join as join3 } from "path";
+import { dirname as dirname3, join as join4 } from "path";
 function sessionsDir() {
-  return join3(homedir3(), ".reasonix", "sessions");
+  return join4(homedir3(), ".reasonix", "sessions");
 }
 function sessionPath(name) {
-  return join3(sessionsDir(), `${sanitizeName(name)}.jsonl`);
+  return join4(sessionsDir(), `${sanitizeName(name)}.jsonl`);
 }
 function sanitizeName(name) {
   const cleaned = name.replace(/[^\w\-\u4e00-\u9fa5]/g, "_").slice(0, 64);
@@ -1320,7 +1570,7 @@ function loadSessionMessages(name) {
   const path = sessionPath(name);
   if (!existsSync2(path)) return [];
   try {
-    const raw = readFileSync3(path, "utf8");
+    const raw = readFileSync4(path, "utf8");
     const out = [];
     for (const line of raw.split(/\r?\n/)) {
       const trimmed = line.trim();
@@ -1338,7 +1588,7 @@ function loadSessionMessages(name) {
 }
 function appendSessionMessage(name, message) {
   const path = sessionPath(name);
-  mkdirSync2(dirname2(path), { recursive: true });
+  mkdirSync2(dirname3(path), { recursive: true });
   appendFileSync(path, `${JSON.stringify(message)}
 `, "utf8");
   try {
@@ -1352,7 +1602,7 @@ function listSessions() {
   try {
     const files = readdirSync(dir).filter((f) => f.endsWith(".jsonl"));
     return files.map((file) => {
-      const path = join3(dir, file);
+      const path = join4(dir, file);
       const stat = statSync(path);
       const name = file.replace(/\.jsonl$/, "");
       const messageCount = countLines(path);
@@ -1373,7 +1623,7 @@ function deleteSession(name) {
 }
 function rewriteSession(name, messages) {
   const path = sessionPath(name);
-  mkdirSync2(dirname2(path), { recursive: true });
+  mkdirSync2(dirname3(path), { recursive: true });
   const body = messages.map((m) => JSON.stringify(m)).join("\n");
   writeFileSync2(path, body ? `${body}
 ` : "", "utf8");
@@ -1384,7 +1634,7 @@ function rewriteSession(name, messages) {
 }
 function countLines(path) {
   try {
-    const raw = readFileSync3(path, "utf8");
+    const raw = readFileSync4(path, "utf8");
     return raw.split(/\r?\n/).filter((l) => l.trim()).length;
   } catch {
     return 0;
@@ -1393,8 +1643,8 @@ function countLines(path) {
 
 // src/telemetry.ts
 var DEEPSEEK_PRICING = {
-  "deepseek-chat": { inputCacheHit: 0.07, inputCacheMiss: 0.27, output: 1.1 },
-  "deepseek-reasoner": { inputCacheHit: 0.14, inputCacheMiss: 0.55, output: 2.19 }
+  "deepseek-chat": { inputCacheHit: 0.028, inputCacheMiss: 0.28, output: 0.42 },
+  "deepseek-reasoner": { inputCacheHit: 0.028, inputCacheMiss: 0.28, output: 0.42 }
 };
 var CLAUDE_SONNET_PRICING = { input: 3, output: 15 };
 var DEEPSEEK_CONTEXT_TOKENS = {
@@ -1949,6 +2199,24 @@ var CacheFirstLoop = class {
         return;
       }
       const ctxMax = DEEPSEEK_CONTEXT_TOKENS[this.model] ?? DEFAULT_CONTEXT_TOKENS;
+      if (usage) {
+        const ratio = usage.promptTokens / ctxMax;
+        if (ratio > 0.6 && ratio <= 0.8) {
+          const before = usage.promptTokens;
+          const soft = this.compact(16e3);
+          if (soft.healedCount > 0) {
+            const approxSaved = Math.round(soft.charsSaved / 4);
+            const after = Math.max(0, before - approxSaved);
+            yield {
+              turn: this._turn,
+              role: "warning",
+              content: `context ${before.toLocaleString()}/${ctxMax.toLocaleString()} (${Math.round(
+                ratio * 100
+              )}%) \u2014 proactively compacted ${soft.healedCount} tool result(s) to 16k, saved ~${approxSaved.toLocaleString()} tokens (now ~${after.toLocaleString()}). Staying ahead of the 80% guard.`
+            };
+          }
+        }
+      }
       if (usage && usage.promptTokens / ctxMax > 0.8) {
         const before = usage.promptTokens;
         const compactResult = this.compact(4e3);
@@ -2011,7 +2279,10 @@ var CacheFirstLoop = class {
           result = `[hook block] ${blocking?.hook.command ?? "<unknown>"}
 ${reason}`;
         } else {
-          result = await this.tools.dispatch(name, args, { signal });
+          result = await this.tools.dispatch(name, args, {
+            signal,
+            maxResultTokens: DEFAULT_MAX_RESULT_TOKENS
+          });
           const postReport = await runHooks({
             hooks: this.hooks,
             payload: {
@@ -3118,6 +3389,50 @@ function tokenizeCommand(cmd) {
   if (cur.length > 0) out.push(cur);
   return out;
 }
+function detectShellOperator(cmd) {
+  const opPrefix = /^(?:2>&1|&>|\|{1,2}|&{1,2}|2>{1,2}|>{1,2}|<{1,2})/;
+  let cur = "";
+  let curQuoted = false;
+  let quote = null;
+  const check = () => {
+    if (cur.length === 0 && !curQuoted) return null;
+    if (!curQuoted) {
+      const m = opPrefix.exec(cur);
+      if (m) return m[0] ?? null;
+    }
+    return null;
+  };
+  for (let i = 0; i < cmd.length; i++) {
+    const ch = cmd[i];
+    if (quote) {
+      if (ch === quote) {
+        quote = null;
+      } else if (ch === "\\" && quote === '"' && i + 1 < cmd.length) {
+        cur += cmd[++i];
+        curQuoted = true;
+      } else {
+        cur += ch;
+        curQuoted = true;
+      }
+      continue;
+    }
+    if (ch === '"' || ch === "'") {
+      quote = ch;
+      curQuoted = true;
+      continue;
+    }
+    if (ch === " " || ch === "	") {
+      const op = check();
+      if (op) return op;
+      cur = "";
+      curQuoted = false;
+      continue;
+    }
+    cur += ch;
+  }
+  if (quote) return null;
+  return check();
+}
 function isAllowed(cmd, extra = []) {
   const normalized = cmd.trim().replace(/\s+/g, " ");
   const allowlist = [...BUILTIN_ALLOWLIST, ...extra];
@@ -3130,6 +3445,12 @@ function isAllowed(cmd, extra = []) {
 async function runCommand(cmd, opts) {
   const argv = tokenizeCommand(cmd);
   if (argv.length === 0) throw new Error("run_command: empty command");
+  const operator = detectShellOperator(cmd);
+  if (operator !== null) {
+    throw new Error(
+      `run_command: shell operator "${operator}" is not supported \u2014 this tool spawns one process, no shell expansion. Split into separate run_command calls and combine the output in your reasoning (e.g. instead of \`grep foo *.ts | wc -l\`, call \`grep -c foo *.ts\` or two separate commands). To pass "${operator}" as a literal argument, wrap it in quotes.`
+    );
+  }
   const timeoutMs = (opts.timeoutSec ?? DEFAULT_TIMEOUT_SEC) * 1e3;
   const maxChars = opts.maxOutputChars ?? DEFAULT_MAX_OUTPUT_CHARS;
   const spawnOpts = {
@@ -3307,7 +3628,7 @@ function registerShellTools(registry, opts) {
       properties: {
         command: {
           type: "string",
-          description: "Full command line. Tokenized with POSIX-ish quoting; no shell expansion, no pipes, no redirects."
+          description: 'Full command line. Tokenized with POSIX-ish quoting; no shell expansion. Pipes (`|`), redirects (`>`, `<`, `2>`), and `&&`/`||` chaining are rejected with an error \u2014 split into separate calls instead. To pass an operator character as a literal argument (e.g. a regex), wrap it in quotes: `grep "a|b" file.txt`.'
         },
         timeoutSec: {
           type: "integer",
@@ -3526,12 +3847,12 @@ ${i + 1}. ${r.title}`);
 }
 
 // src/env.ts
-import { readFileSync as readFileSync4 } from "fs";
+import { readFileSync as readFileSync5 } from "fs";
 import { resolve as resolve3 } from "path";
 function loadDotenv(path = ".env") {
   let raw;
   try {
-    raw = readFileSync4(resolve3(process.cwd(), path), "utf8");
+    raw = readFileSync5(resolve3(process.cwd(), path), "utf8");
   } catch {
     return;
   }
@@ -3550,7 +3871,7 @@ function loadDotenv(path = ".env") {
 }
 
 // src/transcript.ts
-import { createWriteStream, readFileSync as readFileSync5 } from "fs";
+import { createWriteStream, readFileSync as readFileSync6 } from "fs";
 function recordFromLoopEvent(ev, extra) {
   const rec = {
     ts: (/* @__PURE__ */ new Date()).toISOString(),
@@ -3601,7 +3922,7 @@ function openTranscriptFile(path, meta) {
   return stream;
 }
 function readTranscript(path) {
-  const raw = readFileSync5(path, "utf8");
+  const raw = readFileSync6(path, "utf8");
   return parseTranscript(raw);
 }
 function isPlanStateEmptyShape(s) {
@@ -4687,8 +5008,8 @@ async function trySection(load) {
 }
 
 // src/code/edit-blocks.ts
-import { existsSync as existsSync4, mkdirSync as mkdirSync3, readFileSync as readFileSync6, unlinkSync as unlinkSync2, writeFileSync as writeFileSync3 } from "fs";
-import { dirname as dirname4, resolve as resolve4 } from "path";
+import { existsSync as existsSync4, mkdirSync as mkdirSync3, readFileSync as readFileSync7, unlinkSync as unlinkSync2, writeFileSync as writeFileSync3 } from "fs";
+import { dirname as dirname5, resolve as resolve4 } from "path";
 var BLOCK_RE = /^(\S[^\n]*)\n<{7} SEARCH\n([\s\S]*?)\n?={7}\n([\s\S]*?)\n?>{7} REPLACE/gm;
 function parseEditBlocks(text) {
   const out = [];
@@ -4726,11 +5047,11 @@ function applyEditBlock(block, rootDir) {
           message: "file does not exist; to create it, use an empty SEARCH block"
         };
       }
-      mkdirSync3(dirname4(absTarget), { recursive: true });
+      mkdirSync3(dirname5(absTarget), { recursive: true });
       writeFileSync3(absTarget, block.replace, "utf8");
       return { path: block.path, status: "created" };
     }
-    const content = readFileSync6(absTarget, "utf8");
+    const content = readFileSync7(absTarget, "utf8");
     if (searchEmpty) {
       return {
         path: block.path,
@@ -4769,7 +5090,7 @@ function snapshotBeforeEdits(blocks, rootDir) {
       continue;
     }
     try {
-      snapshots.push({ path: b.path, prevContent: readFileSync6(abs, "utf8") });
+      snapshots.push({ path: b.path, prevContent: readFileSync7(abs, "utf8") });
     } catch {
       snapshots.push({ path: b.path, prevContent: null });
     }
@@ -4812,25 +5133,25 @@ function sep() {
 }
 
 // src/version.ts
-import { existsSync as existsSync5, mkdirSync as mkdirSync4, readFileSync as readFileSync7, writeFileSync as writeFileSync4 } from "fs";
+import { existsSync as existsSync5, mkdirSync as mkdirSync4, readFileSync as readFileSync8, writeFileSync as writeFileSync4 } from "fs";
 import { homedir as homedir4 } from "os";
-import { dirname as dirname5, join as join5 } from "path";
-import { fileURLToPath } from "url";
+import { dirname as dirname6, join as join6 } from "path";
+import { fileURLToPath as fileURLToPath2 } from "url";
 var REGISTRY_URL = "https://registry.npmjs.org/reasonix/latest";
 var LATEST_CACHE_TTL_MS = 24 * 60 * 60 * 1e3;
 var LATEST_FETCH_TIMEOUT_MS = 2e3;
 function readPackageVersion() {
   try {
-    let dir = dirname5(fileURLToPath(import.meta.url));
+    let dir = dirname6(fileURLToPath2(import.meta.url));
     for (let i = 0; i < 6; i++) {
-      const p = join5(dir, "package.json");
+      const p = join6(dir, "package.json");
       if (existsSync5(p)) {
-        const pkg = JSON.parse(readFileSync7(p, "utf8"));
+        const pkg = JSON.parse(readFileSync8(p, "utf8"));
         if (pkg?.name === "reasonix" && typeof pkg.version === "string") {
           return pkg.version;
         }
       }
-      const parent = dirname5(dir);
+      const parent = dirname6(dir);
       if (parent === dir) break;
       dir = parent;
     }
@@ -4840,11 +5161,11 @@ function readPackageVersion() {
 }
 var VERSION = readPackageVersion();
 function cachePath(homeDirOverride) {
-  return join5(homeDirOverride ?? homedir4(), ".reasonix", "version-cache.json");
+  return join6(homeDirOverride ?? homedir4(), ".reasonix", "version-cache.json");
 }
 function readCache(homeDirOverride) {
   try {
-    const raw = readFileSync7(cachePath(homeDirOverride), "utf8");
+    const raw = readFileSync8(cachePath(homeDirOverride), "utf8");
     const parsed = JSON.parse(raw);
     if (parsed && typeof parsed.version === "string" && typeof parsed.checkedAt === "number") {
       return parsed;
@@ -4856,7 +5177,7 @@ function readCache(homeDirOverride) {
 function writeCache(entry, homeDirOverride) {
   try {
     const p = cachePath(homeDirOverride);
-    mkdirSync4(dirname5(p), { recursive: true });
+    mkdirSync4(dirname6(p), { recursive: true });
     writeFileSync4(p, JSON.stringify(entry), "utf8");
   } catch {
   }
@@ -4864,8 +5185,8 @@ function writeCache(entry, homeDirOverride) {
 async function getLatestVersion(opts = {}) {
   const ttl = opts.ttlMs ?? LATEST_CACHE_TTL_MS;
   if (!opts.force) {
-    const cached = readCache(opts.homeDir);
-    if (cached && Date.now() - cached.checkedAt < ttl) return cached.version;
+    const cached2 = readCache(opts.homeDir);
+    if (cached2 && Date.now() - cached2.checkedAt < ttl) return cached2.version;
   }
   const fetchImpl = opts.fetchImpl ?? globalThis.fetch;
   if (!fetchImpl) return null;
@@ -4913,11 +5234,11 @@ function isNpxInstall() {
 }
 
 // src/usage.ts
-import { appendFileSync as appendFileSync2, existsSync as existsSync6, mkdirSync as mkdirSync5, readFileSync as readFileSync8, statSync as statSync3 } from "fs";
+import { appendFileSync as appendFileSync2, existsSync as existsSync6, mkdirSync as mkdirSync5, readFileSync as readFileSync9, statSync as statSync3 } from "fs";
 import { homedir as homedir5 } from "os";
-import { dirname as dirname6, join as join6 } from "path";
+import { dirname as dirname7, join as join7 } from "path";
 function defaultUsageLogPath(homeDirOverride) {
-  return join6(homeDirOverride ?? homedir5(), ".reasonix", "usage.jsonl");
+  return join7(homeDirOverride ?? homedir5(), ".reasonix", "usage.jsonl");
 }
 function appendUsage(input) {
   const record = {
@@ -4933,7 +5254,7 @@ function appendUsage(input) {
   };
   const path = input.path ?? defaultUsageLogPath();
   try {
-    mkdirSync5(dirname6(path), { recursive: true });
+    mkdirSync5(dirname7(path), { recursive: true });
     appendFileSync2(path, `${JSON.stringify(record)}
 `, "utf8");
   } catch {
@@ -4944,7 +5265,7 @@ function readUsageLog(path = defaultUsageLogPath()) {
   if (!existsSync6(path)) return [];
   let raw;
   try {
-    raw = readFileSync8(path, "utf8");
+    raw = readFileSync9(path, "utf8");
   } catch {
     return [];
   }
@@ -5117,7 +5438,7 @@ ${skill.body}${argsBlock}`;
 }
 
 // src/cli/ui/EventLog.tsx
-import { Box as Box3, Text as Text3 } from "ink";
+import { Box as Box3, Text as Text3, useStdout } from "ink";
 import React4 from "react";
 
 // src/cli/ui/PlanStateBlock.tsx
@@ -5137,8 +5458,8 @@ function PlanStateBlock({ planState }) {
 }
 
 // src/cli/ui/markdown.tsx
-import { readFileSync as readFileSync9, statSync as statSync4 } from "fs";
-import { isAbsolute as isAbsolute3, join as join7 } from "path";
+import { readFileSync as readFileSync10, statSync as statSync4 } from "fs";
+import { isAbsolute as isAbsolute3, join as join8 } from "path";
 import { Box as Box2, Text as Text2 } from "ink";
 import React2 from "react";
 var SUPERSCRIPT = {
@@ -5216,7 +5537,7 @@ function parseCitationUrl(url) {
 function validateCitation(url, projectRoot) {
   const parts = parseCitationUrl(url);
   if (!parts || !parts.path) return { ok: false, reason: "empty path" };
-  const fullPath = isAbsolute3(parts.path) ? parts.path : join7(projectRoot, parts.path);
+  const fullPath = isAbsolute3(parts.path) ? parts.path : join8(projectRoot, parts.path);
   let stat;
   try {
     stat = statSync4(fullPath);
@@ -5227,7 +5548,7 @@ function validateCitation(url, projectRoot) {
   if (parts.startLine === void 0) return { ok: true };
   let lineCount;
   try {
-    lineCount = readFileSync9(fullPath, "utf8").split("\n").length;
+    lineCount = readFileSync10(fullPath, "utf8").split("\n").length;
   } catch {
     return { ok: false, reason: "unreadable" };
   }
@@ -5277,7 +5598,7 @@ function InlineMd({
         const status = citations?.get(url);
         if (status && !status.ok) {
           parts.push(
-            /* @__PURE__ */ React2.createElement(Text2, { key: `l${idx++}`, color: "red", strikethrough: true }, `${linkText} \u274C`)
+            /* @__PURE__ */ React2.createElement(Text2, { key: `l${idx++}`, color: "red", strikethrough: true }, `${linkText} \u2717`)
           );
         } else {
           parts.push(
@@ -5583,7 +5904,7 @@ function Markdown({ text, projectRoot }) {
 function BrokenCitationsBlock({ items }) {
   return /* @__PURE__ */ React2.createElement(Box2, { flexDirection: "column", borderStyle: "round", borderColor: "red", paddingX: 1 }, /* @__PURE__ */ React2.createElement(Text2, { color: "red", bold: true }, `\u26A0 ${items.length} broken citation${items.length > 1 ? "s" : ""} \u2014 the model referenced paths or lines that don't exist`), items.map((b, i) => (
     // biome-ignore lint/suspicious/noArrayIndexKey: list is derived from a Map iteration order, stable per render
-    /* @__PURE__ */ React2.createElement(Text2, { key: `bc-${i}`, color: "red" }, `  \u274C ${b.url} \u2192 ${b.reason}`)
+    /* @__PURE__ */ React2.createElement(Text2, { key: `bc-${i}`, color: "red" }, `  \u2717 ${b.url} \u2192 ${b.reason}`)
   )));
 }
 
@@ -5610,32 +5931,49 @@ function useElapsedSeconds() {
 }
 
 // src/cli/ui/EventLog.tsx
+var ROLE_GLYPH = {
+  user: "\u25C7",
+  assistant: "\u25C6",
+  assistantPulse: "\u25C7",
+  // pulse alternate for streaming state
+  toolOk: "\u25A3",
+  toolErr: "\u25A5",
+  warning: "\u25B2",
+  error: "\u2726"
+};
+function RoleGlyph({
+  glyph,
+  color
+}) {
+  return /* @__PURE__ */ React4.createElement(Text3, { color, bold: true }, glyph);
+}
 var EventRow = React4.memo(function EventRow2({
   event,
   projectRoot
 }) {
   if (event.role === "user") {
-    return /* @__PURE__ */ React4.createElement(Box3, null, /* @__PURE__ */ React4.createElement(Text3, { bold: true, color: "cyan" }, "you \u203A", " "), /* @__PURE__ */ React4.createElement(Text3, null, event.text));
+    return /* @__PURE__ */ React4.createElement(Box3, { marginTop: event.leadSeparator ? 1 : 0 }, /* @__PURE__ */ React4.createElement(RoleGlyph, { glyph: ROLE_GLYPH.user, color: "cyan" }), /* @__PURE__ */ React4.createElement(Text3, null, "  ", event.text));
   }
   if (event.role === "assistant") {
     if (event.streaming) return /* @__PURE__ */ React4.createElement(StreamingAssistant, { event });
-    return /* @__PURE__ */ React4.createElement(Box3, { flexDirection: "column", marginTop: 1 }, /* @__PURE__ */ React4.createElement(Box3, null, /* @__PURE__ */ React4.createElement(Text3, { bold: true, color: "green" }, "assistant")), event.branch ? /* @__PURE__ */ React4.createElement(BranchBlock, { branch: event.branch }) : null, event.reasoning ? /* @__PURE__ */ React4.createElement(ReasoningBlock, { reasoning: event.reasoning }) : null, !isPlanStateEmpty(event.planState) ? /* @__PURE__ */ React4.createElement(PlanStateBlock, { planState: event.planState }) : null, event.text ? /* @__PURE__ */ React4.createElement(Markdown, { text: event.text, projectRoot }) : /* @__PURE__ */ React4.createElement(Text3, { dimColor: true }, "(no content)"), event.stats ? /* @__PURE__ */ React4.createElement(StatsLine, { stats: event.stats }) : null, event.repair ? /* @__PURE__ */ React4.createElement(Text3, { color: "magenta" }, event.repair) : null);
+    return /* @__PURE__ */ React4.createElement(Box3, { flexDirection: "column", marginTop: 1 }, /* @__PURE__ */ React4.createElement(Box3, null, /* @__PURE__ */ React4.createElement(RoleGlyph, { glyph: ROLE_GLYPH.assistant, color: "green" }), event.stats ? /* @__PURE__ */ React4.createElement(Text3, { dimColor: true }, `  ${event.stats.model}`) : null), /* @__PURE__ */ React4.createElement(Box3, { flexDirection: "column", paddingLeft: 2, marginTop: 1 }, event.branch ? /* @__PURE__ */ React4.createElement(BranchBlock, { branch: event.branch }) : null, event.reasoning ? /* @__PURE__ */ React4.createElement(ReasoningBlock, { reasoning: event.reasoning }) : null, !isPlanStateEmpty(event.planState) ? /* @__PURE__ */ React4.createElement(PlanStateBlock, { planState: event.planState }) : null, event.text ? /* @__PURE__ */ React4.createElement(Markdown, { text: event.text, projectRoot }) : /* @__PURE__ */ React4.createElement(Text3, { dimColor: true }, "(no content)"), event.stats ? /* @__PURE__ */ React4.createElement(StatsLine, { stats: event.stats }) : null, event.repair ? /* @__PURE__ */ React4.createElement(Text3, { color: "magenta" }, event.repair) : null));
   }
   if (event.role === "tool") {
     const isError = event.text.startsWith("ERROR:");
     const color = isError ? "red" : "yellow";
+    const glyph = isError ? ROLE_GLYPH.toolErr : ROLE_GLYPH.toolOk;
     const marker = isError ? "\u2717" : "\u2192";
     const isEditFile = (event.toolName === "edit_file" || event.toolName?.endsWith("_edit_file")) && !isError;
-    return /* @__PURE__ */ React4.createElement(Box3, { flexDirection: "column", marginTop: 1 }, /* @__PURE__ */ React4.createElement(Text3, { color }, `tool<${event.toolName ?? "?"}>  ${marker}`), isEditFile ? /* @__PURE__ */ React4.createElement(EditFileDiff, { text: event.text }) : /* @__PURE__ */ React4.createElement(Text3, { color: isError ? "red" : void 0, dimColor: !isError }, " ", truncate2(event.text, 400)));
+    return /* @__PURE__ */ React4.createElement(Box3, { flexDirection: "column", marginTop: 1 }, /* @__PURE__ */ React4.createElement(Box3, null, /* @__PURE__ */ React4.createElement(RoleGlyph, { glyph, color }), /* @__PURE__ */ React4.createElement(Text3, { color, bold: true }, `  ${event.toolName ?? "?"}`), /* @__PURE__ */ React4.createElement(Text3, { color, dimColor: true }, `  ${marker}`)), /* @__PURE__ */ React4.createElement(Box3, { flexDirection: "column", paddingLeft: 2, marginTop: 1 }, isEditFile ? /* @__PURE__ */ React4.createElement(EditFileDiff, { text: event.text }) : /* @__PURE__ */ React4.createElement(Text3, { color: isError ? "red" : void 0, dimColor: !isError }, truncate2(event.text, 400))));
   }
   if (event.role === "error") {
-    return /* @__PURE__ */ React4.createElement(Box3, { marginTop: 1 }, /* @__PURE__ */ React4.createElement(Text3, { color: "red", bold: true }, "error", " "), /* @__PURE__ */ React4.createElement(Text3, { color: "red" }, event.text));
+    return /* @__PURE__ */ React4.createElement(Box3, { marginTop: 1 }, /* @__PURE__ */ React4.createElement(RoleGlyph, { glyph: ROLE_GLYPH.error, color: "red" }), /* @__PURE__ */ React4.createElement(Text3, { color: "red" }, "  ", event.text));
   }
   if (event.role === "info") {
     return /* @__PURE__ */ React4.createElement(Box3, null, /* @__PURE__ */ React4.createElement(Text3, { dimColor: true }, event.text));
   }
   if (event.role === "warning") {
-    return /* @__PURE__ */ React4.createElement(Box3, null, /* @__PURE__ */ React4.createElement(Text3, { color: "yellow" }, "\u25B8 "), /* @__PURE__ */ React4.createElement(Text3, { color: "yellow" }, event.text));
+    return /* @__PURE__ */ React4.createElement(Box3, null, /* @__PURE__ */ React4.createElement(RoleGlyph, { glyph: ROLE_GLYPH.warning, color: "yellow" }), /* @__PURE__ */ React4.createElement(Text3, { color: "yellow" }, "  ", event.text));
   }
   return /* @__PURE__ */ React4.createElement(Box3, null, /* @__PURE__ */ React4.createElement(Text3, null, event.text));
 });
@@ -5659,13 +5997,13 @@ function BranchBlock({ branch }) {
     const t = (branch.temperatures[i] ?? 0).toFixed(1);
     return `${marker} #${i} T=${t} u=${u}`;
   }).join("  ");
-  return /* @__PURE__ */ React4.createElement(Box3, null, /* @__PURE__ */ React4.createElement(Text3, { color: "blue" }, "\u{1F500} branched ", /* @__PURE__ */ React4.createElement(Text3, { bold: true }, branch.budget), ` samples \u2192 picked #${branch.chosenIndex}   `, /* @__PURE__ */ React4.createElement(Text3, { dimColor: true }, per)));
+  return /* @__PURE__ */ React4.createElement(Box3, null, /* @__PURE__ */ React4.createElement(Text3, { color: "blue" }, "\u2387 branched ", /* @__PURE__ */ React4.createElement(Text3, { bold: true }, branch.budget), ` samples \u2192 picked #${branch.chosenIndex}   `, /* @__PURE__ */ React4.createElement(Text3, { dimColor: true }, per)));
 }
 function ReasoningBlock({ reasoning }) {
   const max = 260;
   const flat = reasoning.replace(/\s+/g, " ").trim();
   const preview = flat.length <= max ? flat : `\u2026 (+${flat.length - max} earlier chars) ${flat.slice(-max)}`;
-  return /* @__PURE__ */ React4.createElement(Box3, { marginBottom: 1 }, /* @__PURE__ */ React4.createElement(Text3, { dimColor: true, italic: true }, "\u21B3 thinking: ", preview));
+  return /* @__PURE__ */ React4.createElement(Box3, { marginBottom: 1 }, /* @__PURE__ */ React4.createElement(Text3, { dimColor: true }, "\u258F "), /* @__PURE__ */ React4.createElement(Text3, { dimColor: true, italic: true }, "thinking ", preview));
 }
 function Elapsed() {
   const s = useElapsedSeconds();
@@ -5673,14 +6011,19 @@ function Elapsed() {
   const ss = String(s % 60).padStart(2, "0");
   return /* @__PURE__ */ React4.createElement(Text3, { dimColor: true }, `${mm}:${ss}`);
 }
+function PulsingAssistantGlyph() {
+  const tick = useTick();
+  const on = Math.floor(tick / 4) % 2 === 0;
+  return /* @__PURE__ */ React4.createElement(Text3, { color: "green", bold: true }, on ? ROLE_GLYPH.assistant : ROLE_GLYPH.assistantPulse);
+}
 function StreamingAssistant({ event }) {
   if (event.branchProgress) {
     const p = event.branchProgress;
     if (p.completed === 0) {
-      return /* @__PURE__ */ React4.createElement(Box3, { flexDirection: "column", marginTop: 1 }, /* @__PURE__ */ React4.createElement(Box3, null, /* @__PURE__ */ React4.createElement(Text3, { bold: true, color: "green" }, "assistant", " "), /* @__PURE__ */ React4.createElement(Text3, { color: "blue" }, "\u{1F500} launching ", p.total, " parallel samples (R1 thinking in parallel)\u2026", " "), /* @__PURE__ */ React4.createElement(Elapsed, null)), /* @__PURE__ */ React4.createElement(Text3, { dimColor: true }, "  ", "spread across T=0.0/0.5/1.0 \xB7 typical wait 30-90s for reasoner"));
+      return /* @__PURE__ */ React4.createElement(Box3, { flexDirection: "column", marginTop: 1 }, /* @__PURE__ */ React4.createElement(Box3, null, /* @__PURE__ */ React4.createElement(PulsingAssistantGlyph, null), /* @__PURE__ */ React4.createElement(Text3, { color: "blue" }, "  \u2387 launching ", p.total, " parallel samples (R1 thinking in parallel)\u2026  "), /* @__PURE__ */ React4.createElement(Elapsed, null)), /* @__PURE__ */ React4.createElement(Text3, { color: "yellow" }, "  ", "spread across T=0.0/0.5/1.0 \xB7 reasoner typically takes 30-90s \u2014 this is normal"));
     }
     const pct2 = Math.round(p.completed / p.total * 100);
-    return /* @__PURE__ */ React4.createElement(Box3, { flexDirection: "column", marginTop: 1 }, /* @__PURE__ */ React4.createElement(Box3, null, /* @__PURE__ */ React4.createElement(Text3, { bold: true, color: "green" }, "assistant", " "), /* @__PURE__ */ React4.createElement(Text3, { color: "blue" }, "\u{1F500} branching ", p.completed, "/", p.total, " (", pct2, "%)", " "), /* @__PURE__ */ React4.createElement(Elapsed, null)), /* @__PURE__ */ React4.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"));
+    return /* @__PURE__ */ React4.createElement(Box3, { flexDirection: "column", marginTop: 1 }, /* @__PURE__ */ React4.createElement(Box3, null, /* @__PURE__ */ React4.createElement(PulsingAssistantGlyph, null), /* @__PURE__ */ React4.createElement(Text3, { color: "blue" }, "  \u2387 branching ", p.completed, "/", p.total, " (", pct2, "%)  "), /* @__PURE__ */ React4.createElement(Elapsed, null)), /* @__PURE__ */ React4.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) : "";
@@ -5708,7 +6051,11 @@ function StreamingAssistant({ event }) {
     label = parts.join(" \xB7 ");
     labelColor = "green";
   }
-  return /* @__PURE__ */ React4.createElement(Box3, { flexDirection: "column", marginTop: 1 }, /* @__PURE__ */ React4.createElement(Box3, null, /* @__PURE__ */ React4.createElement(Text3, { bold: true, color: "green" }, "assistant", " "), /* @__PURE__ */ React4.createElement(Pulse, null), /* @__PURE__ */ React4.createElement(Text3, { color: labelColor }, ` ${label} `), /* @__PURE__ */ React4.createElement(Elapsed, null)), reasoningTail ? /* @__PURE__ */ React4.createElement(Text3, { dimColor: true, italic: true }, "\u21B3 thinking: ", reasoningTail) : null, tail ? /* @__PURE__ */ React4.createElement(Text3, { dimColor: true }, "\u25B8 ", tail) : preFirstByte ? /* @__PURE__ */ React4.createElement(Text3, { dimColor: true, italic: true }, "  connection open, first byte typically in 5-60s depending on model + load") : reasoningOnly ? /* @__PURE__ */ React4.createElement(Text3, { color: "yellow", dimColor: true }, "  R1 is thinking before it speaks \u2014 body text starts when reasoning completes (typically 20-90s).") : toolCallOnly ? /* @__PURE__ */ React4.createElement(Text3, { color: "magenta", dimColor: true }, "  tool-call arguments streaming \u2014 the model is about to dispatch a tool") : event.reasoning ? /* @__PURE__ */ React4.createElement(Text3, { color: "yellow", dimColor: true }, "  R1 still reasoning \u2014 body text or tool call arrives when thinking completes") : null);
+  return /* @__PURE__ */ React4.createElement(Box3, { flexDirection: "column", marginTop: 1 }, /* @__PURE__ */ React4.createElement(Box3, null, /* @__PURE__ */ React4.createElement(PulsingAssistantGlyph, null), /* @__PURE__ */ React4.createElement(Text3, null, "  "), /* @__PURE__ */ React4.createElement(Pulse, null), /* @__PURE__ */ React4.createElement(Text3, { color: labelColor }, ` ${label} `), /* @__PURE__ */ React4.createElement(Elapsed, null)), reasoningTail ? /* @__PURE__ */ React4.createElement(Text3, { dimColor: true, italic: true }, "\u21B3 thinking: ", reasoningTail) : null, tail ? /* @__PURE__ */ React4.createElement(Text3, { dimColor: true }, "\u25B8 ", tail) : preFirstByte ? (
+    // Non-dim yellow: first-time users misread the dim version as
+    // "app frozen". The reassurance has to be VISIBLE to do its job.
+    /* @__PURE__ */ React4.createElement(Text3, { color: "yellow", italic: true }, "  waiting for first byte \u2014 this is normal, typically 5-60s depending on model + load")
+  ) : reasoningOnly ? /* @__PURE__ */ React4.createElement(Text3, { color: "yellow", italic: true }, "  R1 is thinking before it speaks \u2014 body text arrives when reasoning finishes (typically 20-90s, this is normal)") : toolCallOnly ? /* @__PURE__ */ React4.createElement(Text3, { color: "magenta", italic: true }, "  tool-call arguments streaming \u2014 the model is about to dispatch a tool") : event.reasoning ? /* @__PURE__ */ React4.createElement(Text3, { color: "yellow", italic: true }, "  R1 still reasoning \u2014 body text or tool call arrives when thinking finishes") : null);
 }
 function Pulse() {
   const tick = useTick();
@@ -5722,10 +6069,26 @@ function lastLine(s, maxChars) {
 }
 function StatsLine({ stats }) {
   const hit = (stats.cacheHitRatio * 100).toFixed(1);
-  return /* @__PURE__ */ React4.createElement(Text3, { dimColor: true }, "  \u21B3 cache ", hit, "% \xB7 tokens ", stats.usage.promptTokens, "\u2192", stats.usage.completionTokens, " \xB7 $", stats.cost.toFixed(6));
+  return /* @__PURE__ */ React4.createElement(Box3, null, /* @__PURE__ */ React4.createElement(Text3, { dimColor: true }, "\u258F "), /* @__PURE__ */ React4.createElement(Text3, { dimColor: true }, "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)`;
+  if (s.length <= max) return s;
+  if (s.startsWith("ERROR:")) {
+    const firstNl = s.indexOf("\n");
+    const firstLine = firstNl === -1 ? s : s.slice(0, firstNl);
+    if (firstLine.length >= max) {
+      return `${firstLine.slice(0, max)}\u2026 (+${s.length - max} chars \u2014 /tool N for full)`;
+    }
+    const budget = max - firstLine.length - 10;
+    const tail = s.slice(-budget);
+    const skipped2 = s.length - firstLine.length - tail.length;
+    return `${firstLine}
+\u2026 (+${skipped2} chars) \u2026
+${tail}`;
+  }
+  const skipped = s.length - max;
+  return `\u2026 (+${skipped} earlier chars \u2014 /tool N for full) \u2026
+${s.slice(-max)}`;
 }
 
 // src/cli/ui/PlanConfirm.tsx
@@ -5739,7 +6102,8 @@ function SingleSelect({
   items,
   initialValue,
   onSubmit,
-  onCancel
+  onCancel,
+  footer
 }) {
   const initialIndex = Math.max(
     0,
@@ -5766,7 +6130,7 @@ function SingleSelect({
       active: i === index,
       marker: i === index ? "\u25B8" : " "
     }
-  )));
+  )), footer ? /* @__PURE__ */ React5.createElement(Box4, { marginTop: 1 }, /* @__PURE__ */ React5.createElement(Text4, { dimColor: true }, footer)) : null);
 }
 function MultiSelect({
   items,
@@ -5842,7 +6206,7 @@ function PlanConfirm({ plan, onChoose, maxRenderedChars, projectRoot }) {
 
 \u2026 (${plan.length - cap} chars truncated \u2014 use /tool to view the full proposal)` : plan;
   const hasOpenQuestions = /^#{1,6}\s*(open[-\s]?questions?|risks?|unknowns?|assumptions?|unclear)/im.test(plan) || /^#{1,6}\s*(待确认|开放问题|风险|未知|假设|不确定)/im.test(plan);
-  return /* @__PURE__ */ React6.createElement(Box5, { flexDirection: "column", borderStyle: "round", borderColor: "cyan", paddingX: 1, marginY: 1 }, /* @__PURE__ */ React6.createElement(Box5, null, /* @__PURE__ */ React6.createElement(Text5, { bold: true, color: "cyan" }, "\u25B8 plan submitted \u2014 awaiting your review")), /* @__PURE__ */ React6.createElement(Box5, { marginTop: 1, flexDirection: "column" }, /* @__PURE__ */ React6.createElement(Markdown, { text: visible, projectRoot })), hasOpenQuestions ? /* @__PURE__ */ React6.createElement(Box5, { marginTop: 1 }, /* @__PURE__ */ React6.createElement(Text5, { color: "yellow" }, "\u25B2 the plan has open questions or flagged risks \u2014 pick", " ", /* @__PURE__ */ React6.createElement(Text5, { bold: true }, "Refine / answer questions"), " to write concrete answers before the model moves on.")) : null, /* @__PURE__ */ React6.createElement(Box5, { marginTop: 1 }, /* @__PURE__ */ React6.createElement(
+  return /* @__PURE__ */ React6.createElement(Box5, { flexDirection: "column", borderStyle: "round", borderColor: "cyan", paddingX: 1, marginY: 1 }, /* @__PURE__ */ React6.createElement(Box5, null, /* @__PURE__ */ React6.createElement(Text5, { bold: true, color: "cyan" }, "\u25B8 plan submitted \u2014 awaiting your review")), /* @__PURE__ */ React6.createElement(Box5, null, /* @__PURE__ */ React6.createElement(Text5, { 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__ */ React6.createElement(Box5, { marginTop: 1, flexDirection: "column" }, /* @__PURE__ */ React6.createElement(Markdown, { text: visible, projectRoot })), hasOpenQuestions ? /* @__PURE__ */ React6.createElement(Box5, { marginTop: 1 }, /* @__PURE__ */ React6.createElement(Text5, { color: "yellow" }, "\u25B2 the plan has open questions or flagged risks \u2014 pick", " ", /* @__PURE__ */ React6.createElement(Text5, { bold: true }, "Refine / answer questions"), " to write concrete answers before the model moves on.")) : null, /* @__PURE__ */ React6.createElement(Box5, { marginTop: 1 }, /* @__PURE__ */ React6.createElement(
     SingleSelect,
     {
       initialValue: hasOpenQuestions ? "refine" : "approve",
@@ -5863,7 +6227,9 @@ function PlanConfirm({ plan, onChoose, maxRenderedChars, projectRoot }) {
           hint: "Exit plan mode. Drop the plan; the model won't implement it."
         }
       ],
-      onSubmit: (v) => onChoose(v)
+      onSubmit: (v) => onChoose(v),
+      onCancel: () => onChoose("cancel"),
+      footer: "[\u2191\u2193] navigate  \xB7  [Enter] select  \xB7  [Esc] cancel"
     }
   )));
 }
@@ -6054,7 +6420,7 @@ function PromptInput({
     },
     { isActive: !disabled }
   );
-  const effectivePlaceholder = disabled ? placeholder ?? "\u2026waiting for response\u2026" : placeholder ?? "type a message, or /command \xB7 Ctrl+J for newline";
+  const effectivePlaceholder = disabled ? placeholder ?? "\u2026waiting for response\u2026  \xB7  [Esc] to stop" : placeholder ?? "type a message, or /command  \xB7  [Shift+Enter] / [Ctrl+J] newline";
   const lines = value.length > 0 ? value.split("\n") : [""];
   const borderColor = disabled ? "gray" : "cyan";
   const { line: cursorLine, col: cursorCol } = lineAndColumn(value, cursor);
@@ -6095,7 +6461,7 @@ function LineWithCursor({
 import { Box as Box8, Text as Text8 } from "ink";
 import React9 from "react";
 function ShellConfirm({ command, allowPrefix, onChoose }) {
-  return /* @__PURE__ */ React9.createElement(Box8, { flexDirection: "column", borderStyle: "round", borderColor: "yellow", paddingX: 1, marginY: 1 }, /* @__PURE__ */ React9.createElement(Box8, null, /* @__PURE__ */ React9.createElement(Text8, { bold: true, color: "yellow" }, "\u25B8 model wants to run a shell command")), /* @__PURE__ */ React9.createElement(Box8, { marginTop: 1 }, /* @__PURE__ */ React9.createElement(Text8, null, /* @__PURE__ */ React9.createElement(Text8, { dimColor: true }, "$ "), /* @__PURE__ */ React9.createElement(Text8, { color: "cyan" }, command))), /* @__PURE__ */ React9.createElement(Box8, { marginTop: 1 }, /* @__PURE__ */ React9.createElement(
+  return /* @__PURE__ */ React9.createElement(Box8, { flexDirection: "column", borderStyle: "round", borderColor: "yellow", paddingX: 1, marginY: 1 }, /* @__PURE__ */ React9.createElement(Box8, null, /* @__PURE__ */ React9.createElement(Text8, { bold: true, color: "yellow" }, "\u25B8 model wants to run a shell command")), /* @__PURE__ */ React9.createElement(Box8, null, /* @__PURE__ */ React9.createElement(Text8, { color: "yellow", 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__ */ React9.createElement(Box8, { marginTop: 1 }, /* @__PURE__ */ React9.createElement(Text8, null, /* @__PURE__ */ React9.createElement(Text8, { dimColor: true }, "$ "), /* @__PURE__ */ React9.createElement(Text8, { color: "cyan" }, command))), /* @__PURE__ */ React9.createElement(Box8, { marginTop: 1 }, /* @__PURE__ */ React9.createElement(
     SingleSelect,
     {
       initialValue: "run_once",
@@ -6116,7 +6482,9 @@ function ShellConfirm({ command, allowPrefix, onChoose }) {
           hint: "Tell the model the user refused; it will continue without this command."
         }
       ],
-      onSubmit: (v) => onChoose(v)
+      onSubmit: (v) => onChoose(v),
+      onCancel: () => onChoose("deny"),
+      footer: "[\u2191\u2193] navigate  \xB7  [Enter] select  \xB7  [Esc] deny"
     }
   )));
 }
@@ -6166,7 +6534,7 @@ function SlashSuggestions({
   const shown = matches.slice(windowStart, windowStart + MAX);
   const hiddenAbove = windowStart;
   const hiddenBelow = total - windowStart - shown.length;
-  return /* @__PURE__ */ React10.createElement(Box9, { flexDirection: "column", paddingX: 1 }, hiddenAbove > 0 ? /* @__PURE__ */ React10.createElement(Text9, { dimColor: true }, " \u2191 ", hiddenAbove, " more above") : null, shown.map((spec, i) => /* @__PURE__ */ React10.createElement(SuggestionRow, { key: spec.cmd, spec, isSelected: windowStart + i === selectedIndex })), hiddenBelow > 0 ? /* @__PURE__ */ React10.createElement(Text9, { dimColor: true }, " \u2193 ", hiddenBelow, " more below") : null, /* @__PURE__ */ React10.createElement(Text9, { dimColor: true }, " \u2191/\u2193 navigate \xB7 Tab or Enter to pick"));
+  return /* @__PURE__ */ React10.createElement(Box9, { flexDirection: "column", paddingX: 1 }, hiddenAbove > 0 ? /* @__PURE__ */ React10.createElement(Text9, { dimColor: true }, " \u2191 ", hiddenAbove, " more above") : null, shown.map((spec, i) => /* @__PURE__ */ React10.createElement(SuggestionRow, { key: spec.cmd, spec, isSelected: windowStart + i === selectedIndex })), hiddenBelow > 0 ? /* @__PURE__ */ React10.createElement(Text9, { dimColor: true }, " \u2193 ", hiddenBelow, " more below") : null, /* @__PURE__ */ React10.createElement(Text9, { dimColor: true }, " [\u2191\u2193] navigate \xB7 [Tab]/[Enter] pick"));
 }
 function SuggestionRow({ spec, isSelected }) {
   const marker = isSelected ? "\u25B8" : " ";
@@ -6179,8 +6547,37 @@ function SuggestionRow({ spec, isSelected }) {
 }
 
 // src/cli/ui/StatsPanel.tsx
-import { Box as Box10, Text as Text10 } from "ink";
+import { Box as Box10, Text as Text10, useStdout as useStdout2 } from "ink";
 import React11 from "react";
+var WORDMARK_STYLES = [
+  { ch: "\u25C8", color: "#5eead4", isLogo: true },
+  // teal — brand mark
+  { ch: " ", color: "#5eead4", isLogo: false },
+  { ch: "R", color: "#67e8f9", isLogo: false },
+  // cyan
+  { ch: "E", color: "#7dd3fc", isLogo: false },
+  // sky
+  { ch: "A", color: "#93c5fd", isLogo: false },
+  // blue
+  { ch: "S", color: "#a5b4fc", isLogo: false },
+  // indigo
+  { ch: "O", color: "#c4b5fd", isLogo: false },
+  // violet
+  { ch: "N", color: "#d8b4fe", isLogo: false },
+  // purple
+  { ch: "I", color: "#f0abfc", isLogo: false },
+  // fuchsia
+  { ch: "X", color: "#f0abfc", isLogo: false }
+  // fuchsia
+];
+function Wordmark({ busy }) {
+  const tick = useTick();
+  const period = busy ? 5 : 12;
+  const bright = Math.floor(tick / period) % 2 === 0;
+  return /* @__PURE__ */ React11.createElement(Text10, null, WORDMARK_STYLES.map((c) => /* @__PURE__ */ React11.createElement(Text10, { key: `${c.ch}-${c.color}`, color: c.color, bold: c.isLogo ? bright : true }, c.ch)));
+}
+var NARROW_BREAKPOINT = 120;
+var COLD_START_TURNS = 3;
 function StatsPanel({
   summary,
   model,
@@ -6189,27 +6586,149 @@ function StatsPanel({
   branchBudget,
   planMode,
   balance,
-  updateAvailable
+  updateAvailable,
+  busy
 }) {
-  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;
   const ctxMax = DEEPSEEK_CONTEXT_TOKENS[model] ?? DEFAULT_CONTEXT_TOKENS;
   const ctxRatio = summary.lastPromptTokens / ctxMax;
-  const ctxColor = ctxRatio >= 0.8 ? "red" : ctxRatio >= 0.5 ? "yellow" : void 0;
-  return /* @__PURE__ */ React11.createElement(Box10, { borderStyle: "round", borderColor: "cyan", flexDirection: "column", paddingX: 1 }, /* @__PURE__ */ React11.createElement(Box10, { justifyContent: "space-between" }, /* @__PURE__ */ React11.createElement(Text10, null, /* @__PURE__ */ React11.createElement(Text10, { color: "cyan", bold: true }, "Reasonix"), /* @__PURE__ */ React11.createElement(Text10, { dimColor: true }, ` v${VERSION}`), /* @__PURE__ */ React11.createElement(Text10, { dimColor: true }, " \xB7 model "), /* @__PURE__ */ React11.createElement(Text10, { color: "yellow" }, model), /* @__PURE__ */ React11.createElement(Text10, { dimColor: true }, " \xB7 prefix "), /* @__PURE__ */ React11.createElement(Text10, { dimColor: true }, prefixHash), harvestOn ? /* @__PURE__ */ React11.createElement(Text10, { color: "magenta" }, " \xB7 harvest") : null, branchOn ? /* @__PURE__ */ React11.createElement(Text10, { color: "blue" }, " \xB7 branch", branchBudget) : null, planMode ? /* @__PURE__ */ React11.createElement(Text10, { color: "red", bold: true }, " ", "\xB7 PLAN") : null), /* @__PURE__ */ React11.createElement(Text10, null, updateAvailable ? /* @__PURE__ */ React11.createElement(Text10, { color: "yellow", bold: true }, `update: ${updateAvailable} \xB7 `) : null, /* @__PURE__ */ React11.createElement(Text10, { dimColor: true }, "turns ", summary.turns, " \xB7 type /help"))), /* @__PURE__ */ React11.createElement(Box10, { marginTop: 1, gap: 3 }, /* @__PURE__ */ React11.createElement(Text10, null, /* @__PURE__ */ React11.createElement(Text10, { dimColor: true }, "cache hit "), /* @__PURE__ */ React11.createElement(Text10, { color: hitColor, bold: true }, hitPct, "%")), /* @__PURE__ */ React11.createElement(Text10, null, /* @__PURE__ */ React11.createElement(Text10, { dimColor: true }, "cost "), /* @__PURE__ */ React11.createElement(Text10, { color: "green", bold: true }, "$", summary.totalCostUsd.toFixed(6)), /* @__PURE__ */ React11.createElement(Text10, { dimColor: true }, " (in ", "$", summary.totalInputCostUsd.toFixed(6), " \xB7 out ", "$", summary.totalOutputCostUsd.toFixed(6), ")")), summary.lastPromptTokens > 0 ? /* @__PURE__ */ React11.createElement(Text10, null, /* @__PURE__ */ React11.createElement(Text10, { dimColor: true }, "ctx "), /* @__PURE__ */ React11.createElement(Text10, { color: ctxColor, bold: ctxColor !== void 0 }, formatTokens(summary.lastPromptTokens), "/", formatTokens(ctxMax)), /* @__PURE__ */ React11.createElement(Text10, { dimColor: true }, " (", (ctxRatio * 100).toFixed(0), "%)"), ctxRatio >= 0.8 ? /* @__PURE__ */ React11.createElement(Text10, { color: "red", bold: true }, " ", "\xB7 /compact") : null) : null, balance ? /* @__PURE__ */ React11.createElement(Text10, null, /* @__PURE__ */ React11.createElement(Text10, { dimColor: true }, "balance "), /* @__PURE__ */ React11.createElement(Text10, { color: balance.total < 1 ? "red" : balance.total < 5 ? "yellow" : "green", bold: true }, balance.currency === "USD" ? "$" : "", balance.total.toFixed(2), balance.currency !== "USD" ? ` ${balance.currency}` : "")) : null));
+  const { stdout: stdout2 } = useStdout2();
+  const columns = stdout2?.columns ?? 80;
+  const narrow = columns < NARROW_BREAKPOINT;
+  const coldStart = summary.turns <= COLD_START_TURNS;
+  return /* @__PURE__ */ React11.createElement(Box10, { borderStyle: "round", borderColor: "cyan", flexDirection: "column", paddingX: 1 }, /* @__PURE__ */ React11.createElement(
+    Header,
+    {
+      model,
+      prefixHash,
+      harvestOn,
+      branchOn,
+      branchBudget: branchBudget ?? 1,
+      planMode,
+      turns: summary.turns,
+      updateAvailable,
+      narrow,
+      busy: busy ?? false
+    }
+  ), narrow ? /* @__PURE__ */ React11.createElement(
+    StackedMetrics,
+    {
+      summary,
+      ctxRatio,
+      ctxMax,
+      balance,
+      coldStart
+    }
+  ) : /* @__PURE__ */ React11.createElement(
+    InlineMetrics,
+    {
+      summary,
+      ctxRatio,
+      ctxMax,
+      balance,
+      coldStart
+    }
+  ));
+}
+function Header({
+  model,
+  prefixHash,
+  harvestOn,
+  branchOn,
+  branchBudget,
+  planMode,
+  turns,
+  updateAvailable,
+  narrow,
+  busy
+}) {
+  return /* @__PURE__ */ React11.createElement(Box10, { justifyContent: "space-between" }, /* @__PURE__ */ React11.createElement(Box10, null, /* @__PURE__ */ React11.createElement(Wordmark, { busy }), /* @__PURE__ */ React11.createElement(Text10, { dimColor: true }, ` v${VERSION}`), /* @__PURE__ */ React11.createElement(Text10, { dimColor: true }, " \xB7 "), /* @__PURE__ */ React11.createElement(Text10, { color: "yellow" }, model), narrow ? null : /* @__PURE__ */ React11.createElement(React11.Fragment, null, /* @__PURE__ */ React11.createElement(Text10, { dimColor: true }, " \xB7 "), /* @__PURE__ */ React11.createElement(Text10, { dimColor: true }, prefixHash)), harvestOn ? /* @__PURE__ */ React11.createElement(Text10, { color: "magenta" }, " \xB7 harvest") : null, branchOn ? /* @__PURE__ */ React11.createElement(Text10, { color: "blue" }, " \xB7 branch", branchBudget) : null, planMode ? /* @__PURE__ */ React11.createElement(Text10, { color: "red", bold: true }, " \xB7 PLAN") : null), /* @__PURE__ */ React11.createElement(Text10, null, updateAvailable ? /* @__PURE__ */ React11.createElement(Text10, { color: "yellow", bold: true }, `update: ${updateAvailable} \xB7 `) : null, /* @__PURE__ */ React11.createElement(Text10, { dimColor: true }, narrow ? `turn ${turns}` : `turn ${turns} \xB7 /help`)));
+}
+function InlineMetrics({
+  summary,
+  ctxRatio,
+  ctxMax,
+  balance,
+  coldStart
+}) {
+  return /* @__PURE__ */ React11.createElement(Box10, { marginTop: 1, gap: 3 }, /* @__PURE__ */ React11.createElement(ContextCell, { ratio: ctxRatio, promptTokens: summary.lastPromptTokens, ctxMax }), /* @__PURE__ */ React11.createElement(CacheCell, { hitRatio: summary.cacheHitRatio, coldStart, turns: summary.turns }), /* @__PURE__ */ React11.createElement(CostCell, { summary, coldStart }), balance ? /* @__PURE__ */ React11.createElement(BalanceCell, { balance }) : null);
+}
+function StackedMetrics({
+  summary,
+  ctxRatio,
+  ctxMax,
+  balance,
+  coldStart
+}) {
+  return /* @__PURE__ */ React11.createElement(Box10, { marginTop: 1, flexDirection: "column" }, /* @__PURE__ */ React11.createElement(
+    ContextCell,
+    {
+      ratio: ctxRatio,
+      promptTokens: summary.lastPromptTokens,
+      ctxMax,
+      showBar: true
+    }
+  ), balance ? /* @__PURE__ */ React11.createElement(BalanceCell, { balance }) : null, /* @__PURE__ */ React11.createElement(CacheCell, { hitRatio: summary.cacheHitRatio, coldStart, turns: summary.turns }), /* @__PURE__ */ React11.createElement(CostCell, { summary, coldStart }));
+}
+function ContextCell({
+  ratio,
+  promptTokens,
+  ctxMax,
+  showBar
+}) {
+  if (promptTokens === 0) {
+    return /* @__PURE__ */ React11.createElement(Text10, null, /* @__PURE__ */ React11.createElement(Text10, { dimColor: true }, "ctx "), /* @__PURE__ */ React11.createElement(Text10, { dimColor: true }, "\u2014 (no turns yet)"));
+  }
+  const color = ratio >= 0.8 ? "red" : ratio >= 0.6 ? "yellow" : "green";
+  const pct2 = Math.round(ratio * 100);
+  return /* @__PURE__ */ React11.createElement(Text10, null, /* @__PURE__ */ React11.createElement(Text10, { dimColor: true }, "ctx "), showBar ? /* @__PURE__ */ React11.createElement(Bar, { ratio, color }) : null, showBar ? /* @__PURE__ */ React11.createElement(Text10, null, " ") : null, /* @__PURE__ */ React11.createElement(Text10, { color, bold: true }, formatTokens(promptTokens), "/", formatTokens(ctxMax)), /* @__PURE__ */ React11.createElement(Text10, { dimColor: true }, " (", pct2, "%)"), ratio >= 0.8 ? /* @__PURE__ */ React11.createElement(Text10, { color: "red", bold: true }, "  \xB7  /compact") : null);
+}
+function CacheCell({
+  hitRatio,
+  coldStart,
+  turns
+}) {
+  const pct2 = (hitRatio * 100).toFixed(1);
+  if (turns === 0) {
+    return /* @__PURE__ */ React11.createElement(Text10, null, /* @__PURE__ */ React11.createElement(Text10, { dimColor: true }, "cache "), /* @__PURE__ */ React11.createElement(Text10, { dimColor: true }, "\u2014"));
+  }
+  if (coldStart) {
+    return /* @__PURE__ */ React11.createElement(Text10, null, /* @__PURE__ */ React11.createElement(Text10, { dimColor: true }, "cache "), /* @__PURE__ */ React11.createElement(Text10, { dimColor: true }, pct2, "% "), /* @__PURE__ */ React11.createElement(Text10, { dimColor: true, italic: true }, "(cold start)"));
+  }
+  const color = hitRatio >= 0.7 ? "green" : hitRatio >= 0.4 ? "yellow" : "red";
+  return /* @__PURE__ */ React11.createElement(Text10, null, /* @__PURE__ */ React11.createElement(Text10, { dimColor: true }, "cache "), /* @__PURE__ */ React11.createElement(Text10, { color, bold: true }, pct2, "%"));
+}
+function CostCell({
+  summary,
+  coldStart
+}) {
+  if (summary.turns === 0) {
+    return /* @__PURE__ */ React11.createElement(Text10, null, /* @__PURE__ */ React11.createElement(Text10, { dimColor: true }, "cost "), /* @__PURE__ */ React11.createElement(Text10, { dimColor: true }, "\u2014"));
+  }
+  const primaryColor = coldStart ? void 0 : "green";
+  return /* @__PURE__ */ React11.createElement(Text10, null, /* @__PURE__ */ React11.createElement(Text10, { dimColor: true }, "cost "), /* @__PURE__ */ React11.createElement(Text10, { color: primaryColor, bold: !coldStart, dimColor: coldStart }, "$", summary.totalCostUsd.toFixed(6)), /* @__PURE__ */ React11.createElement(Text10, { dimColor: true }, " (in ", "$", summary.totalInputCostUsd.toFixed(6), " \xB7 out ", "$", summary.totalOutputCostUsd.toFixed(6), ")"));
+}
+function BalanceCell({ balance }) {
+  const color = balance.total < 1 ? "red" : balance.total < 5 ? "yellow" : "green";
+  return /* @__PURE__ */ React11.createElement(Text10, null, /* @__PURE__ */ React11.createElement(Text10, { dimColor: true }, "balance "), /* @__PURE__ */ React11.createElement(Text10, { color, bold: true }, balance.currency === "USD" ? "$" : "", balance.total.toFixed(2), balance.currency !== "USD" ? ` ${balance.currency}` : ""));
+}
+function Bar({ ratio, color }) {
+  const cells = 10;
+  const filled = Math.max(0, Math.min(cells, Math.round(ratio * cells)));
+  const bar = "\u2588".repeat(filled) + "\u2591".repeat(cells - filled);
+  return /* @__PURE__ */ React11.createElement(Text10, { color }, bar);
 }
 function formatTokens(n) {
-  if (n < 1e3) return String(n);
-  const k = n / 1e3;
-  return k >= 100 ? `${k.toFixed(0)}k` : `${k.toFixed(1)}k`;
+  if (n < 1024) return String(n);
+  const k = n / 1024;
+  return k >= 100 ? `${k.toFixed(0)}K` : `${k.toFixed(1)}K`;
 }
 
 // src/cli/ui/slash.ts
 import { spawnSync } from "child_process";
 
 // src/cli/commands/stats.ts
-import { existsSync as existsSync7, readFileSync as readFileSync10 } from "fs";
+import { existsSync as existsSync7, readFileSync as readFileSync11 } from "fs";
 function statsCommand(opts) {
   if (opts.transcript) {
     transcriptSummary(opts.transcript);
@@ -6222,7 +6741,7 @@ function transcriptSummary(path) {
     console.error(`no such transcript: ${path}`);
     process.exit(1);
   }
-  const lines = readFileSync10(path, "utf8").split(/\r?\n/).filter(Boolean);
+  const lines = readFileSync11(path, "utf8").split(/\r?\n/).filter(Boolean);
   let assistantTurns = 0;
   let toolCalls = 0;
   let lastTurn = 0;
@@ -6324,6 +6843,7 @@ var SLASH_COMMANDS = [
     summary: "one-tap model + harvest + branch bundle"
   },
   { cmd: "model", argsHint: "<id>", summary: "switch DeepSeek model id" },
+  { cmd: "models", summary: "list available models fetched from DeepSeek /models" },
   { cmd: "harvest", argsHint: "[on|off]", summary: "toggle Pillar-2 plan-state extraction" },
   { cmd: "branch", argsHint: "<N|off>", summary: "run N parallel samples per turn (N>=2)" },
   { cmd: "mcp", summary: "list MCP servers + tools attached to this session" },
@@ -6352,6 +6872,10 @@ var SLASH_COMMANDS = [
     summary: "cross-session cost dashboard (today / week / month / all-time \xB7 cache hit \xB7 vs Claude)"
   },
   { cmd: "think", summary: "dump the last turn's full R1 reasoning (reasoner only)" },
+  {
+    cmd: "context",
+    summary: "break down where context tokens are going: system / tools / per-turn log"
+  },
   { cmd: "retry", summary: "truncate & resend your last message (fresh sample)" },
   { cmd: "compact", argsHint: "[cap]", summary: "shrink oversized tool results in the log" },
   { cmd: "sessions", summary: "list saved sessions (current marked with \u25B8)" },
@@ -6696,6 +7220,66 @@ ${entry.text}`
         info: ok ? `\u25B8 deleted session "${name}" \u2014 current screen still shows the conversation, but next launch starts fresh` : `could not delete session "${name}" (already gone?)`
       };
     }
+    case "context": {
+      const systemTokens = countTokens(loop.prefix.system);
+      const toolsTokens = countTokens(JSON.stringify(loop.prefix.toolSpecs));
+      const entries = loop.log.toMessages();
+      let userTokens = 0;
+      let assistantTokens = 0;
+      let toolResultTokens = 0;
+      let toolCallTokens = 0;
+      const toolBreakdown = [];
+      let logTurn = 0;
+      for (const e of entries) {
+        const content = typeof e.content === "string" ? e.content : "";
+        if (e.role === "user") {
+          userTokens += countTokens(content);
+          logTurn += 1;
+        } else if (e.role === "assistant") {
+          assistantTokens += countTokens(content);
+          if (Array.isArray(e.tool_calls) && e.tool_calls.length > 0) {
+            toolCallTokens += countTokens(JSON.stringify(e.tool_calls));
+          }
+        } else if (e.role === "tool") {
+          const n = countTokens(content);
+          toolResultTokens += n;
+          toolBreakdown.push({ name: e.name ?? "?", tokens: n, turn: logTurn });
+        }
+      }
+      const logTokens = userTokens + assistantTokens + toolResultTokens + toolCallTokens;
+      const total = systemTokens + toolsTokens + logTokens;
+      const ctxMax = DEEPSEEK_CONTEXT_TOKENS[loop.model] ?? DEFAULT_CONTEXT_TOKENS;
+      const pct2 = (n) => total > 0 ? `${Math.round(n / total * 100)}%`.padStart(4) : "  0%";
+      const row2 = (label, n, note = "") => `  ${label.padEnd(20)}${compactNum(n).padStart(8)} tokens ${pct2(n)}${note ? `   ${note}` : ""}`;
+      const lines = [
+        `Next-request estimate: ~${compactNum(total)} tokens of ${compactNum(ctxMax)} (${Math.round(
+          total / ctxMax * 100
+        )}% of window)`,
+        "",
+        row2("system prompt", systemTokens),
+        row2("tool specs", toolsTokens, `(${loop.prefix.toolSpecs.length} tools)`),
+        row2("log (all turns)", logTokens, `(${entries.length} messages)`),
+        `    user                ${compactNum(userTokens).padStart(8)} tokens`,
+        `    assistant           ${compactNum(assistantTokens).padStart(8)} tokens`,
+        `    tool-call args      ${compactNum(toolCallTokens).padStart(8)} tokens`,
+        `    tool results        ${compactNum(toolResultTokens).padStart(8)} tokens`
+      ];
+      if (toolBreakdown.length > 0) {
+        const top = [...toolBreakdown].sort((a, b) => b.tokens - a.tokens).slice(0, 5);
+        lines.push("");
+        lines.push(`Top tool results by cost (of ${toolBreakdown.length} total):`);
+        for (const t of top) {
+          lines.push(
+            `    turn ${String(t.turn).padStart(3)}  ${t.name.padEnd(22)} ${compactNum(t.tokens).padStart(8)} tokens`
+          );
+        }
+      }
+      lines.push("");
+      lines.push(
+        "Count is a local estimate (DeepSeek V3 tokenizer, pure-TS port); server prompt_tokens may add ~3-6% for chat-template role markers."
+      );
+      return { info: lines.join("\n") };
+    }
     case "status": {
       const branchBudget = loop.branchOptions.budget ?? 1;
       const ctxMax = DEEPSEEK_CONTEXT_TOKENS[loop.model] ?? DEFAULT_CONTEXT_TOKENS;
@@ -6722,10 +7306,44 @@ ${entry.text}`
     }
     case "model": {
       const id = args[0];
-      if (!id) return { info: "usage: /model <id>   (try deepseek-chat or deepseek-reasoner)" };
+      const known = ctx.models ?? null;
+      if (!id) {
+        const hint = known && known.length > 0 ? known.join(" | ") : "try deepseek-chat or deepseek-reasoner \u2014 run /models to fetch the live list";
+        return { info: `usage: /model <id>   (${hint})` };
+      }
       loop.configure({ model: id });
+      if (known && known.length > 0 && !known.includes(id)) {
+        return {
+          info: `model \u2192 ${id}   (\u26A0 not in the fetched catalog: ${known.join(", ")}. If this is wrong the next call will 400 \u2014 run /models to refresh.)`
+        };
+      }
       return { info: `model \u2192 ${id}` };
     }
+    case "models": {
+      const list = ctx.models ?? null;
+      if (list === null) {
+        ctx.refreshModels?.();
+        return {
+          info: "fetching /models from DeepSeek\u2026 run /models again in a moment. If it stays empty, your API key may lack permission or the network is blocked."
+        };
+      }
+      if (list.length === 0) {
+        return {
+          info: "DeepSeek /models returned an empty list. Try /models again, or check your account status at api-docs.deepseek.com."
+        };
+      }
+      const current = loop.model;
+      const lines = list.map((id) => id === current ? `\u25B8 ${id}  (current)` : `  ${id}`);
+      return {
+        info: [
+          `Available models (DeepSeek /models \xB7 ${list.length} total):`,
+          "",
+          ...lines,
+          "",
+          "Switch with: /model <id>"
+        ].join("\n")
+      };
+    }
     case "harvest": {
       const arg = (args[0] ?? "").toLowerCase();
       const on = arg === "" ? !loop.harvestEnabled : arg === "on" || arg === "true" || arg === "1";
@@ -7137,9 +7755,9 @@ function formatToolList(history) {
   return lines.join("\n");
 }
 function compactNum(n) {
-  if (n < 1e3) return String(n);
-  const k = n / 1e3;
-  return k >= 100 ? `${Math.round(k)}k` : `${k.toFixed(1)}k`;
+  if (n < 1024) return String(n);
+  const k = n / 1024;
+  return k >= 100 ? `${Math.round(k)}K` : `${k.toFixed(1)}K`;
 }
 function stripOuterQuotes(s) {
   if (s.length >= 2 && s.startsWith('"') && s.endsWith('"')) {
@@ -7201,6 +7819,7 @@ function App({
   const [subagentActivity, setSubagentActivity] = useState5(null);
   const [statusLine, setStatusLine] = useState5(null);
   const [balance, setBalance] = useState5(null);
+  const [models, setModels] = useState5(null);
   const [latestVersion, setLatestVersion] = useState5(null);
   const updateAvailable = latestVersion && compareVersions(VERSION, latestVersion) < 0 ? latestVersion : null;
   const [hookList, setHookList] = useState5(
@@ -7312,6 +7931,17 @@ function App({
       cancelled = true;
     };
   }, [loop]);
+  useEffect2(() => {
+    let cancelled = false;
+    void (async () => {
+      const list = await loop.client.listModels().catch(() => null);
+      if (cancelled || !list) return;
+      setModels(list.data.map((m) => m.id));
+    })();
+    return () => {
+      cancelled = true;
+    };
+  }, [loop]);
   useEffect2(() => {
     let cancelled = false;
     void (async () => {
@@ -7356,7 +7986,7 @@ function App({
       }
       setSubagentActivity(null);
       const seconds = ((ev.elapsedMs ?? 0) / 1e3).toFixed(1);
-      const summary2 = ev.error ? `\u{1F9EC} subagent "${ev.task}" failed after ${seconds}s \xB7 ${ev.iter ?? 0} tool call(s) \u2014 ${ev.error}` : `\u{1F9EC} subagent "${ev.task}" done in ${seconds}s \xB7 ${ev.iter ?? 0} tool call(s) \xB7 ${ev.turns ?? 0} turn(s)`;
+      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)`;
       setHistorical((prev) => [
         ...prev,
         {
@@ -7540,6 +8170,13 @@ function App({
               const fresh = await getLatestVersion({ force: true });
               if (fresh) setLatestVersion(fresh);
             })();
+          },
+          models,
+          refreshModels: () => {
+            void (async () => {
+              const list = await loop.client.listModels().catch(() => null);
+              if (list) setModels(list.data.map((m) => m.id));
+            })();
           }
         });
         if (result.exit) {
@@ -7596,7 +8233,14 @@ function App({
         if (promptReport.blocked) return;
       }
       promptHistory.current.push(text);
-      setHistorical((prev) => [...prev, { id: `u-${Date.now()}`, role: "user", text }]);
+      setHistorical((prev) => [
+        ...prev,
+        // `leadSeparator`: thin rule above this user turn when history
+        // isn't empty — visual pacing for multi-turn sessions. First
+        // user message leaves it off so the UI doesn't open with a
+        // dangling divider.
+        { id: `u-${Date.now()}`, role: "user", text, leadSeparator: prev.length > 0 }
+      ]);
       const assistantId = `a-${Date.now()}`;
       const streamRef = { id: assistantId, text: "", reasoning: "" };
       const contentBuf = { current: "" };
@@ -7815,6 +8459,7 @@ function App({
       latestVersion,
       mcpSpecs,
       mcpServers,
+      models,
       planMode,
       session,
       slashSelected,
@@ -7978,6 +8623,7 @@ Stay in plan mode \u2014 address the feedback (explore more if needed), then sub
       branchBudget: loop.branchOptions.budget,
       planMode,
       balance,
+      busy,
       updateAvailable
     }
   ), /* @__PURE__ */ React12.createElement(Static, { items: historical }, (item) => /* @__PURE__ */ React12.createElement(EventRow, { key: item.id, event: item, projectRoot: hookCwd })), !PLAIN_UI && !pendingShell && !pendingPlan && !stagedInput && streaming ? /* @__PURE__ */ React12.createElement(Box11, { marginY: 1 }, /* @__PURE__ */ React12.createElement(EventRow, { event: streaming, projectRoot: hookCwd })) : null, !PLAIN_UI && !pendingShell && !pendingPlan && !stagedInput && ongoingTool ? /* @__PURE__ */ React12.createElement(OngoingToolRow, { tool: ongoingTool, progress: toolProgress }) : null, !PLAIN_UI && !pendingShell && !pendingPlan && !stagedInput && subagentActivity ? /* @__PURE__ */ React12.createElement(SubagentRow, { activity: subagentActivity }) : null, !PLAIN_UI && !pendingShell && !pendingPlan && !stagedInput && !ongoingTool && statusLine ? /* @__PURE__ */ React12.createElement(StatusRow, { text: statusLine }) : null, !PLAIN_UI && !pendingShell && !pendingPlan && !stagedInput && busy && !streaming && !ongoingTool && !statusLine ? /* @__PURE__ */ React12.createElement(StatusRow, { text: "processing\u2026" }) : null, stagedInput ? /* @__PURE__ */ React12.createElement(
@@ -8015,7 +8661,7 @@ function SubagentRow({
 }) {
   const tick = useTick();
   const seconds = (activity.elapsedMs / 1e3).toFixed(1);
-  return /* @__PURE__ */ React12.createElement(Box11, { paddingLeft: 2 }, /* @__PURE__ */ React12.createElement(Text11, { color: "magenta" }, SPINNER_FRAMES[tick % SPINNER_FRAMES.length]), /* @__PURE__ */ React12.createElement(Text11, { color: "magenta" }, ` \u{1F9EC} subagent: ${activity.task}`), /* @__PURE__ */ React12.createElement(Text11, { dimColor: true }, ` \xB7 iter ${activity.iter} \xB7 ${seconds}s`));
+  return /* @__PURE__ */ React12.createElement(Box11, { paddingLeft: 2 }, /* @__PURE__ */ React12.createElement(Text11, { color: "magenta" }, SPINNER_FRAMES[tick % SPINNER_FRAMES.length]), /* @__PURE__ */ React12.createElement(Text11, { color: "magenta" }, ` \u232C subagent: ${activity.task}`), /* @__PURE__ */ React12.createElement(Text11, { dimColor: true }, ` \xB7 iter ${activity.iter} \xB7 ${seconds}s`));
 }
 function OngoingToolRow({
   tool,