@kernelonpanic/kitcode 1.2.8 → 1.2.9

package/dist/index.js

@@ -1430,6 +1430,10 @@ async function runTurn(cfg, history, hooks, signal) {
   let pauses = 0;
   let steps = 0;
   for (; ; ) {
+    if (signal.aborted) {
+      hooks.onEvent({ type: "turn_end", stopReason: "aborted" });
+      return sanitizeHistory(messages);
+    }
     if (++steps > MAX_TURN_STEPS) {
       hooks.onEvent({
         type: "notice",
@@ -1516,12 +1520,16 @@ async function consumeStream(cfg, messages, hooks, signal, maxTokens) {
     signal
   };
   let outcome;
+  let text = "";
+  let thinking = "";
   for await (const event of streamWithRetry(cfg.provider, request, cfg.modelRef, signal)) {
     switch (event.type) {
       case "text_delta":
+        text += event.text;
         hooks.onEvent({ type: "text_delta", text: event.text });
         break;
       case "thinking_delta":
+        thinking += event.text;
         hooks.onEvent({ type: "thinking_delta", text: event.text });
         break;
       case "usage":
@@ -1540,7 +1548,12 @@ async function consumeStream(cfg, messages, hooks, signal, maxTokens) {
     }
   }
   if (outcome) return outcome;
-  if (signal.aborted) return { content: [], stopReason: "aborted" };
+  if (signal.aborted) {
+    const content = [];
+    if (thinking) content.push({ type: "thinking", text: thinking });
+    if (text) content.push({ type: "text", text });
+    return { content, stopReason: "aborted" };
+  }
   throw new Error(
     `"${cfg.provider.id}" ended the stream without completing the turn \u2014 nothing was generated. The endpoint answered, but not with a usable ${cfg.provider.kind} response.`
   );
@@ -1550,8 +1563,29 @@ async function* streamWithRetry(provider, request, modelRef, signal) {
   for (let attempt = 0; attempt <= MAX_RETRIES2; attempt++) {
     if (signal.aborted) return;
     try {
-      for await (const event of provider.stream(request)) {
-        yield event;
+      const stream = provider.stream(request)[Symbol.asyncIterator]();
+      let cancel;
+      let cancelTimer;
+      const cancelled = new Promise((resolve3) => {
+        cancel = () => {
+          cancelTimer ??= setTimeout(() => resolve3({ done: true, value: void 0 }), 100);
+        };
+        signal.addEventListener("abort", cancel, { once: true });
+        if (signal.aborted) cancel();
+      });
+      try {
+        for (; ; ) {
+          const next = await Promise.race([stream.next(), cancelled]);
+          if (next.done) break;
+          if (!signal.aborted || next.value.type === "usage" || next.value.type === "done") {
+            yield next.value;
+          }
+          if (next.value.type === "done") break;
+        }
+      } finally {
+        signal.removeEventListener("abort", cancel);
+        if (cancelTimer !== void 0) clearTimeout(cancelTimer);
+        void stream.return?.().catch(() => void 0);
       }
       return;
     } catch (error) {
@@ -3499,7 +3533,7 @@ function clip(value) {
 // package.json
 var package_default = {
   name: "@kernelonpanic/kitcode",
-  version: "1.2.8",
+  version: "1.2.9",
   description: "Terminal coding agent with a config you never have to write by hand",
   type: "module",
   license: "MIT",
@@ -3567,7 +3601,7 @@ var package_default = {
 
 // src/version.ts
 var KITCODE_VERSION = package_default.version;
-var KITCODE_COMMIT = true ? "422e80dd7cd81a1c20f186b1e3ab36d6e0779b89" : "development";
+var KITCODE_COMMIT = true ? "cc499fc443e73408f49b928f204b77c48e9d2d05" : "development";
 
 // src/mcp/client.ts
 var clientInfo = { name: "kitcode", version: KITCODE_VERSION };
@@ -7067,6 +7101,10 @@ function validateKey(value) {
 // src/app/tui.tsx
 import { render } from "ink";
 
+// src/ui/App.tsx
+import { Box as Box13, Text as Text12, useApp, useInput as useInput2, useStdout as useStdout2 } from "ink";
+import { useCallback, useEffect as useEffect2, useMemo as useMemo5, useRef as useRef4, useState as useState5 } from "react";
+
 // src/ui/terminal-size.ts
 import { useStdout } from "ink";
 import { useMemo, useSyncExternalStore } from "react";
@@ -7107,10 +7145,6 @@ function useTerminalSize() {
   return useSyncExternalStore(store.subscribe, store.getSnapshot, store.getSnapshot);
 }
 
-// src/ui/App.tsx
-import { Box as Box13, Text as Text12, useApp, useInput as useInput2 } from "ink";
-import { useCallback, useEffect as useEffect2, useMemo as useMemo5, useRef as useRef4, useState as useState5 } from "react";
-
 // src/mcp/add.ts
 var SERVER_NAME = /^[a-zA-Z0-9][a-zA-Z0-9_-]{0,63}$/;
 function parseMcpAddArgs(args) {
@@ -9598,7 +9632,8 @@ function App({
   initialHistory,
   warnings = []
 }) {
-  const { exit } = useApp();
+  const { exit, suspendTerminal } = useApp();
+  const { stdout } = useStdout2();
   const { rows } = useTerminalSize();
   const [transcript, setTranscript] = useState5(
     () => warnings.reduce((state, text) => pushNotice(state, "warn", text), fromHistory(initialHistory))
@@ -9634,6 +9669,9 @@ function App({
   const [context, setContext] = useState5(() => runtime.modelContext());
   const transcriptEvents = useRef4([]);
   const transcriptTimer = useRef4(null);
+  const clearScreen = useCallback(() => {
+    if (stdout.isTTY) stdout.write("\x1B[2J\x1B[3J\x1B[H");
+  }, [stdout]);
   const replaceAttachments = useCallback((next) => {
     attachmentsRef.current = next;
     setAttachments(next);
@@ -9801,12 +9839,20 @@ function App({
           exit();
           return;
         case "clear":
+          if (busyRef.current && abort.current) {
+            abort.current.abort();
+          }
+          queueRef.current = [];
+          setPendingCount(0);
           await runtime.newSession();
           history.current = [];
           replaceAttachments([]);
           setPromptHistory([]);
-          setTranscript(emptyTranscript());
-          setTranscriptRevision((revision) => revision + 1);
+          await suspendTerminal(async () => {
+            setTranscript(emptyTranscript());
+            setTranscriptRevision((revision) => revision + 1);
+            clearScreen();
+          });
           sessionStart.current = Date.now();
           turns.current = 0;
           void runtime.persist([]).catch(