kimiflare 0.48.1 → 0.48.3

package/dist/index.js

@@ -357,7 +357,7 @@ function log(level, event, data) {
   };
   console.error(JSON.stringify(entry));
 }
-var globalMinLevel, LEVEL_ORDER, logger;
+var globalMinLevel, LEVEL_ORDER, logger2;
 var init_logger = __esm({
   "src/util/logger.ts"() {
     "use strict";
@@ -369,7 +369,7 @@ var init_logger = __esm({
       error: 3,
       off: 4
     };
-    logger = {
+    logger2 = {
       debug: (event, data) => log("debug", event, data),
       info: (event, data) => log("info", event, data),
       warn: (event, data) => log("warn", event, data),
@@ -406,7 +406,7 @@ async function* readSSE(stream, signal, idleTimeoutMs) {
     while (true) {
       if (signal?.aborted) throw new DOMException("aborted", "AbortError");
       if (idleTimeoutMs !== void 0 && Date.now() - lastDataAt > idleTimeoutMs) {
-        logger.warn("sse:idle_timeout", { idleTimeoutMs });
+        logger2.warn("sse:idle_timeout", { idleTimeoutMs });
         throw new DOMException(
           `kimiflare: stream idle for ${idleTimeoutMs}ms \u2014 no data received from API`,
           "TimeoutError"
@@ -581,7 +581,7 @@ async function* runKimi(opts2) {
   if (opts2.reasoningEffort) {
     body.reasoning_effort = opts2.reasoningEffort;
   }
-  logger.debug("runKimi:request", { requestId, attempt: 0, model: opts2.model });
+  logger2.debug("runKimi:request", { requestId, attempt: 0, model: opts2.model });
   for (let attempt = 0; attempt < MAX_ATTEMPTS; attempt++) {
     let res;
     try {
@@ -604,7 +604,7 @@ async function* runKimi(opts2) {
       });
     } catch (fetchErr) {
       const msg = fetchErr instanceof Error ? fetchErr.message : String(fetchErr);
-      logger.warn("runKimi:fetch_error", { requestId, attempt, error: msg });
+      logger2.warn("runKimi:fetch_error", { requestId, attempt, error: msg });
       if (attempt < MAX_ATTEMPTS - 1) {
         const delay = 500 * 2 ** attempt + Math.random() * 250;
         await sleep(delay, opts2.signal);
@@ -635,12 +635,12 @@ async function* runKimi(opts2) {
     const meta = readGatewayMeta(res.headers);
     if (meta) yield { type: "gateway_meta", meta };
     let lastUsage = null;
-    logger.debug("runKimi:stream_start", { requestId });
+    logger2.debug("runKimi:stream_start", { requestId });
     for await (const ev of parseStream(res.body, opts2.signal, opts2.idleTimeoutMs)) {
       if (ev.type === "usage") lastUsage = ev.usage;
       yield ev;
     }
-    logger.debug("runKimi:stream_end", { requestId });
+    logger2.debug("runKimi:stream_end", { requestId });
     if (opts2.cloudMode && lastUsage && opts2.cloudToken) {
       const reportUrl = "https://api.kimiflare.com/v1/usage/report";
       const reportHeaders = {
@@ -2375,7 +2375,7 @@ function isHighSignalMemory(memory) {
 }
 async function runAgentTurn(opts2) {
   const turnStart = performance.now();
-  logger.info("turn:start", { sessionId: opts2.sessionId, codeMode: opts2.codeMode ?? false });
+  logger2.info("turn:start", { sessionId: opts2.sessionId, codeMode: opts2.codeMode ?? false });
   const max = opts2.maxToolIterations ?? 50;
   const codeMode = opts2.codeMode ?? false;
   let toolDefs;
@@ -2512,7 +2512,7 @@ Use console.log() to return results. Only console.log output will be sent back t
         `kimiflare: context window exceeded (~${promptTokens.toLocaleString()} tokens). Run /compact to summarize older turns, or /clear to start fresh.`
       );
     }
-    logger.debug("turn:api_request", { sessionId: opts2.sessionId, messageCount: apiMessages.length });
+    logger2.debug("turn:api_request", { sessionId: opts2.sessionId, messageCount: apiMessages.length });
     const events = runKimi({
       accountId: opts2.accountId,
       apiToken: opts2.apiToken,
@@ -2534,7 +2534,7 @@ Use console.log() to return results. Only console.log output will be sent back t
     for await (const ev of events) {
       if (!gotFirstChunk) {
         gotFirstChunk = true;
-        logger.debug("turn:api_first_chunk", { sessionId: opts2.sessionId });
+        logger2.debug("turn:api_first_chunk", { sessionId: opts2.sessionId });
       }
       switch (ev.type) {
         case "gateway_meta":
@@ -2613,7 +2613,7 @@ Use console.log() to return results. Only console.log output will be sent back t
       if (budgetExhausted) {
         throw new BudgetExhaustedError();
       }
-      logger.info("turn:complete", { sessionId: opts2.sessionId, durationMs: Math.round(performance.now() - turnStart) });
+      logger2.info("turn:complete", { sessionId: opts2.sessionId, durationMs: Math.round(performance.now() - turnStart) });
       return;
     }
     for (const tc of toolCalls) {
@@ -2742,7 +2742,7 @@ ${sandboxResult.output}` : `${warningPrefix}${sandboxResult.output}`;
         recentToolCalls.push(loopSignature);
         if (recentToolCalls.length > LOOP_WINDOW) recentToolCalls.shift();
       } else {
-        logger.debug("turn:tool_start", { sessionId: opts2.sessionId, tool: tc.function.name, toolCallId: tc.id });
+        logger2.debug("turn:tool_start", { sessionId: opts2.sessionId, tool: tc.function.name, toolCallId: tc.id });
         const result = await opts2.executor.run(
           { id: tc.id, name: tc.function.name, arguments: tc.function.arguments },
           opts2.callbacks.askPermission,
@@ -2755,7 +2755,7 @@ ${sandboxResult.output}` : `${warningPrefix}${sandboxResult.output}`;
 
 [truncated: ${content2.length - MAX_TOOL_CONTENT_CHARS} chars omitted]`;
         }
-        logger.debug("turn:tool_end", { sessionId: opts2.sessionId, tool: tc.function.name, toolCallId: tc.id, ok: result.ok });
+        logger2.debug("turn:tool_end", { sessionId: opts2.sessionId, tool: tc.function.name, toolCallId: tc.id, ok: result.ok });
         toolResults.push(result);
         opts2.messages.push({
           role: "tool",
@@ -3411,7 +3411,7 @@ function runBash(args, ctx) {
   const timeout = Math.min(Math.max(1e3, args.timeout_ms ?? DEFAULT_TIMEOUT), MAX_TIMEOUT);
   const command = injectCoauthor(args.command, ctx.coauthor);
   return new Promise((resolve2, reject) => {
-    logger.debug("bash:spawn", { command: args.command.slice(0, 200), cwd: ctx.cwd });
+    logger2.debug("bash:spawn", { command: args.command.slice(0, 200), cwd: ctx.cwd });
     const child = spawn("bash", ["-lc", command], {
       cwd: ctx.cwd,
       env: {
@@ -3425,12 +3425,12 @@ function runBash(args, ctx) {
     let killedByAbort = false;
     const timer = setTimeout(() => {
       killedByTimeout = true;
-      logger.warn("bash:kill_timeout", { command: args.command.slice(0, 200) });
+      logger2.warn("bash:kill_timeout", { command: args.command.slice(0, 200) });
       child.kill("SIGKILL");
     }, timeout);
     const onAbort = () => {
       killedByAbort = true;
-      logger.warn("bash:kill_abort", { command: args.command.slice(0, 200) });
+      logger2.warn("bash:kill_abort", { command: args.command.slice(0, 200), pid: child.pid });
       child.kill("SIGKILL");
     };
     ctx.signal?.addEventListener("abort", onAbort, { once: true });
@@ -3443,13 +3443,18 @@ function runBash(args, ctx) {
     child.on("error", (e) => {
       clearTimeout(timer);
       ctx.signal?.removeEventListener("abort", onAbort);
-      logger.error("bash:error", { error: e.message });
+      logger2.error("bash:error", { error: e.message, pid: child.pid });
       reject(e);
     });
+    child.on("exit", (code, signal) => {
+      logger2.debug("bash:exit", { code, signal, pid: child.pid, killedByTimeout, killedByAbort });
+      child.stdout?.destroy();
+      child.stderr?.destroy();
+    });
     child.on("close", (code, signal) => {
       clearTimeout(timer);
       ctx.signal?.removeEventListener("abort", onAbort);
-      logger.debug("bash:close", { code, signal, killedByTimeout, killedByAbort });
+      logger2.debug("bash:close", { code, signal, pid: child.pid, killedByTimeout, killedByAbort });
       const header = killedByTimeout ? `(timed out after ${timeout}ms)` : killedByAbort ? `(aborted \u2014 sent SIGKILL)` : `exit=${code ?? "?"}${signal ? ` signal=${signal}` : ""}`;
       const parts = [header];
       if (stdout) parts.push(`--- stdout ---
@@ -6244,24 +6249,24 @@ var init_supervisor = __esm({
       }
       startTurn(opts2, callbacks) {
         if (this.isRunning) {
-          logger.warn("supervisor:start_rejected", { reason: "turn_already_running", phase: this._phase });
+          logger2.warn("supervisor:start_rejected", { reason: "turn_already_running", phase: this._phase });
           throw new Error("TurnSupervisor: turn already in progress");
         }
         this._phase = "streaming";
         this._killRequested = false;
-        logger.debug("supervisor:turn_start", { sessionId: opts2.sessionId });
+        logger2.debug("supervisor:turn_start", { sessionId: opts2.sessionId });
         this.currentTurn = runAgentTurn(opts2).then(async () => {
           this._phase = "idle";
           if (this._killRequested) {
-            logger.debug("supervisor:turn_killed", { sessionId: opts2.sessionId });
+            logger2.debug("supervisor:turn_killed", { sessionId: opts2.sessionId });
           } else {
-            logger.debug("supervisor:turn_done", { sessionId: opts2.sessionId });
+            logger2.debug("supervisor:turn_done", { sessionId: opts2.sessionId });
           }
           await callbacks?.onDone?.();
         }).catch(async (error) => {
           this._phase = "idle";
           const err = error;
-          logger.warn("supervisor:turn_error", {
+          logger2.warn("supervisor:turn_error", {
             sessionId: opts2.sessionId,
             error: err.message ?? String(err),
             name: err.name
@@ -6279,7 +6284,7 @@ var init_supervisor = __esm({
       killTurn() {
         if (!this.isRunning) return;
         this._killRequested = true;
-        logger.debug("supervisor:kill_requested", { phase: this._phase });
+        logger2.debug("supervisor:kill_requested", { phase: this._phase });
       }
     };
   }
@@ -8248,7 +8253,7 @@ var init_cloud_quota_message = __esm({
 
 // src/ui/chat.tsx
 import React4 from "react";
-import { Box as Box5, Text as Text5, Static } from "ink";
+import { Box as Box5, Text as Text5 } from "ink";
 import Spinner2 from "ink-spinner";
 import { jsx as jsx6, jsxs as jsxs5 } from "react/jsx-runtime";
 function toolSignature(name, args) {
@@ -8265,8 +8270,6 @@ var init_chat = __esm({
     init_cloud_quota_message();
     ChatView = React4.memo(function ChatView2({ events, showReasoning, verbose, intentTier }) {
       const theme = useTheme();
-      const finalized = [];
-      const active = [];
       const toolCounts = /* @__PURE__ */ new Map();
       for (const e of events) {
         if (e.kind === "tool") {
@@ -8278,31 +8281,14 @@ var init_chat = __esm({
       for (const [sig, count] of toolCounts) {
         if (count >= 3) repeatedSigs.add(sig);
       }
-      for (let i = 0; i < events.length; i++) {
-        const e = events[i];
-        const isStreaming = e.kind === "assistant" && e.streaming;
-        if (isStreaming) {
-          active.push(e);
-        } else {
-          const prev = events[i - 1];
-          const showSeparator = !!(e.kind === "user" && prev && (prev.kind === "assistant" || prev.kind === "tool"));
-          finalized.push({ id: e.key, evt: e, showSeparator });
-        }
-      }
-      return /* @__PURE__ */ jsxs5(Box5, { flexDirection: "column", children: [
-        /* @__PURE__ */ jsx6(Static, { items: finalized, children: (item) => /* @__PURE__ */ jsxs5(Box5, { flexDirection: "column", children: [
-          item.showSeparator && /* @__PURE__ */ jsx6(Box5, { marginY: 1, children: /* @__PURE__ */ jsx6(Text5, { color: theme.info.color, children: "\u2500".repeat(40) }) }),
-          /* @__PURE__ */ jsx6(EventView, { evt: item.evt, showReasoning, verbose, repeatedSigs, intentTier })
-        ] }, item.id) }),
-        active.map((e, i) => {
-          const prevEvt = i > 0 ? active[i - 1] : finalized[finalized.length - 1]?.evt;
-          const showSeparator = e.kind === "user" && prevEvt && (prevEvt.kind === "assistant" || prevEvt.kind === "tool");
-          return /* @__PURE__ */ jsxs5(Box5, { flexDirection: "column", children: [
-            showSeparator && /* @__PURE__ */ jsx6(Box5, { marginY: 1, children: /* @__PURE__ */ jsx6(Text5, { color: theme.info.color, children: "\u2500".repeat(40) }) }),
-            /* @__PURE__ */ jsx6(EventView, { evt: e, showReasoning, verbose, repeatedSigs, intentTier })
-          ] }, e.key);
-        })
-      ] });
+      return /* @__PURE__ */ jsx6(Box5, { flexDirection: "column", children: events.map((e, i) => {
+        const prev = events[i - 1];
+        const showSeparator = !!(e.kind === "user" && prev && (prev.kind === "assistant" || prev.kind === "tool"));
+        return /* @__PURE__ */ jsxs5(Box5, { flexDirection: "column", children: [
+          showSeparator && /* @__PURE__ */ jsx6(Box5, { marginY: 1, children: /* @__PURE__ */ jsx6(Text5, { color: theme.info.color, children: "\u2500".repeat(40) }) }),
+          /* @__PURE__ */ jsx6(EventView, { evt: e, showReasoning, verbose, repeatedSigs, intentTier })
+        ] }, e.key);
+      }) });
     });
     EventView = React4.memo(function EventView2({
       evt,
@@ -16013,6 +15999,18 @@ function App({
       })
     );
   }, []);
+  useEffect7(() => {
+    const onSigint = () => {
+      logger.info("sigint:fired", {
+        hasHandler: sigintHandlerRef.current !== null
+      });
+      sigintHandlerRef.current?.();
+    };
+    process.on("SIGINT", onSigint);
+    return () => {
+      process.off("SIGINT", onSigint);
+    };
+  }, []);
   useEffect7(() => {
     let cancelled = false;
     loadAndMergeThemes().then(({ errors, wcagWarnings }) => {
@@ -16068,6 +16066,7 @@ ${wcagWarnings.join("\n")}` }
   const supervisorRef = useRef3(new TurnSupervisor());
   const isAbortingRef = useRef3(false);
   const lastEscapeAtRef = useRef3(0);
+  const sigintHandlerRef = useRef3(null);
   const permResolveRef = useRef3(null);
   const limitResolveRef = useRef3(null);
   const pendingToolCallsRef = useRef3(/* @__PURE__ */ new Map());
@@ -16751,6 +16750,13 @@ ${wcagWarnings.join("\n")}` }
   );
   useInput8((inputChar, key) => {
     if (key.ctrl && inputChar === "c") {
+      logger.info("input:ctrl+c", {
+        busy: busyRef.current,
+        hasActiveScope: activeScopeRef.current !== null,
+        isAborting: isAbortingRef.current,
+        hasPerm: permResolveRef.current !== null,
+        hasLimit: limitResolveRef.current !== null
+      });
       const hadPerm = permResolveRef.current !== null;
       const hadLimit = limitResolveRef.current !== null;
       if (hadPerm) {
@@ -16775,6 +16781,7 @@ ${wcagWarnings.join("\n")}` }
         setTasksStartTokens(0);
         tasksRef.current = [];
       } else if (!hadPerm && !hadLimit) {
+        logger.info("input:ctrl+c:exiting");
         void lspManagerRef.current.stopAll().finally(() => exit());
       }
       return;
@@ -16819,6 +16826,42 @@ ${wcagWarnings.join("\n")}` }
       return;
     }
   });
+  sigintHandlerRef.current = () => {
+    logger.info("sigint:handler", {
+      busy: busyRef.current,
+      hasActiveScope: activeScopeRef.current !== null,
+      isAborting: isAbortingRef.current,
+      hasPerm: permResolveRef.current !== null,
+      hasLimit: limitResolveRef.current !== null
+    });
+    const hadPerm = permResolveRef.current !== null;
+    const hadLimit = limitResolveRef.current !== null;
+    if (hadPerm) {
+      permResolveRef.current("deny");
+      permResolveRef.current = null;
+      setPerm(null);
+    }
+    if (hadLimit) {
+      limitResolveRef.current("stop");
+      limitResolveRef.current = null;
+      setLimitModal(null);
+    }
+    if (busyRef.current && activeScopeRef.current && !isAbortingRef.current) {
+      isAbortingRef.current = true;
+      supervisorRef.current.killTurn();
+      activeScopeRef.current.abort("user_stopped");
+      setQueue([]);
+      setEvents((e) => [...e, { kind: "info", key: mkKey(), text: "(interrupted)" }]);
+      void saveSessionSafe();
+      setTasks([]);
+      setTasksStartedAt(null);
+      setTasksStartTokens(0);
+      tasksRef.current = [];
+    } else if (!hadPerm && !hadLimit) {
+      logger.info("sigint:handler:exiting");
+      void lspManagerRef.current.stopAll().finally(() => exit());
+    }
+  };
   const flushAssistantUpdates = useCallback2(() => {
     flushTimeoutRef.current = null;
     const pending = pendingTextRef.current;
@@ -16962,6 +17005,7 @@ ${wcagWarnings.join("\n")}` }
         ]);
       }
     } finally {
+      logger.info("runCompact:finally");
       setBusy(false);
       busyRef.current = false;
       setTurnStartedAt(null);
@@ -16969,6 +17013,7 @@ ${wcagWarnings.join("\n")}` }
       setCurrentToolName(null);
       setLastActivityAt(null);
       activeScopeRef.current = null;
+      isAbortingRef.current = false;
       permResolveRef.current = null;
       limitResolveRef.current = null;
       pendingToolCallsRef.current.clear();
@@ -17227,6 +17272,7 @@ ${wcagWarnings.join("\n")}` }
         ]);
       }
     } finally {
+      logger.info("runInit:finally");
       setCodeMode(false);
       const asstId = activeAsstIdRef.current;
       if (asstId !== null) updateAssistant(asstId, () => ({ streaming: false }));
@@ -17238,6 +17284,7 @@ ${wcagWarnings.join("\n")}` }
       setLastActivityAt(null);
       activeAsstIdRef.current = null;
       activeScopeRef.current = null;
+      isAbortingRef.current = false;
       permResolveRef.current = null;
       limitResolveRef.current = null;
       pendingToolCallsRef.current.clear();
@@ -18578,6 +18625,7 @@ ${lines.join("\n")}` }]);
         }
       };
       const cleanupTurn = () => {
+        logger.info("cleanupTurn");
         setCodeMode(false);
         const asstId = activeAsstIdRef.current;
         if (asstId !== null) updateAssistant(asstId, () => ({ streaming: false }));