kimiflare 0.74.1 → 0.75.0

package/dist/index.js

@@ -12886,7 +12886,7 @@ var init_chat = __esm({
       }
       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"));
+        const showSeparator = !!(prev && (e.kind === "user" && prev.kind !== "user" || e.kind === "assistant" && 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 })
@@ -12919,7 +12919,7 @@ var init_chat = __esm({
         return /* @__PURE__ */ jsxs5(Box5, { flexDirection: "column", children: [
           /* @__PURE__ */ jsxs5(Box5, { children: [
             /* @__PURE__ */ jsxs5(Text5, { bold: true, color: theme.user, children: [
-              "\u203A",
+              "You:",
               " "
             ] }),
             /* @__PURE__ */ jsx6(Text5, { bold: true, children: evt.text })
@@ -12931,15 +12931,21 @@ var init_chat = __esm({
         ] });
       }
       if (evt.kind === "assistant") {
-        return /* @__PURE__ */ jsxs5(Box5, { flexDirection: "column", paddingLeft: 2, children: [
-          showReasoning && evt.reasoning ? /* @__PURE__ */ jsx6(Box5, { flexDirection: "column", marginBottom: 1, children: /* @__PURE__ */ jsxs5(Text5, { color: theme.reasoning.color, children: [
-            "thinking\u2026",
-            " ",
-            evt.reasoning.length > 400 ? evt.reasoning.slice(0, 400) + "\u2026" : evt.reasoning
-          ] }) }) : null,
-          evt.text ? /* @__PURE__ */ jsx6(MD, { text: evt.text }) : null,
-          evt.streaming && /* @__PURE__ */ jsx6(Text5, { color: theme.spinner, children: /* @__PURE__ */ jsx6(Spinner2, { type: "dots" }) })
-        ] });
+        return /* @__PURE__ */ jsx6(Box5, { flexDirection: "column", children: /* @__PURE__ */ jsxs5(Box5, { children: [
+          /* @__PURE__ */ jsxs5(Text5, { bold: true, color: theme.assistant ?? theme.info.color, children: [
+            "kimiflare:",
+            " "
+          ] }),
+          /* @__PURE__ */ jsxs5(Box5, { flexDirection: "column", children: [
+            showReasoning && evt.reasoning ? /* @__PURE__ */ jsx6(Box5, { flexDirection: "column", marginBottom: 1, children: /* @__PURE__ */ jsxs5(Text5, { color: theme.reasoning.color, children: [
+              "thinking\u2026",
+              " ",
+              evt.reasoning.length > 400 ? evt.reasoning.slice(0, 400) + "\u2026" : evt.reasoning
+            ] }) }) : null,
+            evt.text ? /* @__PURE__ */ jsx6(MD, { text: evt.text }) : null,
+            evt.streaming && /* @__PURE__ */ jsx6(Text5, { color: theme.spinner, children: /* @__PURE__ */ jsx6(Spinner2, { type: "dots" }) })
+          ] })
+        ] }) });
       }
       if (evt.kind === "tool") {
         const isRepeated = repeatedSigs?.has(toolSignature(evt.name, evt.args)) ?? false;
@@ -13021,9 +13027,10 @@ function StatusBar({ usage, sessionUsage, thinking, turnStartedAt, mode, context
     metaParts.push("memory");
   }
   const phaseLabel = phase === "generating" ? humanizePhase("generating", intentTier) : phase === "executing" ? `${humanizePhase("executing", intentTier)} ${currentTool ?? ""}` : phase === "waiting" ? humanizePhase("waiting", intentTier) : humanizePhase("generating", intentTier);
+  const activePhaseLabel = thinking && phase === "waiting" ? humanizePhase("generating", intentTier) : phaseLabel;
   const idleMs = lastActivityAt && thinking ? now2 - lastActivityAt : 0;
   const idleLabel = idleMs > 3e4 ? ` (idle ${formatElapsed2(Math.floor(idleMs / 1e3))})` : "";
-  const thinkingText = metaParts.length > 0 ? `${phaseLabel}${elapsed ? ` \xB7 ${elapsed}` : ""}${idleLabel} \xB7 ${metaParts.join(" \xB7 ")}` : `${phaseLabel}${elapsed ? ` \xB7 ${elapsed}` : ""}${idleLabel}`;
+  const thinkingText = metaParts.length > 0 ? `${activePhaseLabel}${elapsed ? ` \xB7 ${elapsed}` : ""}${idleLabel} \xB7 ${metaParts.join(" \xB7 ")}` : `${activePhaseLabel}${elapsed ? ` \xB7 ${elapsed}` : ""}${idleLabel}`;
   const readyText = idleParts.length > 0 ? `${idleParts.join(" \xB7 ")} \xB7 ready` : "ready";
   return /* @__PURE__ */ jsxs6(Box6, { flexDirection: "column", children: [
     /* @__PURE__ */ jsxs6(Box6, { children: [
@@ -16594,7 +16601,7 @@ var init_everforest_dark = __esm({
         error: "#e67e80"
       },
       user: "#a7c080",
-      assistant: null,
+      assistant: "#e69875",
       reasoning: {
         color: "#8c968a",
         dim: false
@@ -16650,7 +16657,7 @@ var init_everforest_light = __esm({
         error: "#cf4745"
       },
       user: "#6f7e01",
-      assistant: null,
+      assistant: "#c4715a",
       reasoning: {
         color: "#70796f",
         dim: false
@@ -16706,7 +16713,7 @@ var init_kanagawa_dark = __esm({
         error: "#ff5d62"
       },
       user: "#7e9cd8",
-      assistant: null,
+      assistant: "#d27e99",
       reasoning: {
         color: "#93938b",
         dim: false
@@ -16762,7 +16769,7 @@ var init_dracula_dark = __esm({
         error: "#ff5858"
       },
       user: "#ff79c6",
-      assistant: null,
+      assistant: "#bd93f9",
       reasoning: {
         color: "#8191c2",
         dim: false
@@ -16818,7 +16825,7 @@ var init_tokyo_night = __esm({
         error: "#f7768e"
       },
       user: "#7aa2f7",
-      assistant: null,
+      assistant: "#ff9e64",
       reasoning: {
         color: "#8991b5",
         dim: false
@@ -16874,7 +16881,7 @@ var init_catppuccin_mocha = __esm({
         error: "#f38ba8"
       },
       user: "#89b4fa",
-      assistant: null,
+      assistant: "#f5c2e7",
       reasoning: {
         color: "#8e91a7",
         dim: false
@@ -16930,7 +16937,7 @@ var init_catppuccin_latte = __esm({
         error: "#d20f39"
       },
       user: "#1e66f5",
-      assistant: null,
+      assistant: "#ea76cb",
       reasoning: {
         color: "#737685",
         dim: false
@@ -16986,7 +16993,7 @@ var init_solarized_dark = __esm({
         error: "#ff5956"
       },
       user: "#359ae1",
-      assistant: null,
+      assistant: "#d33682",
       reasoning: {
         color: "#81969c",
         dim: false
@@ -17042,7 +17049,7 @@ var init_solarized_light = __esm({
         error: "#c0392b"
       },
       user: "#227bbb",
-      assistant: null,
+      assistant: "#c61b6e",
       reasoning: {
         color: "#6e7878",
         dim: false
@@ -17098,7 +17105,7 @@ var init_nord = __esm({
         error: "#d08770"
       },
       user: "#88c0d0",
-      assistant: null,
+      assistant: "#b48ead",
       reasoning: {
         color: "#8a96a8",
         dim: false
@@ -17154,7 +17161,7 @@ var init_gruvbox_dark = __esm({
         error: "#ff5b46"
       },
       user: "#b8bb26",
-      assistant: null,
+      assistant: "#fe8019",
       reasoning: {
         color: "#a19283",
         dim: false
@@ -17210,7 +17217,7 @@ var init_gruvbox_light = __esm({
         error: "#9d0006"
       },
       user: "#79740e",
-      assistant: null,
+      assistant: "#af3a03",
       reasoning: {
         color: "#827467",
         dim: false
@@ -17266,7 +17273,7 @@ var init_one_dark = __esm({
         error: "#e36f78"
       },
       user: "#61afef",
-      assistant: null,
+      assistant: "#c678dd",
       reasoning: {
         color: "#8c939e",
         dim: false
@@ -21732,7 +21739,7 @@ function clearLimitLoopResolvers(deps) {
 function interruptTurn(deps) {
   const hadPermission = deps.denyPendingPermission();
   const { hadLimit, hadLoop } = clearLimitLoopResolvers(deps);
-  if (deps.busyRef.current && deps.activeScopeRef.current && !deps.isAbortingRef.current) {
+  if ((deps.busyRef.current || deps.supervisorRef.current.isRunning) && deps.activeScopeRef.current && !deps.isAbortingRef.current) {
     deps.isAbortingRef.current = true;
     deps.supervisorRef.current.killTurn();
     deps.activeScopeRef.current.abort("user_stopped");
@@ -25786,7 +25793,7 @@ ${wcagWarnings.join("\n")}` }
     if (key.escape) {
       const now2 = Date.now();
       const modalOpen = perm !== null || limitModal !== null || loopModal !== null || showLspWizard || showCommandList || commandWizard !== null || commandToDelete !== null || resumeSessions !== null || checkpointSession !== null || showThemePicker;
-      if (!modalOpen && busyRef.current && activeScopeRef.current && !isAbortingRef.current && now2 - lastEscapeAtRef.current > 500) {
+      if (!modalOpen && (busyRef.current || supervisorRef.current.isRunning) && activeScopeRef.current && !isAbortingRef.current && now2 - lastEscapeAtRef.current > 500) {
         lastEscapeAtRef.current = now2;
         interruptTurn(interruptDepsRef.current);
         return;
@@ -26441,6 +26448,7 @@ ${wcagWarnings.join("\n")}` }
         onAssistantStart: () => {
           const id = mkAssistantId();
           activeAsstIdRef.current = id;
+          beginTurn();
           setTurnPhase("generating");
           setLastActivityAt(Date.now());
           setEvents((e) => [
@@ -26462,6 +26470,9 @@ ${wcagWarnings.join("\n")}` }
           const id = activeAsstIdRef.current;
           if (id !== null) updateAssistant(id, () => ({ streaming: false }));
           setTurnPhase("waiting");
+          if (pendingToolCallsRef.current.size === 0) {
+            endTurn();
+          }
         },
         onToolCallFinalized: (call) => {
           pendingToolCallsRef.current.set(call.id, call.function.name);
@@ -26501,6 +26512,7 @@ ${wcagWarnings.join("\n")}` }
           if (pendingToolCallsRef.current.size === 0) {
             setTurnPhase("waiting");
             setCurrentToolName(null);
+            endTurn();
           }
           updateTool(r.tool_call_id, {
             status: !r.ok && typeof r.content === "string" && r.content.startsWith("Permission denied") ? "rejected" : r.ok ? "done" : "error",
@@ -26643,105 +26655,111 @@ ${wcagWarnings.join("\n")}` }
           callbacks: sharedCallbacks
         },
         {
-          onDone: async () => {
-            await saveSessionSafe();
-            if (turnScope.signal.aborted) {
-              cleanupTurn();
-              return;
-            }
-            if (shouldCompact({ messages: messagesRef.current })) {
-              if (hooksManagerRef.current.hasEnabledHooks("PreCompact")) {
-                void hooksManagerRef.current.fire(
-                  "PreCompact",
-                  {
-                    event: "PreCompact",
-                    session_id: sessionIdRef.current,
-                    cwd: process.cwd()
-                  },
-                  null
-                ).catch(() => {
-                });
+          onDone: () => {
+            void (async () => {
+              await saveSessionSafe();
+              if (turnScope.signal.aborted) {
+                return;
               }
-              if (compiledContextRef.current) {
-                const store = artifactStoreRef.current;
-                const result = compactMessagesViaArtifacts({
-                  messages: messagesRef.current,
-                  state: sessionStateRef.current,
-                  store
-                });
-                if (result.metrics.rawTurnsRemoved > 0) {
-                  messagesRef.current = result.newMessages;
-                  sessionStateRef.current = result.newState;
-                  setEvents((e) => [
-                    ...e,
+              let didCompact = false;
+              if (shouldCompact({ messages: messagesRef.current })) {
+                if (hooksManagerRef.current.hasEnabledHooks("PreCompact")) {
+                  void hooksManagerRef.current.fire(
+                    "PreCompact",
                     {
-                      kind: "info",
-                      key: mkKey(),
-                      text: `auto-compacted: ${result.metrics.estimatedTokensBefore} \u2192 ${result.metrics.estimatedTokensAfter} tokens (${result.metrics.archivedArtifacts} artifacts)`
-                    }
-                  ]);
-                  await saveSessionSafe();
+                      event: "PreCompact",
+                      session_id: sessionIdRef.current,
+                      cwd: process.cwd()
+                    },
+                    null
+                  ).catch(() => {
+                  });
                 }
-              } else {
-                try {
-                  const result = await summarizeMessagesViaLlm({
-                    accountId: cfg.accountId,
-                    apiToken: cfg.apiToken,
-                    model: cfg.model,
+                if (compiledContextRef.current) {
+                  const store = artifactStoreRef.current;
+                  const result = compactMessagesViaArtifacts({
                     messages: messagesRef.current,
-                    signal: turnScope.signal,
-                    gateway: gatewayFromConfig(cfg)
+                    state: sessionStateRef.current,
+                    store
                   });
-                  if (result.replacedCount > 0) {
+                  if (result.metrics.rawTurnsRemoved > 0) {
                     messagesRef.current = result.newMessages;
+                    sessionStateRef.current = result.newState;
                     setEvents((e) => [
                       ...e,
                       {
                         kind: "info",
                         key: mkKey(),
-                        text: `auto-compacted: ${result.replacedCount} messages summarized`
+                        text: `auto-compacted: ${result.metrics.estimatedTokensBefore} \u2192 ${result.metrics.estimatedTokensAfter} tokens (${result.metrics.archivedArtifacts} artifacts)`
                       }
                     ]);
                     await saveSessionSafe();
+                    didCompact = true;
                   }
-                } catch (compactErr) {
-                  if (compactErr.name !== "AbortError") {
-                    setEvents((es) => [
-                      ...es,
-                      {
-                        kind: "info",
-                        key: mkKey(),
-                        text: `auto-compact failed: ${compactErr.message ?? String(compactErr)}`
-                      }
-                    ]);
+                } else {
+                  try {
+                    const result = await summarizeMessagesViaLlm({
+                      accountId: cfg.accountId,
+                      apiToken: cfg.apiToken,
+                      model: cfg.model,
+                      messages: messagesRef.current,
+                      signal: turnScope.signal,
+                      gateway: gatewayFromConfig(cfg)
+                    });
+                    if (result.replacedCount > 0) {
+                      messagesRef.current = result.newMessages;
+                      setEvents((e) => [
+                        ...e,
+                        {
+                          kind: "info",
+                          key: mkKey(),
+                          text: `auto-compacted: ${result.replacedCount} messages summarized`
+                        }
+                      ]);
+                      await saveSessionSafe();
+                      didCompact = true;
+                    }
+                  } catch (compactErr) {
+                    if (compactErr.name !== "AbortError") {
+                      setEvents((es) => [
+                        ...es,
+                        {
+                          kind: "info",
+                          key: mkKey(),
+                          text: `auto-compact failed: ${compactErr.message ?? String(compactErr)}`
+                        }
+                      ]);
+                    }
                   }
                 }
-              }
-            }
-            const manager = memoryManagerRef.current;
-            if (manager) {
-              try {
-                const cwd = process.cwd();
-                const queryText = sessionStateRef.current.task || cwd;
-                const results = await manager.recall({ text: queryText, repoPath: cwd, limit: 5 });
-                if (results.length > 0) {
-                  const text2 = await manager.synthesizeRecalled(results);
-                  const lastSystemIdx = messagesRef.current.findLastIndex((m) => m.role === "system");
-                  const insertIdx = lastSystemIdx >= 0 ? lastSystemIdx + 1 : messagesRef.current.length;
-                  messagesRef.current.splice(insertIdx, 0, { role: "system", content: text2 });
-                  setEvents((e) => [
-                    ...e,
-                    {
-                      kind: "memory",
-                      key: mkKey(),
-                      text: `recalled ${results.length} memory${results.length === 1 ? "" : "ies"} after compaction`
+                if (didCompact) {
+                  const manager = memoryManagerRef.current;
+                  if (manager) {
+                    try {
+                      const cwd = process.cwd();
+                      const queryText = sessionStateRef.current.task || cwd;
+                      const results = await manager.recall({ text: queryText, repoPath: cwd, limit: 5 });
+                      if (results.length > 0) {
+                        const text2 = await manager.synthesizeRecalled(results);
+                        const lastSystemIdx = messagesRef.current.findLastIndex((m) => m.role === "system");
+                        const insertIdx = lastSystemIdx >= 0 ? lastSystemIdx + 1 : messagesRef.current.length;
+                        messagesRef.current.splice(insertIdx, 0, { role: "system", content: text2 });
+                        setEvents((e) => [
+                          ...e,
+                          {
+                            kind: "memory",
+                            key: mkKey(),
+                            text: `recalled ${results.length} memory${results.length === 1 ? "" : "ies"} after compaction`
+                          }
+                        ]);
+                        await saveSessionSafe();
+                      }
+                    } catch {
                     }
-                  ]);
-                  await saveSessionSafe();
+                  }
                 }
-              } catch {
               }
-            }
+            })();
             cleanupTurn();
           },
           onError: async (e) => {