clixad 0.0.1-beta.42 → 0.0.1-beta.44

package/dist/{chunk-ABDMJDYJ.mjs → chunk-JV44GYWT.mjs}

@@ -2319,6 +2319,94 @@ function diffStat(lines) {
   }
   return { added, removed };
 }
+var MAX_VIEW_ROWS = 2e3;
+function diffView(path, before, after, opts = {}) {
+  const context = opts.context ?? 3;
+  if (opts.created) {
+    const lines2 = splitLines(after);
+    const rows2 = lines2.slice(0, MAX_VIEW_ROWS).map((text, i) => ({ kind: "add", line: i + 1, text }));
+    if (lines2.length > MAX_VIEW_ROWS) rows2.push({ kind: "gap", count: lines2.length - MAX_VIEW_ROWS });
+    return { kind: "diff", path, created: true, added: after === "" ? 0 : lines2.length, removed: 0, rows: rows2 };
+  }
+  const lines = diffLines(splitLines(before), splitLines(after));
+  const { added, removed } = diffStat(lines);
+  const keep = new Array(lines.length).fill(false);
+  lines.forEach((l, i) => {
+    if (l.kind === "ctx") return;
+    for (let k = Math.max(0, i - context); k <= Math.min(lines.length - 1, i + context); k++) keep[k] = true;
+  });
+  const rows = [];
+  let skipped = 0;
+  for (let i = 0; i < lines.length; i++) {
+    if (!keep[i]) {
+      skipped++;
+      continue;
+    }
+    if (skipped > 0 && rows.length > 0) rows.push({ kind: "gap", count: skipped });
+    skipped = 0;
+    if (rows.length >= MAX_VIEW_ROWS) {
+      rows.push({ kind: "gap", count: lines.length - i });
+      break;
+    }
+    rows.push({ ...lines[i] });
+  }
+  return { kind: "diff", path, created: false, added, removed, rows };
+}
+function diffTint(env = process.env) {
+  if (env.NO_COLOR) return "none";
+  if (env.COLORTERM === "truecolor" || env.COLORTERM === "24bit") return "truecolor";
+  if (/256/.test(env.TERM ?? "")) return "256";
+  if (env.TERM === "dumb") return "none";
+  return "basic";
+}
+var TINTS = {
+  truecolor: {
+    add: "\x1B[48;2;28;62;38m",
+    del: "\x1B[48;2;78;32;36m",
+    addSign: "\x1B[38;2;126;231;135m",
+    delSign: "\x1B[38;2;255;123;114m",
+    off: R
+  },
+  "256": { add: "\x1B[48;5;22m", del: "\x1B[48;5;52m", addSign: "\x1B[92m", delSign: "\x1B[91m", off: R },
+  basic: { add: GREEN, del: RED, addSign: "", delSign: "", off: R },
+  none: { add: "", del: "", addSign: "", delSign: "", off: "" }
+};
+function renderDiffRows(view, width, opts) {
+  const tint = TINTS[opts.tint ?? "basic"];
+  const max = opts.maxRows ?? Number.POSITIVE_INFINITY;
+  const numbers = view.rows.filter((r) => r.kind !== "gap");
+  const gutter = Math.max(3, ...numbers.map((r) => String(r.line).length));
+  const fit = (text) => {
+    const cut2 = opts.measure(text) > width ? opts.cut(text, width) : text;
+    return cut2 + " ".repeat(Math.max(0, width - opts.measure(cut2)));
+  };
+  const rows = [];
+  let more = 0;
+  for (const row of view.rows) {
+    if (rows.length >= max) {
+      if (row.kind !== "gap") more++;
+      continue;
+    }
+    if (row.kind === "gap") {
+      const dim = tint === TINTS.none ? "" : DIM;
+      rows.push(`${dim}${opts.cut(`${" ".repeat(gutter)}   \u22EF ${row.count} unchanged line${row.count === 1 ? "" : "s"}`, width)}${tint.off}`);
+      continue;
+    }
+    const text = row.text.replace(/\t/g, "  ");
+    const no = String(row.line).padStart(gutter);
+    if (row.kind === "ctx") {
+      rows.push(`${tint === TINTS.none ? "" : DIM}${opts.cut(`${no}   ${text}`, width)}${tint.off}`);
+      continue;
+    }
+    const sign = row.kind === "add" ? "+" : "-";
+    const bg2 = row.kind === "add" ? tint.add : tint.del;
+    const signColor = row.kind === "add" ? tint.addSign : tint.delSign;
+    const body = fit(`${no} ${sign} ${text}`);
+    const at = gutter + 1;
+    rows.push(`${bg2}${body.slice(0, at)}${signColor}${sign}${signColor ? "\x1B[39m" : ""}${body.slice(at + 1)}${tint.off}`);
+  }
+  return { rows, more };
+}
 function renderDiff(oldText, newText, opts = {}) {
   const context = opts.context ?? 3;
   const maxLines = opts.maxLines ?? 40;
@@ -3618,13 +3706,16 @@ ${body2}` + (pdf.text.length > MAX_FILE_BYTES ? "\n\u2026 [truncated]" : "");
     const abs = safeResolve(ctx.root, requireString(args.path, "write_file", "path"));
     const content = requireString(args.content, "write_file", "content");
     const name = rel(ctx.root, abs);
-    const before = existsSync2(abs) ? fsCall(`cannot write ${name}`, () => readFileSync3(abs, "utf8")) : "";
+    const existed = existsSync2(abs);
+    const before = existed ? fsCall(`cannot write ${name}`, () => readFileSync3(abs, "utf8")) : "";
     const preview = renderDiff(before, content) || "(no change)";
+    const view = diffView(name, before, content, { created: !existed });
     await gate(ctx, {
       tool: "write_file",
       signature: `write:${name}`,
       summary: `${before ? "overwrite" : "create"} ${name}`,
       preview,
+      view,
       path: name,
       root: ctx.root
     });
@@ -3632,6 +3723,7 @@ ${body2}` + (pdf.text.length > MAX_FILE_BYTES ? "\n\u2026 [truncated]" : "");
       mkdirSync2(dirname2(abs), { recursive: true });
       writeFileSync2(abs, content, "utf8");
     });
