kimiflare 0.6.0 → 0.7.1

package/README.md

@@ -1,6 +1,6 @@
 # kimiflare
 
-A terminal coding agent powered by **[Kimi-K2.6](https://developers.cloudflare.com/workers-ai/models/kimi-k2.6/)** on Cloudflare Workers AI. It's Claude Code, but the model is Moonshot's 1T-parameter open-source Kimi running directly on your Cloudflare account — no middleman, no AI Gateway, no OpenAI SDK. You bring the token, your traffic goes straight to Cloudflare.
+A terminal coding agent powered by **[Kimi-K2.6](https://developers.cloudflare.com/workers-ai/models/kimi-k2.6/)** on Cloudflare Workers AI. Moonshot's 1T-parameter open-source model runs directly on your Cloudflare account. You bring the token, your traffic goes straight to Cloudflare.
 
 ```
 $ kimiflare
@@ -180,7 +180,7 @@ All tool calls show inline; mutating ones require per-call approval the first ti
                                        @cf/moonshotai/kimi-k2.6
 ```
 
-No AI Gateway, no proxy, no OpenAI SDK. Direct `fetch` to Workers AI, OpenAI-compatible `messages` + `tools` payload, SSE stream with reasoning + content + tool-call deltas accumulated by index.
+Direct `fetch` to Workers AI, OpenAI-compatible `messages` + `tools` payload, SSE stream with reasoning + content + tool-call deltas accumulated by index.
 
 ## Development
 

package/dist/index.js

@@ -142,7 +142,33 @@ var init_errors = __esm({
   }
 });
 
+// src/agent/messages.ts
+function sanitizeString(str) {
+  return str.replace(/[\uD800-\uDFFF]/g, "\uFFFD");
+}
+function jsonReplacer(_key, value) {
+  if (typeof value === "string") {
+    return sanitizeString(value);
+  }
+  return value;
+}
+var init_messages = __esm({
+  "src/agent/messages.ts"() {
+    "use strict";
+  }
+});
+
 // src/agent/client.ts
+function cleanErrorMessage(msg) {
+  return msg.replace(/^(AiError:\s*)+/, "").trim();
+}
+function isRetryable(err, attempt) {
+  if (attempt >= MAX_ATTEMPTS - 1) return false;
+  if (err.code !== void 0 && RETRYABLE_CODES.has(err.code)) return true;
+  if (err.httpStatus !== void 0 && err.httpStatus >= 500 && err.httpStatus < 600) return true;
+  if (err.message.includes("Internal server error")) return true;
+  return false;
+}
 async function* runKimi(opts2) {
   const url = `https://api.cloudflare.com/client/v4/accounts/${opts2.accountId}/ai/run/${opts2.model}`;
   const body = {
@@ -156,15 +182,26 @@ async function* runKimi(opts2) {
     body.reasoning_effort = opts2.reasoningEffort;
   }
   for (let attempt = 0; attempt < MAX_ATTEMPTS; attempt++) {
-    const res = await fetch(url, {
-      method: "POST",
-      headers: {
-        Authorization: `Bearer ${opts2.apiToken}`,
-        "Content-Type": "application/json"
-      },
-      body: JSON.stringify(body),
-      signal: opts2.signal
-    });
+    let res;
+    try {
+      res = await fetch(url, {
+        method: "POST",
+        headers: {
+          Authorization: `Bearer ${opts2.apiToken}`,
+          "Content-Type": "application/json"
+        },
+        body: JSON.stringify(body, jsonReplacer),
+        signal: opts2.signal
+      });
+    } catch (fetchErr) {
+      const msg = fetchErr instanceof Error ? fetchErr.message : String(fetchErr);
+      if (attempt < MAX_ATTEMPTS - 1) {
+        const delay = 500 * 2 ** attempt + Math.random() * 250;
+        await sleep(delay, opts2.signal);
+        continue;
+      }
+      throw new KimiApiError(`kimiflare: network error: ${msg}`, void 0, void 0);
+    }
     const contentType = res.headers.get("content-type") ?? "";
     if (!contentType.includes("text/event-stream")) {
       const text = await res.text();
@@ -174,13 +211,15 @@ async function* runKimi(opts2) {
       } catch {
       }
       const err = extractCloudflareError(parsed);
-      if (err?.code === RETRYABLE_CODE && attempt < MAX_ATTEMPTS - 1) {
+      const rawMsg = err?.message ?? `HTTP ${res.status}: ${text.slice(0, 300)}`;
+      const msg = cleanErrorMessage(rawMsg);
+      const apiErr = new KimiApiError(`kimiflare: ${msg}`, err?.code, res.status);
+      if (isRetryable(apiErr, attempt)) {
         const delay = 500 * 2 ** attempt + Math.random() * 250;
         await sleep(delay, opts2.signal);
         continue;
       }
-      const msg = err?.message ?? `HTTP ${res.status}: ${text.slice(0, 300)}`;
-      throw new KimiApiError(`kimiflare: ${msg}`, err?.code, res.status);
+      throw apiErr;
     }
     if (!res.body) throw new KimiApiError("kimiflare: empty response body", void 0, res.status);
     yield* parseStream(res.body, opts2.signal);
@@ -257,9 +296,14 @@ async function* parseStream(body, signal) {
 }
 function extractCloudflareError(parsed) {
   if (!parsed || typeof parsed !== "object") return null;
-  const p = parsed;
-  if (p.success === false && Array.isArray(p.errors) && p.errors.length > 0) {
-    return { code: p.errors[0]?.code, message: p.errors[0]?.message };
+  const cf = parsed;
+  if (cf.success === false && Array.isArray(cf.errors) && cf.errors.length > 0) {
+    return { code: cf.errors[0]?.code, message: cf.errors[0]?.message };
+  }
+  const oai = parsed;
+  if (oai.object === "error" && typeof oai.message === "string") {
+    const codeNum = typeof oai.code === "number" ? oai.code : void 0;
+    return { code: codeNum, message: oai.message };
   }
   return null;
 }
@@ -277,13 +321,14 @@ function sleep(ms, signal) {
     signal?.addEventListener("abort", onAbort, { once: true });
   });
 }
-var RETRYABLE_CODE, MAX_ATTEMPTS;
+var RETRYABLE_CODES, MAX_ATTEMPTS;
 var init_client = __esm({
   "src/agent/client.ts"() {
     "use strict";
     init_sse();
     init_errors();
-    RETRYABLE_CODE = 3040;
+    init_messages();
+    RETRYABLE_CODES = /* @__PURE__ */ new Set([3040]);
     MAX_ATTEMPTS = 5;
   }
 });
@@ -360,9 +405,17 @@ async function runAgentTurn(opts2) {
     }
     const assistantMsg = {
       role: "assistant",
-      content: content || null,
-      ...reasoning ? { reasoning_content: reasoning } : {},
-      ...toolCalls.length ? { tool_calls: toolCalls } : {}
+      content: content ? sanitizeString(content) : null,
+      ...reasoning ? { reasoning_content: sanitizeString(reasoning) } : {},
+      ...toolCalls.length ? {
+        tool_calls: toolCalls.map((tc) => ({
+          ...tc,
+          function: {
+            name: tc.function.name,
+            arguments: sanitizeString(tc.function.arguments)
+          }
+        }))
+      } : {}
     };
     opts2.messages.push(assistantMsg);
     opts2.callbacks.onAssistantFinal?.(assistantMsg);
@@ -377,7 +430,7 @@ async function runAgentTurn(opts2) {
       opts2.messages.push({
         role: "tool",
         tool_call_id: result.tool_call_id,
-        content: result.content,
+        content: sanitizeString(result.content),
         name: result.name
       });
       opts2.callbacks.onToolResult?.(result);
@@ -390,6 +443,7 @@ var init_loop = __esm({
     "use strict";
     init_client();
     init_registry();
+    init_messages();
   }
 });
 
@@ -1465,6 +1519,7 @@ var init_markdown = __esm({
 
 // src/ui/chat.tsx
 import { Box as Box4, Text as Text4 } from "ink";
+import Spinner2 from "ink-spinner";
 import { jsx as jsx4, jsxs as jsxs4 } from "react/jsx-runtime";
 function ChatView({ events, showReasoning, theme, verbose }) {
   return /* @__PURE__ */ jsx4(Box4, { flexDirection: "column", children: events.map((e, i) => {
@@ -1498,7 +1553,8 @@ function EventView({
         " ",
         evt.reasoning.length > 400 ? evt.reasoning.slice(0, 400) + "\u2026" : evt.reasoning
       ] }) }) : null,
-      evt.text ? /* @__PURE__ */ jsx4(MD, { text: evt.text, theme }) : null
+      evt.text ? /* @__PURE__ */ jsx4(MD, { text: evt.text, theme }) : null,
+      evt.streaming && /* @__PURE__ */ jsx4(Text4, { color: theme.spinner, children: /* @__PURE__ */ jsx4(Spinner2, { type: "dots" }) })
     ] });
   }
   if (evt.kind === "tool") {
@@ -1524,26 +1580,21 @@ var init_chat = __esm({
 });
 
 // src/ui/status.tsx
+import { useEffect, useState } from "react";
 import { Box as Box5, Text as Text5 } from "ink";
+import Spinner3 from "ink-spinner";
 import { jsx as jsx5, jsxs as jsxs5 } from "react/jsx-runtime";
-function StatusBar({ model, usage, thinking, theme, mode, effort, contextLimit }) {
+function StatusBar({ model, usage, thinking, turnStartedAt, theme, mode, effort, contextLimit }) {
+  const [now, setNow] = useState(Date.now());
   const modeColor = mode === "plan" ? theme.modeBadge.plan : mode === "auto" ? theme.modeBadge.auto : theme.modeBadge.edit;
   const warn = usage && usage.prompt_tokens / contextLimit >= 0.8;
+  useEffect(() => {
+    if (!thinking || turnStartedAt === null) return;
+    const id = setInterval(() => setNow(Date.now()), 1e3);
+    return () => clearInterval(id);
+  }, [thinking, turnStartedAt]);
+  const elapsed = turnStartedAt !== null ? formatElapsed(now - turnStartedAt) : null;
   const leftParts = [`${shortModel(model)}`, effort];
-  if (thinking) leftParts.push("thinking\u2026");
-  const rightParts = [];
-  if (usage) {
-    const cached = usage.prompt_tokens_details?.cached_tokens ?? 0;
-    const uncachedIn = usage.prompt_tokens - cached;
-    const cost = uncachedIn * PRICE_IN_PER_M / 1e6 + cached * PRICE_IN_CACHED_PER_M / 1e6 + usage.completion_tokens * PRICE_OUT_PER_M / 1e6;
-    const pct = Math.round(usage.prompt_tokens / contextLimit * 100);
-    rightParts.push(
-      `in ${usage.prompt_tokens}${cached ? ` (${cached} cached)` : ""}`,
-      `out ${usage.completion_tokens}`,
-      `ctx ${pct}%`,
-      `${cost.toFixed(5)}`
-    );
-  }
   return /* @__PURE__ */ jsxs5(Box5, { flexDirection: "column", children: [
     /* @__PURE__ */ jsxs5(Box5, { children: [
       /* @__PURE__ */ jsxs5(Text5, { color: modeColor, bold: true, children: [
@@ -1552,10 +1603,18 @@ function StatusBar({ model, usage, thinking, theme, mode, effort, contextLimit }
         "]"
       ] }),
       /* @__PURE__ */ jsx5(Text5, { children: " " }),
-      /* @__PURE__ */ jsx5(Text5, { color: theme.info.color, dimColor: theme.info.dim, children: leftParts.join("  \xB7  ") })
+      thinking ? /* @__PURE__ */ jsxs5(Text5, { color: theme.spinner, children: [
+        /* @__PURE__ */ jsx5(Spinner3, { type: "dots" }),
+        " ",
+        "thinking",
+        elapsed ? ` \xB7 ${elapsed}` : ""
+      ] }) : /* @__PURE__ */ jsxs5(Text5, { color: theme.info.color, dimColor: theme.info.dim, children: [
+        leftParts.join("  \xB7  "),
+        "  \xB7  ready"
+      ] })
     ] }),
-    rightParts.length > 0 && /* @__PURE__ */ jsxs5(Box5, { children: [
-      /* @__PURE__ */ jsx5(Text5, { color: theme.info.color, dimColor: theme.info.dim, children: rightParts.join("  \xB7  ") }),
+    usage && /* @__PURE__ */ jsxs5(Box5, { children: [
+      /* @__PURE__ */ jsx5(Text5, { color: theme.info.color, dimColor: theme.info.dim, children: buildRightParts(usage, contextLimit).join("  \xB7  ") }),
       warn ? /* @__PURE__ */ jsxs5(Text5, { color: theme.warn, bold: true, children: [
         "  \xB7  ",
         "/compact recommended"
@@ -1563,10 +1622,29 @@ function StatusBar({ model, usage, thinking, theme, mode, effort, contextLimit }
     ] })
   ] });
 }
+function buildRightParts(usage, contextLimit) {
+  const cached = usage.prompt_tokens_details?.cached_tokens ?? 0;
+  const uncachedIn = usage.prompt_tokens - cached;
+  const cost = uncachedIn * PRICE_IN_PER_M / 1e6 + cached * PRICE_IN_CACHED_PER_M / 1e6 + usage.completion_tokens * PRICE_OUT_PER_M / 1e6;
+  const pct = Math.round(usage.prompt_tokens / contextLimit * 100);
+  return [
+    `in ${usage.prompt_tokens}${cached ? ` (${cached} cached)` : ""}`,
+    `out ${usage.completion_tokens}`,
+    `ctx ${pct}%`,
+    `${cost.toFixed(5)}`
+  ];
+}
 function shortModel(m) {
   const last = m.split("/").at(-1) ?? m;
   return last;
 }
+function formatElapsed(ms) {
+  const total = Math.floor(ms / 1e3);
+  const m = Math.floor(total / 60);
+  const s = total % 60;
+  if (m === 0) return `${s}s`;
+  return `${m}m ${s}s`;
+}
 var PRICE_IN_PER_M, PRICE_IN_CACHED_PER_M, PRICE_OUT_PER_M;
 var init_status = __esm({
   "src/ui/status.tsx"() {
@@ -1671,12 +1749,13 @@ var init_resume_picker = __esm({
 });
 
 // src/ui/task-list.tsx
-import { useEffect, useState } from "react";
+import { useEffect as useEffect2, useState as useState2 } from "react";
 import { Box as Box8, Text as Text8 } from "ink";
+import Spinner4 from "ink-spinner";
 import { jsx as jsx8, jsxs as jsxs8 } from "react/jsx-runtime";
 function TaskList({ tasks, theme, startedAt, tokensDelta }) {
-  const [now, setNow] = useState(Date.now());
-  useEffect(() => {
+  const [now, setNow] = useState2(Date.now());
+  useEffect2(() => {
     if (startedAt === null) return;
     const allDone2 = tasks.length > 0 && tasks.every((t) => t.status === "completed");
     if (allDone2) return;
@@ -1689,7 +1768,7 @@ function TaskList({ tasks, theme, startedAt, tokensDelta }) {
   const total = tasks.length;
   const allDone = done === total;
   const header = active ? active.title : allDone ? `${total} tasks done` : `${done}/${total}`;
-  const elapsed = startedAt ? formatElapsed(now - startedAt) : null;
+  const elapsed = startedAt ? formatElapsed2(now - startedAt) : null;
   const headerStats = [elapsed, tokensDelta > 0 ? `\u2191 ${formatTokens(tokensDelta)} tokens` : null].filter(Boolean).join(" \xB7 ");
   const visibleTasks = tasks.slice(0, MAX_VISIBLE);
   const hiddenPending = Math.max(0, tasks.length - visibleTasks.length);
@@ -1723,7 +1802,8 @@ function TaskRow({ task, theme }) {
   if (task.status === "in_progress") {
     return /* @__PURE__ */ jsxs8(Text8, { color: theme.accent, bold: true, children: [
       "  ",
-      "\u25A0 ",
+      /* @__PURE__ */ jsx8(Spinner4, { type: "dots" }),
+      " ",
       task.title
     ] });
   }
@@ -1733,7 +1813,7 @@ function TaskRow({ task, theme }) {
     task.title
   ] });
 }
-function formatElapsed(ms) {
+function formatElapsed2(ms) {
   const total = Math.floor(ms / 1e3);
   const m = Math.floor(total / 60);
   const s = total % 60;
@@ -2273,7 +2353,7 @@ var init_source = __esm({
 });
 
 // src/ui/text-input.tsx
-import { useState as useState2, useEffect as useEffect2, useRef } from "react";
+import { useState as useState3, useEffect as useEffect3, useRef } from "react";
 import { Text as Text9, useInput } from "ink";
 import { jsx as jsx9 } from "react/jsx-runtime";
 function shouldTreatAsPaste(input) {
@@ -2308,9 +2388,9 @@ function CustomTextInput({
   mask,
   enablePaste = false
 }) {
-  const [cursorOffset, setCursorOffset] = useState2(value.length);
+  const [cursorOffset, setCursorOffset] = useState3(value.length);
   const pastesRef = useRef(/* @__PURE__ */ new Map());
-  useEffect2(() => {
+  useEffect3(() => {
     if (!focus) return;
     setCursorOffset((prev) => prev > value.length ? value.length : prev);
   }, [value, focus]);
@@ -2469,7 +2549,7 @@ var init_text_input = __esm({
     "use strict";
     init_source();
     PASTE_CHAR_THRESHOLD = 200;
-    PASTE_NEWLINE_THRESHOLD = 3;
+    PASTE_NEWLINE_THRESHOLD = 1;
   }
 });
 
@@ -2586,15 +2666,15 @@ var init_update_check = __esm({
 });
 
 // src/ui/onboarding.tsx
-import { useState as useState3 } from "react";
+import { useState as useState4 } from "react";
 import { Box as Box9, Text as Text10 } from "ink";
 import { Fragment, jsx as jsx10, jsxs as jsxs9 } from "react/jsx-runtime";
 function Onboarding({ onDone }) {
-  const [step, setStep] = useState3("accountId");
-  const [accountId, setAccountId] = useState3("");
-  const [apiToken, setApiToken] = useState3("");
-  const [model, setModel] = useState3(DEFAULT_MODEL);
-  const [savedPath, setSavedPath] = useState3(null);
+  const [step, setStep] = useState4("accountId");
+  const [accountId, setAccountId] = useState4("");
+  const [apiToken, setApiToken] = useState4("");
+  const [model, setModel] = useState4(DEFAULT_MODEL);
+  const [savedPath, setSavedPath] = useState4(null);
   const stepIndex = STEPS.indexOf(step) + 1;
   const handleAccountIdSubmit = (value) => {
     const trimmed = value.trim();
@@ -2917,7 +2997,7 @@ var app_exports = {};
 __export(app_exports, {
   renderApp: () => renderApp
 });
-import { useState as useState4, useRef as useRef2, useEffect as useEffect3, useCallback } from "react";
+import { useState as useState5, useRef as useRef2, useEffect as useEffect4, useCallback } from "react";
 import { Box as Box11, Text as Text12, useApp, useInput as useInput2, render } from "ink";
 import { existsSync } from "fs";
 import { join as join5 } from "path";
@@ -2925,27 +3005,28 @@ import { unlink } from "fs/promises";
 import { jsx as jsx12, jsxs as jsxs11 } from "react/jsx-runtime";
 function App({ initialCfg }) {
   const { exit } = useApp();
-  const [cfg, setCfg] = useState4(initialCfg);
-  const [events, setEvents] = useState4([]);
-  const [input, setInput] = useState4("");
-  const [busy, setBusy] = useState4(false);
-  const [usage, setUsage] = useState4(null);
-  const [showReasoning, setShowReasoning] = useState4(false);
-  const [perm, setPerm] = useState4(null);
-  const [queue, setQueue] = useState4([]);
-  const [history, setHistory] = useState4([]);
-  const [historyIndex, setHistoryIndex] = useState4(-1);
-  const [draftInput, setDraftInput] = useState4("");
-  const [mode, setMode] = useState4("edit");
-  const [effort, setEffort] = useState4(
+  const [cfg, setCfg] = useState5(initialCfg);
+  const [events, setEvents] = useState5([]);
+  const [input, setInput] = useState5("");
+  const [busy, setBusy] = useState5(false);
+  const [usage, setUsage] = useState5(null);
+  const [showReasoning, setShowReasoning] = useState5(false);
+  const [perm, setPerm] = useState5(null);
+  const [queue, setQueue] = useState5([]);
+  const [history, setHistory] = useState5([]);
+  const [historyIndex, setHistoryIndex] = useState5(-1);
+  const [draftInput, setDraftInput] = useState5("");
+  const [mode, setMode] = useState5("edit");
+  const [effort, setEffort] = useState5(
     initialCfg?.reasoningEffort ?? DEFAULT_REASONING_EFFORT
   );
-  const [theme, setTheme] = useState4(resolveTheme(initialCfg?.theme));
-  const [resumeSessions, setResumeSessions] = useState4(null);
-  const [tasks, setTasks] = useState4([]);
-  const [tasksStartedAt, setTasksStartedAt] = useState4(null);
-  const [tasksStartTokens, setTasksStartTokens] = useState4(0);
-  const [verbose, setVerbose] = useState4(false);
+  const [theme, setTheme] = useState5(resolveTheme(initialCfg?.theme));
+  const [resumeSessions, setResumeSessions] = useState5(null);
+  const [tasks, setTasks] = useState5([]);
+  const [tasksStartedAt, setTasksStartedAt] = useState5(null);
+  const [tasksStartTokens, setTasksStartTokens] = useState5(0);
+  const [turnStartedAt, setTurnStartedAt] = useState5(null);
+  const [verbose, setVerbose] = useState5(false);
   const messagesRef = useRef2([
     {
       role: "system",
@@ -2965,7 +3046,35 @@ function App({ initialCfg }) {
   const effortRef = useRef2(effort);
   const tasksRef = useRef2([]);
   const usageRef = useRef2(null);
-  useEffect3(() => {
+  const updateCheckedRef = useRef2(false);
+  const compactSuggestedRef = useRef2(false);
+  useEffect4(() => {
+    if (!cfg || updateCheckedRef.current) return;
+    updateCheckedRef.current = true;
+    void checkForUpdate().then((result) => {
+      if (result.hasUpdate) {
+        setEvents((e) => [
+          ...e,
+          {
+            kind: "info",
+            key: mkKey(),
+            text: `update available: ${result.localVersion} \u2192 ${result.latestVersion}`
+          }
+        ]);
+        void isGitRepo().then((git) => {
+          setEvents((e) => [
+            ...e,
+            {
+              kind: "info",
+              key: mkKey(),
+              text: git ? "run:  git pull && npm install && npm run build  then restart kimiflare" : "run:  npm update -g kimiflare  then restart"
+            }
+          ]);
+        });
+      }
+    });
+  }, [cfg]);
+  useEffect4(() => {
     modeRef.current = mode;
     messagesRef.current[0] = {
       role: "system",
@@ -2980,7 +3089,7 @@ function App({ initialCfg }) {
       executorRef.current.clearSessionPermissions();
     }
   }, [mode, cfg?.model]);
-  useEffect3(() => {
+  useEffect4(() => {
     effortRef.current = effort;
   }, [effort]);
   const saveSessionSafe = useCallback(async () => {
@@ -3053,7 +3162,7 @@ function App({ initialCfg }) {
       return;
     }
     setBusy(true);
-    setEvents((e) => [...e, { kind: "info", key: mkKey(), text: "compacting conversation\u2026" }]);
+    setTurnStartedAt(Date.now());
     const controller = new AbortController();
     activeControllerRef.current = controller;
     try {
@@ -3090,6 +3199,7 @@ function App({ initialCfg }) {
       }
     } finally {
       setBusy(false);
+      setTurnStartedAt(null);
       activeControllerRef.current = null;
     }
   }, [cfg, busy, saveSessionSafe]);
@@ -3133,8 +3243,9 @@ function App({ initialCfg }) {
       "Do not call `tasks_set` for this. Just read what you need, then write the file."
     ].join("\n");
     setEvents((e) => [...e, { kind: "user", key: mkKey(), text: "/init" }]);
-    messagesRef.current.push({ role: "user", content: prompt });
+    messagesRef.current.push({ role: "user", content: sanitizeString(prompt) });
     setBusy(true);
+    setTurnStartedAt(Date.now());
     const controller = new AbortController();
     activeControllerRef.current = controller;
     try {
@@ -3229,6 +3340,7 @@ function App({ initialCfg }) {
       }
     } finally {
       setBusy(false);
+      setTurnStartedAt(null);
       activeAsstIdRef.current = null;
       activeControllerRef.current = null;
     }
@@ -3273,11 +3385,12 @@ function App({ initialCfg }) {
       if (c === "/clear") {
         messagesRef.current = [messagesRef.current[0]];
         sessionIdRef.current = null;
-        setEvents([{ kind: "info", key: mkKey(), text: "conversation cleared" }]);
+        setEvents([]);
         setUsage(null);
         setTasks([]);
         setTasksStartedAt(null);
         setTasksStartTokens(0);
+        compactSuggestedRef.current = false;
         return true;
       }
       if (c === "/reasoning") {
@@ -3484,8 +3597,9 @@ use: /thinking low | medium | high`
       if (trimmed.startsWith("/") && handleSlash(trimmed)) return;
       const display = displayText?.trim() || trimmed;
       setEvents((e) => [...e, { kind: "user", key: mkKey(), text: display }]);
-      messagesRef.current.push({ role: "user", content: trimmed });
+      messagesRef.current.push({ role: "user", content: sanitizeString(trimmed) });
       setBusy(true);
+      setTurnStartedAt(Date.now());
       const controller = new AbortController();
       activeControllerRef.current = controller;
       try {
@@ -3599,13 +3713,14 @@ use: /thinking low | medium | high`
         }
       } finally {
         setBusy(false);
+        setTurnStartedAt(null);
         activeAsstIdRef.current = null;
         activeControllerRef.current = null;
       }
     },
     [cfg, handleSlash, updateAssistant, updateTool, saveSessionSafe]
   );
-  useEffect3(() => {
+  useEffect4(() => {
     if (!busy && queue.length > 0) {
       const next = queue[0];
       setQueue((q) => q.slice(1));
@@ -3632,20 +3747,18 @@ use: /thinking low | medium | high`
     },
     [busy, processMessage]
   );
-  useEffect3(() => {
+  useEffect4(() => {
+    if (compactSuggestedRef.current) return;
     if (usage && usage.prompt_tokens / CONTEXT_LIMIT >= AUTO_COMPACT_SUGGEST_PCT) {
-      setEvents((e) => {
-        const last = e[e.length - 1];
-        if (last?.kind === "info" && last.text.startsWith("context ")) return e;
-        return [
-          ...e,
-          {
-            kind: "info",
-            key: mkKey(),
-            text: `context ${Math.round(usage.prompt_tokens / CONTEXT_LIMIT * 100)}% full \u2014 run /compact to summarize older turns`
-          }
-        ];
-      });
+      compactSuggestedRef.current = true;
+      setEvents((e) => [
+        ...e,
+        {
+          kind: "info",
+          key: mkKey(),
+          text: `context ${Math.round(usage.prompt_tokens / CONTEXT_LIMIT * 100)}% full \u2014 run /compact to summarize older turns`
+        }
+      ]);
     }
   }, [usage]);
   if (!cfg) {
@@ -3699,6 +3812,7 @@ use: /thinking low | medium | high`
           model: cfg.model,
           usage,
           thinking: busy,
+          turnStartedAt,
           theme,
           mode,
           effort,
@@ -3767,6 +3881,7 @@ var init_app = __esm({
     init_system_prompt();
     init_compact();
     init_executor();
+    init_messages();
     init_chat();
     init_status();
     init_permission();