clixad 0.0.1-beta.43 → 0.0.1-beta.45

package/dist/{chunk-T7SUUKJC.mjs → chunk-Y55DBUP6.mjs}

@@ -607,16 +607,16 @@ async function httpFailure(res, what) {
   return detail ? `${what} failed: ${res.status} \u2014 ${detail}` : `${what} failed: ${res.status}`;
 }
 function sleep(ms, signal) {
-  return new Promise((resolve4) => {
+  return new Promise((resolve5) => {
     if (!signal) {
-      setTimeout(resolve4, ms);
+      setTimeout(resolve5, ms);
       return;
     }
-    if (signal.aborted) return resolve4();
+    if (signal.aborted) return resolve5();
     const done = () => {
       clearTimeout(timer);
       signal.removeEventListener("abort", done);
-      resolve4();
+      resolve5();
     };
     const timer = setTimeout(done, ms);
     signal.addEventListener("abort", done, { once: true });
@@ -1939,16 +1939,16 @@ async function devLogin(client, config, email, invite) {
   };
 }
 function sleep2(ms, signal) {
-  return new Promise((resolve4) => {
+  return new Promise((resolve5) => {
     if (!signal) {
-      setTimeout(resolve4, ms);
+      setTimeout(resolve5, ms);
       return;
     }
-    if (signal.aborted) return resolve4();
+    if (signal.aborted) return resolve5();
     const done = () => {
       clearTimeout(timer);
       signal.removeEventListener("abort", done);
-      resolve4();
+      resolve5();
     };
     const timer = setTimeout(done, ms);
     signal.addEventListener("abort", done, { once: true });
@@ -3084,7 +3084,7 @@ var StdioTransport = class {
     if (this.exited) return Promise.reject(new McpError(this.exited));
     const id = ++this.seq;
     const payload = JSON.stringify({ jsonrpc: "2.0", id, method, params }) + "\n";
-    return new Promise((resolve4, reject) => {
+    return new Promise((resolve5, reject) => {
       const settle = (fn) => {
         clearTimeout(timer);
         signal?.removeEventListener("abort", onAbort);
@@ -3098,7 +3098,7 @@ var StdioTransport = class {
       const onAbort = () => settle(() => reject(new McpError("cancelled")));
       signal?.addEventListener("abort", onAbort, { once: true });
       this.pending.set(id, {
-        resolve: (v) => settle(() => resolve4(v)),
+        resolve: (v) => settle(() => resolve5(v)),
         reject: (e) => settle(() => reject(e))
       });
       this.child.stdin?.write(payload, (err) => {
@@ -5486,79 +5486,92 @@ ${NO_SEARCH_INSTRUCTION}`,
       ...turn.spendable ? { spendable: turn.spendable } : {}
     });
   }
-  let retriedEmpty = false;
-  for (let step = 0; step < maxSteps; step++) {
-    if (opts.signal?.aborted) return stop("aborted");
-    let turn;
-    try {
-      turn = await client.chatStream(messages, opts.model, {
-        effort: opts.effort,
-        tools: opts.tools ? opts.tools() : TOOL_SCHEMA,
-        signal: opts.signal,
-        onDelta: (text) => emit({ type: "delta", text })
-      });
-    } catch (err) {
-      if (isAbort(err) || opts.signal?.aborted) return stop("aborted");
-      throw err;
-    }
-    creditsCharged += turn.creditsCharged;
-    creditsWaived += turn.creditsWaived ?? 0;
-    if (turn.freeCreditsLeft !== void 0) freeCreditsLeft = turn.freeCreditsLeft;
-    balance = turn.balance;
-    emitUsage(turn);
-    const content = messageText(turn.message);
-    const calls = turn.message.tool_calls ?? [];
-    if (calls.length === 0 && !content.trim() && !retriedEmpty) {
-      retriedEmpty = true;
-      continue;
-    }
-    retriedEmpty = false;
-    messages.push(turn.message);
-    if (content) lastText = content;
-    if (calls.length === 0) {
-      emit({ type: "final", content, creditsCharged, balance });
-      return {
-        content,
-        messages: withoutReasoning(messages),
-        creditsCharged,
-        balance,
-        creditsWaived,
-        freeCreditsLeft,
-        searchCredits,
-        steps: step + 1
-      };
+  const base = messages.length;
+  try {
+    return await loop();
+  } catch (err) {
+    if (typeof err === "object" && err !== null) {
+      if (messages.length > base) interrupted.set(err, closeOpenCalls(withoutReasoning(messages)));
+      else interrupted.delete(err);
     }
-    if (content) emit({ type: "message", content });
-    pendingImages = [];
-    for (const [i, call] of calls.entries()) {
-      if (opts.signal?.aborted) {
-        for (const rest of calls.slice(i)) messages.push(toolMessage(rest, "cancelled by the user"));
-        return stop("aborted");
+    throw err;
+  }
+  async function loop() {
+    let retriedEmpty = false;
+    for (let step = 0; step < maxSteps; step++) {
+      if (opts.signal?.aborted) return stop("aborted");
+      let turn;
+      try {
+        turn = await client.chatStream(messages, opts.model, {
+          effort: opts.effort,
+          tools: opts.tools ? opts.tools() : TOOL_SCHEMA,
+          signal: opts.signal,
+          onDelta: (text) => emit({ type: "delta", text })
+        });
+      } catch (err) {
+        if (isAbort(err) || opts.signal?.aborted) return stop("aborted");
+        throw err;
       }
-      const result = await executeToolCall(ctx, call, emit);
-      messages.push(toolMessage(call, result));
-    }
-    if (pendingImages.length) {
-      messages.push(imageMessage(pendingImages));
-      emit({
-        type: "attachment",
-        labels: pendingImages.map((image) => image.label)
-      });
+      creditsCharged += turn.creditsCharged;
+      creditsWaived += turn.creditsWaived ?? 0;
+      if (turn.freeCreditsLeft !== void 0) freeCreditsLeft = turn.freeCreditsLeft;
+      balance = turn.balance;
+      emitUsage(turn);
+      const content = messageText(turn.message);
+      const calls = turn.message.tool_calls ?? [];
+      if (calls.length === 0 && !content.trim() && !retriedEmpty) {
+        retriedEmpty = true;
+        continue;
+      }
+      retriedEmpty = false;
+      messages.push(turn.message);
+      if (content) lastText = content;
+      if (calls.length === 0) {
+        emit({ type: "final", content, creditsCharged, balance });
+        return {
+          content,
+          messages: withoutReasoning(messages),
+          creditsCharged,
+          balance,
+          creditsWaived,
+          freeCreditsLeft,
+          searchCredits,
+          steps: step + 1
+        };
+      }
+      if (content) emit({ type: "message", content });
       pendingImages = [];
+      for (const [i, call] of calls.entries()) {
+        if (opts.signal?.aborted) {
+          for (const rest of calls.slice(i)) messages.push(toolMessage(rest, "cancelled by the user"));
+          return stop("aborted");
+        }
+        const result = await executeToolCall(ctx, call, emit);
+        messages.push(toolMessage(call, result));
+      }
+      if (pendingImages.length) {
+        messages.push(imageMessage(pendingImages));
+        emit({
+          type: "attachment",
+          labels: pendingImages.map((image) => image.label)
+        });
+        pendingImages = [];
+      }
+      opts.onCheckpoint?.(withoutReasoning(messages));
     }
+    emit({ type: "max_steps" });
+    return {
+      content: lastText || "(stopped: reached max steps)",
+      messages: withoutReasoning(messages),
+      creditsCharged,
+      balance,
+      creditsWaived,
+      freeCreditsLeft,
+      searchCredits,
+      steps: maxSteps,
+      stopped: "max_steps"
+    };
   }
-  emit({ type: "max_steps" });
-  return {
-    content: lastText || "(stopped: reached max steps)",
-    messages: withoutReasoning(messages),
-    creditsCharged,
-    balance,
-    creditsWaived,
-    freeCreditsLeft,
-    searchCredits,
-    steps: maxSteps,
-    stopped: "max_steps"
-  };
   function stop(reason) {
     emit({ type: reason });
     return {
@@ -5574,6 +5587,21 @@ ${NO_SEARCH_INSTRUCTION}`,
     };
   }
 }
+var interrupted = /* @__PURE__ */ new WeakMap();
+function interruptedConversation(err) {
+  return typeof err === "object" && err !== null ? interrupted.get(err) : void 0;
+}
+var INTERRUPTED_CALL = "not completed: the turn stopped with an error before this call finished";
+function closeOpenCalls(messages) {
+  const out = [...messages];
+  const last = out.findLastIndex((m) => m.role === "assistant");
+  const calls = last >= 0 ? out[last].tool_calls ?? [] : [];
+  const answered = new Set(out.slice(last + 1).map((m) => m.tool_call_id));
+  for (const call of calls) {
+    if (!answered.has(call.id)) out.push(toolMessage(call, INTERRUPTED_CALL));
+  }
+  return out;
+}
 function toolMessage(call, content) {
   return { role: "tool", tool_call_id: call.id, name: call.function.name, content };
 }
@@ -5944,12 +5972,20 @@ import {
   writeFileSync as writeFileSync3
 } from "node:fs";
 import { homedir as homedir5 } from "node:os";
-import { join as join5 } from "node:path";
+import { join as join5, resolve as resolve4 } from "node:path";
 var ROOT = join5(homedir5(), ".clixad");
 var SESSION_DIR = join5(ROOT, "sessions");
 var HISTORY_FILE = join5(ROOT, "history");
 var MAX_HISTORY = 200;
-var MAX_SESSIONS = 50;
+var MAX_SESSIONS = 200;
+var SESSION_ID = /^[A-Za-z0-9][A-Za-z0-9_-]{0,63}$/;
+function isSessionId(id) {
+  return SESSION_ID.test(id);
+}
+function sameDirectory(a, b) {
+  const norm = (p) => process.platform === "win32" ? resolve4(p).toLowerCase() : resolve4(p);
+  return norm(a) === norm(b);
+}
 function newSessionId() {
   const now = (/* @__PURE__ */ new Date()).toISOString().replace(/[-:]/g, "").replace(/\.\d+Z$/, "");
   return `${now}-${Math.random().toString(16).slice(2, 6)}`;
@@ -5964,12 +6000,25 @@ function saveSession(session) {
   }
 }
 function loadSession(id) {
+  if (!isSessionId(id)) return void 0;
   try {
-    return JSON.parse(readFileSync5(join5(SESSION_DIR, `${id}.json`), "utf8"));
+    const s = JSON.parse(readFileSync5(join5(SESSION_DIR, `${id}.json`), "utf8"));
+    return s && Array.isArray(s.messages) && typeof s.id === "string" ? s : void 0;
   } catch {
     return void 0;
   }
 }
+function deleteSession(id) {
+  if (!isSessionId(id)) return false;
+  const path = join5(SESSION_DIR, `${id}.json`);
+  try {
+    if (!existsSync4(path)) return false;
+    rmSync(path);
+    return true;
+  } catch {
+    return false;
+  }
+}
 function listSessions(cwd, limit = 20) {
   if (!existsSync4(SESSION_DIR)) return [];
   const metas = [];
@@ -5977,16 +6026,15 @@ function listSessions(cwd, limit = 20) {
     if (!name.endsWith(".json")) continue;
     const s = loadSession(name.slice(0, -5));
     if (!s) continue;
-    if (cwd && s.cwd !== cwd) continue;
-    const { messages: _messages, ...meta } = s;
-    metas.push(meta);
+    if (cwd && !sameDirectory(s.cwd ?? "", cwd)) continue;
+    const { messages, ...meta } = s;
+    metas.push({ ...meta, title: meta.title ?? "", updated: meta.updated ?? "", messageCount: messages.length });
   }
   metas.sort((a, b) => b.updated.localeCompare(a.updated));
   return metas.slice(0, limit);
 }
 function hasSessionIn(cwd) {
   if (!existsSync4(SESSION_DIR)) return false;
-  const needle = `"cwd":${JSON.stringify(cwd)}`;
   try {
     for (const name of readdirSync3(SESSION_DIR)) {
       if (!name.endsWith(".json")) continue;
@@ -5999,8 +6047,14 @@ function hasSessionIn(cwd) {
       } finally {
         closeSync2(fd);
       }
-      if (head.includes(needle)) return true;
-      if (!head.includes('"cwd":') && loadSession(name.slice(0, -5))?.cwd === cwd) return true;
+      const field = /"cwd":("(?:[^"\\]|\\.)*")/.exec(head)?.[1];
+      let stored;
+      try {
+        stored = field ? JSON.parse(field) : loadSession(name.slice(0, -5))?.cwd;
+      } catch {
+        stored = void 0;
+      }
+      if (stored && sameDirectory(stored, cwd)) return true;
     }
   } catch {
   }
@@ -6045,6 +6099,7 @@ var CONTEXT_TOKENS = {
   "claude-haiku-5.5": 24e3,
   "deepseek-v4-flash": 1048576,
   "gemini-3.5-flash-lite": 1048576,
+  "glm-5.3-flash": 1048576,
   "kimi-k2.5": 262144,
   "gemini-3.8-flash": 1048576,
   "kimi-k2.7-code": 262144,
@@ -6132,14 +6187,14 @@ function runKimiCode(config, task, opts = {}) {
     OPENAI_BASE_URL: `${config.gatewayUrl.replace(/\/+$/, "")}/v1`,
     OPENAI_API_KEY: config.token
   };
-  return new Promise((resolve4) => {
+  return new Promise((resolve5) => {
     const child = process.platform === "win32" ? spawn5([bin, ...args].map(quoteWin).join(" "), { stdio: "inherit", env, shell: true }) : spawn5(bin, args, { stdio: "inherit", env });
     child.on("error", (err) => {
       if (err.code === "ENOENT") console.log("\n" + INSTALL_HELP);
       else console.error(`failed to launch Kimi CLI: ${err.message}`);
-      resolve4(127);
+      resolve5(127);
     });
-    child.on("exit", (code) => resolve4(code ?? 0));
+    child.on("exit", (code) => resolve5(code ?? 0));
   });
 }
 function quoteWin(s) {
@@ -6399,6 +6454,8 @@ function cutPoint(messages, keepTurns = 2) {
   }
   return 0;
 }
+var SUMMARY_LEAD = "Summary of the earlier conversation:\n\n";
+var SUMMARY_ACK = "Understood \u2014 continuing from that summary.";
 var SUMMARY_PROMPT = "Summarise the conversation above for your future self, which will continue the work without seeing it. Cover: what the user asked for, what was already changed (files and the reasoning), what was learned about the codebase, and what is still open. Be specific about file paths and names. No preamble.";
 async function compact(client, model, messages, opts = {}) {
   const cut2 = cutPoint(messages, opts.keepTurns ?? 2);
@@ -6414,10 +6471,8 @@ async function compact(client, model, messages, opts = {}) {
   const summary = messageText(turn.message).trim() || "(no summary returned)";
   const compacted = [
     messages[0],
-    { role: "user", content: `Summary of the earlier conversation:
-
-${summary}` },
-    { role: "assistant", content: "Understood \u2014 continuing from that summary." },
+    { role: "user", content: `${SUMMARY_LEAD}${summary}` },
+    { role: "assistant", content: SUMMARY_ACK },
     ...messages.slice(cut2)
   ];
   return {
@@ -6533,6 +6588,7 @@ export {
   referLines,
   redeemMessage,
   ledgerReasonLabel,
+  messageText,
   PaywallError,
   PremiumLockedError,
   LimitRefusalError,
@@ -6574,6 +6630,8 @@ export {
   pickReviewModel,
   NO_SEARCH_INSTRUCTION,
   runAgent,
+  interruptedConversation,
+  INTERRUPTED_CALL,
   collectContext,
   INIT_PROMPT,
   INIT_HINT,
@@ -6586,9 +6644,12 @@ export {
   switchMode,
   createPermit,
   denyAll,
+  MAX_SESSIONS,
+  sameDirectory,
   newSessionId,
   saveSession,
   loadSession,
+  deleteSession,
   listSessions,
   hasSessionIn,
   latestSession,
@@ -6613,6 +6674,8 @@ export {
   estimateTokens,
   conversationTokens,
   shouldCompact,
+  SUMMARY_LEAD,
+  SUMMARY_ACK,
   compact,
   VERSION,
   VERSION_LABEL,

package/dist/clixad.mjs

@@ -43,6 +43,7 @@ import {
   rowTaskHint,
   runAgent,
   runKimiCode,
+  sameDirectory,
   saveConfig,
   savedEffort,
   shells,
@@ -53,7 +54,7 @@ import {
   takeConfigNotices,
   toolSchemaFor,
   usd
-} from "./chunk-T7SUUKJC.mjs";
+} from "./chunk-Y55DBUP6.mjs";
 
 // src/tui/load.ts
 import * as nodeModule from "node:module";
@@ -132,7 +133,7 @@ async function withProductionReact(load) {
 }
 function loadTui() {
   boundInkCaches();
-  return withProductionReact(() => import("./tui-773NJ4FQ.mjs"));
+  return withProductionReact(() => import("./tui-KH7DNN65.mjs"));
 }
 
 // src/title.ts
@@ -615,13 +616,18 @@ async function codeCmd(client, config, rest) {
 }
 async function repl(client, config, opts = {}) {
   if (opts.resume === "pick") {
-    const sessions = listSessions(void 0, 10);
+    const sessions = listSessions(void 0, 20);
     if (!sessions.length) return console.log(c.yellow("no saved sessions yet"));
-    console.log(c.bold("Sessions:"));
+    const here = process.cwd();
+    console.log(c.bold("Sessions (newest first, * = this directory):"));
     for (const s of sessions) {
-      console.log(`  ${c.cyan(s.id)}  ${s.updated.slice(0, 16).replace("T", " ")}  ${s.title}`);
+      const mark = sameDirectory(s.cwd, here) ? "*" : " ";
+      console.log(
+        `${mark} ${c.cyan(s.id)}  ${s.updated.slice(0, 16).replace("T", " ")}  ${String(s.messageCount).padStart(4)} msgs  ${s.title}`
+      );
+      if (mark === " ") console.log(c.dim(`    in ${s.cwd}`));
     }
-    console.log(c.dim("\n  resume one with: clixad --resume <id>"));
+    console.log(c.dim("\n  resume one with: clixad --resume <id>   \xB7   delete one in the REPL: /resume, then d twice"));
     return;
   }
   if (!process.stdin.isTTY) {
@@ -639,9 +645,10 @@ async function repl(client, config, opts = {}) {
     if (!config.token) return;
   }
   let session;
+  const notices = [...opts.notices ?? []];
   if (opts.resume === "latest") {
     session = latestSession(process.cwd());
-    if (!session) console.log(c.dim("  no previous session here \u2014 starting a new one"));
+    if (!session) notices.push("no saved session in this directory, so this is a new one (/resume all lists every directory's)");
   } else if (opts.resume) {
     session = loadSession(opts.resume);
     if (!session) return console.log(c.red(`no such session: ${opts.resume}`));
@@ -661,7 +668,7 @@ async function repl(client, config, opts = {}) {
     newAccount,
     preferences,
     initialTask: opts.task,
-    ...opts.notices?.length ? { notices: opts.notices } : {},
+    ...notices.length ? { notices } : {},
     ...initHint ? { initHint } : {}
   });
 }

package/dist/{tui-773NJ4FQ.mjs → tui-KH7DNN65.mjs}

@@ -6,7 +6,9 @@ import {
   EXTRA_AD_FORMATS,
   INIT_HINT,
   INIT_PROMPT,
+  INTERRUPTED_CALL,
   LimitRefusalError,
+  MAX_SESSIONS,
   MIN_BANNER_WIDTH,
   MODES,
   MODE_LABEL,
@@ -17,6 +19,8 @@ import {
   PaywallError,
   PremiumLockedError,
   SPINNER_TICKS_PER_FRAME,
+  SUMMARY_ACK,
+  SUMMARY_LEAD,
   TERMS_NOTICE,
   TERMS_URL,
   TOOLS,
@@ -35,6 +39,7 @@ import {
   conversationTokens,
   createPermit,
   createState,
+  deleteSession,
   diffTint,
   effortLabel,
   effortRaised,
@@ -45,12 +50,14 @@ import {
   freeHelpLine,
   freeTierNotice,
   grantLabel,
+  interruptedConversation,
   isNewerVersion,
   listSessions,
   listWorkspaceFiles,
   loadHistory,
   loadMcpConfig,
   loadSession,
+  messageText,
   modeInstruction,
   newSessionId,
   nextMode,
@@ -97,7 +104,7 @@ import {
   visibleLength,
   webSearchCostLine,
   welcomeBanner
-} from "./chunk-T7SUUKJC.mjs";
+} from "./chunk-Y55DBUP6.mjs";
 
 // src/tui/index.tsx
 import "react";
@@ -110,6 +117,7 @@ import { Box as Box2, Static, Text as Text2, useApp, useInput, usePaste, useStdo
 // src/mentions.ts
 var TRAILING = /[),;:]+$/;
 var MAX_MENTION_CHARS = 12e4;
+var MENTIONS_HEADING = "\n\n# Files the user referenced\n";
 function findMentions(text) {
   const out = [];
   for (const match of text.matchAll(/(?:^|\s)@([^\s]+)/g)) {
@@ -144,10 +152,7 @@ ${clipped}`);
   }
   if (blocks.length === 0) return { text, attached: [], images: [] };
   return {
-    text: `${text}
-
-# Files the user referenced
-Their contents are below, already read for you \u2014 do not call read_file on them again.
+    text: `${text}${MENTIONS_HEADING}Their contents are below, already read for you \u2014 do not call read_file on them again.
 
 ` + blocks.join("\n\n"),
     attached,
@@ -420,8 +425,8 @@ var COMMANDS = [
   { name: "clear", desc: "clear the screen and start a new session" },
   // Deliberately *no* `args` on /resume, for /login's reason: an arg hint makes
   // enter complete the command instead of running it, and the picker is the
-  // point. `/resume <id>` still works when typed in full.
-  { name: "resume", desc: "pick up an earlier session in this directory" },
+  // point. `/resume <id>`, `/resume all` and `/resume delete <id>` work typed in full.
+  { name: "resume", desc: "pick up or delete an earlier session (all: every directory)" },
   { name: "init", desc: "write a CLIXAD.md for this project" },
   // Deliberately *no* `args` on either, for /login's reason: an arg hint makes
   // enter complete the command instead of running it, and listing is what both
@@ -1461,9 +1466,9 @@ function presentResult(input, width, tint = diffTint()) {
       const [notes = "", ...rest] = result.split("\n\n");
       const out = nonEmpty(rest.join("\n\n")).filter((l) => l !== "(nothing new since the last read)");
       const { body, more } = rows(out);
-      const failed = /\] (exited with code (?!0\b)\d+|failed|killed)/.test(notes);
+      const failed2 = /\] (exited with code (?!0\b)\d+|failed|killed)/.test(notes);
       return {
-        status: failed ? "error" : "ok",
+        status: failed2 ? "error" : "ok",
         line: fit(nonEmpty(notes)[0] ?? "read"),
         body,
         more,
@@ -1603,6 +1608,69 @@ function askWords(req) {
   }
 }
 
+// src/tui/replay.ts
+function shellNote(command2, output) {
+  return `I ran \`${command2}\` in the workspace myself. Its output:
+
+${output}`;
+}
+var SHELL_NOTE = /^I ran `([^\n]*)` in the workspace myself\. Its output:\n\n([\s\S]*)$/;
+var IMAGE_NOTE = /^Here (?:is the image|are the images) you read \(/;
+function failed(result) {
+  return result.startsWith("error: ") || result === INTERRUPTED_CALL;
+}
+function parseArgs(raw) {
+  if (!raw) return {};
+  try {
+    const parsed = JSON.parse(raw);
+    return parsed && typeof parsed === "object" && !Array.isArray(parsed) ? parsed : {};
+  } catch {
+    return {};
+  }
+}
+function replayItems(messages) {
+  const answers = /* @__PURE__ */ new Map();
+  for (const m of messages) {
+    if (m.role === "tool" && m.tool_call_id) answers.set(m.tool_call_id, messageText(m));
+  }
+  const out = [];
+  for (const m of messages) {
+    if (m.role === "user") {
+      const text = messageText(m);
+      if (text.startsWith(SUMMARY_LEAD)) {
+        out.push({ kind: "notice", text: "earlier messages were summarised to save context; the summary is what the model has" });
+        continue;
+      }
+      if (IMAGE_NOTE.test(text)) continue;
+      const shell = SHELL_NOTE.exec(text);
+      if (shell) {
+        out.push({ kind: "user", text: `!${shell[1]}` });
+        out.push({ kind: "tool", name: "!", args: { command: shell[1] }, result: shell[2] ?? "", ok: true });
+        continue;
+      }
+      const cut = text.indexOf(MENTIONS_HEADING);
+      const typed = (cut >= 0 ? text.slice(0, cut) : text).trim();
+      if (typed) out.push({ kind: "user", text: typed });
+      continue;
+    }
+    if (m.role === "assistant") {
+      const text = messageText(m).trim();
+      if (text && text !== SUMMARY_ACK) out.push({ kind: "assistant", text });
+      for (const call of m.tool_calls ?? []) {
+        const result = answers.get(call.id) ?? INTERRUPTED_CALL;
+        out.push({
+          kind: "tool",
+          name: call.function.name,
+          args: parseArgs(call.function.arguments),
+          result,
+          ok: !failed(result)
+        });
+      }
+    }
+  }
+  return out;
+}
+
 // src/tui/app.tsx
 import { Fragment, jsx as jsx2, jsxs as jsxs2 } from "react/jsx-runtime";
 var WORKING = "working\u2026";
@@ -1615,6 +1683,7 @@ var SENDING_FEEDBACK = "sending\u2026";
 var WAITING_FOR_PAYMENT = "waiting for the payment\u2026";
 var FEEDBACK_TURN_INTERVAL = 50;
 var NOT_SIGNED_IN = "  Not signed in, or the stored token isn't valid for this gateway.\n  Run /login to sign in.";
+var KEPT_AFTER_ERROR = "  The work done before this error is kept. Send a message to carry on from there,\n  now or after a restart with clixad --continue.";
 var LIVE_OUTPUT_LINES = 5;
 var DELTA_FLUSH_MS = 50;
 var PASTE_ENTER_MS = 30;
@@ -1713,6 +1782,7 @@ var INIT_HINT_AFTER_TURNS = 3;
 var freshStream = () => ({ text: "", md: {}, committed: false, streamed: false });
 var EARN_ROW = "\0earn";
 var BUY_ROW = "\0buy";
+var PICKER_DELETE_CONFIRM = "Press d again to delete it for good \xB7 any other key keeps it";
 function App({
   client,
   config,
@@ -1803,6 +1873,8 @@ function App({
   const [plan, setPlan] = useState(null);
   const [picker, setPicker] = useState(null);
   const [pickerSel, setPickerSel] = useState(0);
+  const [pickerArmed, setPickerArmed] = useState(null);
+  const [pickerNote, setPickerNote] = useState(null);
   const [buy, setBuy] = useState(null);
   const [tick, setTick] = useState(0);
   const [startedAt, setStartedAt] = useState(0);
@@ -2111,9 +2183,6 @@ function App({
     if (freeLine) {
       push({ kind: "notice", tone: (wallet?.balance ?? 0) <= 0 ? "warn" : "good", text: `  ${freeLine}` });
     }
-    if (session?.messages.length) {
-      push({ kind: "notice", text: `  resumed session ${session.id} (${session.messages.length} messages)` });
-    }
     if (initHint?.returning) {
       initHintedRef.current = true;
       push({ kind: "notice", text: `  ${INIT_HINT}` });
@@ -2158,14 +2227,14 @@ function App({
       if (cancelled) return void hub.close();
       mcpRef.current = hub;
       const ready = hub.status().filter((s) => s.state === "ready");
-      const failed = hub.status().filter((s) => s.state === "failed");
+      const failed2 = hub.status().filter((s) => s.state === "failed");
       if (ready.length) {
         push({
           kind: "notice",
           text: `  mcp: ${ready.map((s) => `${s.name} (${s.toolCount} tools)`).join(", ")}`
         });
       }
-      for (const server of failed) {
+      for (const server of failed2) {
         push({ kind: "notice", tone: "warn", text: `  mcp: ${server.name} did not start \u2014 ${server.error}` });
       }
     });
@@ -2245,7 +2314,7 @@ function App({
       const fitting = AD_FORMATS.filter((format) => adFitsFormat(format, colsRef.current));
       void (async () => {
         let direct = [];
-        let failed = false;
+        let failed2 = false;
         if (directSupportedRef.current && fitting.length > 0) {
           const ask2 = sponsorDirect ?? ((formats, cols2, signal) => client.directSponsor(formats, cols2, signal));
           let answer = { supported: true, lines: [] };
@@ -2255,9 +2324,9 @@ function App({
             answer = { supported: true, lines: [], failed: true };
           }
           if (!answer.supported) directSupportedRef.current = false;
-          failed = answer.failed === true;
+          failed2 = answer.failed === true;
           direct = answer.lines;
-          if (!failed) knownBookedRef.current = new Set(direct.map((line2) => line2.format));
+          if (!failed2) knownBookedRef.current = new Set(direct.map((line2) => line2.format));
         }
         if (call !== sponsorCallRef.current) return;
         for (const format of ["top_bar", ...EXTRA_AD_FORMATS]) {
@@ -2265,7 +2334,7 @@ function App({
           const booked = direct.find((line2) => line2.format === format);
           if (booked && "hold" in booked) continue;
           if (booked) paintDirect(booked);
-          else if (failed && knownBookedRef.current.has(format)) continue;
+          else if (failed2 && knownBookedRef.current.has(format)) continue;
           else fetchNetwork(format);
         }
       })();
@@ -2362,6 +2431,26 @@ function App({
     },
     [cols, keepOutput, push]
   );
+  const replayConversation = useCallback(
+    (stored) => {
+      const title = stored.title ? ` \xB7 ${stored.title}` : "";
+      push({
+        kind: "notice",
+        tone: "good",
+        text: `  resumed session ${stored.id} (${stored.messages.length} messages)${title}`
+      });
+      for (const item of replayItems(stored.messages)) {
+        if (item.kind === "tool") commitTool(item.name, item.args, { result: item.result, ok: item.ok });
+        else if (item.kind === "notice") push({ kind: "notice", text: `  ${item.text}` });
+        else push(item);
+      }
+      push({ kind: "notice", text: "  the agent has all of this conversation; carry on below" });
+    },
+    [commitTool, push]
+  );
+  useEffect(() => {
+    if (session?.messages.length) replayConversation(session);
+  }, []);
   const handleEvent = useCallback(
     (event) => {
       if (event.type === "delta") {
@@ -2481,6 +2570,18 @@ function App({
       setLive({ text: "" });
       nextSponsor(model2);
       let history = messagesRef.current;
+      const persist = (conversation) => {
+        sessionRef.current.title ??= (task.split("\n")[0] || task).slice(0, 80);
+        saveSession({
+          id: sessionRef.current.id,
+          started: sessionRef.current.started,
+          updated: (/* @__PURE__ */ new Date()).toISOString(),
+          cwd: root,
+          model: model2,
+          title: sessionRef.current.title,
+          messages: conversation
+        });
+      };
       try {
         const window = contextWindow(model2);
         if (shouldCompact([{ role: "system", content: contextRef.current.systemPrompt }, ...history], window)) {
@@ -2546,20 +2647,13 @@ ${preferencesText}` : ""),
             webSearch: searchRef.current
           }),
           signal: ac.signal,
-          onEvent: handleEvent
+          onEvent: handleEvent,
+          // Without the system prompt, which is rebuilt per run.
+          onCheckpoint: (conversation) => persist(conversation.slice(1))
         });
         const next = result.messages.slice(1);
         setMessages(next);
-        sessionRef.current.title ??= (task.split("\n")[0] || task).slice(0, 80);
-        saveSession({
-          id: sessionRef.current.id,
-          started: sessionRef.current.started,
-          updated: (/* @__PURE__ */ new Date()).toISOString(),
-          cwd: root,
-          model: model2,
-          title: sessionRef.current.title,
-          messages: next
-        });
+        persist(next);
         if (result.stopped === "aborted") {
           if (streamRef.current.streamed) finishStream();
           push({ kind: "notice", tone: "warn", text: "  (stopped)" });
@@ -2647,6 +2741,11 @@ ${preferencesText}` : ""),
         }
       } catch (err) {
         if (streamRef.current.streamed) finishStream();
+        const kept = interruptedConversation(err)?.slice(1);
+        if (kept) {
+          setMessages(kept);
+          persist(kept);
+        }
         if ((err instanceof LimitRefusalError || err instanceof PremiumLockedError) && err.spendable) {
           balanceSeqRef.current++;
           takeSpendable(err.spendable.figures, err.spendable.balance);
@@ -2706,6 +2805,9 @@ ${preferencesText}` : ""),
         } else {
           push({ kind: "notice", tone: "error", text: `  error: ${errorNotice(err.message, void 0, "  ")}` });
         }
+        if (kept && !(err instanceof PaywallError) && !(err instanceof PremiumLockedError)) {
+          push({ kind: "notice", text: KEPT_AFTER_ERROR });
+        }
       } finally {
         abortRef.current = null;
         dropDelta();
@@ -3334,11 +3436,23 @@ ${preferencesText}` : ""),
         // earlier conversation was to quit the one you were in.
         case "resume":
         case "sessions": {
-          const metas = listSessions(root, 10);
-          if (!metas.length) {
-            push({ kind: "notice", tone: "warn", text: "  no saved sessions in this directory yet" });
+          const [verb, target] = arg.split(/\s+/);
+          if (verb === "delete" || verb === "rm") {
+            if (!target) {
+              push({ kind: "notice", tone: "warn", text: "  /resume delete <id>, or press d twice on a row in /resume" });
+              return;
+            }
+            if (target === sessionRef.current.id) {
+              push({ kind: "notice", tone: "warn", text: `  ${target} is the conversation you are in. /clear starts a new one first.` });
+              return;
+            }
+            push(
+              deleteSession(target) ? { kind: "notice", tone: "good", text: `  deleted session ${target}` } : { kind: "notice", tone: "error", text: `  no such session: ${target}` }
+            );
             return;
           }
+          const everywhere = verb === "all";
+          const metas = listSessions(everywhere ? void 0 : root, MAX_SESSIONS);
           const load = (id) => {
             const found = loadSession(id);
             if (!found) {
@@ -3347,26 +3461,42 @@ ${preferencesText}` : ""),
             }
             setMessages(found.messages);
             sessionRef.current = { id: found.id, started: found.started, title: found.title };
+            todosRef.current = new TodoList();
+            lastTurnRef.current = null;
+            replayConversation(found);
+          };
+          if (arg && !everywhere) return load(arg);
+          if (!metas.length) {
+            const elsewhere = everywhere ? 0 : listSessions(void 0, MAX_SESSIONS).length;
             push({
               kind: "notice",
-              tone: "good",
-              text: `  resumed ${found.id} \u2014 ${found.messages.length} messages
-  ${found.title}`
+              tone: "warn",
+              text: elsewhere ? `  no saved sessions in this directory yet. ${elsewhere} in other directories: /resume all lists them.` : "  no saved sessions yet"
             });
-          };
-          if (arg) return load(arg);
+            return;
+          }
           const items = metas.map((m) => ({
             value: m.id,
             label: m.updated.slice(0, 16).replace("T", " "),
-            hint: m.title.slice(0, 60),
+            hint: `${m.title.slice(0, 60)} \xB7 ${m.messageCount} messages${everywhere ? ` \xB7 ${m.cwd}` : ""}`,
             current: m.id === sessionRef.current.id
           }));
           setPickerSel(0);
+          setPickerArmed(null);
+          setPickerNote(null);
           setPicker({
-            title: "Resume a session",
-            subtitle: "Replaces the current conversation; nothing on screen is lost.",
+            title: everywhere ? "Resume a session from any directory" : "Resume a session",
+            subtitle: "Replaces the current conversation; nothing on screen is lost. d twice deletes one.",
             items,
-            onPick: (choice) => load(choice.value)
+            onPick: (choice) => load(choice.value),
+            onDelete: (choice) => {
+              if (choice.value === sessionRef.current.id) {
+                return "That is the conversation you are in. /clear starts a new one first.";
+              }
+              if (!deleteSession(choice.value)) return "It could not be deleted.";
+              push({ kind: "notice", tone: "good", text: `  deleted session ${choice.value}` });
+              return void 0;
+            }
           });
           return;
         }
@@ -3465,7 +3595,7 @@ ${preferencesText}` : ""),
           push({ kind: "notice", tone: "warn", text: `  unknown command: /${cmd} \u2014 try /help` });
       }
     },
-    [client, cols, config, cycleMode, exit, model, modelTaskHints, premium, push, root, runAdWall, runBusy, runBuy, runLogin, runTurn, setPremium, writeToStdout]
+    [client, cols, config, cycleMode, exit, model, modelTaskHints, premium, push, replayConversation, root, runAdWall, runBusy, runBuy, runLogin, runTurn, setPremium, writeToStdout]
   );
   const runShell = useCallback(
     async (command2) => {
@@ -3492,9 +3622,7 @@ ${preferencesText}` : ""),
       if (output) {
         setMessages((prev) => [
           ...prev,
-          { role: "user", content: `I ran \`${command2}\` in the workspace myself. Its output:
-
-${output}` }
+          { role: "user", content: shellNote(command2, output) }
         ]);
       }
     },
@@ -3703,6 +3831,22 @@ ${output}` }
     }
     if (picker) {
       const n = picker.items.length;
+      if (picker.onDelete && (ch === "d" || ch === "D") && !key.ctrl && !key.meta) {
+        const item = picker.items[Math.min(pickerSel, n - 1)];
+        if (!item) return;
+        setPickerNote(null);
+        if (pickerArmed !== item.value) return setPickerArmed(item.value);
+        setPickerArmed(null);
+        const refused = picker.onDelete(item);
+        if (refused) return setPickerNote(refused);
+        const rest = picker.items.filter((i) => i !== item);
+        if (!rest.length) return setPicker(null);
+        setPicker({ ...picker, items: rest });
+        setPickerSel((sel2) => Math.min(sel2, rest.length - 1));
+        return;
+      }
+      if (pickerArmed !== null) setPickerArmed(null);
+      if (pickerNote !== null) setPickerNote(null);
       if (key.escape) {
         const cancel = picker.onCancel;
         setPicker(null);
@@ -3917,16 +4061,17 @@ ${dropped.map((l) => `  \xB7 ${l}`).join("\n")}`
     };
   });
   const pickerTitle = picker ? fitRow(picker.title, inner) : "";
-  const pickerSubtitle = picker ? fitRow(picker.subtitle, inner) : "";
+  const pickerSubtitle = picker ? fitRow(pickerArmed !== null ? PICKER_DELETE_CONFIRM : pickerNote ?? picker.subtitle, inner) : "";
+  const pickerDelete = picker?.onDelete ? " \xB7 d delete" : "";
   const pickerHint = picker ? pickHint(
     picker.items.length > pickerItems.length ? [
-      `\u2191\u2193 choose (${pickerFrom + 1}-${pickerFrom + pickerItems.length} of ${picker.items.length}) \xB7 1-${pickerItems.length} jump \xB7 \u23CE confirm \xB7 esc cancel`,
-      `\u2191\u2193 ${pickerFrom + 1}-${pickerFrom + pickerItems.length}/${picker.items.length} \xB7 \u23CE confirm \xB7 esc cancel`,
-      "\u2191\u2193 \xB7 \u23CE \xB7 esc"
+      `\u2191\u2193 choose (${pickerFrom + 1}-${pickerFrom + pickerItems.length} of ${picker.items.length}) \xB7 1-${pickerItems.length} jump \xB7 \u23CE confirm${pickerDelete} \xB7 esc cancel`,
+      `\u2191\u2193 ${pickerFrom + 1}-${pickerFrom + pickerItems.length}/${picker.items.length} \xB7 \u23CE confirm${pickerDelete} \xB7 esc cancel`,
+      picker.onDelete ? "\u2191\u2193 \xB7 \u23CE \xB7 d \xB7 esc" : "\u2191\u2193 \xB7 \u23CE \xB7 esc"
     ] : [
-      `\u2191\u2193 choose \xB7 1-${Math.min(9, pickerItems.length)} jump straight to a row \xB7 \u23CE confirm \xB7 esc cancel`,
-      `\u2191\u2193 choose \xB7 1-${Math.min(9, pickerItems.length)} jump \xB7 \u23CE confirm \xB7 esc cancel`,
-      "\u2191\u2193 \xB7 \u23CE \xB7 esc"
+      `\u2191\u2193 choose \xB7 1-${Math.min(9, pickerItems.length)} jump straight to a row \xB7 \u23CE confirm${pickerDelete} \xB7 esc cancel`,
+      `\u2191\u2193 choose \xB7 1-${Math.min(9, pickerItems.length)} jump \xB7 \u23CE confirm${pickerDelete} \xB7 esc cancel`,
+      picker.onDelete ? "\u2191\u2193 \xB7 \u23CE \xB7 d \xB7 esc" : "\u2191\u2193 \xB7 \u23CE \xB7 esc"
     ],
     inner
   ) : "";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "clixad",
-  "version": "0.0.1-beta.43",
+  "version": "0.0.1-beta.45",
   "description": "Free AI coding agent in your terminal, funded by rewarded ads.",
   "license": "Apache-2.0",
   "type": "module",