kimiflare 0.52.0 → 0.53.0

package/dist/index.js

@@ -2803,6 +2803,7 @@ ${sandboxResult.output}` : `${warningPrefix}${sandboxResult.output}`;
         recentToolCalls.push(loopSignature);
         if (recentToolCalls.length > LOOP_WINDOW) recentToolCalls.shift();
       } else {
+        opts2.callbacks.onToolWillExecute?.(tc.id, tc.function.name);
         logger.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 },
@@ -10173,12 +10174,14 @@ var init_tool_view = __esm({
         const id = setInterval(() => setNow(Date.now()), 1e3);
         return () => clearInterval(id);
       }, [evt.status, evt.startedAt]);
-      const statusIcon = evt.status === "running" ? /* @__PURE__ */ jsx3(Text2, { color: theme.info.color, children: /* @__PURE__ */ jsx3(Spinner, { type: "dots" }) }) : evt.status === "error" ? /* @__PURE__ */ jsx3(Text2, { color: theme.palette.error, children: "\u2717" }) : /* @__PURE__ */ jsx3(Text2, { color: theme.palette.success, children: "\u2713" });
+      const statusIcon = evt.status === "queued" ? /* @__PURE__ */ jsx3(Text2, { color: theme.muted?.color ?? theme.info.color, children: "[ ]" }) : evt.status === "running" ? /* @__PURE__ */ jsx3(Text2, { color: theme.info.color, children: /* @__PURE__ */ jsx3(Spinner, { type: "dots" }) }) : evt.status === "error" ? /* @__PURE__ */ jsx3(Text2, { color: theme.palette.error, children: "[err]" }) : evt.status === "cancelled" ? /* @__PURE__ */ jsx3(Text2, { color: theme.info.color, children: "[x]" }) : evt.status === "rejected" ? /* @__PURE__ */ jsx3(Text2, { color: theme.palette.error, children: "[!]" }) : /* @__PURE__ */ jsx3(Text2, { color: theme.palette.success, children: "[ok]" });
       const rawTitle = evt.render?.title ?? `${evt.name}(${compactArgs(evt.args)})`;
       let title = humanizeToolTitle(evt.name, rawTitle, intentTier);
-      if (evt.startedAt !== void 0) {
+      if (evt.startedAt !== void 0 && (evt.status === "running" || evt.status === "done" || evt.status === "error")) {
         title += ` \xB7 ${formatElapsed(now2 - evt.startedAt)}`;
       }
+      const statusLabel = evt.status === "rejected" ? /* @__PURE__ */ jsx3(Text2, { color: theme.palette.error, children: " rejected" }) : evt.status === "cancelled" ? /* @__PURE__ */ jsx3(Text2, { color: theme.info.color, children: " cancelled" }) : null;
+      const showItalic = evt.status === "queued" || evt.status === "cancelled" || evt.status === "rejected";
       const expand = Boolean(evt.expanded || verbose);
       const lines = evt.result ? evt.result.split("\n") : [];
       const showLimit = verbose ? 200 : 20;
@@ -10186,8 +10189,9 @@ var init_tool_view = __esm({
         /* @__PURE__ */ jsxs2(Text2, { children: [
           statusIcon,
           " ",
-          /* @__PURE__ */ jsx3(Text2, { color: theme.info.color, children: title }),
-          isRepeated ? /* @__PURE__ */ jsx3(Text2, { color: theme.warn, children: " \u26A0 repeated" }) : null
+          /* @__PURE__ */ jsx3(Text2, { color: theme.info.color, italic: showItalic, children: title }),
+          statusLabel,
+          isRepeated ? /* @__PURE__ */ jsx3(Text2, { color: theme.warn, children: " [warn] repeated" }) : null
         ] }),
         evt.render?.diff ? /* @__PURE__ */ jsx3(Box2, { marginLeft: 2, children: /* @__PURE__ */ jsx3(DiffView, { ...evt.render.diff }) }) : null,
         evt.result && expand ? /* @__PURE__ */ jsxs2(
@@ -10209,7 +10213,7 @@ var init_tool_view = __esm({
             ]
           }
         ) : null,
-        evt.result && !expand && evt.status !== "running" ? /* @__PURE__ */ jsxs2(Text2, { color: theme.info.color, children: [
+        evt.result && !expand && evt.status !== "running" && evt.status !== "queued" && evt.status !== "cancelled" && evt.status !== "rejected" ? /* @__PURE__ */ jsxs2(Text2, { color: theme.info.color, children: [
           "  ",
           firstLine(evt.result)
         ] }) : null
@@ -17734,8 +17738,11 @@ ${wcagWarnings.join("\n")}` }
         isAbortingRef.current = true;
         supervisorRef.current.killTurn();
         activeScopeRef.current.abort("user_stopped");
