@botconnector/bccli 0.4.1 → 0.4.3

package/dist/{acp-3PHBAI64.js → acp-NU4HZHQO.js}

@@ -36,6 +36,9 @@ function runAcp(input, output, opts) {
   const replyError = (id, code, message) => write({ jsonrpc: "2.0", id, error: { code, message } });
   const update = (sessionId, body) => write({ jsonrpc: "2.0", method: "session/update", params: { sessionId, update: body } });
   const ioFor = (sid, session) => ({
+    onThinking(delta) {
+      update(sid, { sessionUpdate: "agent_thought_chunk", content: { type: "text", text: delta } });
+    },
     toolStart(id, tool, target) {
       session.open.push({ id, tool, target });
       update(sid, { sessionUpdate: "tool_call", toolCallId: id, title: titleOf(tool, target), kind: kindOf(tool), status: "in_progress", rawInput: { target } });
@@ -89,7 +92,7 @@ function runAcp(input, output, opts) {
         protocolVersion: ACP_PROTOCOL_VERSION,
         agentCapabilities: {
           loadSession: false,
-          promptCapabilities: { image: false, audio: false, embeddedContext: false }
+          promptCapabilities: { image: false, audio: false, embeddedContext: true }
         }
       });
     }
@@ -108,7 +111,17 @@ function runAcp(input, output, opts) {
       const sid = params?.sessionId ?? "";
       const session = sessions.get(sid);
       if (!session) return replyError(id, -32602, "Unknown session");
-      const text = (params?.prompt ?? []).filter((p) => p?.type === "text").map((p) => String(p.text ?? "")).join("\n");
+      if (session.controller) return replyError(id, -32e3, "Session is busy");
+      const text = (params?.prompt ?? []).map((p) => {
+        if (p?.type === "text") return String(p.text ?? "");
+        if ((p?.type === "resource" || p?.type === "embeddedContext") && p.resource?.text) {
+          const label = p.resource.uri ? `
+[${p.resource.uri}]
+` : "\n";
+          return `${label}${p.resource.text}`;
+        }
+        return "";
+      }).filter(Boolean).join("\n");
       const controller = new AbortController();
       session.controller = controller;
       let cancelled = false;
@@ -122,8 +135,10 @@ function runAcp(input, output, opts) {
         if (cancelled) return reply(id, { stopReason: "cancelled" });
         return replyError(id, -32603, e.message);
       } finally {
-        session.controller = null;
-        session.open = [];
+        if (session.controller === controller) {
+          session.controller = null;
+          session.open = [];
+        }
       }
       return reply(id, { stopReason: cancelled ? "cancelled" : "end_turn" });
     }
@@ -150,6 +165,10 @@ function runAcp(input, output, opts) {
     };
     const onEnd = () => {
       input.removeListener("data", onData);
+      for (const session of sessions.values()) {
+        session.controller?.abort();
+        for (const settle of [...session.pending]) settle("no");
+      }
       resolve();
     };
     input.on("data", onData);
@@ -161,17 +180,22 @@ function runtimeAgent(cwd, allowAll = false) {
   return {
     async run(text, onChunk, signal, io) {
       if (!rt) {
-        const { parseCliArgs } = await import("./args-W6BNKY7K.js");
-        const { createRuntime } = await import("./setup-OV3NWQN5.js");
+        const { parseCliArgs } = await import("./args-NRTZWWEV.js");
+        const { createRuntime } = await import("./setup-HVVHOIL4.js");
         rt = createRuntime({ cwd, args: { ...parseCliArgs([]), allowAll } });
       }
       if (io && !allowAll) rt.agent.askPermission = (req) => io.askPermission(req);
+      let turnError;
       rt.agent.onEvent = (event) => {
         if (event.type === "text") onChunk(event.delta);
+        else if (event.type === "thinking") io?.onThinking?.(event.delta);
         else if (event.type === "toolStart") io?.toolStart(event.id, event.tool, event.target);
         else if (event.type === "toolEnd") io?.toolEnd(event.id, event.output, event.isError);
+        else if (event.type === "error") turnError = event.message;
+        else if (event.type === "budgetExceeded") turnError = `Budget exceeded (${event.kind})`;
       };
       await rt.agent.run(text, signal);
+      if (turnError) throw new Error(turnError);
     }
   };
 }

package/dist/acp.d.ts

@@ -5,6 +5,7 @@ export interface AcpIo {
     toolStart(id: string, tool: string, target: string): void;
     toolEnd(id: string, output: string, isError: boolean): void;
     askPermission(req: PermissionAsk): Promise<PermissionAnswer>;
+    onThinking?(delta: string): void;
 }
 /** The minimum an ACP client needs: run one prompt, stream text chunks, allow cancellation. */
 export interface AcpAgent {

package/dist/agent.d.ts

@@ -109,14 +109,18 @@ export declare class Agent {
     private definitions;
     private turnTools;
     private turnDefinitions;
-    private readonly readFiles;
+    readonly readFiles: Set<string>;
     private readonly webBudget;
     private readonly maxSteps?;
     private contextWindow;
+    private budgetModel;
     private systemPrompt;
     constructor(opts: AgentOptions);
     setSystemPrompt(text: string): void;
     setContextWindow(window: number): void;
+    getContextWindow(): number;
+    setBudgetModel(model: string): void;
+    getBudgetModel(): string;
     setTools(tools: Tool[]): void;
     private isParallelSafe;
     private push;

package/dist/args-NRTZWWEV.js

@@ -0,0 +1,13 @@
+#!/usr/bin/env node
+import {
+  helpText,
+  parseCliArgs
+} from "./chunk-6UO5GX55.js";
+import "./chunk-WFZKJY3R.js";
+import "./chunk-KPTML72Q.js";
+import "./chunk-RX4UQX43.js";
+import "./chunk-3WHI4LN3.js";
+export {
+  helpText,
+  parseCliArgs
+};

package/dist/args.d.ts

@@ -45,6 +45,8 @@ export interface CliArgs {
     project?: string;
     /** `bccli pr` — explicit owner/name repo when cwd is not a git checkout of the PR. */
     repo?: string;
+    /** Automatic fallback model ref when the primary model fails with 429 or 5xx. */
+    fallbackModel?: string;
 }
 /** Help text in the current language (call it after the language is set). */
 export declare const helpText: () => string;

package/dist/checkpoints.d.ts

@@ -8,6 +8,7 @@ export declare class CheckpointStore {
     private readonly history;
     private current;
     private pendingRedo;
+    private offset;
     beginTurn(): void;
     /** Call before writing a file; only the first snapshot per file per turn is kept. */
     snapshot(path: string): Promise<void>;

package/dist/{chunk-MFHCQQEN.js → chunk-3I5BW3ZT.js}

@@ -2,7 +2,7 @@
 import {
   quarantineCorruptFile,
   writeFileAtomic
-} from "./chunk-FLQPE4S5.js";
+} from "./chunk-RX4UQX43.js";
 
 // src/mcp/oauth.ts
 import { spawn } from "child_process";
@@ -156,8 +156,9 @@ async function authorizeMcpServer(spec, deps) {
       res.end("<html><body><p>BCCLI is connected. You can close this tab.</p></body></html>");
       settle.resolve(code);
     } catch (error) {
+      const escaped = error.message.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;");
       res.writeHead(400, { "content-type": "text/html; charset=utf-8" });
-      res.end(`<html><body><p>${error.message}</p></body></html>`);
+      res.end(`<html><body><p>${escaped}</p></body></html>`);
       settle.reject(error);
     }
   });

package/dist/{chunk-UZWJQF67.js → chunk-3WHI4LN3.js}

@@ -458,7 +458,8 @@ Opsi:
   "gh is not available ({error}); install GitHub CLI first": "gh tidak tersedia ({error}); pasang GitHub CLI dulu",
   "gh pr checkout {n} failed (exit {code})": "gh pr checkout {n} gagal (exit {code})",
   "checked out PR #{n}": "checkout PR #{n} selesai",
-  "--allow-all: the PR task runs every tool without asking": "--allow-all: tugas PR menjalankan semua alat tanpa bertanya"
+  "--allow-all: the PR task runs every tool without asking": "--allow-all: tugas PR menjalankan semua alat tanpa bertanya",
+  "view or change configuration settings": "lihat atau ubah pengaturan konfigurasi"
 };
 
 // src/i18n.ts

package/dist/{chunk-BGXNR74O.js → chunk-4W5SKQDC.js}

@@ -4,14 +4,21 @@ import {
 } from "./chunk-PSO7R5AD.js";
 import {
   t
-} from "./chunk-UZWJQF67.js";
+} from "./chunk-3WHI4LN3.js";
 
 // src/tools/bash.ts
 import { spawn } from "child_process";