+    ctx.present?.(view);
     return `wrote ${content.length} bytes to ${name}`;
   },
   /**
@@ -3661,15 +3753,18 @@ ${body2}` + (pdf.text.length > MAX_FILE_BYTES ? "\n\u2026 [truncated]" : "");
     }
     const after = before.split(oldString).join(newString);
     const preview = renderDiff(before, after) || "(no change)";
+    const view = diffView(name, before, after);
     await gate(ctx, {
       tool: "edit_file",
       signature: `write:${name}`,
       summary: `edit ${name}`,
       preview,
+      view,
       path: name,
       root: ctx.root
     });
     fsCall(`cannot edit ${name}`, () => writeFileSync2(abs, after, "utf8"));
+    ctx.present?.(view);
     return `edited ${name} (${count > 1 ? `${count} occurrences` : "1 occurrence"})`;
   },
   /**
@@ -5316,6 +5411,9 @@ async function runAgent(client, task, opts) {
     mcp: opts.mcp,
     shells: opts.shells,
     attach: (image) => pendingImages.push(image),
+    // A placeholder that says writes are shown at this depth; each call gets
+    // its own (`executeToolCall`), which puts the view on its result event.
+    ...depth === 0 ? { present: () => void 0 } : {},
     // The recursion guard, and the whole of it: a sub-agent runs at depth 1 and
     // is handed no way to start another.
     ...depth === 0 ? { spawn: runSubAgent } : {}
@@ -5388,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 {
@@ -5476,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 };
 }
@@ -5511,9 +5637,13 @@ async function executeToolCall(ctx, call, emit) {
   }
   emit({ type: "tool_call", id, name, args });
   const search = ctx.webSearch;
+  let view;
   const scoped = {
     ...ctx,
     onOutput: (chunk) => emit({ type: "tool_output", id, chunk }),
+    // Only where something draws it: a sub-agent's writes are not shown, and
+    // `ctx.present` is how this run says whether anybody is watching.
+    ...ctx.present ? { present: (v) => view = v } : {},
     // Reported against this call the moment it is charged, so the row says
     // what it cost and the balance on screen moves with it.
     ...search ? {
@@ -5533,7 +5663,7 @@ async function executeToolCall(ctx, call, emit) {
   };
   try {
     const result = await dispatch(scoped, name, args);
-    emit({ type: "tool_result", id, name, result, ok: true });
+    emit({ type: "tool_result", id, name, result, ok: true, ...view ? { view } : {} });
     return result;
   } catch (err) {
     if (err instanceof ToolError) {
@@ -6457,6 +6587,8 @@ export {
   webSearchCostLine,
   freeHelpLine,
   freeAlternativeLine,
+  diffTint,
+  renderDiffRows,
   shells,
   TodoList,
   loadMcpConfig,
@@ -6470,6 +6602,7 @@ export {
   pickReviewModel,
   NO_SEARCH_INSTRUCTION,
   runAgent,
+  interruptedConversation,
   collectContext,
   INIT_PROMPT,
   INIT_HINT,

package/dist/clixad.mjs

@@ -53,7 +53,7 @@ import {
   takeConfigNotices,
   toolSchemaFor,
   usd
-} from "./chunk-ABDMJDYJ.mjs";
+} from "./chunk-JV44GYWT.mjs";
 
 // src/tui/load.ts
 import * as nodeModule from "node:module";
@@ -132,7 +132,7 @@ async function withProductionReact(load) {
 }
 function loadTui() {
   boundInkCaches();
-  return withProductionReact(() => import("./tui-377KNURT.mjs"));
+  return withProductionReact(() => import("./tui-KA2P7O7W.mjs"));
 }
 
 // src/title.ts