clixad 0.0.1-beta.43 → 0.0.1-beta.44

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

@@ -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 };
 }
@@ -6574,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-T7SUUKJC.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-773NJ4FQ.mjs"));
+  return withProductionReact(() => import("./tui-KA2P7O7W.mjs"));
 }
 
 // src/title.ts

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

@@ -45,6 +45,7 @@ import {
   freeHelpLine,
   freeTierNotice,
   grantLabel,
+  interruptedConversation,
   isNewerVersion,
   listSessions,
   listWorkspaceFiles,
@@ -97,7 +98,7 @@ import {
   visibleLength,
   webSearchCostLine,
   welcomeBanner
-} from "./chunk-T7SUUKJC.mjs";
+} from "./chunk-JV44GYWT.mjs";
 
 // src/tui/index.tsx
 import "react";
@@ -1615,6 +1616,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;
@@ -2481,6 +2483,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 +2560,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 +2654,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 +2718,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();

package/package.json

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