-import { existsSync as existsSync2 } from "fs";
+import { existsSync as existsSync2, writeFileSync } from "fs";
+import { tmpdir } from "os";
+import { join } from "path";
 import { z } from "zod";
 
 // src/tools/sandbox.ts
+function winPathToWsl(winPath) {
+  const normalized = winPath.replace(/\\/g, "/");
+  const m = /^([A-Za-z]):\/(.*)$/.exec(normalized);
+  return m ? `/mnt/${m[1].toLowerCase()}/${m[2]}` : normalized;
+}
 function darwinProfile(cwd, network) {
   const writable = [cwd, "/tmp", "/private/tmp", "/dev", "/var/folders"].map((p) => `(subpath "${p}")`).join(" ");
   return [
@@ -55,6 +62,33 @@ function sandboxArgv(command, opts) {
       command
     ];
   }
+  if (opts.platform === "win32" && (opts.wslBwrap || process.env.BCCLI_WIN32_WSL_SANDBOX === "1")) {
+    const wslCwd = winPathToWsl(opts.cwd);
+    return [
+      "wsl.exe",
+      "--",
+      "bwrap",
+      "--ro-bind",
+      "/",
+      "/",
+      "--dev-bind",
+      "/dev",
+      "/dev",
+      "--proc",
+      "/proc",
+      "--bind",
+      wslCwd,
+      wslCwd,
+      "--tmpfs",
+      "/tmp",
+      "--die-with-parent",
+      ...opts.network ? [] : ["--unshare-net"],
+      "--",
+      "/bin/bash",
+      "-c",
+      command
+    ];
+  }
   return void 0;
 }
 