-        setQueue([]);
         setEvents((e) => [...e, { kind: "info", key: mkKey(), text: "(interrupted)" }]);
+        for (const [toolId] of pendingToolCallsRef.current) {
+          updateTool(toolId, { status: "cancelled" });
+        }
+        pendingToolCallsRef.current.clear();
         void saveSessionSafe();
         setTasks([]);
         setTasksStartedAt(null);
@@ -17765,8 +17772,11 @@ ${wcagWarnings.join("\n")}` }
           setLimitModal(null);
         }
         activeScopeRef.current.abort("user_stopped");
-        setQueue([]);
         setEvents((e) => [...e, { kind: "info", key: mkKey(), text: "(interrupted)" }]);
+        for (const [toolId] of pendingToolCallsRef.current) {
+          updateTool(toolId, { status: "cancelled" });
+        }
+        pendingToolCallsRef.current.clear();
         setTasks([]);
         setTasksStartedAt(null);
         setTasksStartTokens(0);
@@ -17811,7 +17821,6 @@ ${wcagWarnings.join("\n")}` }
       isAbortingRef.current = true;
       supervisorRef.current.killTurn();
       activeScopeRef.current.abort("user_stopped");
-      setQueue([]);
       setEvents((e) => [...e, { kind: "info", key: mkKey(), text: "(interrupted)" }]);
       void saveSessionSafe();
       setTasks([]);
@@ -18082,15 +18091,27 @@ ${wcagWarnings.join("\n")}` }
                 id: call.id,
                 name: call.function.name,
                 args: call.function.arguments,
-                status: "running",
+                status: "queued",
                 render: renderMeta,
                 expanded: false
               }
             ]);
           },
+          onToolWillExecute: (id) => {
+            setTurnPhase("executing");
+            setCurrentToolName(pendingToolCallsRef.current.get(id) ?? null);
+            setLastActivityAt(Date.now());
+            updateTool(id, { status: "running", startedAt: Date.now() });
+          },
           onToolResult: (r) => {
             pendingToolCallsRef.current.delete(r.tool_call_id);
-            updateTool(r.tool_call_id, { status: r.ok ? "done" : "error", result: r.content });
+            setLastActivityAt(Date.now());
+            if (pendingToolCallsRef.current.size === 0) {
+              setTurnPhase("waiting");
+              setCurrentToolName(null);
+            }
+            const isDenied = typeof r.content === "string" && r.content.startsWith("Permission denied");
+            updateTool(r.tool_call_id, { status: isDenied ? "rejected" : r.ok ? "done" : "error", result: r.content });
           },
           onUsage: (u) => {
             usageRef.current = u;
@@ -19498,13 +19519,18 @@ ${lines.join("\n")}` }]);
               id: call.id,
               name: call.function.name,
               args: call.function.arguments,
-              status: "running",
+              status: "queued",
               render: renderMeta,
-              expanded: false,
-              startedAt: Date.now()
+              expanded: false
             }
           ]);
         },
+        onToolWillExecute: (id, name) => {
+          setTurnPhase("executing");
+          setCurrentToolName(name);
+          setLastActivityAt(Date.now());
+          updateTool(id, { status: "running", startedAt: Date.now() });
+        },
         onToolResult: (r) => {
           pendingToolCallsRef.current.delete(r.tool_call_id);
           setLastActivityAt(Date.now());
@@ -19513,7 +19539,7 @@ ${lines.join("\n")}` }]);
             setCurrentToolName(null);
           }
           updateTool(r.tool_call_id, {
-            status: r.ok ? "done" : "error",
+            status: !r.ok && typeof r.content === "string" && r.content.startsWith("Permission denied") ? "rejected" : r.ok ? "done" : "error",
             result: r.content
           });
         },
@@ -19812,16 +19838,6 @@ ${lines.join("\n")}` }]);
       const trimmedDisplay = (display ?? full).trim() || trimmedFull;
       const historyEntry = trimmedDisplay;
       if (busyRef.current) {
-        if (activeScopeRef.current && !isAbortingRef.current) {
-          isAbortingRef.current = true;
-          supervisorRef.current.killTurn();
-          activeScopeRef.current.abort("new_message");
-          setEvents((e) => [...e, { kind: "info", key: mkKey(), text: "(preempted)" }]);
-          setTasks([]);
-          setTasksStartedAt(null);
-          setTasksStartTokens(0);
-          tasksRef.current = [];
-        }
         const key = mkKey();
         setEvents((e) => [...e, { kind: "user", key, text: trimmedDisplay, queued: true }]);
         setQueue((q) => [...q, { full: trimmedFull, display: trimmedDisplay, key }]);