kimiflare 0.48.2 → 0.48.4

package/dist/index.js

@@ -3430,7 +3430,7 @@ function runBash(args, ctx) {
     }, timeout);
     const onAbort = () => {
       killedByAbort = true;
-      logger.warn("bash:kill_abort", { command: args.command.slice(0, 200) });
+      logger.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 });
+      logger.error("bash:error", { error: e.message, pid: child.pid });
       reject(e);
     });
+    child.on("exit", (code, signal) => {
+      logger.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 });
+      logger.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 ---
@@ -15994,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 }) => {
@@ -16049,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());
@@ -16732,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) {
@@ -16756,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;
@@ -16800,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;
@@ -16943,6 +17005,7 @@ ${wcagWarnings.join("\n")}` }
         ]);
       }
     } finally {
+      logger.info("runCompact:finally");
       setBusy(false);
       busyRef.current = false;
       setTurnStartedAt(null);
@@ -16950,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();
@@ -17208,6 +17272,7 @@ ${wcagWarnings.join("\n")}` }
         ]);
       }
     } finally {
+      logger.info("runInit:finally");
       setCodeMode(false);
       const asstId = activeAsstIdRef.current;
       if (asstId !== null) updateAssistant(asstId, () => ({ streaming: false }));
@@ -17219,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();
@@ -18559,6 +18625,7 @@ ${lines.join("\n")}` }]);
         }
       };
       const cleanupTurn = () => {
+        logger.info("cleanupTurn");
         setCodeMode(false);
         const asstId = activeAsstIdRef.current;
         if (asstId !== null) updateAssistant(asstId, () => ({ streaming: false }));
@@ -19183,6 +19250,7 @@ var init_app = __esm({
     init_messages();
     init_errors();
     init_abort_scope();
+    init_logger();
     init_chat();
     init_status();
     init_permission();