mini-coder 0.2.0 → 0.2.1

package/dist/mc.js

@@ -2,7 +2,7 @@
 // @bun
 
 // src/index.ts
-import * as c23 from "yoctocolors";
+import * as c22 from "yoctocolors";
 
 // src/agent/agent.ts
 import * as c12 from "yoctocolors";
@@ -12,8 +12,12 @@ import { Client } from "@modelcontextprotocol/sdk/client/index.js";
 import { SSEClientTransport } from "@modelcontextprotocol/sdk/client/sse.js";
 import { StdioClientTransport } from "@modelcontextprotocol/sdk/client/stdio.js";
 import { StreamableHTTPClientTransport } from "@modelcontextprotocol/sdk/client/streamableHttp.js";
+// src/internal/version.ts
+var PACKAGE_VERSION = "0.2.1";
+
+// src/mcp/client.ts
 async function connectMcpServer(config) {
-  const client = new Client({ name: "mini-coder", version: "0.1.0" });
+  const client = new Client({ name: "mini-coder", version: PACKAGE_VERSION });
   if (config.transport === "http") {
     if (!config.url) {
       throw new Error(`MCP server "${config.name}" requires a url`);
@@ -78,7 +82,7 @@ function getDbPath() {
     mkdirSync(dir, { recursive: true });
   return join(dir, "sessions.db");
 }
-var DB_VERSION = 4;
+var DB_VERSION = 6;
 var SCHEMA = `
   CREATE TABLE IF NOT EXISTS sessions (
     id          TEXT PRIMARY KEY,
@@ -129,6 +133,7 @@ var SCHEMA = `
   CREATE TABLE IF NOT EXISTS model_capabilities (
     canonical_model_id TEXT PRIMARY KEY,
     context_window     INTEGER,
+    max_output_tokens  INTEGER,
     reasoning          INTEGER NOT NULL,
     source_provider    TEXT,
     raw_json           TEXT,
@@ -164,6 +169,17 @@ var SCHEMA = `
     expires_at     INTEGER NOT NULL,
     updated_at     INTEGER NOT NULL
   );
+
+  CREATE TABLE IF NOT EXISTS logs (
+    id          INTEGER PRIMARY KEY AUTOINCREMENT,
+    session_id  TEXT NOT NULL REFERENCES sessions(id) ON DELETE CASCADE,
+    level       TEXT NOT NULL,
+    timestamp   INTEGER NOT NULL,
+    data        TEXT NOT NULL
+  );
+
+  CREATE INDEX IF NOT EXISTS idx_logs_session
+    ON logs(session_id, timestamp DESC);
 `;
 var _db = null;
 function isSqliteBusyError(err) {
@@ -232,9 +248,70 @@ function pruneOldData() {
     });
   }
   runBestEffortMaintenance(() => {
-    db.exec("PRAGMA wal_checkpoint(PASSIVE);");
+    db.exec("PRAGMA wal_checkpoint(TRUNCATE);");
   });
 }
+// src/session/db/logs-repo.ts
+class LogsRepo {
+  db;
+  constructor(db) {
+    this.db = db;
+  }
+  write(sessionId, level, data) {
+    const timestamp = Date.now();
+    const serialized = data === undefined ? "{}" : JSON.stringify(this.sanitize(data));
+    this.db.run(`INSERT INTO logs (session_id, level, timestamp, data)
+       VALUES (?, ?, ?, ?)`, [sessionId, level, timestamp, serialized]);
+  }
+  getLogs(sessionId, level) {
+    let sql = `SELECT id, session_id, level, timestamp, data
+               FROM logs
+               WHERE session_id = ?`;
+    if (level) {
+      sql += ` AND level = ? ORDER BY timestamp ASC`;
+      const params2 = [sessionId, level];
+      return this.db.query(sql).all(...params2);
+    }
+    sql += ` ORDER BY timestamp ASC`;
+    const params = [sessionId];
+    return this.db.query(sql).all(...params);
+  }
+  deleteOldLogs(beforeTimestamp) {
+    return this.db.run(`DELETE FROM logs WHERE timestamp < ?`, [
+      beforeTimestamp
+    ]).changes;
+  }
+  deleteSessionLogs(sessionId) {
+    return this.db.run(`DELETE FROM logs WHERE session_id = ?`, [sessionId]).changes;
+  }
+  sanitize(data) {
+    if (!this.isObject(data))
+      return data;
+    const dropKeys = new Set([
+      "requestBodyValues",
+      "responseBody",
+      "responseHeaders",
+      "stack"
+    ]);
+    const result = {};
+    for (const key in data) {
+      if (dropKeys.has(key))
+        continue;
+      const value = data[key];
+      if (key === "errors" && Array.isArray(value)) {
+        result[key] = value.map((e) => this.sanitize(e));
+      } else if (key === "lastError" && this.isObject(value)) {
+        result[key] = this.sanitize(value);
+      } else {
+        result[key] = value;
+      }
+    }
+    return result;
+  }
+  isObject(v) {
+    return typeof v === "object" && v !== null;
+  }
+}
 // src/session/db/mcp-repo.ts
 function listMcpServers() {
   return getDb().query("SELECT name, transport, url, command, args, env FROM mcp_servers ORDER BY name").all();
@@ -261,113 +338,117 @@ function deleteMcpServer(name) {
   getDb().run("DELETE FROM mcp_servers WHERE name = ?", [name]);
 }
 // src/cli/output.ts
-import { existsSync as existsSync3 } from "fs";
 import { homedir as homedir4 } from "os";
-import { join as join4 } from "path";
 import * as c8 from "yoctocolors";
 
-// src/cli/error-log.ts
-import { writeFileSync } from "fs";
-
-// src/cli/log-paths.ts
-import { mkdirSync as mkdirSync2, readdirSync, unlinkSync as unlinkSync2 } from "fs";
+// src/agent/context-files.ts
+import { existsSync as existsSync2, readFileSync } from "fs";
 import { homedir as homedir2 } from "os";
-import { join as join2 } from "path";
-var LOGS_DIR = join2(homedir2(), ".config", "mini-coder", "logs");
-function getLogsDir() {
-  mkdirSync2(LOGS_DIR, { recursive: true });
-  return LOGS_DIR;
+import { dirname, join as join2, resolve } from "path";
+var HOME = homedir2();
+function tilde(p) {
+  return p.startsWith(HOME) ? `~${p.slice(HOME.length)}` : p;
+}
+function globalContextCandidates(homeDir = HOME) {
+  return [
+    {
+      abs: join2(homeDir, ".agents", "AGENTS.md"),
+      label: "~/.agents/AGENTS.md"
+    },
+    {
+      abs: join2(homeDir, ".agents", "CLAUDE.md"),
+      label: "~/.agents/CLAUDE.md"
+    },
+    {
+      abs: join2(homeDir, ".claude", "CLAUDE.md"),
+      label: "~/.claude/CLAUDE.md"
+    }
+  ];
+}
+function dirContextCandidates(dir) {
+  const rel = (p) => tilde(resolve(dir, p));
+  return [
+    {
+      abs: join2(dir, ".agents", "AGENTS.md"),
+      label: `${rel(".agents/AGENTS.md")}`
+    },
+    {
+      abs: join2(dir, ".agents", "CLAUDE.md"),
+      label: `${rel(".agents/CLAUDE.md")}`
+    },
+    {
+      abs: join2(dir, ".claude", "CLAUDE.md"),
+      label: `${rel(".claude/CLAUDE.md")}`
+    },
+    { abs: join2(dir, "CLAUDE.md"), label: `${rel("CLAUDE.md")}` },
+    { abs: join2(dir, "AGENTS.md"), label: `${rel("AGENTS.md")}` }
+  ];
 }
-function pidLogPath(prefix) {
-  return join2(getLogsDir(), `${prefix}-${process.pid}.log`);
+function discoverContextFiles(cwd, homeDir) {
+  const candidates = [
+    ...globalContextCandidates(homeDir),
+    ...dirContextCandidates(cwd)
+  ];
+  return candidates.filter((c) => existsSync2(c.abs)).map((c) => c.label);
 }
-function isProcessAlive(pid) {
+function tryReadFile(p) {
+  if (!existsSync2(p))
+    return null;
   try {
-    process.kill(pid, 0);
-    return true;
+    return readFileSync(p, "utf-8");
   } catch {
-    return false;
+    return null;
   }
 }
-var LOG_FILE_RE = /^(api|errors)-(\d+)\.log$/;
-function cleanStaleLogs() {
-  let entries;
-  try {
-    entries = readdirSync(LOGS_DIR);
-  } catch {
-    return;
+function readCandidates(candidates) {
+  const parts = [];
+  for (const c of candidates) {
+    const content = tryReadFile(c.abs);
+    if (content)
+      parts.push(content);
   }
-  for (const name of entries) {
-    const m = LOG_FILE_RE.exec(name);
-    if (!m)
-      continue;
-    const pidStr = m[2];
-    const pid = Number.parseInt(pidStr, 10);
-    if (pid === process.pid)
-      continue;
-    if (!isProcessAlive(pid)) {
-      try {
-        unlinkSync2(join2(LOGS_DIR, name));
-      } catch {}
-    }
+  return parts.length > 0 ? parts.join(`
+
+`) : null;
+}
+function loadGlobalContextFile(homeDir) {
+  return readCandidates(globalContextCandidates(homeDir));
+}
+function loadLocalContextFile(cwd) {
+  let current = resolve(cwd);
+  while (true) {
+    const content = readCandidates(dirContextCandidates(current));
+    if (content)
+      return content;
+    if (existsSync2(join2(current, ".git")))
+      break;
+    const parent = dirname(current);
+    if (parent === current)
+      break;
+    current = parent;
   }
+  return null;
 }
 
-// src/cli/error-log.ts
-var writer = null;
-function initErrorLog() {
-  if (writer)
-    return;
-  const logPath = pidLogPath("errors");
-  writeFileSync(logPath, "");
-  writer = Bun.file(logPath).writer();
-  process.on("uncaughtException", (err) => {
-    logError(err, "uncaught");
-    process.exit(1);
-  });
+// src/logging/context.ts
+var _currentContext = null;
+function setLogContext(context) {
+  _currentContext = context;
 }
-function isObject(v) {
-  return typeof v === "object" && v !== null;
+function getLogContext() {
+  return _currentContext;
 }
 function logError(err, context) {
-  if (!writer)
+  const logCtx = _currentContext;
+  if (!logCtx)
     return;
-  let entry = `[${new Date().toISOString()}]`;
-  if (context)
-    entry += ` context=${context}`;
-  entry += `
-`;
-  if (isObject(err)) {
-    if (typeof err.name === "string")
-      entry += `  name: ${err.name}
-`;
-    if (typeof err.message === "string")
-      entry += `  message: ${err.message}
-`;
-    if ("statusCode" in err)
-      entry += `  statusCode: ${err.statusCode}
-`;
-    if ("url" in err)
-      entry += `  url: ${err.url}
-`;
-    if ("isRetryable" in err)
-      entry += `  isRetryable: ${err.isRetryable}
-`;
-    if (typeof err.stack === "string") {
-      const indentedStack = err.stack.split(`
-`).map((line, i) => i === 0 ? line : `  ${line}`).join(`
-`);
-      entry += `  stack: ${indentedStack}
-`;
-    }
-  } else {
-    entry += `  value: ${String(err)}
-`;
-  }
-  entry += `---
-`;
-  writer.write(entry);
-  writer.flush();
+  logCtx.logsRepo.write(logCtx.sessionId, "error", { error: err, context });
+}
+function logApiEvent(event, data) {
+  const logCtx = _currentContext;
+  if (!logCtx)
+    return;
+  logCtx.logsRepo.write(logCtx.sessionId, "api", { event, data });
 }
 
 // src/cli/error-parse.ts
@@ -537,31 +618,61 @@ function parseAppError(err) {
 // src/cli/skills.ts
 import {
   closeSync,
-  existsSync as existsSync2,
+  existsSync as existsSync3,
   openSync,
-  readdirSync as readdirSync2,
-  readFileSync,
+  readdirSync,
+  readFileSync as readFileSync2,
   readSync,
   statSync
 } from "fs";
 import { homedir as homedir3 } from "os";
-import { dirname, join as join3, resolve } from "path";
-
-// src/cli/config-conflicts.ts
+import { dirname as dirname2, join as join3, resolve as resolve2 } from "path";
 import * as c from "yoctocolors";
-function warnConventionConflicts(kind, scope, agentsNames, claudeNames) {
-  const agents = new Set(agentsNames);
-  const claude = new Set(claudeNames);
-  const conflicts = [];
-  for (const name of agents) {
-    if (claude.has(name))
-      conflicts.push(name);
+
+// src/cli/frontmatter.ts
+var FM_RE = /^---\r?\n([\s\S]*?)\r?\n---\r?\n?([\s\S]*)$/;
+function parseFrontmatter(raw) {
+  const m = raw.match(FM_RE);
+  if (!m)
+    return { meta: {}, body: raw };
+  const meta = {};
+  const lines = (m[1] ?? "").split(`
+`);
+  let parentKey = "";
+  for (const line of lines) {
+    const stripped = line.replace(/\r$/, "");
+    const indent = stripped.length - stripped.trimStart().length;
+    if (indent > 0 && parentKey) {
+      const colon2 = stripped.indexOf(":");
+      if (colon2 === -1)
+        continue;
+      const key2 = stripped.slice(0, colon2).trim();
+      const val2 = stripped.slice(colon2 + 1).trim().replace(/^["']|["']$/g, "");
+      if (!key2)
+        continue;
+      const parent = meta[parentKey];
+      if (typeof parent === "object")
+        parent[key2] = val2;
+      else
+        meta[parentKey] = { [key2]: val2 };
+      continue;
+    }
+    const colon = stripped.indexOf(":");
+    if (colon === -1)
+      continue;
+    const key = stripped.slice(0, colon).trim();
+    const val = stripped.slice(colon + 1).trim().replace(/^["']|["']$/g, "");
+    if (!key)
+      continue;
+    if (val === "") {
+      parentKey = key;
+      meta[key] = {};
+    } else {
+      parentKey = "";
+      meta[key] = val;
+    }
   }
-  if (conflicts.length === 0)
-    return;
-  conflicts.sort((a, b) => a.localeCompare(b));
-  const list = conflicts.map((n) => c.cyan(n)).join(c.dim(", "));
-  writeln(`${G.warn} conflicting ${kind} in ${scope} .agents and .claude: ${list} ${c.dim("\u2014 using .agents version")}`);
+  return { meta, body: (m[2] ?? "").trim() };
 }
 
 // src/cli/skills.ts
@@ -577,28 +688,17 @@ function parseSkillFrontmatter(filePath) {
     const chunk = Buffer.allocUnsafe(MAX_FRONTMATTER_BYTES);
     const bytesRead = readSync(fd, chunk, 0, MAX_FRONTMATTER_BYTES, 0);
     const text = chunk.toString("utf8", 0, bytesRead);
-    const lines = text.split(`
-`);
-    if ((lines[0] ?? "").trim() !== "---")
-      return {};
-    const meta = {};
-    for (let i = 1;i < lines.length; i++) {
-      const line = (lines[i] ?? "").replace(/\r$/, "");
-      if (line.trim() === "---")
-        break;
-      const colon = line.indexOf(":");
-      if (colon === -1)
-        continue;
-      const key = line.slice(0, colon).trim();
-      const value = line.slice(colon + 1).trim().replace(/^["']|["']$/g, "");
-      if (key === "name")
-        meta.name = value;
-      if (key === "description")
-        meta.description = value;
-      if (key === "context")
-        meta.context = value;
-    }
-    return meta;
+    const { meta } = parseFrontmatter(text);
+    const result = {};
+    if (typeof meta.name === "string" && meta.name)
+      result.name = meta.name;
+    if (typeof meta.description === "string" && meta.description)
+      result.description = meta.description;
+    if (typeof meta.context === "string" && meta.context)
+      result.context = meta.context;
+    if (typeof meta.compatibility === "string" && meta.compatibility)
+      result.compatibility = meta.compatibility;
+    return result;
   } catch {
     return {};
   } finally {
@@ -616,18 +716,18 @@ function candidateConflictName(candidate) {
   return getCandidateFrontmatter(candidate).name?.trim() || candidate.folderName;
 }
 function findGitBoundary(cwd) {
-  let current = resolve(cwd);
+  let current = resolve2(cwd);
   while (true) {
-    if (existsSync2(join3(current, ".git")))
+    if (existsSync3(join3(current, ".git")))
       return current;
-    const parent = dirname(current);
+    const parent = dirname2(current);
     if (parent === current)
       return null;
     current = parent;
   }
 }
 function localSearchRoots(cwd) {
-  const start = resolve(cwd);
+  const start = resolve2(cwd);
   const stop = findGitBoundary(start);
   if (!stop)
     return [start];
@@ -637,41 +737,54 @@ function localSearchRoots(cwd) {
     roots.push(current);
     if (current === stop)
       break;
-    const parent = dirname(current);
+    const parent = dirname2(current);
     if (parent === current)
       break;
     current = parent;
   }
   return roots;
 }
+var MAX_SKILL_SCAN_DEPTH = 5;
+var MAX_SKILL_DIRS_SCANNED = 2000;
 function listSkillCandidates(skillsDir, source, rootPath) {
-  if (!existsSync2(skillsDir))
-    return [];
-  let entries;
-  try {
-    entries = readdirSync2(skillsDir).sort((a, b) => a.localeCompare(b));
-  } catch {
+  if (!existsSync3(skillsDir))
     return [];
-  }
   const candidates = [];
-  for (const entry of entries) {
-    const skillDir = join3(skillsDir, entry);
+  let dirsScanned = 0;
+  function walk(dir, depth) {
+    if (depth > MAX_SKILL_SCAN_DEPTH || dirsScanned >= MAX_SKILL_DIRS_SCANNED)
+      return;
+    let entries;
     try {
-      if (!statSync(skillDir).isDirectory())
-        continue;
+      entries = readdirSync(dir).sort((a, b) => a.localeCompare(b));
     } catch {
-      continue;
+      return;
+    }
+    for (const entry of entries) {
+      if (dirsScanned >= MAX_SKILL_DIRS_SCANNED)
+        return;
+      const entryPath = join3(dir, entry);
+      try {
+        if (!statSync(entryPath).isDirectory())
+          continue;
+      } catch {
+        continue;
+      }
+      dirsScanned++;
+      const filePath = join3(entryPath, "SKILL.md");
+      if (existsSync3(filePath)) {
+        candidates.push({
+          folderName: entry,
+          filePath,
+          rootPath,
+          source
+        });
+      } else {
+        walk(entryPath, depth + 1);
+      }
     }
-    const filePath = join3(skillDir, "SKILL.md");
-    if (!existsSync2(filePath))
-      continue;
-    candidates.push({
-      folderName: entry,
-      filePath,
-      rootPath,
-      source
-    });
   }
+  walk(skillsDir, 1);
   return candidates;
 }
 function warnInvalidSkill(filePath, reason) {
@@ -688,6 +801,20 @@ function warnSkillIssue(filePath, reason) {
   warnedSkillIssues.add(key);
   writeln(`${G.warn} skill ${filePath}: ${reason}`);
 }
+function warnConventionConflicts(kind, scope, agentsNames, claudeNames) {
+  const agents = new Set(agentsNames);
+  const claude = new Set(claudeNames);
+  const conflicts = [];
+  for (const name of agents) {
+    if (claude.has(name))
+      conflicts.push(name);
+  }
+  if (conflicts.length === 0)
+    return;
+  conflicts.sort((a, b) => a.localeCompare(b));
+  const list = conflicts.map((n) => c.cyan(n)).join(c.dim(", "));
+  writeln(`${G.warn} conflicting ${kind} in ${scope} .agents and .claude: ${list} ${c.dim("\u2014 using .agents version")}`);
+}
 function validateSkill(candidate) {
   const meta = getCandidateFrontmatter(candidate);
   const name = meta.name?.trim();
@@ -712,7 +839,8 @@ function validateSkill(candidate) {
     source: candidate.source,
     rootPath: candidate.rootPath,
     filePath: candidate.filePath,
-    ...meta.context === "fork" && { context: "fork" }
+    ...meta.context === "fork" && { context: "fork" },
+    ...meta.compatibility && { compatibility: meta.compatibility }
   };
 }
 function allSkillCandidates(cwd, homeDir) {
@@ -747,7 +875,7 @@ function listSkillResources(skillDir) {
   function walk(dir, prefix) {
     let entries;
     try {
-      entries = readdirSync2(dir);
+      entries = readdirSync(dir);
     } catch {
       return;
     }
@@ -772,8 +900,8 @@ function listSkillResources(skillDir) {
 }
 function loadSkillContentFromMeta(skill) {
   try {
-    const content = readFileSync(skill.filePath, "utf-8");
-    const skillDir = dirname(skill.filePath);
+    const content = readFileSync2(skill.filePath, "utf-8");
+    const skillDir = dirname2(skill.filePath);
     return {
       name: skill.name,
       content,
@@ -944,15 +1072,17 @@ function stripAnsi(text) {
   return text.replace(ANSI_REGEX, "");
 }
 
-// src/cli/status-bar.ts
-var STATUS_SEP = c3.dim("  \xB7  ");
-function truncatePlainText(value, maxLen) {
-  if (value.length <= maxLen)
+// src/internal/text.ts
+function truncateText(value, max) {
+  if (value.length <= max)
     return value;
-  if (maxLen <= 1)
+  if (max <= 1)
     return "\u2026";
-  return `${value.slice(0, maxLen - 1)}\u2026`;
+  return `${value.slice(0, max - 1)}\u2026`;
 }
+
+// src/cli/status-bar.ts
+var STATUS_SEP = c3.dim("  \xB7  ");
 function fmtTokens(n) {
   if (n >= 1000)
     return `${(n / 1000).toFixed(1)}k`;
@@ -986,8 +1116,7 @@ function buildStatusBarSignature(opts) {
     outputTokens: opts.outputTokens,
     contextTokens: opts.contextTokens,
     contextWindow: opts.contextWindow,
-    thinkingEffort: opts.thinkingEffort ?? null,
-    showReasoning: opts.showReasoning ?? false
+    thinkingEffort: opts.thinkingEffort ?? null
   });
 }
 function fitStatusSegments(required, optional, cols) {
@@ -1003,17 +1132,16 @@ function fitStatusSegments(required, optional, cols) {
   const sepLen = stripAnsi(STATUS_SEP).length;
   const fixedPrefix = plainRequired[0] ?? "";
   if (plainRequired.length <= 1)
-    return truncatePlainText(fixedPrefix, cols);
+    return truncateText(fixedPrefix, cols);
   const maxTailLen = Math.max(8, cols - fixedPrefix.length - sepLen);
-  const truncatedTail = truncatePlainText(plainRequired[1] ?? "", maxTailLen);
+  const truncatedTail = truncateText(plainRequired[1] ?? "", maxTailLen);
   return `${required[0]}${STATUS_SEP}${c3.dim(truncatedTail)}`;
 }
 function renderStatusBar(opts) {
   const cols = Math.max(20, terminal.stdoutColumns || 80);
-  const required = [c3.cyan(opts.model), c3.dim(`#${opts.sessionId}`)];
+  const modelSegment = opts.thinkingEffort ? `${c3.cyan(opts.model)} ${c3.magenta(c3.italic(`\u2726  ${opts.thinkingEffort}`))}` : c3.cyan(opts.model);
+  const required = [modelSegment, c3.dim(`#${opts.sessionId}`)];
   const optional = [];
-  if (opts.thinkingEffort)
-    optional.push(c3.dim(`\u2726 ${opts.thinkingEffort}`));
   if (opts.gitBranch)
     optional.push(c3.dim(`\u2387 ${opts.gitBranch}`));
   if (opts.inputTokens > 0 || opts.outputTokens > 0) {
@@ -1117,8 +1245,7 @@ function isToolCallPart(part) {
 function hasObjectToolCallInput(part) {
   return isToolCallPart(part) && "input" in part && isRecord(part.input) && !Array.isArray(part.input);
 }
-var TOOL_RUNTIME_INPUT_KEYS = new Set(["cwd"]);
-function stripToolRuntimeInputFields(messages) {
+function mapAssistantParts(messages, transform) {
   let mutated = false;
   const result = messages.map((message) => {
     if (message.role !== "assistant" || !Array.isArray(message.content)) {
@@ -1126,24 +1253,10 @@ function stripToolRuntimeInputFields(messages) {
     }
     let contentMutated = false;
     const nextContent = message.content.map((part) => {
-      if (!hasObjectToolCallInput(part)) {
-        return part;
-      }
-      let inputMutated = false;
-      const nextInput = { ...part.input };
-      for (const key of TOOL_RUNTIME_INPUT_KEYS) {
-        if (!(key in nextInput))
-          continue;
-        delete nextInput[key];
-        inputMutated = true;
-      }
-      if (!inputMutated)
-        return part;
-      contentMutated = true;
-      return {
-        ...part,
-        input: nextInput
-      };
+      const next = transform(part);
+      if (next !== part)
+        contentMutated = true;
+      return next;
     });
     if (!contentMutated)
       return message;
@@ -1155,6 +1268,22 @@ function stripToolRuntimeInputFields(messages) {
   });
   return mutated ? result : messages;
 }
+var TOOL_RUNTIME_INPUT_KEYS = new Set(["cwd"]);
+function stripToolRuntimeInputFields(messages) {
+  return mapAssistantParts(messages, (part) => {
+    if (!hasObjectToolCallInput(part))
+      return part;
+    let inputMutated = false;
+    const nextInput = { ...part.input };
+    for (const key of TOOL_RUNTIME_INPUT_KEYS) {
+      if (!(key in nextInput))
+        continue;
+      delete nextInput[key];
+      inputMutated = true;
+    }
+    return inputMutated ? { ...part, input: nextInput } : part;
+  });
+}
 
 // src/llm-api/history/gemini.ts
 function getGeminiThoughtSignature(part) {
@@ -1294,38 +1423,19 @@ function isOpenAIGPT(modelString) {
 function normalizeOpenAICompatibleToolCallInputs(messages, modelString) {
   if (!isZenOpenAICompatibleChatModel(modelString))
     return messages;
-  let mutated = false;
-  const result = messages.map((message) => {
-    if (message.role !== "assistant" || !Array.isArray(message.content)) {
-      return message;
+  return mapAssistantParts(messages, (part) => {
+    if (!isToolCallPart(part) || !("input" in part) || typeof part.input !== "string") {
+      return part;
     }
-    let contentMutated = false;
-    const nextContent = message.content.map((part) => {
-      if (!isToolCallPart(part) || !("input" in part) || typeof part.input !== "string") {
-        return part;
-      }
-      try {
-        const parsed = JSON.parse(part.input);
-        if (!isRecord(parsed) || Array.isArray(parsed))
-          return part;
-        contentMutated = true;
-        return {
-          ...part,
-          input: parsed
-        };
-      } catch {
+    try {
+      const parsed = JSON.parse(part.input);
+      if (!isRecord(parsed) || Array.isArray(parsed))
         return part;
-      }
-    });
-    if (!contentMutated)
-      return message;
-    mutated = true;
-    return {
-      ...message,
-      content: nextContent
-    };
+      return { ...part, input: parsed };
+    } catch {
+      return part;
+    }
   });
-  return mutated ? result : messages;
 }
 function stripOpenAIHistory(messages, modelString, options) {
   if (!isOpenAIGPT(modelString))
@@ -1400,7 +1510,7 @@ function makeInterruptMessage(reason) {
   return { role: "assistant", content: text };
 }
 function isAbortError(error) {
-  return error.name === "AbortError" || error.name === "Error" && error.message.toLowerCase().includes("abort");
+  return error.name === "AbortError" || "code" in error && error.code === "ABORT_ERR" || error.name === "Error" && error.message === "aborted";
 }
 function buildAbortMessages(partialMessages, accumulatedText) {
   const stub = makeInterruptMessage("user");
@@ -1647,7 +1757,7 @@ function writePreviewLines(opts) {
 function truncateOneLine(value, max = 100, verboseOutput = false) {
   if (verboseOutput)
     return value;
-  return value.length > max ? `${value.slice(0, max - 1)}\u2026` : value;
+  return truncateText(value, max);
 }
 function normalizeShellText(value) {
   return value.replace(/[\r\n]+$/, "");
@@ -1895,7 +2005,7 @@ function shellCmdGlyph(cmd, fullCmd) {
     case "touch":
       return G.write;
     case "sed":
-      return /\s-i\b/.test(fullCmd) ? G.write : G.run;
+      return /\s-i\b/.test(fullCmd) ? G.write : G.read;
     case "git":
     case "bun":
     case "echo":
@@ -1921,15 +2031,12 @@ function extractFirstCommand(cmd) {
   }
   return tokens[0] ?? "";
 }
-function truncate(s, max) {
-  return s.length > max ? `${s.slice(0, max - 1)}\u2026` : s;
-}
 function formatShellCallLine(cmd) {
   const { cwd, rest } = parseShellCdPrefix(cmd);
   const firstCmd = extractFirstCommand(rest);
   const glyph = shellCmdGlyph(firstCmd, rest);
   const cwdSuffix = cwd ? ` ${c6.dim(`in ${cwd}`)}` : "";
-  const display = truncate(rest, 80);
+  const display = truncateText(rest, 80);
   return `${glyph} ${display}${cwdSuffix}`;
 }
 function buildToolCallLine(name, args) {
@@ -2115,6 +2222,9 @@ async function renderTurn(events, spinner, opts) {
         liveReasoning.finish();
         content.flushOpenContent();
         spinner.stop();
+        inputTokens = event.inputTokens;
+        outputTokens = event.outputTokens;
+        contextTokens = event.contextTokens;
         if (isAbortError(event.error)) {
           newMessages = buildAbortMessages(event.partialMessages, content.getText());
         } else {
@@ -2135,10 +2245,9 @@ async function renderTurn(events, spinner, opts) {
 }
 
 // src/cli/output.ts
-var HOME = homedir4();
-var PACKAGE_VERSION = "0.2.0";
+var HOME2 = homedir4();
 function tildePath(p) {
-  return p.startsWith(HOME) ? `~${p.slice(HOME.length)}` : p;
+  return p.startsWith(HOME2) ? `~${p.slice(HOME2.length)}` : p;
 }
 function restoreTerminal() {
   terminal.restoreTerminal();
@@ -2203,28 +2312,12 @@ function renderError(err, context = "render") {
     writeln(`  ${c8.dim(parsed.hint)}`);
   }
 }
-function discoverContextFiles(cwd) {
-  const found = [];
-  const globalDir = join4(HOME, ".agents");
-  const candidates = [
-    [join4(globalDir, "AGENTS.md"), "~/.agents/AGENTS.md"],
-    [join4(globalDir, "CLAUDE.md"), "~/.agents/CLAUDE.md"],
-    [join4(cwd, ".agents", "AGENTS.md"), ".agents/AGENTS.md"],
-    [join4(cwd, "CLAUDE.md"), "CLAUDE.md"],
-    [join4(cwd, "AGENTS.md"), "AGENTS.md"]
-  ];
-  for (const [abs, label] of candidates) {
-    if (existsSync3(abs))
-      found.push(label);
-  }
-  return found;
-}
 function renderBanner(model, cwd) {
   writeln();
   const title = PACKAGE_VERSION ? `mini-coder \xB7 v${PACKAGE_VERSION}` : "mini-coder";
   writeln(`  ${c8.cyan("mc")}  ${c8.dim(title)}`);
   writeln(`  ${c8.dim(model)}  ${c8.dim("\xB7")}  ${c8.dim(tildePath(cwd))}`);
-  writeln(`  ${c8.dim("/help for commands  \xB7  esc cancel  \xB7  ctrl+c/ctrl+d exit")}`);
+  writeln(`  ${c8.dim("/help for commands  \xB7  esc cancel  \xB7  ctrl+d exit")}`);
   const items = [];
   if (getPreferredShowReasoning())
     items.push("reasoning: on");
@@ -2369,22 +2462,23 @@ function getPromptHistory(limit = 200) {
 }
 // src/session/db/model-info-repo.ts
 function listModelCapabilities() {
-  return getDb().query("SELECT canonical_model_id, context_window, reasoning, source_provider, raw_json, updated_at FROM model_capabilities").all();
+  return getDb().query("SELECT canonical_model_id, context_window, max_output_tokens, reasoning, source_provider, raw_json, updated_at FROM model_capabilities").all();
 }
 function replaceModelCapabilities(rows) {
   const db = getDb();
   const insertStmt = db.prepare(`INSERT INTO model_capabilities (
 			canonical_model_id,
 			context_window,
+			max_output_tokens,
 			reasoning,
 			source_provider,
 			raw_json,
 			updated_at
-		) VALUES (?, ?, ?, ?, ?, ?)`);
+		) VALUES (?, ?, ?, ?, ?, ?, ?)`);
   const run = db.transaction(() => {
     db.run("DELETE FROM model_capabilities");
     for (const row of rows) {
-      insertStmt.run(row.canonical_model_id, row.context_window, row.reasoning, row.source_provider, row.raw_json, row.updated_at);
+      insertStmt.run(row.canonical_model_id, row.context_window, row.max_output_tokens, row.reasoning, row.source_provider, row.raw_json, row.updated_at);
     }
   });
   run();
@@ -2446,6 +2540,12 @@ function touchSession(id, model) {
     id
   ]);
 }
+function setSessionTitle(id, title) {
+  getDb().run("UPDATE sessions SET title = ? WHERE id = ? AND title = ''", [
+    title,
+    id
+  ]);
+}
 function listSessions(limit = 20) {
   return getDb().query("SELECT * FROM sessions ORDER BY updated_at DESC LIMIT ?").all(limit);
 }
@@ -2586,7 +2686,7 @@ function buildPromptDisplay(text, cursor, maxLen) {
 }
 
 // src/cli/completions.ts
-import { join as join5, relative } from "path";
+import { join as join4, relative } from "path";
 
 // src/session/oauth/anthropic.ts
 import { createServer } from "http";
@@ -2623,7 +2723,7 @@ var SUCCESS_HTML = `<!doctype html>
 <html lang="en"><head><meta charset="utf-8"><title>Authenticated</title></head>
 <body><p>Authentication successful. Return to your terminal.</p></body></html>`;
 function startCallbackServer(expectedState) {
-  return new Promise((resolve2, reject) => {
+  return new Promise((resolve3, reject) => {
     let result = null;
     let cancelled = false;
     const server = createServer((req, res) => {
@@ -2644,7 +2744,7 @@ function startCallbackServer(expectedState) {
     });
     server.on("error", reject);
     server.listen(CALLBACK_PORT, CALLBACK_HOST, () => {
-      resolve2({
+      resolve3({
         server,
         cancel: () => {
           cancelled = true;
@@ -2818,6 +2918,15 @@ function parseContextWindow(model) {
     return null;
   return Math.max(0, Math.trunc(context));
 }
+function parseMaxOutputTokens(model) {
+  const limit = model.limit;
+  if (!isRecord(limit))
+    return null;
+  const output = limit.output;
+  if (typeof output !== "number" || !Number.isFinite(output))
+    return null;
+  return Math.max(0, Math.trunc(output));
+}
 function parseModelsDevCapabilities(payload, updatedAt) {
   if (!isRecord(payload))
     return [];
@@ -2836,6 +2945,7 @@ function parseModelsDevCapabilities(payload, updatedAt) {
       if (!canonicalModelId)
         continue;
       const contextWindow = parseContextWindow(modelValue);
+      const maxOutputTokens = parseMaxOutputTokens(modelValue);
       const reasoning = modelValue.reasoning === true;
       const rawJson = JSON.stringify(modelValue);
       const prev = merged.get(canonicalModelId);
@@ -2843,6 +2953,7 @@ function parseModelsDevCapabilities(payload, updatedAt) {
         merged.set(canonicalModelId, {
           canonicalModelId,
           contextWindow,
+          maxOutputTokens,
           reasoning,
           sourceProvider: provider,
           rawJson
@@ -2852,6 +2963,7 @@ function parseModelsDevCapabilities(payload, updatedAt) {
       merged.set(canonicalModelId, {
         canonicalModelId,
         contextWindow: prev.contextWindow ?? contextWindow,
+        maxOutputTokens: prev.maxOutputTokens ?? maxOutputTokens,
         reasoning: prev.reasoning || reasoning,
         sourceProvider: prev.sourceProvider,
         rawJson: prev.rawJson ?? rawJson
@@ -2861,6 +2973,7 @@ function parseModelsDevCapabilities(payload, updatedAt) {
   return Array.from(merged.values()).map((entry) => ({
     canonical_model_id: entry.canonicalModelId,
     context_window: entry.contextWindow,
+    max_output_tokens: entry.maxOutputTokens,
     reasoning: entry.reasoning ? 1 : 0,
     source_provider: entry.sourceProvider,
     raw_json: entry.rawJson,
@@ -2945,6 +3058,7 @@ function buildRuntimeCache(capabilityRows, providerRows, stateRows) {
     capabilitiesByCanonical.set(canonical, {
       canonicalModelId: canonical,
       contextWindow: row.context_window,
+      maxOutputTokens: row.max_output_tokens,
       reasoning: row.reasoning === 1,
       sourceProvider: row.source_provider
     });
@@ -2992,6 +3106,7 @@ function resolveFromProviderRow(row, cache) {
       return {
         canonicalModelId: capability.canonicalModelId,
         contextWindow: capability.contextWindow ?? row.contextWindow,
+        maxOutputTokens: capability.maxOutputTokens,
         reasoning: capability.reasoning
       };
     }
@@ -2999,6 +3114,7 @@ function resolveFromProviderRow(row, cache) {
   return {
     canonicalModelId: row.canonicalModelId,
     contextWindow: row.contextWindow,
+    maxOutputTokens: null,
     reasoning: false
   };
 }
@@ -3019,6 +3135,7 @@ function resolveModelInfoInCache(modelString, cache) {
       return {
         canonicalModelId: capability.canonicalModelId,
         contextWindow: capability.contextWindow,
+        maxOutputTokens: capability.maxOutputTokens,
         reasoning: capability.reasoning
       };
     }
@@ -3381,6 +3498,9 @@ function resolveModelInfo(modelString) {
 function getContextWindow(modelString) {
   return resolveModelInfo(modelString)?.contextWindow ?? null;
 }
+function getMaxOutputTokens(modelString) {
+  return resolveModelInfo(modelString)?.maxOutputTokens ?? null;
+}
 function supportsThinking(modelString) {
   return resolveModelInfo(modelString)?.reasoning ?? false;
 }
@@ -3502,7 +3622,7 @@ async function getAtCompletions(prefix, cwd) {
   for await (const file of glob.scan({ cwd, onlyFiles: true })) {
     if (file.includes("node_modules") || file.includes(".git"))
       continue;
-    results.push(`@${relative(cwd, join5(cwd, file))}`);
+    results.push(`@${relative(cwd, join4(cwd, file))}`);
     if (results.length >= MAX)
       break;
   }
@@ -3599,7 +3719,7 @@ function deleteWordBackward(buf, cursor) {
 }
 
 // src/cli/input-images.ts
-import { join as join6 } from "path";
+import { join as join5 } from "path";
 
 // src/cli/image-types.ts
 var IMAGE_EXTENSIONS = new Set([
@@ -3652,7 +3772,7 @@ async function tryExtractImageFromPaste(pasted, cwd, loadImage = loadImageFile)
     }
   }
   if (!trimmed.includes(" ") && isImageFilename(trimmed)) {
-    const filePath = trimmed.startsWith("/") ? trimmed : join6(cwd, trimmed);
+    const filePath = trimmed.startsWith("/") ? trimmed : join5(cwd, trimmed);
     const attachment = await loadImage(filePath);
     if (attachment) {
       const name = filePath.split("/").pop() ?? trimmed;
@@ -3685,11 +3805,17 @@ var CTRL_L = "\f";
 var CTRL_R = "\x12";
 var TAB = "\t";
 var _stdinReader = null;
+var _stdinGated = false;
+function setStdinGated(gated) {
+  _stdinGated = gated;
+}
 function getStdinReader() {
   if (!_stdinReader) {
     const stream = new ReadableStream({
       start(controller) {
         process.stdin.on("data", (chunk) => {
+          if (_stdinGated)
+            return;
           try {
             controller.enqueue(new Uint8Array(chunk));
           } catch {}
@@ -3727,6 +3853,7 @@ function exitOnCtrlC(opts) {
 function watchForCancel(abortController) {
   if (!terminal.isTTY)
     return () => {};
+  setStdinGated(true);
   const onCancel = () => {
     cleanup();
     abortController.abort();
@@ -3747,6 +3874,7 @@ function watchForCancel(abortController) {
     process.stdin.removeListener("data", onData);
     terminal.setRawMode(false);
     process.stdin.pause();
+    setStdinGated(false);
   };
   terminal.setRawMode(true);
   process.stdin.resume();
@@ -3818,8 +3946,11 @@ async function readline(opts) {
   try {
     while (true) {
       const raw = await readKey(reader);
-      if (!raw)
-        continue;
+      if (!raw) {
+        process.stdout.write(`
+`);
+        return { type: "eof" };
+      }
       if (searchMode) {
         if (raw === ESC2) {
           searchMode = false;
@@ -4060,79 +4191,6 @@ import { createAnthropic } from "@ai-sdk/anthropic";
 import { createGoogleGenerativeAI } from "@ai-sdk/google";
 import { createOpenAI } from "@ai-sdk/openai";
 import { createOpenAICompatible } from "@ai-sdk/openai-compatible";
-
-// src/llm-api/api-log.ts
-import { writeFileSync as writeFileSync2 } from "fs";
-var writer2 = null;
-var MAX_ENTRY_BYTES = 8 * 1024;
-function initApiLog() {
-  if (writer2)
-    return;
-  const logPath = pidLogPath("api");
-  writeFileSync2(logPath, "");
-  writer2 = Bun.file(logPath).writer();
-}
-function isObject2(v) {
-  return typeof v === "object" && v !== null;
-}
-var LOG_DROP_KEYS = new Set([
-  "requestBodyValues",
-  "responseBody",
-  "responseHeaders",
-  "stack"
-]);
-function sanitizeForLog(data) {
-  if (!isObject2(data))
-    return data;
-  const result = {};
-  for (const key in data) {
-    if (LOG_DROP_KEYS.has(key))
-      continue;
-    const value = data[key];
-    if (key === "errors" && Array.isArray(value)) {
-      result[key] = value.map((e) => sanitizeForLog(e));
-    } else if (key === "lastError" && isObject2(value)) {
-      result[key] = sanitizeForLog(value);
-    } else {
-      result[key] = value;
-    }
-  }
-  return result;
-}
-function isApiLogEnabled() {
-  return writer2 !== null;
-}
-function logApiEvent(event, data) {
-  if (!writer2)
-    return;
-  const timestamp = new Date().toISOString();
-  let entry = `[${timestamp}] ${event}
-`;
-  if (data !== undefined) {
-    try {
-      const safe = sanitizeForLog(data);
-      let serialized = JSON.stringify(safe, null, 2);
-      if (serialized.length > MAX_ENTRY_BYTES) {
-        serialized = `${serialized.slice(0, MAX_ENTRY_BYTES)}
-  \u2026truncated`;
-      }
-      entry += serialized.split(`
-`).map((line) => `  ${line}`).join(`
-`);
-      entry += `
-`;
-    } catch (err) {
-      entry += `  [Error stringifying data: ${String(err)}]
-`;
-    }
-  }
-  entry += `---
-`;
-  writer2.write(entry);
-  writer2.flush();
-}
-
-// src/llm-api/providers.ts
 var SUPPORTED_PROVIDERS = [
   "zen",
   "anthropic",
@@ -4141,46 +4199,8 @@ var SUPPORTED_PROVIDERS = [
   "ollama"
 ];
 var ZEN_BASE2 = "https://opencode.ai/zen/v1";
-var REDACTED_HEADERS = new Set(["authorization"]);
-function redactHeaders(headers) {
-  if (!headers)
-    return;
-  const h = new Headers(headers);
-  const out = {};
-  h.forEach((v, k) => {
-    out[k] = REDACTED_HEADERS.has(k) ? "[REDACTED]" : v;
-  });
-  return out;
-}
-function createFetchWithLogging() {
-  const customFetch = async (input, init) => {
-    if (init?.body) {
-      try {
-        const bodyStr = init.body.toString();
-        const bodyJson = JSON.parse(bodyStr);
-        logApiEvent("Provider Request", {
-          url: input.toString(),
-          method: init.method,
-          headers: redactHeaders(init.headers),
-          body: bodyJson
-        });
-      } catch {
-        logApiEvent("Provider Request", {
-          url: input.toString(),
-          method: init.method,
-          headers: redactHeaders(init.headers),
-          body: init.body
-        });
-      }
-    }
-    return fetch(input, init);
-  };
-  return customFetch;
-}
-var fetchWithLogging = createFetchWithLogging();
 var OAUTH_STRIP_BETAS = new Set;
 function createOAuthFetch(accessToken) {
-  const baseFetch = createFetchWithLogging();
   const oauthFetch = async (input, init) => {
     let opts = init;
     if (opts?.headers) {
@@ -4196,7 +4216,7 @@ function createOAuthFetch(accessToken) {
       h.set("x-app", "cli");
       opts = { ...opts, headers: Object.fromEntries(h.entries()) };
     }
-    return baseFetch(input, opts);
+    return fetch(input, opts);
   };
   return oauthFetch;
 }
@@ -4225,22 +4245,22 @@ function lazy(factory) {
 }
 var zenProviders = {
   anthropic: lazy(() => createAnthropic({
-    fetch: fetchWithLogging,
+    fetch,
     apiKey: requireEnv("OPENCODE_API_KEY"),
     baseURL: ZEN_BASE2
   })),
   openai: lazy(() => createOpenAI({
-    fetch: fetchWithLogging,
+    fetch,
     apiKey: requireEnv("OPENCODE_API_KEY"),
     baseURL: ZEN_BASE2
   })),
   google: lazy(() => createGoogleGenerativeAI({
-    fetch: fetchWithLogging,
+    fetch,
     apiKey: requireEnv("OPENCODE_API_KEY"),
     baseURL: ZEN_BASE2
   })),
   compat: lazy(() => createOpenAICompatible({
-    fetch: fetchWithLogging,
+    fetch,
     name: "zen-compat",
     apiKey: requireEnv("OPENCODE_API_KEY"),
     baseURL: ZEN_BASE2
@@ -4248,15 +4268,15 @@ var zenProviders = {
 };
 var directProviders = {
   anthropic: lazy(() => createAnthropic({
-    fetch: fetchWithLogging,
+    fetch,
     apiKey: requireEnv("ANTHROPIC_API_KEY")
   })),
   openai: lazy(() => createOpenAI({
-    fetch: fetchWithLogging,
+    fetch,
     apiKey: requireEnv("OPENAI_API_KEY")
   })),
   google: lazy(() => createGoogleGenerativeAI({
-    fetch: fetchWithLogging,
+    fetch,
     apiKey: requireAnyEnv(["GOOGLE_API_KEY", "GEMINI_API_KEY"])
   })),
   ollama: lazy(() => {
@@ -4265,7 +4285,7 @@ var directProviders = {
       name: "ollama",
       baseURL: `${baseURL}/v1`,
       apiKey: "ollama",
-      fetch: fetchWithLogging
+      fetch
     });
   })
 };
@@ -4699,6 +4719,11 @@ async function* mapFullStreamToTurnEvents(stream, opts) {
   const toolCallTracker = new StreamToolCallTracker;
   const textPhaseTracker = new StreamTextPhaseTracker;
   for await (const originalChunk of stream) {
+    if (originalChunk.type === "start-step" && opts.stepPruneQueue) {
+      for (const rec of opts.stepPruneQueue.splice(0)) {
+        yield { type: "context-pruned", ...rec };
+      }
+    }
     const prepared = toolCallTracker.prepare(originalChunk);
     const chunk = prepared.chunk;
     const route = textPhaseTracker.route(chunk);
@@ -4713,9 +4738,6 @@ async function* mapFullStreamToTurnEvents(stream, opts) {
   }
 }
 
-// src/llm-api/turn-request.ts
-import { wrapLanguageModel } from "ai";
-
 // src/llm-api/turn-context.ts
 import { pruneMessages } from "ai";
 var DEFAULT_TOOL_RESULT_PAYLOAD_CAP_BYTES = 16 * 1024;
@@ -4802,6 +4824,15 @@ function applyContextPruning(messages) {
     emptyMessages: "remove"
   });
 }
+function applyStepPruning(messages, initialMessageCount) {
+  const newMessageCount = Math.max(0, messages.length - initialMessageCount);
+  return pruneMessages({
+    messages,
+    reasoning: "none",
+    toolCalls: `before-last-${40 + newMessageCount}-messages`,
+    emptyMessages: "remove"
+  });
+}
 function compactHeadTail(serialized, maxChars = 4096) {
   const chars = Math.max(512, maxChars);
   const headLength = Math.floor(chars / 2);
@@ -4873,6 +4904,22 @@ function compactToolResultPayloads(messages) {
   });
   return mutated ? compacted : messages;
 }
+function stripCacheBreakpoint(msg) {
+  const anthropic = msg?.providerOptions?.anthropic;
+  if (!anthropic?.cacheControl)
+    return msg;
+  const { cacheControl: _, ...rest } = anthropic;
+  const hasOtherKeys = Object.keys(rest).length > 0;
+  const { anthropic: __, ...otherProviders } = msg.providerOptions;
+  const hasOtherProviders = Object.keys(otherProviders).length > 0;
+  return {
+    ...msg,
+    providerOptions: {
+      ...hasOtherProviders ? otherProviders : {},
+      ...hasOtherKeys ? { anthropic: rest } : {}
+    }
+  };
+}
 function withCacheBreakpoint(msg) {
   return {
     ...msg,
@@ -4886,20 +4933,29 @@ function withCacheBreakpoint(msg) {
   };
 }
 function annotateAnthropicCacheBreakpoints(prompt) {
-  const result = [...prompt];
-  const systemIdxs = [];
-  const nonSystemIdxs = [];
+  const result = prompt.map(stripCacheBreakpoint);
+  let firstSystemIdx = -1;
+  let lastUserIdx = -1;
+  let lastNonSystemIdx = -1;
   for (let i = 0;i < result.length; i++) {
-    if (result[i]?.role === "system")
-      systemIdxs.push(i);
-    else
-      nonSystemIdxs.push(i);
+    const role = result[i]?.role;
+    if (role === "system") {
+      if (firstSystemIdx === -1)
+        firstSystemIdx = i;
+    } else {
+      lastNonSystemIdx = i;
+      if (role === "user")
+        lastUserIdx = i;
+    }
   }
-  for (const idx of systemIdxs.slice(0, 1)) {
-    result[idx] = withCacheBreakpoint(result[idx]);
+  if (firstSystemIdx >= 0) {
+    result[firstSystemIdx] = withCacheBreakpoint(result[firstSystemIdx]);
   }
-  for (const idx of nonSystemIdxs.slice(-2)) {
-    result[idx] = withCacheBreakpoint(result[idx]);
+  if (lastUserIdx >= 0) {
+    result[lastUserIdx] = withCacheBreakpoint(result[lastUserIdx]);
+  }
+  if (lastNonSystemIdx >= 0 && lastNonSystemIdx !== lastUserIdx) {
+    result[lastNonSystemIdx] = withCacheBreakpoint(result[lastNonSystemIdx]);
   }
   return result;
 }
@@ -4907,7 +4963,7 @@ function annotateAnthropicCacheBreakpoints(prompt) {
 // src/llm-api/turn-prepare-messages.ts
 function prepareTurnMessages(input) {
   const { messages, modelString, toolCount, systemPrompt } = input;
-  const apiLogOn = isApiLogEnabled();
+  const apiLogOn = getLogContext() !== null;
   const strippedRuntimeToolFields = stripToolRuntimeInputFields(messages);
   if (strippedRuntimeToolFields !== messages && apiLogOn) {
     logApiEvent("runtime tool input fields stripped", { modelString });
@@ -4970,7 +5026,7 @@ function prepareTurnMessages(input) {
     }
     finalMessages = [...systemMessages, ...finalMessages];
   }
-  const wasPruned = postStats.messageCount < preStats.messageCount || postStats.totalBytes < preStats.totalBytes;
+  const wasPruned = postStats.messageCount < preStats.messageCount;
   return {
     messages: finalMessages,
     systemPrompt: finalSystemPrompt,
@@ -4983,7 +5039,7 @@ function prepareTurnMessages(input) {
 }
 
 // src/llm-api/provider-options.ts
-var ANTHROPIC_BUDGET = {
+var ANTHROPIC_ZEN_BUDGET = {
   low: 4096,
   medium: 8192,
   high: 16384,
@@ -5001,27 +5057,31 @@ function clampEffort(effort, max) {
   const maxIdx = ORDER.indexOf(max);
   return ORDER[Math.min(effortIdx, maxIdx)];
 }
-function getAnthropicThinkingOptions(modelId, effort) {
-  const isAdaptive = /^claude-3-7/.test(modelId) || /^claude-sonnet-4/.test(modelId) || /^claude-opus-4/.test(modelId);
-  if (isAdaptive) {
-    const isOpus = /^claude-opus-4/.test(modelId);
-    const xhighMapping = isOpus ? "max" : "high";
-    const mapped = effort === "xhigh" ? xhighMapping : effort;
-    return { anthropic: { thinking: { type: "adaptive" }, effort: mapped } };
+function getAnthropicThinkingOptions(modelString, effort) {
+  const { provider, modelId } = parseModelString(modelString);
+  if (provider === "zen") {
+    return {
+      anthropic: {
+        thinking: {
+          type: "enabled",
+          budgetTokens: ANTHROPIC_ZEN_BUDGET[effort]
+        }
+      }
+    };
   }
-  return {
-    anthropic: {
-      thinking: { type: "enabled", budgetTokens: ANTHROPIC_BUDGET[effort] },
-      betas: ["interleaved-thinking-2025-05-14"]
-    }
-  };
+  const isOpus = /^claude-opus-4/.test(modelId);
+  const xhighMapping = isOpus ? "max" : "high";
+  const mapped = effort === "xhigh" ? xhighMapping : effort;
+  return { anthropic: { thinking: { type: "adaptive" }, effort: mapped } };
 }
-function getOpenAIThinkingOptions(modelId, effort) {
+function getOpenAIThinkingOptions(modelString, effort) {
+  const { modelId } = parseModelString(modelString);
   const supportsXhigh = /^gpt-5\.[2-9]/.test(modelId) || /^o4/.test(modelId);
   const clamped = supportsXhigh ? effort : clampEffort(effort, "high");
   return { openai: { reasoningEffort: clamped, reasoningSummary: "auto" } };
 }
-function getGeminiThinkingOptions(modelId, effort) {
+function getGeminiThinkingOptions(modelString, effort) {
+  const { modelId } = parseModelString(modelString);
   if (/^gemini-3/.test(modelId)) {
     return {
       google: {
@@ -5058,11 +5118,10 @@ var THINKING_STRATEGIES = [
 function getThinkingProviderOptions(modelString, effort) {
   if (!supportsThinking(modelString))
     return null;
-  const { modelId } = parseModelString(modelString);
   for (const strategy of THINKING_STRATEGIES) {
     if (!strategy.supports(modelString))
       continue;
-    return strategy.build(modelId, effort);
+    return strategy.build(modelString, effort);
   }
   return null;
 }
@@ -5118,28 +5177,39 @@ function buildTurnPreparation(input) {
 }
 function buildStreamTextRequest(input) {
   const isAnthropic = isAnthropicModelFamily(input.modelString);
-  const model = wrapLanguageModel({
-    model: input.model,
-    middleware: [
-      {
-        specificationVersion: "v3",
-        transformParams: async ({ params }) => {
-          const prompt = params.prompt;
-          const pruned = applyContextPruning(prompt);
-          const compacted = compactToolResultPayloads(pruned);
-          const final = isAnthropic ? annotateAnthropicCacheBreakpoints(compacted) : compacted;
-          return { ...params, prompt: final };
-        }
-      }
-    ]
-  });
+  const initialMessageCount = input.prepared.messages.length;
   return {
-    model,
-    maxOutputTokens: 16384,
+    model: input.model,
+    maxOutputTokens: getMaxOutputTokens(input.modelString) ?? 16384,
     messages: input.prepared.messages,
     tools: input.toolSet,
     stopWhen: continueUntilModelStops,
     onStepFinish: input.onStepFinish,
+    prepareStep: ({ stepNumber, messages }) => {
+      if (stepNumber === 0) {
+        return isAnthropic ? {
+          messages: annotateAnthropicCacheBreakpoints(messages)
+        } : {};
+      }
+      const preCount = messages.length;
+      const pruned = applyStepPruning(messages, initialMessageCount);
+      const postCount = pruned.length;
+      if (postCount < preCount) {
+        const pre = getMessageStats(messages);
+        const post = getMessageStats(pruned);
+        input.stepPruneQueue.push({
+          beforeMessageCount: pre.messageCount,
+          afterMessageCount: post.messageCount,
+          removedMessageCount: pre.messageCount - post.messageCount,
+          beforeTotalBytes: pre.totalBytes,
+          afterTotalBytes: post.totalBytes,
+          removedBytes: pre.totalBytes - post.totalBytes
+        });
+      }
+      const compacted = compactToolResultPayloads(pruned);
+      const final = isAnthropic ? annotateAnthropicCacheBreakpoints(compacted) : compacted;
+      return { messages: final };
+    },
     ...input.prepared.systemPrompt ? { system: input.prepared.systemPrompt } : {},
     ...Object.keys(input.providerOptions).length > 0 ? {
       providerOptions: input.providerOptions
@@ -5196,11 +5266,7 @@ async function* runTurn(options) {
         removedBytes: prepared.prePruneTotalBytes - prepared.postPruneTotalBytes
       };
     }
-    if (isApiLogEnabled()) {
-      logApiEvent("prompt caching configured", {
-        cacheFamily: providerOptionsResult.cacheFamily
-      });
-    }
+    const stepPruneQueue = [];
     const result = streamText(buildStreamTextRequest({
       model,
       modelString,
@@ -5208,19 +5274,21 @@ async function* runTurn(options) {
       toolSet,
       onStepFinish: turnState.onStepFinish,
       signal,
-      providerOptions: providerOptionsResult.providerOptions
+      providerOptions: providerOptionsResult.providerOptions,
+      stepPruneQueue
     }));
     result.response.catch(() => {});
     for await (const event of mapFullStreamToTurnEvents(result.fullStream, {
+      stepPruneQueue,
       onChunk: (streamChunk) => {
-        logApiEvent("stream chunk", {
-          type: streamChunk.type,
-          toolCallId: streamChunk.toolCallId,
-          toolName: streamChunk.toolName,
-          isError: streamChunk.isError,
-          hasArgs: "args" in streamChunk || "input" in streamChunk,
-          hasOutput: "output" in streamChunk || "result" in streamChunk
-        });
+        if (streamChunk.type === "tool-call" || streamChunk.type === "tool-result") {
+          logApiEvent("stream chunk", {
+            type: streamChunk.type,
+            toolCallId: streamChunk.toolCallId,
+            toolName: streamChunk.toolName,
+            isError: streamChunk.isError
+          });
+        }
       }
     })) {
       yield event;
@@ -5245,7 +5313,10 @@ async function* runTurn(options) {
     yield {
       type: "turn-error",
       error: normalizedError,
-      partialMessages: finalState.partialMessages
+      partialMessages: finalState.partialMessages,
+      inputTokens: finalState.inputTokens,
+      outputTokens: finalState.outputTokens,
+      contextTokens: finalState.contextTokens
     };
   }
 }
@@ -5267,6 +5338,14 @@ function resumeSession(id) {
 function touchActiveSession(session) {
   touchSession(session.id, session.model);
 }
+function autoTitleSession(sessionId, userText) {
+  const line = userText.split(`
+`)[0]?.trim() ?? "";
+  if (!line)
+    return;
+  const title = line.length > 60 ? `${line.slice(0, 57)}...` : line;
+  setSessionTitle(sessionId, title);
+}
 function renderSessionTable(footer) {
   const sessions = listSessions(20);
   if (sessions.length === 0)
@@ -5294,84 +5373,33 @@ function getMostRecentSession() {
 }
 
 // src/agent/system-prompt.ts
-import { existsSync as existsSync4, readFileSync as readFileSync2 } from "fs";
 import { homedir as homedir5 } from "os";
-import { dirname as dirname2, join as join7, resolve as resolve2 } from "path";
-function tryReadFile(p) {
-  if (!existsSync4(p))
-    return null;
-  try {
-    return readFileSync2(p, "utf-8");
-  } catch {
-    return null;
-  }
-}
-function collectFiles(...paths) {
-  const parts = [];
-  for (const p of paths) {
-    const content = tryReadFile(p);
-    if (content)
-      parts.push(content);
-  }
-  return parts.length > 0 ? parts.join(`
-
-`) : null;
-}
-function loadGlobalContextFile(homeDir) {
-  return collectFiles(join7(homeDir, ".agents", "AGENTS.md"), join7(homeDir, ".agents", "CLAUDE.md"), join7(homeDir, ".claude", "CLAUDE.md"));
-}
-function loadContextFileAt(dir) {
-  return collectFiles(join7(dir, ".agents", "AGENTS.md"), join7(dir, ".agents", "CLAUDE.md"), join7(dir, ".claude", "CLAUDE.md"), join7(dir, "CLAUDE.md"), join7(dir, "AGENTS.md"));
-}
-function loadLocalContextFile(cwd) {
-  const start = resolve2(cwd);
-  let current = start;
-  while (true) {
-    const content = loadContextFileAt(current);
-    if (content)
-      return content;
-    if (existsSync4(join7(current, ".git")))
-      break;
-    const parent = dirname2(current);
-    if (parent === current)
-      break;
-    current = parent;
-  }
-  return null;
-}
 var AUTONOMY = `
 
-# Autonomy and persistence
-- You are a capable senior engineer. Once given a direction, proactively gather context and implement \u2014 don't ask for permission to start.
-- Carry changes through to implementation and verify they work. Don't stop halfway through a task without a good reason.
-- Skip preamble. Don't output a plan before working \u2014 start using tools right away.
-- Don't ask "shall I proceed?" or "shall I start?" at the beginning of a turn. Just begin.
-- Do not guess unknown facts. Inspect files and web or run commands to find out. Don't make assumptions, verify.
-- Avoid excessive looping: if you find yourself re-reading or re-editing the same files without clear progress, stop and summarise what's blocking you.`;
+# Autonomy
+- Begin work immediately using tools. Gather context, implement, and verify \u2014 do not ask for permission to start.
+- Carry changes through to completion. If blocked, summarise what is preventing progress instead of looping.
+- Verify facts by inspecting files or running commands \u2014 never guess unknown state.`;
 var SAFETY = `
 
-# Safety and risk boundaries
-- Never expose, print, or commit secrets/tokens/keys.
-- Never invent URLs. Use URLs explicitly provided by the user or found in trusted project files/docs.
-- For destructive or irreversible actions (for example deleting data or force-resetting git history), ask one targeted confirmation question before proceeding.`;
-var WORKSPACE_GUARDRAILS = `
-
-# Workspace guardrails
+# Safety
+- Never expose, print, or commit secrets, tokens, or keys.
+- Never invent URLs \u2014 only use URLs the user provided or that exist in project files.
 - Never revert user-authored changes unless explicitly asked.
-- If unexpected modifications appear in files you are actively editing, pause and ask how to proceed.
-- Avoid destructive git commands unless explicitly requested. Prefer non-interactive git commands.`;
-var STATUS_UPDATES = `
-
-# Progress communication
-- Do not send ceremonial preambles.
-- For long-running or multi-phase tasks, send brief progress updates every few tool batches (one sentence with the next concrete action).`;
-var FINAL_MESSAGE = `
-
-# Final response style
-- Default to non verbose, concise output (short bullets or a brief paragraph).
-- For substantial code changes, state what changed, where, and why.
-- Reference files with line numbers when helpful.
+- Before any destructive or irreversible action (deleting data, force-pushing, resetting history), ask one targeted confirmation question \u2014 mistakes here are unrecoverable.
+- If files you are editing change unexpectedly, pause and ask how to proceed.`;
+var COMMUNICATION = `
+
+# Communication
+- Be concise: short bullets or a brief paragraph. No ceremonial preambles.
+- For long tasks, send a one-sentence progress update every 3-5 tool calls.
+- For code changes, state what changed, where, and why. Reference files with line numbers.
 - Do not paste large file contents unless asked.`;
+var ERROR_HANDLING = `
+
+# Error handling
+- On tool failure: read the error, adjust your approach, and retry once. If it fails again, explain the blocker to the user.
+- If you find yourself re-reading or re-editing the same files without progress, stop and summarise what is blocking you.`;
 function buildSystemPrompt(sessionTimeAnchor, cwd, homeDir) {
   const globalContext = loadGlobalContextFile(homeDir ?? homedir5());
   const localContext = loadLocalContextFile(cwd);
@@ -5383,32 +5411,24 @@ Current working directory: ${cwdDisplay}
 Current date/time: ${sessionTimeAnchor}
 
 Guidelines:
-- Be concise and precise. Avoid unnecessary preamble. Don't be verbose.
-- Inspect code and files primarily through shell commands.
-- Use temp files to handle large content, prefer scanning over full reads.
-- Prefer small, targeted edits over large file rewrites.
-- For file edits, use shell commands that invoke \`mc-edit\`.
-- Use the skill tools only when you need to inspect available community/project skills or load one skill body.
-- Make parallel tool calls when independent searches/lookups can happen concurrently.
-- Keep your context clean and focused on the user request.
-
-# Preferred file workflow
-- Use shell for repo inspection, verification, temp-file orchestration, and any non-edit file operation.
-- \`mc-edit\` is available inside shell commands.
-- \`mc-edit\` applies one exact-text edit and fails if the expected old text is missing or ambiguous.
+- You are a capable senior engineer. Proactively gather context and implement \u2014 work the problem, not just the symptom. Prefer root-cause fixes over patches.
+- Inspect code and files primarily through shell commands. Use temp files for large content to avoid filling your context window.
+- For file edits, invoke \`mc-edit\` via shell. Prefer small, targeted edits over full rewrites so diffs stay reviewable.
+- Make parallel tool calls when the lookups are independent \u2014 this speeds up multi-file investigation.
+- Before starting work, scan the skills list below. If there is even a small chance a skill applies to your task, load it with \`readSkill\` and follow its instructions before writing code or responding. Skills are mandatory when they match \u2014 not optional references.
+- Keep it simple: DRY, KISS, YAGNI. Avoid unnecessary complexity.
 
-Usage: mc-edit <path> (--old <text> | --old-file <path>) [--new <text> | --new-file <path>] [--cwd <path>]
-Outputs a diff of the changes and meta information.
+# File editing with mc-edit
+\`mc-edit\` applies one exact-text replacement per invocation. It fails deterministically if the old text is missing or matches more than once.
 
-Apply one safe exact-text edit to an existing file.
-- The expected old text must match exactly once.
+Usage: mc-edit <path> (--old <text> | --old-file <path>) [--new <text> | --new-file <path>] [--cwd <path>]
 - Omit --new / --new-file to delete the matched text.
+- To create new files, use shell commands (e.g. \`cat > file.txt << 'EOF'\\n...\\nEOF\`).
 `;
   prompt += AUTONOMY;
   prompt += SAFETY;
-  prompt += WORKSPACE_GUARDRAILS;
-  prompt += STATUS_UPDATES;
-  prompt += FINAL_MESSAGE;
+  prompt += COMMUNICATION;
+  prompt += ERROR_HANDLING;
   if (globalContext || localContext) {
     prompt += `
 
@@ -5428,15 +5448,29 @@ ${localContext}`;
   if (skills.length > 0) {
     prompt += `
 
-# Available skills (metadata only)`;
-    prompt += "\nUse `listSkills` to browse and `readSkill` to load one SKILL.md on demand.";
+# Skills`;
+    prompt += "\nSkills provide specialized instructions for specific tasks. When a task matches a skill description, call `readSkill` with that skill name before doing anything else \u2014 including asking clarifying questions. Check ALL skills against the current task, not just the first match. When a skill references relative paths, resolve them against the skill directory (parent of SKILL.md).";
     prompt += `
-When a skill references relative paths, resolve them against the skill directory (parent of SKILL.md).`;
-    prompt += '\nFor complex skills that would clutter your context, consider delegating to a subagent via `mc "prompt"` in the shell tool.\n';
+
+<available_skills>`;
     for (const skill of skills) {
+      const compat = skill.compatibility ? `
+    <compatibility>${skill.compatibility}</compatibility>` : "";
+      prompt += `
+  <skill>`;
       prompt += `
-- ${skill.name}: ${skill.description} (${skill.source}, ${skill.filePath})`;
+    <name>${skill.name}</name>`;
+      prompt += `
+    <description>${skill.description}</description>`;
+      prompt += `
+    <location>${skill.filePath}</location>`;
+      prompt += `
+    <source>${skill.source}</source>${compat}`;
+      prompt += `
+  </skill>`;
     }
+    prompt += `
+</available_skills>`;
   }
   return prompt;
 }
@@ -5492,7 +5526,6 @@ class SessionRunner {
       model: this.currentModel,
       sessionId: this.session.id,
       thinkingEffort: this.currentThinkingEffort,
-      showReasoning: this.showReasoning,
       totalIn: this.totalIn,
       totalOut: this.totalOut,
       lastContextTokens: this.lastContextTokens
@@ -5589,30 +5622,38 @@ ${output}
     let lastAssistantText = "";
     try {
       this.reporter.startSpinner("thinking");
-      const events = runTurn({
-        model: llm,
-        modelString: this.currentModel,
-        messages: this.coreHistory,
-        tools: this.tools,
-        ...systemPrompt ? { systemPrompt } : {},
-        signal: abortController.signal,
-        ...this.currentThinkingEffort ? { thinkingEffort: this.currentThinkingEffort } : {}
-      });
-      const { inputTokens, outputTokens, contextTokens, newMessages } = await this.reporter.renderTurn(events, {
-        showReasoning: this.showReasoning,
-        verboseOutput: this.verboseOutput
-      });
-      const historyMessages = sanitizeModelAuthoredMessages(newMessages, this.currentModel);
-      if (historyMessages.length > 0) {
-        this.coreHistory.push(...historyMessages);
-        this.session.messages.push(...historyMessages);
-        saveMessages(this.session.id, historyMessages, thisTurn);
+      const logsRepo = new LogsRepo(getDb());
+      setLogContext({ sessionId: this.session.id, logsRepo });
+      try {
+        const events = runTurn({
+          model: llm,
+          modelString: this.currentModel,
+          messages: this.coreHistory,
+          tools: this.tools,
+          ...systemPrompt ? { systemPrompt } : {},
+          signal: abortController.signal,
+          ...this.currentThinkingEffort ? { thinkingEffort: this.currentThinkingEffort } : {}
+        });
+        const { inputTokens, outputTokens, contextTokens, newMessages } = await this.reporter.renderTurn(events, {
+          showReasoning: this.showReasoning,
+          verboseOutput: this.verboseOutput
+        });
+        const historyMessages = sanitizeModelAuthoredMessages(newMessages, this.currentModel);
+        if (historyMessages.length > 0) {
+          this.coreHistory.push(...historyMessages);
+          this.session.messages.push(...historyMessages);
+          saveMessages(this.session.id, historyMessages, thisTurn);
+        }
+        lastAssistantText = extractAssistantText(historyMessages);
+        this.totalIn += inputTokens;
+        this.totalOut += outputTokens;
+        this.lastContextTokens = contextTokens;
+        touchActiveSession(this.session);
+        autoTitleSession(this.session.id, text);
+        this.coreHistory = compactToolResultPayloads(applyContextPruning(this.coreHistory));
+      } finally {
+        setLogContext(null);
       }
-      lastAssistantText = extractAssistantText(historyMessages);
-      this.totalIn += inputTokens;
-      this.totalOut += outputTokens;
-      this.lastContextTokens = contextTokens;
-      touchActiveSession(this.session);
     } catch (err) {
       const stubMsg = makeInterruptMessage("error");
       this.coreHistory.push(stubMsg);
@@ -5689,17 +5730,9 @@ var webContentTool = {
 import { z as z2 } from "zod";
 
 // src/internal/file-edit/command.ts
-import { existsSync as existsSync5 } from "fs";
-import { dirname as dirname3, extname, join as join8 } from "path";
+import { existsSync as existsSync4 } from "fs";
+import { dirname as dirname3, extname, join as join6 } from "path";
 import { fileURLToPath } from "url";
-
-// src/internal/runtime/script.ts
-function resolveProcessScriptPath(mainModule, argv1) {
-  const script = mainModule && !mainModule.endsWith("/[eval]") && !mainModule.endsWith("\\[eval]") ? mainModule : argv1;
-  return script && /\.(?:[cm]?[jt]s)$/.test(script) ? script : null;
-}
-
-// src/internal/file-edit/command.ts
 function quoteShellArg(value) {
   return `'${value.replaceAll("'", `'\\''`)}'`;
 }
@@ -5710,7 +5743,7 @@ function resolveSiblingFileEditScript(scriptPath) {
   const mainDir = dirname3(scriptPath);
   const mainBase = scriptPath.slice(mainDir.length + 1);
   if (mainBase === `index${ext}` || mainBase === `mc${ext}`) {
-    return join8(mainDir, `mc-edit${ext}`);
+    return join6(mainDir, `mc-edit${ext}`);
   }
   return null;
 }
@@ -5719,8 +5752,12 @@ function resolveModuleLocalFileEditScript(moduleUrl) {
   const ext = extname(modulePath);
   if (!ext)
     return null;
-  const helperPath = join8(dirname3(modulePath), "..", "..", `mc-edit${ext}`);
-  return existsSync5(helperPath) ? helperPath : null;
+  const helperPath = join6(dirname3(modulePath), "..", "..", `mc-edit${ext}`);
+  return existsSync4(helperPath) ? helperPath : null;
+}
+function resolveProcessScriptPath(mainModule, argv1) {
+  const script = mainModule && !mainModule.endsWith("/[eval]") && !mainModule.endsWith("\\[eval]") ? mainModule : argv1;
+  return script && /\.(?:[cm]?[jt]s)$/.test(script) ? script : null;
 }
 function resolveFileEditCommand(execPath, mainModule, argv1, moduleUrl = import.meta.url) {
   const scriptPath = resolveProcessScriptPath(mainModule, argv1);
@@ -5797,7 +5834,9 @@ ${input.command}`], {
         if (!value)
           continue;
         if (totalBytes + value.length > MAX_OUTPUT_BYTES) {
-          chunks.push(value.slice(0, MAX_OUTPUT_BYTES - totalBytes));
+          const partial = value.slice(0, MAX_OUTPUT_BYTES - totalBytes);
+          const lastNl = partial.lastIndexOf(10);
+          chunks.push(lastNl >= 0 ? partial.slice(0, lastNl + 1) : partial);
           truncated = true;
           reader.cancel().catch(() => {});
           break;
@@ -5864,7 +5903,8 @@ var listSkillsTool = {
       name: skill.name,
       description: skill.description,
       source: skill.source,
-      ...skill.context && { context: skill.context }
+      ...skill.context && { context: skill.context },
+      ...skill.compatibility && { compatibility: skill.compatibility }
     }));
     return { skills };
   }
@@ -6102,38 +6142,50 @@ ${c13.bold("Examples:")}`);
 }
 
 // src/cli/bootstrap.ts
-import { existsSync as existsSync6, mkdirSync as mkdirSync3, writeFileSync as writeFileSync3 } from "fs";
+import { existsSync as existsSync5, mkdirSync as mkdirSync2, writeFileSync } from "fs";
 import { homedir as homedir6 } from "os";
-import { join as join9 } from "path";
+import { join as join7 } from "path";
 import * as c14 from "yoctocolors";
 var REVIEW_SKILL_CONTENT = `---
 name: review
-description: Review recent changes for correctness, code quality, and performance
+description: "Review recent changes for correctness, code quality, and performance. Use when the user asks to review, check, or audit recent code changes, diffs, or pull requests."
 context: fork
 ---
-You are a code reviewer. Review recent changes and provide actionable feedback.
 
-Perform a sensible code review:
-- Correctness: Are the changes in alignment with the goal?
-- Code quality: Is there duplicate, dead, or bad code patterns introduced?
-- Is the code performant?
-- Never flag style choices as bugs, don't be a zealot.
-- Never flag false positives, check before raising an issue.
+Review recent changes and provide actionable feedback.
+
+## Steps
 
-Output a small summary with only the issues found. If nothing is wrong, say so.
+1. Identify the changes to review \u2014 check \`git diff\`, \`git log\`, and staged files.
+2. Read the changed files and understand the intent behind each change.
+3. Evaluate each change against the criteria below.
+4. Output a concise summary with only the issues found. If nothing is wrong, say so.
+
+## Review criteria
+
+- **Correctness** \u2014 Are the changes aligned with their stated goal? Do they introduce bugs or regressions?
+- **Code quality** \u2014 Is there duplicate, dead, or overly complex code? Are abstractions appropriate?
+- **Performance** \u2014 Are there unnecessary allocations, redundant I/O, or algorithmic concerns?
+- **Edge cases** \u2014 Are boundary conditions and error paths handled?
+
+## Guidelines
+
+- Never flag style choices as bugs \u2014 don't be a zealot.
+- Never flag false positives \u2014 verify before raising an issue.
+- Keep feedback actionable: say what's wrong and suggest a fix.
 `;
 function bootstrapGlobalDefaults() {
-  const skillDir = join9(homedir6(), ".agents", "skills", "review");
-  const skillPath = join9(skillDir, "SKILL.md");
-  if (!existsSync6(skillPath)) {
-    mkdirSync3(skillDir, { recursive: true });
-    writeFileSync3(skillPath, REVIEW_SKILL_CONTENT, "utf-8");
+  const skillDir = join7(homedir6(), ".agents", "skills", "review");
+  const skillPath = join7(skillDir, "SKILL.md");
+  if (!existsSync5(skillPath)) {
+    mkdirSync2(skillDir, { recursive: true });
+    writeFileSync(skillPath, REVIEW_SKILL_CONTENT, "utf-8");
     writeln(`${c14.green("\u2713")} created ${c14.dim("~/.agents/skills/review/SKILL.md")} ${c14.dim("(edit it to customise your reviews)")}`);
   }
 }
 
 // src/cli/file-refs.ts
-import { join as join10 } from "path";
+import { join as join8 } from "path";
 async function resolveFileRefs(text, cwd) {
   const atPattern = /@([\w./\-_]+)/g;
   let result = text;
@@ -6143,7 +6195,7 @@ async function resolveFileRefs(text, cwd) {
     const ref = match[1];
     if (!ref)
       continue;
-    const filePath = ref.startsWith("/") ? ref : join10(cwd, ref);
+    const filePath = ref.startsWith("/") ? ref : join8(cwd, ref);
     if (isImageFilename(ref)) {
       const attachment = await loadImageFile(filePath);
       if (attachment) {
@@ -6154,14 +6206,9 @@ async function resolveFileRefs(text, cwd) {
     }
     try {
       const content = await Bun.file(filePath).text();
-      const lines = content.split(`
-`);
-      const preview = lines.length > 200 ? `${lines.slice(0, 200).join(`
-`)}
-[truncated]` : content;
       const replacement = `\`${ref}\`:
 \`\`\`
-${preview}
+${content}
 \`\`\``;
       result = result.slice(0, match.index) + replacement + result.slice((match.index ?? 0) + match[0].length);
     } catch {}
@@ -6170,84 +6217,25 @@ ${preview}
 }
 
 // src/cli/input-loop.ts
-import * as c22 from "yoctocolors";
-
-// src/cli/cli-helpers.ts
-async function getGitBranch(cwd) {
-  try {
-    const proc = Bun.spawn(["git", "rev-parse", "--abbrev-ref", "HEAD"], {
-      cwd,
-      stdout: "pipe",
-      stderr: "pipe"
-    });
-    const out = await new Response(proc.stdout).text();
-    const code = await proc.exited;
-    if (code !== 0)
-      return null;
-    return out.trim() || null;
-  } catch {
-    return null;
-  }
-}
+import * as c21 from "yoctocolors";
 
 // src/cli/commands.ts
 import { randomBytes } from "crypto";
-import { unlinkSync as unlinkSync3, writeFileSync as writeFileSync4 } from "fs";
+import { unlinkSync as unlinkSync2, writeFileSync as writeFileSync2 } from "fs";
 import { tmpdir } from "os";
-import { join as join11 } from "path";
-import * as c21 from "yoctocolors";
-
-// src/cli/commands-config.ts
-import * as c15 from "yoctocolors";
-function handleBooleanToggleCommand(opts) {
-  const mode = opts.args.trim().toLowerCase();
-  if (!mode) {
-    const nextValue = !opts.current;
-    opts.set(nextValue);
-    writeln(`${PREFIX.success} ${opts.label} ${nextValue ? c15.green("on") : c15.dim("off")}`);
-    return;
-  }
-  if (mode === "on") {
-    opts.set(true);
-    writeln(`${PREFIX.success} ${opts.label} ${c15.green("on")}`);
-    return;
-  }
-  if (mode === "off") {
-    opts.set(false);
-    writeln(`${PREFIX.success} ${opts.label} ${c15.dim("off")}`);
-    return;
-  }
-  writeln(`${PREFIX.error} usage: ${opts.usage}`);
-}
-function handleReasoningCommand(ctx, args) {
-  handleBooleanToggleCommand({
-    args,
-    current: ctx.showReasoning,
-    set: (value) => ctx.setShowReasoning(value),
-    label: "reasoning display",
-    usage: "/reasoning <on|off>"
-  });
-}
-function handleVerboseCommand(ctx, args) {
-  handleBooleanToggleCommand({
-    args,
-    current: ctx.verboseOutput,
-    set: (value) => ctx.setVerboseOutput(value),
-    label: "verbose output",
-    usage: "/verbose <on|off>"
-  });
-}
+import { join as join9 } from "path";
+import * as c20 from "yoctocolors";
 
 // src/cli/commands-help.ts
-import * as c16 from "yoctocolors";
+import * as c15 from "yoctocolors";
 function renderEntries(entries) {
   for (const [label, description] of entries) {
-    writeln(`  ${c16.cyan(label.padEnd(28))} ${c16.dim(description)}`);
+    writeln(`  ${c15.cyan(label.padEnd(28))} ${c15.dim(description)}`);
   }
 }
 function renderHelpCommand(ctx) {
   writeln();
-  writeln(`  ${c16.dim("session")}`);
+  writeln(`  ${c15.dim("session")}`);
   renderEntries([
     ["/session [id]", "list sessions or switch to one"],
     ["/new", "start a fresh session"],
@@ -6255,7 +6243,7 @@ function renderHelpCommand(ctx) {
     ["/exit", "quit"]
   ]);
   writeln();
-  writeln(`  ${c16.dim("model + context")}`);
+  writeln(`  ${c15.dim("model + context")}`);
   renderEntries([
     ["/model [id]", "list or switch models"],
     ["/reasoning [on|off]", "toggle reasoning display"],
@@ -6268,7 +6256,7 @@ function renderHelpCommand(ctx) {
     ["/help", "show this help"]
   ]);
   writeln();
-  writeln(`  ${c16.dim("prompt")}`);
+  writeln(`  ${c15.dim("prompt")}`);
   renderEntries([
     ["ask normally", "send a prompt to the current agent"],
     ["!cmd", "run a shell command and keep the result in context"],
@@ -6278,43 +6266,44 @@ function renderHelpCommand(ctx) {
   const skills = loadSkillsIndex(ctx.cwd);
   if (skills.size > 0) {
     writeln();
-    writeln(`  ${c16.dim("skills")}`);
+    writeln(`  ${c15.dim("skills")}`);
     for (const skill of skills.values()) {
-      const source = skill.source === "local" ? c16.dim("local") : c16.dim("global");
-      writeln(`  ${c16.green(`/${skill.name}`.padEnd(28))} ${c16.dim(skill.description)} ${c16.dim("\xB7")} ${source}`);
+      const source = skill.source === "local" ? c15.dim("local") : c15.dim("global");
+      const desc = truncateText(skill.description, 80);
+      writeln(`  ${c15.green(`/${skill.name}`.padEnd(28))} ${c15.dim(desc)} ${c15.dim("\xB7")} ${source}`);
     }
   }
   writeln();
-  writeln(`  ${c16.dim("keys")}  ${c16.dim("esc")} cancel response  ${c16.dim("\xB7")}  ${c16.dim("ctrl+c / ctrl+d")} exit  ${c16.dim("\xB7")}  ${c16.dim("ctrl+r")} history search  ${c16.dim("\xB7")}  ${c16.dim("\u2191\u2193")} history`);
+  writeln(`  ${c15.dim("keys")}  ${c15.dim("esc")} cancel response  ${c15.dim("\xB7")}  ${c15.dim("ctrl+c / ctrl+d")} exit  ${c15.dim("\xB7")}  ${c15.dim("ctrl+r")} history search  ${c15.dim("\xB7")}  ${c15.dim("\u2191\u2193")} history`);
   writeln();
 }
 
 // src/cli/commands-login.ts
-import * as c17 from "yoctocolors";
+import * as c16 from "yoctocolors";
 function renderLoginHelp() {
   writeln();
-  writeln(`  ${c17.dim("usage:")}`);
-  writeln(`    /login                 ${c17.dim("show login status")}`);
-  writeln(`    /login <provider>      ${c17.dim("login via OAuth")}`);
-  writeln(`    /logout <provider>     ${c17.dim("clear saved tokens")}`);
+  writeln(`  ${c16.dim("usage:")}`);
+  writeln(`    /login                 ${c16.dim("show login status")}`);
+  writeln(`    /login <provider>      ${c16.dim("login via OAuth")}`);
+  writeln(`    /logout <provider>     ${c16.dim("clear saved tokens")}`);
   writeln();
-  writeln(`  ${c17.dim("providers:")}`);
+  writeln(`  ${c16.dim("providers:")}`);
   for (const p of getOAuthProviders()) {
-    const status = isLoggedIn(p.id) ? c17.green("logged in") : c17.dim("not logged in");
-    writeln(`    ${c17.cyan(p.id.padEnd(20))} ${p.name} ${c17.dim("\xB7")} ${status}`);
+    const status = isLoggedIn(p.id) ? c16.green("logged in") : c16.dim("not logged in");
+    writeln(`    ${c16.cyan(p.id.padEnd(20))} ${p.name} ${c16.dim("\xB7")} ${status}`);
   }
   writeln();
 }
 function renderStatus() {
   const loggedIn = listLoggedInProviders();
   if (loggedIn.length === 0) {
-    writeln(`${PREFIX.info} ${c17.dim("no OAuth logins \u2014 use")} /login <provider>`);
+    writeln(`${PREFIX.info} ${c16.dim("no OAuth logins \u2014 use")} /login <provider>`);
     return;
   }
   for (const id of loggedIn) {
     const provider = getOAuthProvider(id);
     const name = provider?.name ?? id;
-    writeln(`${PREFIX.success} ${c17.cyan(id)} ${c17.dim(name)}`);
+    writeln(`${PREFIX.success} ${c16.cyan(id)} ${c16.dim(name)}`);
   }
 }
 async function handleLoginCommand(ctx, args) {
@@ -6335,7 +6324,7 @@ async function handleLoginCommand(ctx, args) {
   if (isLoggedIn(providerId)) {
     const token = await getAccessToken(providerId);
     if (token) {
-      writeln(`${PREFIX.success} already logged in to ${c17.cyan(provider.name)}`);
+      writeln(`${PREFIX.success} already logged in to ${c16.cyan(provider.name)}`);
       return;
     }
   }
@@ -6346,7 +6335,7 @@ async function handleLoginCommand(ctx, args) {
         ctx.stopSpinner();
         writeln(`${PREFIX.info} ${instructions}`);
         writeln();
-        writeln(`  ${c17.cyan(url)}`);
+        writeln(`  ${c16.cyan(url)}`);
         writeln();
         let open = "xdg-open";
         if (process.platform === "darwin")
@@ -6358,12 +6347,12 @@ async function handleLoginCommand(ctx, args) {
       },
       onProgress: (msg) => {
         ctx.stopSpinner();
-        writeln(`${PREFIX.info} ${c17.dim(msg)}`);
+        writeln(`${PREFIX.info} ${c16.dim(msg)}`);
         ctx.startSpinner("exchanging tokens");
       }
     });
     ctx.stopSpinner();
-    writeln(`${PREFIX.success} logged in to ${c17.cyan(provider.name)}`);
+    writeln(`${PREFIX.success} logged in to ${c16.cyan(provider.name)}`);
   } catch (err) {
     ctx.stopSpinner();
     writeln(`${PREFIX.error} login failed: ${err.message}`);
@@ -6376,15 +6365,15 @@ function handleLogoutCommand(_ctx, args) {
     return;
   }
   if (!isLoggedIn(providerId)) {
-    writeln(`${PREFIX.info} ${c17.dim("not logged in to")} ${providerId}`);
+    writeln(`${PREFIX.info} ${c16.dim("not logged in to")} ${providerId}`);
     return;
   }
   logout(providerId);
-  writeln(`${PREFIX.success} logged out of ${c17.cyan(providerId)}`);
+  writeln(`${PREFIX.success} logged out of ${c16.cyan(providerId)}`);
 }
 
 // src/cli/commands-mcp.ts
-import * as c18 from "yoctocolors";
+import * as c17 from "yoctocolors";
 async function handleMcpCommand(ctx, args) {
   const parts = args.trim().split(/\s+/);
   const sub = parts[0] ?? "list";
@@ -6392,15 +6381,15 @@ async function handleMcpCommand(ctx, args) {
     case "list": {
       const servers = listMcpServers();
       if (servers.length === 0) {
-        writeln(c18.dim("  no MCP servers configured"));
-        writeln(c18.dim("  /mcp add <name> http <url>  \xB7  /mcp add <name> stdio <cmd> [args...]"));
+        writeln(c17.dim("  no MCP servers configured"));
+        writeln(c17.dim("  /mcp add <name> http <url>  \xB7  /mcp add <name> stdio <cmd> [args...]"));
         return;
       }
       writeln();
       for (const s of servers) {
         const detailText = s.url ?? s.command ?? "";
-        const detail = detailText ? c18.dim(`  ${detailText}`) : "";
-        writeln(`  ${c18.yellow("\u2699")} ${c18.bold(s.name)}  ${c18.dim(s.transport)}${detail}`);
+        const detail = detailText ? c17.dim(`  ${detailText}`) : "";
+        writeln(`  ${c17.yellow("\u2699")} ${c17.bold(s.name)}  ${c17.dim(s.transport)}${detail}`);
       }
       return;
     }
@@ -6445,9 +6434,9 @@ async function handleMcpCommand(ctx, args) {
       }
       try {
         await ctx.connectMcpServer(name);
-        writeln(`${PREFIX.success} mcp server ${c18.cyan(name)} added and connected`);
+        writeln(`${PREFIX.success} mcp server ${c17.cyan(name)} added and connected`);
       } catch (e) {
-        writeln(`${PREFIX.success} mcp server ${c18.cyan(name)} saved  ${c18.dim(`(connection failed: ${String(e)})`)}`);
+        writeln(`${PREFIX.success} mcp server ${c17.cyan(name)} saved  ${c17.dim(`(connection failed: ${String(e)})`)}`);
       }
       return;
     }
@@ -6459,17 +6448,17 @@ async function handleMcpCommand(ctx, args) {
         return;
       }
       deleteMcpServer(name);
-      writeln(`${PREFIX.success} mcp server ${c18.cyan(name)} removed`);
+      writeln(`${PREFIX.success} mcp server ${c17.cyan(name)} removed`);
       return;
     }
     default:
       writeln(`${PREFIX.error} unknown: /mcp ${sub}`);
-      writeln(c18.dim("  subcommands: list \xB7 add \xB7 remove"));
+      writeln(c17.dim("  subcommands: list \xB7 add \xB7 remove"));
   }
 }
 
 // src/cli/commands-model.ts
-import * as c19 from "yoctocolors";
+import * as c18 from "yoctocolors";
 var THINKING_EFFORTS = ["low", "medium", "high", "xhigh"];
 function parseThinkingEffort(value) {
   return THINKING_EFFORTS.includes(value) ? value : null;
@@ -6488,21 +6477,21 @@ function renderModelUpdatedMessage(ctx, modelId, effortArg) {
   if (effortArg) {
     if (effortArg === "off") {
       ctx.setThinkingEffort(null);
-      writeln(`${PREFIX.success} model \u2192 ${c19.cyan(modelId)} ${c19.dim("(thinking disabled)")}`);
+      writeln(`${PREFIX.success} model \u2192 ${c18.cyan(modelId)} ${c18.dim("(thinking disabled)")}`);
       return;
     }
     const effort = parseThinkingEffort(effortArg);
     if (effort) {
       ctx.setThinkingEffort(effort);
-      writeln(`${PREFIX.success} model \u2192 ${c19.cyan(modelId)} ${c19.dim(`(\u2726 ${effort})`)}`);
+      writeln(`${PREFIX.success} model \u2192 ${c18.cyan(modelId)} ${c18.dim(`(\u2726 ${effort})`)}`);
       return;
     }
-    writeln(`${PREFIX.success} model \u2192 ${c19.cyan(modelId)}`);
-    writeln(`${PREFIX.error} unknown effort level ${c19.cyan(effortArg)} (use low, medium, high, xhigh, off)`);
+    writeln(`${PREFIX.success} model \u2192 ${c18.cyan(modelId)}`);
+    writeln(`${PREFIX.error} unknown effort level ${c18.cyan(effortArg)} (use low, medium, high, xhigh, off)`);
     return;
   }
-  const effortTag = ctx.thinkingEffort ? c19.dim(` (\u2726 ${ctx.thinkingEffort})`) : "";
-  writeln(`${PREFIX.success} model \u2192 ${c19.cyan(modelId)}${effortTag}`);
+  const effortTag = ctx.thinkingEffort ? c18.dim(` (\u2726 ${ctx.thinkingEffort})`) : "";
+  writeln(`${PREFIX.success} model \u2192 ${c18.cyan(modelId)}${effortTag}`);
 }
 async function handleModelSet(ctx, args) {
   const parts = args.trim().split(/\s+/).filter(Boolean);
@@ -6515,7 +6504,7 @@ async function handleModelSet(ctx, args) {
     const snapshot = await fetchAvailableModels();
     const match = findModelIdByAlias(idArg, snapshot.models.map((model) => model.id));
     if (!match) {
-      writeln(`${PREFIX.error} unknown model ${c19.cyan(idArg)}  ${c19.dim("\u2014 run /models for the full list")}`);
+      writeln(`${PREFIX.error} unknown model ${c18.cyan(idArg)}  ${c18.dim("\u2014 run /models for the full list")}`);
       return;
     }
     modelId = match;
@@ -6535,7 +6524,7 @@ function handleModelEffort(ctx, effortArg) {
     return;
   }
   ctx.setThinkingEffort(effort);
-  writeln(`${PREFIX.success} thinking effort \u2192 ${c19.cyan(effort)}`);
+  writeln(`${PREFIX.success} thinking effort \u2192 ${c18.cyan(effort)}`);
 }
 async function renderModelList(ctx) {
   ctx.startSpinner("fetching models");
@@ -6543,13 +6532,13 @@ async function renderModelList(ctx) {
   ctx.stopSpinner();
   if (snapshot.models.length === 0) {
     writeln(`${PREFIX.error} No models found. Check your API keys or Ollama connection.`);
-    writeln(c19.dim("  Set OPENCODE_API_KEY for Zen, or start Ollama for local models."));
+    writeln(c18.dim("  Set OPENCODE_API_KEY for Zen, or start Ollama for local models."));
     return;
   }
   if (snapshot.stale) {
     const lastSync = snapshot.lastSyncAt ? new Date(snapshot.lastSyncAt).toLocaleString() : "never";
     const refreshTag = snapshot.refreshing ? " (refreshing in background)" : "";
-    writeln(c19.dim(`  model metadata is stale (last sync: ${lastSync})${refreshTag}`));
+    writeln(c18.dim(`  model metadata is stale (last sync: ${lastSync})${refreshTag}`));
   }
   const modelsByProvider = new Map;
   for (const model of snapshot.models) {
@@ -6562,20 +6551,20 @@ async function renderModelList(ctx) {
   }
   writeln();
   for (const [provider, providerModels] of modelsByProvider) {
-    writeln(c19.bold(`  ${provider}`));
+    writeln(c18.bold(`  ${provider}`));
     for (const model of providerModels) {
       const isCurrent = ctx.currentModel === model.id;
-      const freeTag = model.free ? c19.green(" free") : "";
-      const contextTag = model.context ? c19.dim(` ${Math.round(model.context / 1000)}k`) : "";
-      const effortTag = isCurrent && ctx.thinkingEffort ? c19.dim(` \u2726 ${ctx.thinkingEffort}`) : "";
-      const currentTag = isCurrent ? c19.cyan(" \u25C0") : "";
-      writeln(`    ${c19.dim("\xB7")} ${model.displayName}${freeTag}${contextTag}${currentTag}${effortTag}`);
-      writeln(`      ${c19.dim(model.id)}`);
+      const freeTag = model.free ? c18.green(" free") : "";
+      const contextTag = model.context ? c18.dim(` ${Math.round(model.context / 1000)}k`) : "";
+      const effortTag = isCurrent && ctx.thinkingEffort ? c18.dim(` \u2726 ${ctx.thinkingEffort}`) : "";
+      const currentTag = isCurrent ? c18.cyan(" \u25C0") : "";
+      writeln(`    ${c18.dim("\xB7")} ${model.displayName}${freeTag}${contextTag}${currentTag}${effortTag}`);
+      writeln(`      ${c18.dim(model.id)}`);
     }
   }
   writeln();
-  writeln(c19.dim("  /model <id>  to switch  \xB7  e.g. /model zen/claude-sonnet-4-6"));
-  writeln(c19.dim("  /model effort <low|medium|high|xhigh|off>  to set thinking effort"));
+  writeln(c18.dim("  /model <id>  to switch  \xB7  e.g. /model zen/claude-sonnet-4-6"));
+  writeln(c18.dim("  /model effort <low|medium|high|xhigh|off>  to set thinking effort"));
 }
 async function handleModelCommand(ctx, args) {
   const parts = args.trim().split(/\s+/).filter(Boolean);
@@ -6591,7 +6580,7 @@ async function handleModelCommand(ctx, args) {
 }
 
 // src/cli/commands-session.ts
-import * as c20 from "yoctocolors";
+import * as c19 from "yoctocolors";
 function handleSessionCommand(ctx, args) {
   const id = args.trim();
   if (id) {
@@ -6599,15 +6588,15 @@ function handleSessionCommand(ctx, args) {
     const ok = ctx.switchSession(id);
     ctx.stopSpinner();
     if (ok) {
-      writeln(`${PREFIX.success} switched to session ${c20.cyan(id)} (${c20.cyan(ctx.currentModel)})`);
+      writeln(`${PREFIX.success} switched to session ${c19.cyan(id)} (${c19.cyan(ctx.currentModel)})`);
     } else {
-      writeln(`${PREFIX.error} session ${c20.cyan(id)} not found`);
+      writeln(`${PREFIX.error} session ${c19.cyan(id)} not found`);
     }
     return;
   }
-  const shown = renderSessionTable(`${c20.dim("Use")} /session <id> ${c20.dim("to switch to a session.")}`);
+  const shown = renderSessionTable(`${c19.dim("Use")} /session <id> ${c19.dim("to switch to a session.")}`);
   if (!shown) {
-    writeln(`${PREFIX.info} ${c20.dim("no sessions found")}`);
+    writeln(`${PREFIX.info} ${c19.dim("no sessions found")}`);
   }
 }
 
@@ -6617,9 +6606,9 @@ async function handleUndo(ctx) {
   try {
     const ok = await ctx.undoLastTurn();
     if (ok) {
-      writeln(`${PREFIX.success} ${c21.dim("last conversation turn removed")}`);
+      writeln(`${PREFIX.success} ${c20.dim("last conversation turn removed")}`);
     } else {
-      writeln(`${PREFIX.info} ${c21.dim("nothing to undo")}`);
+      writeln(`${PREFIX.info} ${c20.dim("nothing to undo")}`);
     }
   } finally {
     ctx.stopSpinner();
@@ -6677,7 +6666,7 @@ async function handleCommand(command, args, ctx) {
         if (loaded2) {
           const srcPath = skill.source === "local" ? `.agents/skills/${skill.name}/SKILL.md` : `~/.agents/skills/${skill.name}/SKILL.md`;
           if (skill.context === "fork") {
-            writeln(`${PREFIX.info} ${c21.cyan(skill.name)} ${c21.dim(`[${srcPath}] (forked subagent)`)}`);
+            writeln(`${PREFIX.info} ${c20.cyan(skill.name)} ${c20.dim(`[${srcPath}] (forked subagent)`)}`);
             writeln();
             const subagentPrompt = args ? `${loaded2.content}
 
@@ -6685,7 +6674,7 @@ ${args}` : loaded2.content;
             const result = await runForkedSkill(skill.name, subagentPrompt, ctx.cwd);
             return { type: "inject-user-message", text: result };
           }
-          writeln(`${PREFIX.info} ${c21.cyan(skill.name)} ${c21.dim(`[${srcPath}]`)}`);
+          writeln(`${PREFIX.info} ${c20.cyan(skill.name)} ${c20.dim(`[${srcPath}]`)}`);
           writeln();
           const prompt = args ? `${loaded2.content}
 
@@ -6693,17 +6682,16 @@ ${args}` : loaded2.content;
           return { type: "inject-user-message", text: prompt };
         }
       }
-      writeln(`${PREFIX.error} unknown: /${command}  ${c21.dim("\u2014 /help for commands")}`);
+      writeln(`${PREFIX.error} unknown: /${command}  ${c20.dim("\u2014 /help for commands")}`);
       return { type: "unknown", command };
     }
   }
 }
-var FORK_TIMEOUT_MS = 5 * 60 * 1000;
 async function runForkedSkill(skillName, prompt, cwd) {
-  const tmpFile = join11(tmpdir(), `mc-fork-${randomBytes(8).toString("hex")}.md`);
-  writeFileSync4(tmpFile, prompt, "utf8");
+  const tmpFile = join9(tmpdir(), `mc-fork-${randomBytes(8).toString("hex")}.md`);
+  writeFileSync2(tmpFile, prompt, "utf8");
   try {
-    writeln(`${PREFIX.info} ${c21.dim("running subagent\u2026")} ${c21.dim(`(timeout: ${FORK_TIMEOUT_MS / 1000}s)`)}`);
+    writeln(`${PREFIX.info} ${c20.dim("running subagent\u2026")}`);
     const proc = Bun.spawn([process.execPath, Bun.main], {
       cwd,
       stdin: Bun.file(tmpFile),
@@ -6715,15 +6703,9 @@ async function runForkedSkill(skillName, prompt, cwd) {
       stdout: "pipe",
       stderr: "pipe"
     });
-    const timer = setTimeout(() => {
-      try {
-        proc.kill("SIGTERM");
-      } catch {}
-    }, FORK_TIMEOUT_MS);
     const stdout = await new Response(proc.stdout).text();
     const stderr = await new Response(proc.stderr).text();
     const exitCode = await proc.exited;
-    clearTimeout(timer);
     if (exitCode !== 0 && !stdout.trim()) {
       return `[Subagent skill "${skillName}" failed (exit ${exitCode})]
 ${stderr.trim()}`;
@@ -6734,41 +6716,45 @@ ${stderr.trim()}`;
 ${output}`;
   } finally {
     try {
-      unlinkSync3(tmpFile);
+      unlinkSync2(tmpFile);
     } catch {}
   }
 }
-
-// src/cli/git-branch-cache.ts
-function createGitBranchCache(options) {
-  const fetchBranch = options.fetchBranch ?? getGitBranch;
-  const now = options.now ?? Date.now;
-  const ttlMs = options.ttlMs ?? 5000;
-  let value = null;
-  let lastRefreshAt = 0;
-  let inFlight = null;
-  const refresh = async (force = false) => {
-    if (!force && now() - lastRefreshAt < ttlMs)
-      return;
-    if (inFlight) {
-      await inFlight;
-      return;
-    }
-    inFlight = (async () => {
-      value = await fetchBranch(options.cwd);
-      lastRefreshAt = now();
-    })().finally(() => {
-      inFlight = null;
-    });
-    await inFlight;
-  };
-  return {
-    get: () => value,
-    refresh,
-    refreshInBackground: (force = false) => {
-      refresh(force);
-    }
-  };
+function handleBooleanToggleCommand(opts) {
+  const mode = opts.args.trim().toLowerCase();
+  if (!mode) {
+    writeln(`${PREFIX.success} ${opts.label} ${opts.current ? c20.green("on") : c20.dim("off")}`);
+    return;
+  }
+  if (mode === "on") {
+    opts.set(true);
+    writeln(`${PREFIX.success} ${opts.label} ${c20.green("on")}`);
+    return;
+  }
+  if (mode === "off") {
+    opts.set(false);
+    writeln(`${PREFIX.success} ${opts.label} ${c20.dim("off")}`);
+    return;
+  }
+  writeln(`${PREFIX.error} usage: ${opts.usage}`);
+}
+function handleReasoningCommand(ctx, args) {
+  handleBooleanToggleCommand({
+    args,
+    current: ctx.showReasoning,
+    set: (value) => ctx.setShowReasoning(value),
+    label: "reasoning display",
+    usage: "/reasoning <on|off>"
+  });
+}
+function handleVerboseCommand(ctx, args) {
+  handleBooleanToggleCommand({
+    args,
+    current: ctx.verboseOutput,
+    set: (value) => ctx.setVerboseOutput(value),
+    label: "verbose output",
+    usage: "/verbose <on|off>"
+  });
 }
 
 // src/cli/input-loop.ts
@@ -6783,20 +6769,33 @@ ${result.stderr}`);
     sections.push("command timed out");
   if (!result.success)
     sections.push(`exit code: ${result.exitCode}`);
+  if (sections.length === 0)
+    sections.push(`(no output, exit ${result.exitCode})`);
   return sections.join(`
 
 `).trim();
 }
+async function getGitBranch(cwd) {
+  try {
+    const proc = Bun.spawn(["git", "rev-parse", "--abbrev-ref", "HEAD"], {
+      cwd,
+      stdout: "pipe",
+      stderr: "pipe"
+    });
+    const out = await new Response(proc.stdout).text();
+    const code = await proc.exited;
+    if (code !== 0)
+      return null;
+    return out.trim() || null;
+  } catch {
+    return null;
+  }
+}
 async function runInputLoop(opts) {
   const { cwd, reporter, cmdCtx, runner } = opts;
   let lastStatusSignature = null;
-  const gitBranchCache = createGitBranchCache({
-    cwd,
-    fetchBranch: getGitBranch
-  });
-  await gitBranchCache.refresh(true);
   while (true) {
-    const branch = gitBranchCache.get();
+    const branch = await getGitBranch(cwd);
     const status = runner.getStatusInfo();
     const cwdDisplay = tildePath(cwd);
     const contextWindow = getContextWindow(status.model);
@@ -6809,8 +6808,7 @@ async function runInputLoop(opts) {
       outputTokens: status.totalOut,
       contextTokens: status.lastContextTokens,
       contextWindow,
-      thinkingEffort: status.thinkingEffort,
-      showReasoning: status.showReasoning
+      thinkingEffort: status.thinkingEffort
     };
     const statusSignature = buildStatusBarSignature(statusData);
     if (statusSignature !== lastStatusSignature) {
@@ -6825,15 +6823,14 @@ async function runInputLoop(opts) {
     }
     switch (input.type) {
       case "eof":
-        reporter.writeText(c22.dim("Goodbye."));
+        reporter.writeText(c21.dim("Goodbye."));
         return;
       case "interrupt":
-        gitBranchCache.refreshInBackground();
         continue;
       case "command": {
         const result = await handleCommand(input.command, input.args, cmdCtx);
         if (result.type === "exit") {
-          reporter.writeText(c22.dim("Goodbye."));
+          reporter.writeText(c21.dim("Goodbye."));
           return;
         }
         if (result.type === "inject-user-message") {
@@ -6843,7 +6840,6 @@ async function runInputLoop(opts) {
             await runner.processUserInput(resolvedText, refImages);
           } catch {}
         }
-        gitBranchCache.refreshInBackground();
         continue;
       }
       case "shell": {
@@ -6860,7 +6856,6 @@ async function runInputLoop(opts) {
         if (context) {
           runner.addShellContext(input.command, context);
         }
-        gitBranchCache.refreshInBackground(true);
         continue;
       }
       case "submit": {
@@ -6870,7 +6865,6 @@ async function runInputLoop(opts) {
         try {
           await runner.processUserInput(resolvedText, allImages);
         } catch {}
-        gitBranchCache.refreshInBackground();
         continue;
       }
     }
@@ -6906,9 +6900,6 @@ async function resolvePromptInput(promptArg, opts) {
 
 // src/index.ts
 registerTerminalCleanup();
-initErrorLog();
-initApiLog();
-cleanStaleLogs();
 initModelInfoCache();
 pruneOldData();
 refreshModelInfoInBackground().catch(() => {});
@@ -6945,7 +6936,7 @@ async function main() {
     if (last) {
       sessionId = last.id;
     } else {
-      writeln(c23.dim("No previous session found, starting fresh."));
+      writeln(c22.dim("No previous session found, starting fresh."));
     }
   } else if (args.sessionId) {
     sessionId = args.sessionId;
@@ -6968,7 +6959,7 @@ async function main() {
       const { text: resolvedText, images: refImages } = await resolveFileRefs(prompt, args.cwd);
       const responseText = await runner.processUserInput(resolvedText, refImages);
       if (responseText) {
-        writeln(responseText);
+        writeln(responseText.trimStart());
       }
       return;
     }
@@ -6985,7 +6976,7 @@ async function main() {
     process.exit(1);
   }
 }
-main().catch((err) => {
+main().then(() => process.exit(0), (err) => {
   if (!(err instanceof RenderedError)) {
     renderError(err, "main");
   }