@@ -236,7 +270,7 @@ function offlineEnv(env = process.env) {
   };
 }
 function runCommand(command, opts) {
-  return new Promise((resolve) => {
+  return new Promise((resolve3) => {
     const child = spawnChild(command, opts.cwd, opts.env, opts.shell ?? defaultShell());
     if (!exitHookInstalled) {
       process.on("exit", killAllCommands);
@@ -249,7 +283,14 @@ function runCommand(command, opts) {
     let dropped = 0;
     let timedOut = false;
     let aborted = false;
+    const fullChunks = [];
+    let fullBytes = 0;
+    const MAX_SPILL_BYTES = 10 * 1024 * 1024;
     const onData = (data) => {
+      if (fullBytes < MAX_SPILL_BYTES) {
+        fullChunks.push(data);
+        fullBytes += data.length;
+      }
       let s = data;
       if (head.length < HALF) {
         const take = s.slice(0, HALF - head.length);
@@ -288,10 +329,19 @@ function runCommand(command, opts) {
       active.delete(killAsAborted);
       clearTimeout(timer);
       opts.signal.removeEventListener("abort", onAbort);
+      let spillNote = "";
+      if (dropped && fullChunks.length) {
+        try {
+          const spillPath = join(tmpdir(), `bccli-bash-${Date.now()}-${Math.random().toString(36).slice(2, 8)}.log`);
+          writeFileSync(spillPath, fullChunks.join(""), "utf8");
+          spillNote = `; full output saved to ${spillPath}`;
+        } catch {
+        }
+      }
       const output = dropped ? `${head}
-\u2026 [${dropped} characters truncated] \u2026
+\u2026 [${dropped} characters truncated${spillNote}] \u2026
 ${tail}` : head + tail;
-      resolve({ output: output + extra, exitCode, timedOut, aborted });
+      resolve3({ output: output + extra, exitCode, timedOut, aborted });
     };
     child.on("error", (error) => finish(null, error.message));
     child.on("close", (code) => finish(code));
@@ -403,7 +453,7 @@ var BUILTIN_AGENTS = [
 
 // src/context.ts
 import { existsSync as existsSync3, readFileSync } from "fs";
-import { dirname, join } from "path";
+import { dirname, join as join2 } from "path";
 var FILES = ["AGENTS.md", "CLAUDE.md", "BCCLI.md"];
 function readIf(path) {
   try {
@@ -418,7 +468,7 @@ function instructionPaths(cwd, home) {
     dirs2.unshift(dir);
     if (dirname(dir) === dir) break;
   }
-  return [join(home, "BCCLI.md"), ...dirs2.flatMap((dir) => FILES.map((name) => join(dir, name)))];
+  return [join2(home, "BCCLI.md"), ...dirs2.flatMap((dir) => FILES.map((name) => join2(dir, name)))];
 }
 function loadInstructions(cwd, home) {
   const parts = [];
@@ -431,7 +481,7 @@ ${text}`);
 }
 function isGitRepo(cwd) {
   for (let dir = cwd; ; dir = dirname(dir)) {
-    if (existsSync3(join(dir, ".git"))) return true;
+    if (existsSync3(join2(dir, ".git"))) return true;
     if (dirname(dir) === dir) return false;
   }
 }
@@ -476,15 +526,33 @@ ${instructions}` : ""}`;
 
 // src/extensions.ts
 import { existsSync as existsSync4, readdirSync, readFileSync as readFileSync2, statSync } from "fs";
-import { basename, join as join2 } from "path";
+import { basename, join as join3 } from "path";
 function parseFrontmatter(text) {
   const match = /^---\r?\n([\s\S]*?)\r?\n---\r?\n?/.exec(text);
   if (!match) return { data: {}, body: text };
   const data = {};
+  let currentListKey;
   for (const line of match[1].split(/\r?\n/)) {
+    const listItem = /^\s*-\s+(.+)$/.exec(line);
+    if (listItem && currentListKey) {
+      const item = listItem[1].trim().replace(/^["']|["']$/g, "");
+      const prev = data[currentListKey];
+      if (Array.isArray(prev)) prev.push(item);
+      else data[currentListKey] = [item];
+      continue;
+    }
     const kv = /^([A-Za-z0-9_-]+):\s*(.*)$/.exec(line);
-    if (!kv) continue;
+    if (!kv) {
+      if (line.trim()) currentListKey = void 0;
+      continue;
+    }
     let value = kv[2].trim();
+    if (!value) {
+      currentListKey = kv[1];
+      data[kv[1]] = "";
+      continue;
+    }
+    currentListKey = void 0;
     if (value.startsWith("[") && value.endsWith("]")) {
       data[kv[1]] = value.slice(1, -1).split(",").map((s) => s.trim().replace(/^["']|["']$/g, "")).filter(Boolean);
       continue;
@@ -496,7 +564,7 @@ function parseFrontmatter(text) {
 }
 var str = (v) => Array.isArray(v) ? v.join(", ") : v;
 function dirs(r, kind) {
-  return [join2(r.userHome, ".claude", kind), join2(r.home, kind), join2(r.cwd, ".claude", kind), join2(r.cwd, ".bccli", kind)];
+  return [join3(r.userHome, ".claude", kind), join3(r.home, kind), join3(r.cwd, ".claude", kind), join3(r.cwd, ".bccli", kind)];
 }
 function list(dir) {
   try {
@@ -509,11 +577,11 @@ function loadSkills(r) {
   const byName = /* @__PURE__ */ new Map();
   for (const dir of dirs(r, "skills")) {
     for (const entry of list(dir)) {
-      const file = join2(dir, entry, "SKILL.md");
+      const file = join3(dir, entry, "SKILL.md");
       if (!existsSync4(file)) continue;
       const { data } = parseFrontmatter(readFileSync2(file, "utf8"));
       const name = str(data.name) || entry;
-      byName.set(name, { name, description: str(data.description) ?? "", dir: join2(dir, entry), file });
+      byName.set(name, { name, description: str(data.description) ?? "", dir: join3(dir, entry), file });
     }
   }
   return [...byName.values()];
@@ -522,7 +590,7 @@ function loadCommands(r) {
   const byName = /* @__PURE__ */ new Map();
   for (const dir of dirs(r, "commands")) {
     for (const entry of list(dir)) {
-      const file = join2(dir, entry);
+      const file = join3(dir, entry);
       if (!entry.endsWith(".md") || !statSync(file).isFile()) continue;
       const { data, body } = parseFrontmatter(readFileSync2(file, "utf8"));
       const def = { name: basename(entry, ".md"), body: body.trim() };
@@ -538,7 +606,7 @@ function loadAgentDefs(r) {
   for (const dir of dirs(r, "agents")) {
     for (const entry of list(dir)) {
       if (!entry.endsWith(".md")) continue;
-      const { data, body } = parseFrontmatter(readFileSync2(join2(dir, entry), "utf8"));
+      const { data, body } = parseFrontmatter(readFileSync2(join3(dir, entry), "utf8"));
       const name = str(data.name) || basename(entry, ".md");
       const def = { name, description: str(data.description) ?? "", prompt: body.trim() };
       if (data.tools)
@@ -573,7 +641,7 @@ function runOne(command, event, payload, opts) {
     ...payload.input !== void 0 ? { BCCLI_HOOK_INPUT: JSON.stringify(payload.input) } : {},
     ...payload.output !== void 0 ? { BCCLI_HOOK_OUTPUT: payload.output } : {}
   };
-  return new Promise((resolve) => {
+  return new Promise((resolve3) => {
     let stdout = "";
     let stderr = "";
     let timedOut = false;
@@ -582,7 +650,7 @@ function runOne(command, event, payload, opts) {
       if (settled) return;
       settled = true;
       clearTimeout(timer);
-      resolve(result);
+      resolve3(result);
     };
     let child;
     const shell = defaultShell();
@@ -598,7 +666,7 @@ function runOne(command, event, payload, opts) {
         child = spawn2(command, { shell: true, env, cwd: opts.cwd ?? process.cwd(), stdio: ["ignore", "pipe", "pipe"] });
       }
     } catch (error) {
-      resolve({ failure: error.message });
+      resolve3({ failure: error.message });
       return;
     }
     const timer = setTimeout(() => {
@@ -648,6 +716,38 @@ async function runHooks(hooks, event, payload = {}, opts = {}) {
   return { blocked, warnings };
 }
 
+// src/tools/paths.ts
+import { statSync as statSync2 } from "fs";
+import { isAbsolute, resolve } from "path";
+var readMtimes = /* @__PURE__ */ new WeakMap();
+function resolvePath(cwd, path) {
+  return isAbsolute(path) ? path : resolve(cwd, path);
+}
+function errorCode(error) {
+  return error.code ?? error.message;
+}
+function recordFileMtime(readFiles, abs) {
+  readFiles.add(abs);
+  try {
+    let map = readMtimes.get(readFiles);
+    if (!map) {
+      map = /* @__PURE__ */ new Map();
+      readMtimes.set(readFiles, map);
+    }
+    map.set(abs, statSync2(abs).mtimeMs);
+  } catch {
+  }
+}
+function isFileModifiedSinceRead(readFiles, abs) {
+  const recorded = readMtimes.get(readFiles)?.get(abs);
+  if (recorded === void 0) return false;
+  try {
+    return statSync2(abs).mtimeMs > recorded + 50;
+  } catch {
+    return false;
+  }
+}
+
 // src/slash/memory.ts
 import { appendFileSync, existsSync as existsSync5, readFileSync as readFileSync3 } from "fs";
 function instructionFiles(cwd, home) {
@@ -665,22 +765,38 @@ function parseMemoryArgs(args) {
 
 // src/tools/ignore.ts
 import { readFileSync as readFileSync4 } from "fs";
-import { join as join3 } from "path";
-function ignorePatterns(root) {
+import { dirname as dirname2, join as join4, resolve as resolve2 } from "path";
+function ignorePatterns(root, projectRoot) {
   const patterns = ["**/node_modules/**", "**/.git/**"];
-  let lines = [];
-  try {
-    lines = readFileSync4(join3(root, ".gitignore"), "utf8").split(/\r?\n/);
-  } catch {
-    return patterns;
+  const seen = /* @__PURE__ */ new Set();
+  const dirs2 = [];
+  let cur = resolve2(root);
+  const stop = projectRoot ? resolve2(projectRoot) : cur;
+  while (true) {
+    if (!seen.has(cur)) {
+      seen.add(cur);
+      dirs2.push(cur);
+    }
+    if (cur === stop || !cur.startsWith(stop)) break;
+    const parent = dirname2(cur);
+    if (parent === cur) break;
+    cur = parent;
   }
-  for (const raw of lines) {
-    const line = raw.trim();
-    if (!line || line.startsWith("#") || line.startsWith("!")) continue;
-    const p = line.replace(/^\//, "").replace(/\/$/, "");
-    patterns.push(`**/${p}`, `**/${p}/**`);
+  for (const dir of dirs2) {
+    let lines = [];
+    try {
+      lines = readFileSync4(join4(dir, ".gitignore"), "utf8").split(/\r?\n/);
+    } catch {
+      continue;
+    }
+    for (const raw of lines) {
+      const line = raw.trim();
+      if (!line || line.startsWith("#") || line.startsWith("!")) continue;
+      const p = line.replace(/^\//, "").replace(/\/$/, "");
+      patterns.push(`**/${p}`, `**/${p}/**`);
+    }
   }
-  return patterns;
+  return [...new Set(patterns)];
 }
 
 // src/tools/globSafety.ts
@@ -713,11 +829,16 @@ function normalizeGlobPath(path) {
 }
 
 export {
+  resolveShell,
   runHooks,
   renderBackgroundTasks,
   runCommand,
   createBashTool,
   bashTool,
+  resolvePath,
+  errorCode,
+  recordFileMtime,
+  isFileModifiedSinceRead,
   ignorePatterns,
   validateGlobPattern,
   normalizeGlobPath,

package/dist/{chunk-BC7UXFE4.js → chunk-6AUROP2E.js}

@@ -1,12 +1,12 @@
 #!/usr/bin/env node
 import {
   contentText
-} from "./chunk-WNACAUDK.js";
+} from "./chunk-XTOATEI6.js";
 
 // src/session.ts
 import { randomBytes } from "crypto";
 import { appendFileSync, existsSync, mkdirSync, readdirSync, readFileSync, rmSync, statSync } from "fs";
-import { join } from "path";
+import { basename, join } from "path";
 function projectDir(home, cwd) {
   const slug = cwd.replace(/[^a-zA-Z0-9]+/g, "-").replace(/^-+|-+$/g, "").slice(-100) || "root";
   return join(home, "sessions", slug);
@@ -27,6 +27,9 @@ var Session = class _Session {
     this.file = file;
   }
   file;
+  get id() {
+    return basename(this.file, ".jsonl");
+  }
   static create(home, cwd, now = /* @__PURE__ */ new Date()) {
     const dir = projectDir(home, cwd);
     mkdirSync(dir, { recursive: true });
@@ -38,7 +41,7 @@ var Session = class _Session {
     if (!existsSync(dir)) return [];
     return readdirSync(dir).filter((f) => f.endsWith(".jsonl")).map((f) => {
       const session = new _Session(join(dir, f));
-      const first = session.load().find((m) => m.role === "user");
+      const first = session.loadHistory().find((m) => m.role === "user");
       return { session, mtime: statSync(session.file).mtime, preview: first ? contentText(first.content).slice(0, 80) : "" };
     }).sort((a, b) => b.mtime.getTime() - a.mtime.getTime() || b.session.file.localeCompare(a.session.file));
   }
@@ -88,6 +91,35 @@ var Session = class _Session {
     }
     return void 0;
   }
+  /** Accumulated token usage since the last non-compaction reset. */
+  totalUsage() {
+    const segments = [{ msgs: [], usage: { inputTokens: 0, outputTokens: 0 } }];
+    for (const record of this.records()) {
+      const cur = segments[segments.length - 1];
+      if (record.t === "reset") {
+        segments.push({ msgs: [], usage: { inputTokens: 0, outputTokens: 0 } });
+      } else if (record.t === "msg") {
+        cur.msgs.push(record.m);
+      } else if (record.t === "usage") {
+        cur.usage.inputTokens += record.inputTokens;
+        cur.usage.outputTokens += record.outputTokens;
+        if (record.cachedInputTokens) cur.usage.cachedInputTokens = (cur.usage.cachedInputTokens ?? 0) + record.cachedInputTokens;
+        if (record.cacheWriteTokens) cur.usage.cacheWriteTokens = (cur.usage.cacheWriteTokens ?? 0) + record.cacheWriteTokens;
+      }
+    }
+    let total = { ...segments[0].usage };
+    for (const seg of segments.slice(1)) {
+      if (!isCompactionSummary(seg.msgs[0])) {
+        total = { ...seg.usage };
+      } else {
+        total.inputTokens += seg.usage.inputTokens;
+        total.outputTokens += seg.usage.outputTokens;
+        if (seg.usage.cachedInputTokens) total.cachedInputTokens = (total.cachedInputTokens ?? 0) + seg.usage.cachedInputTokens;
+        if (seg.usage.cacheWriteTokens) total.cacheWriteTokens = (total.cacheWriteTokens ?? 0) + seg.usage.cacheWriteTokens;
+      }
+    }
+    return total;
+  }
   /**
    * What the user sees on resume: the whole conversation. Compaction only shrinks what the model is sent, so
    * its reset does not hide the older turns here. A real reset (/clear, rewind) still starts over, the
@@ -100,12 +132,22 @@ var Session = class _Session {
       else if (record.t === "msg") segments[segments.length - 1].push(record.m);
     }
     let shown = segments[0];
+    let lastSummary;
     for (const segment of segments.slice(1)) {
       if (!isCompactionSummary(segment[0])) {
         shown = segment;
+        lastSummary = void 0;
         continue;
       }
       const kept = segment.slice(2);
+      if (lastSummary && sameMessage(segment[0], lastSummary)) {
+        const subIdx = findContiguousSlice(shown, kept);
+        if (subIdx !== -1) {
+          shown = shown.slice(0, subIdx + kept.length);
+          continue;
+        }
+      }
+      lastSummary = segment[0];
       let at = 0;
       while (at <= shown.length && !endsWithPrefixOf(shown, at, kept)) at++;
       shown = [...shown, ...kept.slice(shown.length - at)];
@@ -132,12 +174,31 @@ function endsWithPrefixOf(shown, at, kept) {
   for (let j = 0; j < n; j++) if (!sameMessage(shown[at + j], kept[j])) return false;
   return true;
 }
+function findContiguousSlice(shown, slice) {
+  if (slice.length === 0) return shown.length;
+  for (let i = 0; i + slice.length <= shown.length; i++) {
+    let ok = true;
+    for (let j = 0; j < slice.length; j++) {
+      if (!sameMessage(shown[i + j], slice[j])) {
+        ok = false;
+        break;
+      }
+    }
+    if (ok) return i;
+  }
+  return -1;
+}
 function pruneSessions(home, now = Date.now(), maxAgeDays = 30) {
   const root = join(home, "sessions");
   if (!existsSync(root)) return 0;
   let removed = 0;
   for (const project of readdirSync(root)) {
     const dir = join(root, project);
+    try {
+      if (!statSync(dir).isDirectory()) continue;
+    } catch {
+      continue;
+    }
     for (const file of readdirSync(dir)) {
       const path = join(dir, file);
       if (now - statSync(path).mtimeMs > maxAgeDays * 864e5) {

package/dist/{chunk-24JN75FZ.js → chunk-6M55UPES.js}

@@ -2,10 +2,10 @@
 import {
   ConfigError,
   writeFileAtomic
-} from "./chunk-FLQPE4S5.js";
+} from "./chunk-RX4UQX43.js";
 import {
   t
-} from "./chunk-UZWJQF67.js";
+} from "./chunk-3WHI4LN3.js";
 
 // src/mcp/config.ts
 import { createHash } from "crypto";