kimiflare 0.41.0 → 0.42.0

package/dist/index.js

@@ -204,7 +204,8 @@ async function loadConfig() {
         plumbingModel: envPlumbingModel ?? parsed.plumbingModel,
         codeMode: envCodeMode ?? parsed.codeMode,
         costAttribution: envCostAttribution ?? parsed.costAttribution ?? false,
-        filePicker: envFilePicker ?? parsed.filePicker ?? true
+        filePicker: envFilePicker ?? parsed.filePicker ?? true,
+        theme: parsed.theme
       };
     }
     if (parsed.accountId && parsed.apiToken) {
@@ -235,7 +236,8 @@ async function loadConfig() {
         codeMode: envCodeMode ?? parsed.codeMode ?? true,
         costAttribution: envCostAttribution ?? parsed.costAttribution ?? true,
         filePicker: envFilePicker ?? parsed.filePicker ?? true,
-        cloudMode: envCloudMode ?? parsed.cloudMode
+        cloudMode: envCloudMode ?? parsed.cloudMode,
+        theme: parsed.theme
       };
     }
   } catch {
@@ -345,10 +347,11 @@ var init_lsp_config = __esm({
 });
 
 // src/util/sse.ts
-async function* readSSE(stream, signal) {
+async function* readSSE(stream, signal, idleTimeoutMs) {
   const reader = stream.getReader();
   const decoder = new TextDecoder("utf-8");
   let buffer = "";
+  let lastDataAt = Date.now();
   const onAbort = () => {
     reader.cancel(new DOMException("aborted", "AbortError")).catch(() => {
     });
@@ -357,8 +360,15 @@ async function* readSSE(stream, signal) {
   try {
     while (true) {
       if (signal?.aborted) throw new DOMException("aborted", "AbortError");
+      if (idleTimeoutMs !== void 0 && Date.now() - lastDataAt > idleTimeoutMs) {
+        throw new DOMException(
+          `kimiflare: stream idle for ${idleTimeoutMs}ms \u2014 no data received from API`,
+          "TimeoutError"
+        );
+      }
       const { done, value } = await reader.read();
       if (done) break;
+      lastDataAt = Date.now();
       buffer += decoder.decode(value, { stream: true });
       buffer = buffer.replace(/\r\n/g, "\n");
       let sep3;
@@ -573,7 +583,7 @@ async function* runKimi(opts2) {
     const meta = readGatewayMeta(res.headers);
     if (meta) yield { type: "gateway_meta", meta };
     let lastUsage = null;
-    for await (const ev of parseStream(res.body, opts2.signal)) {
+    for await (const ev of parseStream(res.body, opts2.signal, opts2.idleTimeoutMs)) {
       if (ev.type === "usage") lastUsage = ev.usage;
       yield ev;
     }
@@ -654,11 +664,12 @@ function readGatewayMeta(headers) {
   if (model) meta.model = model;
   return Object.keys(meta).length > 0 ? meta : null;
 }
-async function* parseStream(body, signal) {
+async function* parseStream(body, signal, idleTimeoutMs = DEFAULT_IDLE_TIMEOUT_MS) {
   const toolCalls = /* @__PURE__ */ new Map();
   let lastUsage = null;
   let finishReason = null;
-  for await (const dataStr of readSSE(body, signal)) {
+  let lastDataAt = Date.now();
+  for await (const dataStr of readSSE(body, signal, idleTimeoutMs)) {
     if (dataStr === "[DONE]") break;
     let chunk = null;
     try {
@@ -789,7 +800,7 @@ function sleep(ms, signal) {
     signal?.addEventListener("abort", onAbort, { once: true });
   });
 }
-var RETRYABLE_CODES, MAX_ATTEMPTS;
+var RETRYABLE_CODES, MAX_ATTEMPTS, DEFAULT_IDLE_TIMEOUT_MS;
 var init_client = __esm({
   "src/agent/client.ts"() {
     "use strict";
@@ -799,6 +810,7 @@ var init_client = __esm({
     init_messages();
     RETRYABLE_CODES = /* @__PURE__ */ new Set([3040]);
     MAX_ATTEMPTS = 5;
+    DEFAULT_IDLE_TIMEOUT_MS = 6e4;
   }
 });
 
@@ -6917,10 +6929,18 @@ var init_narrative = __esm({
 });
 
 // src/ui/tool-view.tsx
-import React2 from "react";
+import React2, { useEffect, useState } from "react";
 import { Box as Box2, Text as Text2 } from "ink";
 import Spinner from "ink-spinner";
 import { jsx as jsx3, jsxs as jsxs2 } from "react/jsx-runtime";
+function formatElapsed(ms) {
+  const total = Math.floor(ms / 1e3);
+  if (total < 1) return "<1s";
+  const m = Math.floor(total / 60);
+  const s = total % 60;
+  if (m === 0) return `${s}s`;
+  return `${m}m ${s}s`;
+}
 function firstLine(s) {
   const line = s.split("\n").find((l) => l.trim().length > 0) ?? "";
   return line.length <= 120 ? line : line.slice(0, 120) + "\u2026";
@@ -6933,10 +6953,20 @@ var init_tool_view = __esm({
     init_paths();
     init_theme_context();
     init_narrative();
-    ToolView = React2.memo(function ToolView2({ evt, verbose }) {
+    ToolView = React2.memo(function ToolView2({ evt, verbose, isRepeated }) {
       const theme = useTheme();
+      const [now2, setNow] = useState(Date.now());
+      useEffect(() => {
+        if (evt.startedAt === void 0) return;
+        if (evt.status !== "running") {
+          setNow(Date.now());
+          return;
+        }
+        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 title = evt.render?.title ?? (() => {
+      let title = evt.render?.title ?? (() => {
         try {
           const args = evt.args ? JSON.parse(evt.args) : {};
           return humanizeToolTitle(evt.name, args);
@@ -6944,6 +6974,9 @@ var init_tool_view = __esm({
           return humanizeToolTitle(evt.name);
         }
       })();
+      if (evt.startedAt !== void 0) {
+        title += ` \xB7 ${formatElapsed(now2 - evt.startedAt)}`;
+      }
       const expand = Boolean(evt.expanded || verbose);
       const lines = evt.result ? evt.result.split("\n") : [];
       const showLimit = verbose ? 200 : 20;
@@ -6951,7 +6984,8 @@ var init_tool_view = __esm({
         /* @__PURE__ */ jsxs2(Text2, { children: [
           statusIcon,
           " ",
-          /* @__PURE__ */ jsx3(Text2, { color: theme.info.color, children: title })
+          /* @__PURE__ */ jsx3(Text2, { color: theme.info.color, children: title }),
+          isRepeated ? /* @__PURE__ */ jsx3(Text2, { color: theme.warn, children: " \u26A0 repeated" }) : null
         ] }),
         evt.render?.diff ? /* @__PURE__ */ jsx3(Box2, { marginLeft: 2, children: /* @__PURE__ */ jsx3(DiffView, { ...evt.render.diff }) }) : null,
         evt.result && expand ? /* @__PURE__ */ jsxs2(
@@ -7027,6 +7061,15 @@ function parseBlocks(src) {
       out.push({ kind: "quote", text: quoteLines.join("\n") });
       continue;
     }
+    if (/^\s*\d+\.\s+/.test(line)) {
+      const items = [];
+      while (i < lines.length && /^\s*\d+\.\s+/.test(lines[i])) {
+        items.push(lines[i].replace(/^\s*\d+\.\s+/, ""));
+        i++;
+      }
+      out.push({ kind: "numbered", items });
+      continue;
+    }
     if (/^\s*[-*]\s+/.test(line)) {
       const items = [];
       while (i < lines.length && /^\s*[-*]\s+/.test(lines[i])) {
@@ -7036,9 +7079,23 @@ function parseBlocks(src) {
       out.push({ kind: "bullet", items });
       continue;
     }
+    if (i + 1 < lines.length && /^\|/.test(line) && /^\|[\s\-:|]+\|$/.test(lines[i + 1])) {
+      const headerLine = line;
+      const headers = headerLine.split("|").slice(1, -1).map((h) => h.trim());
+      i += 2;
+      const rows = [];
+      while (i < lines.length && /^\|/.test(lines[i])) {
+        rows.push(
+          lines[i].split("|").slice(1, -1).map((c) => c.trim())
+        );
+        i++;
+      }
+      out.push({ kind: "table", headers, rows });
+      continue;
+    }
     const paraLines = [line];
     i++;
-    while (i < lines.length && lines[i].trim() !== "" && !/^(#{1,3})\s+/.test(lines[i]) && !/^\s*[-*]\s+/.test(lines[i]) && !/^\s*>\s?/.test(lines[i]) && !/^```/.test(lines[i])) {
+    while (i < lines.length && lines[i].trim() !== "" && !/^(#{1,3})\s+/.test(lines[i]) && !/^\s*[-*]\s+/.test(lines[i]) && !/^\s*\d+\.\s+/.test(lines[i]) && !/^\s*>\s?/.test(lines[i]) && !/^```/.test(lines[i]) && !/^\|/.test(lines[i])) {
       paraLines.push(lines[i]);
       i++;
     }
@@ -7051,7 +7108,18 @@ function renderInline(src, theme) {
   return segments.map((seg, i) => {
     if (seg.kind === "bold") return /* @__PURE__ */ jsx4(Text3, { bold: true, children: seg.text }, i);
     if (seg.kind === "italic") return /* @__PURE__ */ jsx4(Text3, { italic: true, children: seg.text }, i);
-    if (seg.kind === "code") return /* @__PURE__ */ jsx4(Text3, { color: theme.tool, children: seg.text }, i);
+    if (seg.kind === "code") {
+      const color = theme.codeInline ?? theme.tool;
+      return /* @__PURE__ */ jsx4(Text3, { color, children: seg.text }, i);
+    }
+    if (seg.kind === "strikethrough") {
+      const color = theme.strikethrough ?? theme.muted?.color ?? theme.palette.secondary;
+      return /* @__PURE__ */ jsx4(Text3, { strikethrough: true, color, children: seg.text }, i);
+    }
+    if (seg.kind === "link") {
+      const color = theme.link ?? theme.accent;
+      return /* @__PURE__ */ jsx4(Text3, { underline: true, color, children: seg.text }, i);
+    }
     return /* @__PURE__ */ jsx4(Text3, { children: seg.text }, i);
   });
 }
@@ -7076,6 +7144,30 @@ function parseInline(src) {
         continue;
       }
     }
+    if (ch === "~" && src[i + 1] === "~") {
+      const end = src.indexOf("~~", i + 2);
+      if (end > i + 1) {
+        flush();
+        out.push({ kind: "strikethrough", text: src.slice(i + 2, end) });
+        i = end + 2;
+        continue;
+      }
+    }
+    if (ch === "[") {
+      const closeBracket = src.indexOf("]", i + 1);
+      const openParen = closeBracket >= 0 ? src.indexOf("(", closeBracket) : -1;
+      const closeParen = openParen >= 0 ? src.indexOf(")", openParen) : -1;
+      if (closeParen > openParen && openParen === closeBracket + 1) {
+        flush();
+        out.push({
+          kind: "link",
+          text: src.slice(i + 1, closeBracket),
+          url: src.slice(openParen + 1, closeParen)
+        });
+        i = closeParen + 1;
+        continue;
+      }
+    }
     if (ch === "*" && src[i + 1] === "*") {
       const end = src.indexOf("**", i + 2);
       if (end > i + 1) {
@@ -7135,11 +7227,53 @@ var init_markdown = __esm({
           /* @__PURE__ */ jsx4(Text3, { children: renderInline(item, theme) })
         ] }, i)) });
       }
+      if (block.kind === "numbered") {
+        return /* @__PURE__ */ jsx4(Box3, { flexDirection: "column", children: block.items.map((item, idx) => /* @__PURE__ */ jsxs3(Box3, { children: [
+          /* @__PURE__ */ jsxs3(Text3, { color: theme.accent, children: [
+            "  ",
+            idx + 1,
+            ". "
+          ] }),
+          /* @__PURE__ */ jsx4(Text3, { children: renderInline(item, theme) })
+        ] }, idx)) });
+      }
       if (block.kind === "quote") {
-        return /* @__PURE__ */ jsx4(Box3, { marginLeft: 2, children: /* @__PURE__ */ jsx4(Text3, { color: theme.info.color, italic: true, children: renderInline(block.text, theme) }) });
+        const quoteColor = theme.blockquote?.color ?? theme.info.color;
+        const dim = theme.blockquote?.dim ?? false;
+        return /* @__PURE__ */ jsx4(Box3, { marginLeft: 2, children: /* @__PURE__ */ jsx4(Text3, { color: quoteColor, dimColor: dim, italic: true, children: renderInline(block.text, theme) }) });
       }
       if (block.kind === "code") {
-        return /* @__PURE__ */ jsx4(Box3, { flexDirection: "column", marginLeft: 2, children: block.text.split("\n").map((l, i) => /* @__PURE__ */ jsx4(Text3, { color: theme.tool, children: l }, i)) });
+        const codeColor = theme.codeBlock ?? theme.tool;
+        return /* @__PURE__ */ jsx4(Box3, { flexDirection: "column", marginLeft: 2, children: block.text.split("\n").map((l, i) => /* @__PURE__ */ jsx4(Text3, { color: codeColor, children: l }, i)) });
+      }
+      if (block.kind === "table") {
+        const borderColor = theme.tableBorder ?? theme.accent;
+        const headerColor = theme.tableHeader ?? theme.accent;
+        const cellColor = theme.tableCell ?? theme.palette.foreground;
+        const colCount = block.headers.length;
+        return /* @__PURE__ */ jsxs3(Box3, { flexDirection: "column", marginLeft: 2, children: [
+          /* @__PURE__ */ jsxs3(Box3, { children: [
+            /* @__PURE__ */ jsx4(Text3, { color: borderColor, children: "\u2502 " }),
+            block.headers.map((h, ci) => /* @__PURE__ */ jsxs3(React3.Fragment, { children: [
+              /* @__PURE__ */ jsx4(Text3, { bold: true, color: headerColor, children: h }),
+              ci < colCount - 1 && /* @__PURE__ */ jsx4(Text3, { color: borderColor, children: " \u2502 " })
+            ] }, ci)),
+            /* @__PURE__ */ jsx4(Text3, { color: borderColor, children: " \u2502" })
+          ] }),
+          /* @__PURE__ */ jsx4(Box3, { children: /* @__PURE__ */ jsxs3(Text3, { color: borderColor, children: [
+            "\u251C",
+            Array(colCount).fill("\u2500".repeat(8)).join("\u253C"),
+            "\u2524"
+          ] }) }),
+          block.rows.map((row, ri) => /* @__PURE__ */ jsxs3(Box3, { children: [
+            /* @__PURE__ */ jsx4(Text3, { color: borderColor, children: "\u2502 " }),
+            row.map((cell, ci) => /* @__PURE__ */ jsxs3(React3.Fragment, { children: [
+              /* @__PURE__ */ jsx4(Text3, { color: cellColor, children: cell }),
+              ci < colCount - 1 && /* @__PURE__ */ jsx4(Text3, { color: borderColor, children: " \u2502 " })
+            ] }, ci)),
+            /* @__PURE__ */ jsx4(Text3, { color: borderColor, children: " \u2502" })
+          ] }, ri))
+        ] });
       }
       return /* @__PURE__ */ jsx4(Text3, { children: renderInline(block.text, theme) });
     });
@@ -7151,6 +7285,9 @@ import React4 from "react";
 import { Box as Box4, Text as Text4, Static } from "ink";
 import Spinner2 from "ink-spinner";
 import { jsx as jsx5, jsxs as jsxs4 } from "react/jsx-runtime";
+function toolSignature(name, args) {
+  return `${name}:${args}`;
+}
 var ChatView, EventView;
 var init_chat = __esm({
   "src/ui/chat.tsx"() {
@@ -7162,6 +7299,17 @@ var init_chat = __esm({
       const theme = useTheme();
       const finalized = [];
       const active = [];
+      const toolCounts = /* @__PURE__ */ new Map();
+      for (const e of events) {
+        if (e.kind === "tool") {
+          const sig = toolSignature(e.name, e.args);
+          toolCounts.set(sig, (toolCounts.get(sig) ?? 0) + 1);
+        }
+      }
+      const repeatedSigs = /* @__PURE__ */ new Set();
+      for (const [sig, count] of toolCounts) {
+        if (count >= 3) repeatedSigs.add(sig);
+      }
       for (let i = 0; i < events.length; i++) {
         const e = events[i];
         if (suppressTools && e.kind === "tool") continue;
@@ -7177,14 +7325,14 @@ var init_chat = __esm({
       return /* @__PURE__ */ jsxs4(Box4, { flexDirection: "column", children: [
         /* @__PURE__ */ jsx5(Static, { items: finalized, children: (item) => /* @__PURE__ */ jsxs4(Box4, { flexDirection: "column", children: [
           item.showSeparator && /* @__PURE__ */ jsx5(Box4, { marginY: 1, children: /* @__PURE__ */ jsx5(Text4, { color: theme.info.color, children: "\u2500".repeat(40) }) }),
-          /* @__PURE__ */ jsx5(EventView, { evt: item.evt, showReasoning, verbose })
+          /* @__PURE__ */ jsx5(EventView, { evt: item.evt, showReasoning, verbose, repeatedSigs })
         ] }, 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__ */ jsxs4(Box4, { flexDirection: "column", children: [
             showSeparator && /* @__PURE__ */ jsx5(Box4, { marginY: 1, children: /* @__PURE__ */ jsx5(Text4, { color: theme.info.color, children: "\u2500".repeat(40) }) }),
-            /* @__PURE__ */ jsx5(EventView, { evt: e, showReasoning, verbose })
+            /* @__PURE__ */ jsx5(EventView, { evt: e, showReasoning, verbose, repeatedSigs })
           ] }, e.key);
         })
       ] });
@@ -7192,7 +7340,8 @@ var init_chat = __esm({
     EventView = React4.memo(function EventView2({
       evt,
       showReasoning,
-      verbose
+      verbose,
+      repeatedSigs
     }) {
       const theme = useTheme();
       if (evt.kind === "user") {
@@ -7222,7 +7371,8 @@ var init_chat = __esm({
         ] });
       }
       if (evt.kind === "tool") {
-        return /* @__PURE__ */ jsx5(ToolView, { evt, verbose });
+        const isRepeated = repeatedSigs?.has(toolSignature(evt.name, evt.args)) ?? false;
+        return /* @__PURE__ */ jsx5(ToolView, { evt, verbose, isRepeated });
       }
       if (evt.kind === "info") {
         return /* @__PURE__ */ jsxs4(Text4, { color: theme.info.color, children: [
@@ -7269,24 +7419,27 @@ var init_pricing = __esm({
 });
 
 // src/ui/status.tsx
-import { useEffect, useState } from "react";
+import { useEffect as useEffect2, useState as useState2 } from "react";
 import { Box as Box5, Text as Text5 } from "ink";
 import Spinner3 from "ink-spinner";
 import { jsx as jsx6, jsxs as jsxs5 } from "react/jsx-runtime";
-function StatusBar({ model, usage, sessionUsage, thinking, turnStartedAt, mode, effort, contextLimit, hasUpdate, latestVersion, gatewayMeta, codeMode, cloudMode, cloudBudget, kimiMdStale }) {
+function StatusBar({ model, usage, sessionUsage, thinking, turnStartedAt, mode, effort, contextLimit, hasUpdate, latestVersion, gatewayMeta, codeMode, cloudMode, cloudBudget, phase, currentTool, lastActivityAt, kimiMdStale }) {
   const theme = useTheme();
-  const [now2, setNow] = useState(Date.now());
+  const [now2, setNow] = useState2(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(() => {
+  useEffect2(() => {
     if (!thinking || turnStartedAt === null) return;
     const id = setInterval(() => setNow(Date.now()), 1e3);
     return () => clearInterval(id);
   }, [thinking, turnStartedAt]);
-  const elapsed = turnStartedAt !== null ? formatElapsed(now2 - turnStartedAt) : null;
+  const elapsed = turnStartedAt !== null ? formatElapsed2(now2 - turnStartedAt) : null;
   const leftParts = [`${shortModel(model)}`, effort];
   if (cloudMode) leftParts.push("CLOUD");
   if (codeMode) leftParts.push("CODE");
+  const phaseLabel = phase === "generating" ? "generating" : phase === "executing" ? `executing ${currentTool ?? ""}` : phase === "waiting" ? "waiting" : "thinking";
+  const idleMs = lastActivityAt && thinking ? now2 - lastActivityAt : 0;
+  const idleLabel = idleMs > 3e4 ? ` (idle ${formatElapsed2(Math.floor(idleMs / 1e3))})` : "";
   return /* @__PURE__ */ jsxs5(Box5, { flexDirection: "column", children: [
     /* @__PURE__ */ jsxs5(Box5, { children: [
       /* @__PURE__ */ jsxs5(Text5, { color: modeColor, bold: true, children: [
@@ -7298,8 +7451,9 @@ function StatusBar({ model, usage, sessionUsage, thinking, turnStartedAt, mode,
       thinking ? /* @__PURE__ */ jsxs5(Text5, { color: theme.spinner, children: [
         /* @__PURE__ */ jsx6(Spinner3, { type: "dots" }),
         " ",
-        "thinking",
-        elapsed ? ` \xB7 ${elapsed}` : ""
+        phaseLabel,
+        elapsed ? ` \xB7 ${elapsed}` : "",
+        idleLabel
       ] }) : /* @__PURE__ */ jsxs5(Text5, { color: theme.info.color, children: [
         leftParts.join("  \xB7  "),
         "  \xB7  ready"
@@ -7370,7 +7524,7 @@ function shortModel(m) {
   const last = m.split("/").at(-1) ?? m;
   return last;
 }
-function formatElapsed(ms) {
+function formatElapsed2(ms) {
   const total = Math.floor(ms / 1e3);
   const m = Math.floor(total / 60);
   const s = total % 60;
@@ -7460,14 +7614,14 @@ var init_limit_modal = __esm({
 });
 
 // src/ui/resume-picker.tsx
-import { useState as useState2 } from "react";
+import { useState as useState3 } from "react";
 import { Box as Box8, Text as Text8, useWindowSize } from "ink";
 import SelectInput3 from "ink-select-input";
 import { jsx as jsx9, jsxs as jsxs8 } from "react/jsx-runtime";
 function ResumePicker({ sessions, onPick }) {
   const theme = useTheme();
   const { rows } = useWindowSize();
-  const [page, setPage] = useState2(0);
+  const [page, setPage] = useState3(0);
   const pageSize = Math.max(MIN_PAGE_SIZE, rows - HEADER_ROWS - FOOTER_ROWS);
   const totalPages = Math.max(1, Math.ceil(sessions.length / pageSize));
   const safePage = Math.min(page, totalPages - 1);
@@ -7549,16 +7703,16 @@ var init_resume_picker = __esm({
 });
 
 // src/ui/task-list.tsx
-import { useEffect as useEffect2, useRef, useState as useState3 } from "react";
+import { useEffect as useEffect3, useRef, useState as useState4 } from "react";
 import { Box as Box9, Text as Text9 } from "ink";
 import Spinner4 from "ink-spinner";
 import { jsx as jsx10, jsxs as jsxs9 } from "react/jsx-runtime";
 function TaskList({ tasks, startedAt, tokensDelta }) {
   const theme = useTheme();
-  const [now2, setNow] = useState3(Date.now());
+  const [now2, setNow] = useState4(Date.now());
   const tasksRef = useRef(tasks);
   tasksRef.current = tasks;
-  useEffect2(() => {
+  useEffect3(() => {
     if (startedAt === null) return;
     const id = setInterval(() => {
       setNow(Date.now());
@@ -7575,7 +7729,7 @@ function TaskList({ tasks, startedAt, tokensDelta }) {
   const total = tasks.length;
   const allDone = done === total;
   const header = active ? active.title : allDone ? `${total} tasks done` : `${done}/${total}`;
-  const elapsed = startedAt ? formatElapsed2(now2 - startedAt) : null;
+  const elapsed = startedAt ? formatElapsed3(now2 - startedAt) : null;
   const headerStats = [elapsed, tokensDelta > 0 ? `\u2191 ${formatTokens2(tokensDelta)} tokens` : null].filter(Boolean).join(" \xB7 ");
   const visibleTasks = tasks.slice(0, MAX_VISIBLE);
   const hiddenPending = Math.max(0, tasks.length - visibleTasks.length);
@@ -7621,7 +7775,7 @@ function TaskRow({ task }) {
     task.title
   ] });
 }
-function formatElapsed2(ms) {
+function formatElapsed3(ms) {
   const total = Math.floor(ms / 1e3);
   const m = Math.floor(total / 60);
   const s = total % 60;
@@ -8162,7 +8316,7 @@ var init_source = __esm({
 });
 
 // src/ui/text-input.tsx
-import { useState as useState4, useEffect as useEffect3, useRef as useRef2 } from "react";
+import { useState as useState5, useEffect as useEffect4, useRef as useRef2 } from "react";
 import { Text as Text10, useInput } from "ink";
 import { jsx as jsx11 } from "react/jsx-runtime";
 function shouldTreatAsPaste(input) {
@@ -8204,14 +8358,14 @@ function CustomTextInput({
   onPickerSelect,
   onPickerCancel
 }) {
-  const [internalCursor, setInternalCursor] = useState4(value.length);
+  const [internalCursor, setInternalCursor] = useState5(value.length);
   const cursorOffset = controlledCursor ?? internalCursor;
   const setCursorOffset = (offset) => {
     setInternalCursor(offset);
     onCursorChange?.(offset);
   };
   const pastesRef = useRef2(/* @__PURE__ */ new Map());
-  useEffect3(() => {
+  useEffect4(() => {
     if (!focus) return;
     const next = cursorOffset > value.length ? value.length : cursorOffset;
     if (next !== cursorOffset) {
@@ -8396,7 +8550,7 @@ var init_text_input = __esm({
 });
 
 // src/ui/onboarding.tsx
-import { useState as useState5, useEffect as useEffect4, useCallback } from "react";
+import { useState as useState6, useEffect as useEffect5, useCallback } from "react";
 import { Box as Box10, Text as Text11, useInput as useInput2 } from "ink";
 import SelectInput4 from "ink-select-input";
 import Spinner5 from "ink-spinner";
@@ -8419,15 +8573,15 @@ function formatRemaining(ms) {
 }
 function Onboarding({ onDone, onCancel }) {
   const theme = useTheme();
-  const [step, setStep] = useState5("mode");
-  const [mode, setMode] = useState5("byok");
-  const [accountId, setAccountId] = useState5("");
-  const [apiToken, setApiToken] = useState5("");
-  const [model, setModel] = useState5(DEFAULT_MODEL);
-  const [savedPath, setSavedPath] = useState5(null);
-  const [cloudAuth, setCloudAuth] = useState5(null);
-  const [pollTick, setPollTick] = useState5(0);
-  useEffect4(() => {
+  const [step, setStep] = useState6("mode");
+  const [mode, setMode] = useState6("byok");
+  const [accountId, setAccountId] = useState6("");
+  const [apiToken, setApiToken] = useState6("");
+  const [model, setModel] = useState6(DEFAULT_MODEL);
+  const [savedPath, setSavedPath] = useState6(null);
+  const [cloudAuth, setCloudAuth] = useState6(null);
+  const [pollTick, setPollTick] = useState6(0);
+  useEffect5(() => {
     if (step !== "cloudAuth" || !cloudAuth) return;
     if (cloudAuth.phase !== "polling") return;
     let cancelled = false;
@@ -8830,13 +8984,13 @@ var init_welcome = __esm({
 });
 
 // src/ui/help-menu.tsx
-import { useState as useState6 } from "react";
+import { useState as useState7 } from "react";
 import { Box as Box12, Text as Text13, useInput as useInput3 } from "ink";
 import SelectInput5 from "ink-select-input";
 import { jsx as jsx14, jsxs as jsxs12 } from "react/jsx-runtime";
 function HelpMenu({ customCommands, costAttributionEnabled, cloudMode, onDone, onCommand }) {
   const theme = useTheme();
-  const [page, setPage] = useState6("main");
+  const [page, setPage] = useState7("main");
   const customs = customCommands ?? [];
   useInput3((_input, key) => {
     if (key.escape) {
@@ -9164,17 +9318,17 @@ var init_tui_deploy = __esm({
 });
 
 // src/ui/remote-dashboard.tsx
-import { useEffect as useEffect5, useState as useState7 } from "react";
+import { useEffect as useEffect6, useState as useState8 } from "react";
 import { Box as Box13, Text as Text14, useInput as useInput4 } from "ink";
 import SelectInput6 from "ink-select-input";
 import { jsx as jsx15, jsxs as jsxs13 } from "react/jsx-runtime";
 function RemoteDashboard({ onSelect, onCancel }) {
   const theme = useTheme();
-  const [sessions, setSessions] = useState7([]);
-  const [loading, setLoading] = useState7(true);
-  const [error, setError] = useState7(null);
-  const [refreshing, setRefreshing] = useState7(false);
-  useEffect5(() => {
+  const [sessions, setSessions] = useState8([]);
+  const [loading, setLoading] = useState8(true);
+  const [error, setError] = useState8(null);
+  const [refreshing, setRefreshing] = useState8(false);
+  useEffect6(() => {
     loadSessions();
   }, []);
   async function loadSessions() {
@@ -9288,7 +9442,7 @@ function RemoteSessionDetail({
   onCancel
 }) {
   const theme = useTheme();
-  const [cancelling, setCancelling] = useState7(false);
+  const [cancelling, setCancelling] = useState8(false);
   useInput4((input, key) => {
     if (key.escape) {
       onBack();
@@ -11355,21 +11509,21 @@ var init_save = __esm({
 });
 
 // src/ui/command-wizard.tsx
-import { useState as useState8 } from "react";
+import { useState as useState9 } from "react";
 import { Box as Box14, Text as Text15, useInput as useInput5, useWindowSize as useWindowSize2 } from "ink";
 import SelectInput7 from "ink-select-input";
 import { Fragment as Fragment2, jsx as jsx16, jsxs as jsxs14 } from "react/jsx-runtime";
 function CommandWizard({ mode, initial, existingNames, builtinNames, onDone, onSave }) {
   const theme = useTheme();
-  const [step, setStep] = useState8("name");
-  const [name, setName] = useState8(initial?.name ?? "");
-  const [description, setDescription] = useState8(initial?.description ?? "");
-  const [template, setTemplate] = useState8(initial?.template ?? "");
-  const [cmdMode, setCmdMode] = useState8(initial?.mode);
-  const [cmdEffort, setCmdEffort] = useState8(initial?.effort);
-  const [cmdModel, setCmdModel] = useState8(initial?.model);
-  const [source, setSource] = useState8(initial?.source ?? "project");
-  const [error, setError] = useState8(null);
+  const [step, setStep] = useState9("name");
+  const [name, setName] = useState9(initial?.name ?? "");
+  const [description, setDescription] = useState9(initial?.description ?? "");
+  const [template, setTemplate] = useState9(initial?.template ?? "");
+  const [cmdMode, setCmdMode] = useState9(initial?.mode);
+  const [cmdEffort, setCmdEffort] = useState9(initial?.effort);
+  const [cmdModel, setCmdModel] = useState9(initial?.model);
+  const [source, setSource] = useState9(initial?.source ?? "project");
+  const [error, setError] = useState9(null);
   const { columns } = useWindowSize2();
   const totalSteps = 5;
   const stepIndex = step === "name" ? 1 : step === "description" ? 2 : step === "template" ? 3 : step === "advanced" || step === "mode" || step === "effort" || step === "model" ? 4 : step === "location" ? 4 : 5;
@@ -12311,20 +12465,20 @@ var init_command_list = __esm({
 });
 
 // src/ui/lsp-wizard.tsx
-import { useState as useState9 } from "react";
+import { useState as useState10 } from "react";
 import { Box as Box17, Text as Text18 } from "ink";
 import SelectInput9 from "ink-select-input";
 import { spawn as spawn3 } from "child_process";
 import { jsx as jsx19, jsxs as jsxs17 } from "react/jsx-runtime";
 function LspWizard({ servers, currentScope, hasProjectDir, onDone, onSave }) {
   const theme = useTheme();
-  const [page, setPage] = useState9("main");
-  const [selectedPreset, setSelectedPreset] = useState9(null);
-  const [customName, setCustomName] = useState9("");
-  const [customCommand, setCustomCommand] = useState9("");
-  const [installState, setInstallState] = useState9({ status: "idle", output: "" });
-  const [pendingServers, setPendingServers] = useState9(null);
-  const [pendingEnabled, setPendingEnabled] = useState9(true);
+  const [page, setPage] = useState10("main");
+  const [selectedPreset, setSelectedPreset] = useState10(null);
+  const [customName, setCustomName] = useState10("");
+  const [customCommand, setCustomCommand] = useState10("");
+  const [installState, setInstallState] = useState10({ status: "idle", output: "" });
+  const [pendingServers, setPendingServers] = useState10(null);
+  const [pendingEnabled, setPendingEnabled] = useState10(true);
   const runInstall = (command) => {
     setInstallState({ status: "running", output: "Installing..." });
     const child = spawn3("bash", ["-lc", command], {
@@ -12885,39 +13039,628 @@ var init_theme_picker = __esm({
   }
 });
 
+// src/ui/themes/everforest-dark.json
+var everforest_dark_default;
+var init_everforest_dark = __esm({
+  "src/ui/themes/everforest-dark.json"() {
+    everforest_dark_default = {
+      name: "everforest-dark",
+      label: "Everforest Dark",
+      palette: {
+        background: "#2b3339",
+        foreground: "#d3c6aa",
+        primary: "#a7c080",
+        secondary: "#7a8478",
+        success: "#a7c080",
+        error: "#e67e80"
+      },
+      user: "#a7c080",
+      assistant: null,
+      reasoning: { color: "#7a8478", dim: true },
+      info: { color: "#d3c6aa", dim: false },
+      error: "#e67e80",
+      warn: "#dbbc7f",
+      tool: "#7fbbb3",
+      spinner: "#a7c080",
+      permission: "#e67e80",
+      queue: { color: "#7a8478", dim: true },
+      accent: "#a7c080",
+      modeBadge: {
+        plan: "#a7c080",
+        auto: "#a7c080",
+        edit: "#e67e80"
+      },
+      blockquote: { color: "#7a8478", dim: true },
+      codeInline: "#7fbbb3",
+      codeBlock: "#7fbbb3",
+      link: "#a7c080",
+      strikethrough: "#7a8478",
+      tableBorder: "#4b565c",
+      tableHeader: "#d3c6aa",
+      tableCell: "#d3c6aa",
+      muted: { color: "#7a8478", dim: true }
+    };
+  }
+});
+
+// src/ui/themes/everforest-light.json
+var everforest_light_default;
+var init_everforest_light = __esm({
+  "src/ui/themes/everforest-light.json"() {
+    everforest_light_default = {
+      name: "everforest-light",
+      label: "Everforest Light",
+      palette: {
+        background: "#fdf6e3",
+        foreground: "#5c6a72",
+        primary: "#8da101",
+        secondary: "#939f91",
+        success: "#8da101",
+        error: "#f85552"
+      },
+      user: "#8da101",
+      assistant: null,
+      reasoning: { color: "#939f91", dim: true },
+      info: { color: "#5c6a72", dim: false },
+      error: "#f85552",
+      warn: "#dfa000",
+      tool: "#3a94c5",
+      spinner: "#8da101",
+      permission: "#f85552",
+      queue: { color: "#939f91", dim: true },
+      accent: "#8da101",
+      modeBadge: {
+        plan: "#8da101",
+        auto: "#8da101",
+        edit: "#f85552"
+      },
+      blockquote: { color: "#939f91", dim: true },
+      codeInline: "#3a94c5",
+      codeBlock: "#3a94c5",
+      link: "#8da101",
+      strikethrough: "#939f91",
+      tableBorder: "#bdc3af",
+      tableHeader: "#5c6a72",
+      tableCell: "#5c6a72",
+      muted: { color: "#939f91", dim: true }
+    };
+  }
+});
+
+// src/ui/themes/kanagawa-dark.json
+var kanagawa_dark_default;
+var init_kanagawa_dark = __esm({
+  "src/ui/themes/kanagawa-dark.json"() {
+    kanagawa_dark_default = {
+      name: "kanagawa-dark",
+      label: "Kanagawa Dark",
+      palette: {
+        background: "#1f1f28",
+        foreground: "#dcd7ba",
+        primary: "#7e9cd8",
+        secondary: "#727169",
+        success: "#98bb6c",
+        error: "#ff5d62"
+      },
+      user: "#7e9cd8",
+      assistant: null,
+      reasoning: { color: "#727169", dim: true },
+      info: { color: "#dcd7ba", dim: false },
+      error: "#ff5d62",
+      warn: "#e6c384",
+      tool: "#7fb4ca",
+      spinner: "#7e9cd8",
+      permission: "#ff5d62",
+      queue: { color: "#727169", dim: true },
+      accent: "#7e9cd8",
+      modeBadge: {
+        plan: "#7e9cd8",
+        auto: "#98bb6c",
+        edit: "#ff5d62"
+      },
+      blockquote: { color: "#727169", dim: true },
+      codeInline: "#7fb4ca",
+      codeBlock: "#7fb4ca",
+      link: "#7e9cd8",
+      strikethrough: "#727169",
+      tableBorder: "#54546d",
+      tableHeader: "#dcd7ba",
+      tableCell: "#dcd7ba",
+      muted: { color: "#727169", dim: true }
+    };
+  }
+});
+
+// src/ui/themes/dracula-dark.json
+var dracula_dark_default;
+var init_dracula_dark = __esm({
+  "src/ui/themes/dracula-dark.json"() {
+    dracula_dark_default = {
+      name: "dracula-dark",
+      label: "Dracula Dark",
+      palette: {
+        background: "#282a36",
+        foreground: "#f8f8f2",
+        primary: "#ff79c6",
+        secondary: "#6272a4",
+        success: "#50fa7b",
+        error: "#ff5555"
+      },
+      user: "#ff79c6",
+      assistant: null,
+      reasoning: { color: "#6272a4", dim: true },
+      info: { color: "#f8f8f2", dim: false },
+      error: "#ff5555",
+      warn: "#f1fa8c",
+      tool: "#8be9fd",
+      spinner: "#ff79c6",
+      permission: "#ff5555",
+      queue: { color: "#6272a4", dim: true },
+      accent: "#ff79c6",
+      modeBadge: {
+        plan: "#ff79c6",
+        auto: "#50fa7b",
+        edit: "#ff5555"
+      },
+      blockquote: { color: "#6272a4", dim: true },
+      codeInline: "#8be9fd",
+      codeBlock: "#8be9fd",
+      link: "#ff79c6",
+      strikethrough: "#6272a4",
+      tableBorder: "#44475a",
+      tableHeader: "#f8f8f2",
+      tableCell: "#f8f8f2",
+      muted: { color: "#6272a4", dim: true }
+    };
+  }
+});
+
+// src/ui/themes/tokyo-night.json
+var tokyo_night_default;
+var init_tokyo_night = __esm({
+  "src/ui/themes/tokyo-night.json"() {
+    tokyo_night_default = {
+      name: "tokyo-night",
+      label: "Tokyo Night",
+      palette: {
+        background: "#1a1b26",
+        foreground: "#a9b1d6",
+        primary: "#7aa2f7",
+        secondary: "#565f89",
+        success: "#9ece6a",
+        error: "#f7768e"
+      },
+      user: "#7aa2f7",
+      assistant: null,
+      reasoning: { color: "#565f89", dim: true },
+      info: { color: "#a9b1d6", dim: false },
+      error: "#f7768e",
+      warn: "#e0af68",
+      tool: "#bb9af7",
+      spinner: "#7aa2f7",
+      permission: "#f7768e",
+      queue: { color: "#565f89", dim: true },
+      accent: "#7aa2f7",
+      modeBadge: {
+        plan: "#7aa2f7",
+        auto: "#9ece6a",
+        edit: "#f7768e"
+      },
+      blockquote: { color: "#565f89", dim: true },
+      codeInline: "#bb9af7",
+      codeBlock: "#bb9af7",
+      link: "#7aa2f7",
+      strikethrough: "#565f89",
+      tableBorder: "#414868",
+      tableHeader: "#c0caf5",
+      tableCell: "#a9b1d6",
+      muted: { color: "#565f89", dim: true }
+    };
+  }
+});
+
+// src/ui/themes/catppuccin-mocha.json
+var catppuccin_mocha_default;
+var init_catppuccin_mocha = __esm({
+  "src/ui/themes/catppuccin-mocha.json"() {
+    catppuccin_mocha_default = {
+      name: "catppuccin-mocha",
+      label: "Catppuccin Mocha",
+      palette: {
+        background: "#1e1e2e",
+        foreground: "#cdd6f4",
+        primary: "#89b4fa",
+        secondary: "#6c7086",
+        success: "#a6e3a1",
+        error: "#f38ba8"
+      },
+      user: "#89b4fa",
+      assistant: null,
+      reasoning: { color: "#6c7086", dim: true },
+      info: { color: "#cdd6f4", dim: false },
+      error: "#f38ba8",
+      warn: "#f9e2af",
+      tool: "#cba6f7",
+      spinner: "#89b4fa",
+      permission: "#f38ba8",
+      queue: { color: "#6c7086", dim: true },
+      accent: "#89b4fa",
+      modeBadge: {
+        plan: "#89b4fa",
+        auto: "#a6e3a1",
+        edit: "#f38ba8"
+      },
+      blockquote: { color: "#6c7086", dim: true },
+      codeInline: "#cba6f7",
+      codeBlock: "#cba6f7",
+      link: "#89b4fa",
+      strikethrough: "#6c7086",
+      tableBorder: "#45475a",
+      tableHeader: "#cdd6f4",
+      tableCell: "#cdd6f4",
+      muted: { color: "#6c7086", dim: true }
+    };
+  }
+});
+
+// src/ui/themes/catppuccin-latte.json
+var catppuccin_latte_default;
+var init_catppuccin_latte = __esm({
+  "src/ui/themes/catppuccin-latte.json"() {
+    catppuccin_latte_default = {
+      name: "catppuccin-latte",
+      label: "Catppuccin Latte",
+      palette: {
+        background: "#eff1f5",
+        foreground: "#4c4f69",
+        primary: "#1e66f5",
+        secondary: "#8c8fa1",
+        success: "#40a02b",
+        error: "#d20f39"
+      },
+      user: "#1e66f5",
+      assistant: null,
+      reasoning: { color: "#8c8fa1", dim: true },
+      info: { color: "#4c4f69", dim: false },
+      error: "#d20f39",
+      warn: "#df8e1d",
+      tool: "#8839ef",
+      spinner: "#1e66f5",
+      permission: "#d20f39",
+      queue: { color: "#8c8fa1", dim: true },
+      accent: "#1e66f5",
+      modeBadge: {
+        plan: "#1e66f5",
+        auto: "#40a02b",
+        edit: "#d20f39"
+      },
+      blockquote: { color: "#8c8fa1", dim: true },
+      codeInline: "#8839ef",
+      codeBlock: "#8839ef",
+      link: "#1e66f5",
+      strikethrough: "#8c8fa1",
+      tableBorder: "#bcc0cc",
+      tableHeader: "#4c4f69",
+      tableCell: "#4c4f69",
+      muted: { color: "#8c8fa1", dim: true }
+    };
+  }
+});
+
+// src/ui/themes/solarized-dark.json
+var solarized_dark_default;
+var init_solarized_dark = __esm({
+  "src/ui/themes/solarized-dark.json"() {
+    solarized_dark_default = {
+      name: "solarized-dark",
+      label: "Solarized Dark",
+      palette: {
+        background: "#002b36",
+        foreground: "#839496",
+        primary: "#268bd2",
+        secondary: "#586e75",
+        success: "#859900",
+        error: "#dc322f"
+      },
+      user: "#268bd2",
+      assistant: null,
+      reasoning: { color: "#586e75", dim: true },
+      info: { color: "#839496", dim: false },
+      error: "#dc322f",
+      warn: "#b58900",
+      tool: "#2aa198",
+      spinner: "#268bd2",
+      permission: "#dc322f",
+      queue: { color: "#586e75", dim: true },
+      accent: "#268bd2",
+      modeBadge: {
+        plan: "#268bd2",
+        auto: "#859900",
+        edit: "#dc322f"
+      },
+      blockquote: { color: "#586e75", dim: true },
+      codeInline: "#2aa198",
+      codeBlock: "#2aa198",
+      link: "#268bd2",
+      strikethrough: "#586e75",
+      tableBorder: "#073642",
+      tableHeader: "#93a1a1",
+      tableCell: "#839496",
+      muted: { color: "#586e75", dim: true }
+    };
+  }
+});
+
+// src/ui/themes/solarized-light.json
+var solarized_light_default;
+var init_solarized_light = __esm({
+  "src/ui/themes/solarized-light.json"() {
+    solarized_light_default = {
+      name: "solarized-light",
+      label: "Solarized Light",
+      palette: {
+        background: "#fdf6e3",
+        foreground: "#657b83",
+        primary: "#268bd2",
+        secondary: "#93a1a1",
+        success: "#859900",
+        error: "#dc322f"
+      },
+      user: "#268bd2",
+      assistant: null,
+      reasoning: { color: "#93a1a1", dim: true },
+      info: { color: "#657b83", dim: false },
+      error: "#dc322f",
+      warn: "#b58900",
+      tool: "#2aa198",
+      spinner: "#268bd2",
+      permission: "#dc322f",
+      queue: { color: "#93a1a1", dim: true },
+      accent: "#268bd2",
+      modeBadge: {
+        plan: "#268bd2",
+        auto: "#859900",
+        edit: "#dc322f"
+      },
+      blockquote: { color: "#93a1a1", dim: true },
+      codeInline: "#2aa198",
+      codeBlock: "#2aa198",
+      link: "#268bd2",
+      strikethrough: "#93a1a1",
+      tableBorder: "#eee8d5",
+      tableHeader: "#586e75",
+      tableCell: "#657b83",
+      muted: { color: "#93a1a1", dim: true }
+    };
+  }
+});
+
+// src/ui/themes/nord.json
+var nord_default;
+var init_nord = __esm({
+  "src/ui/themes/nord.json"() {
+    nord_default = {
+      name: "nord",
+      label: "Nord",
+      palette: {
+        background: "#2e3440",
+        foreground: "#d8dee9",
+        primary: "#88c0d0",
+        secondary: "#4c566a",
+        success: "#a3be8c",
+        error: "#bf616a"
+      },
+      user: "#88c0d0",
+      assistant: null,
+      reasoning: { color: "#4c566a", dim: true },
+      info: { color: "#d8dee9", dim: false },
+      error: "#bf616a",
+      warn: "#ebcb8b",
+      tool: "#81a1c1",
+      spinner: "#88c0d0",
+      permission: "#bf616a",
+      queue: { color: "#4c566a", dim: true },
+      accent: "#88c0d0",
+      modeBadge: {
+        plan: "#88c0d0",
+        auto: "#a3be8c",
+        edit: "#bf616a"
+      },
+      blockquote: { color: "#4c566a", dim: true },
+      codeInline: "#81a1c1",
+      codeBlock: "#81a1c1",
+      link: "#88c0d0",
+      strikethrough: "#4c566a",
+      tableBorder: "#434c5e",
+      tableHeader: "#eceff4",
+      tableCell: "#d8dee9",
+      muted: { color: "#4c566a", dim: true }
+    };
+  }
+});
+
+// src/ui/themes/gruvbox-dark.json
+var gruvbox_dark_default;
+var init_gruvbox_dark = __esm({
+  "src/ui/themes/gruvbox-dark.json"() {
+    gruvbox_dark_default = {
+      name: "gruvbox-dark",
+      label: "Gruvbox Dark",
+      palette: {
+        background: "#282828",
+        foreground: "#ebdbb2",
+        primary: "#b8bb26",
+        secondary: "#928374",
+        success: "#b8bb26",
+        error: "#fb4934"
+      },
+      user: "#b8bb26",
+      assistant: null,
+      reasoning: { color: "#928374", dim: true },
+      info: { color: "#ebdbb2", dim: false },
+      error: "#fb4934",
+      warn: "#fabd2f",
+      tool: "#83a598",
+      spinner: "#b8bb26",
+      permission: "#fb4934",
+      queue: { color: "#928374", dim: true },
+      accent: "#b8bb26",
+      modeBadge: {
+        plan: "#b8bb26",
+        auto: "#b8bb26",
+        edit: "#fb4934"
+      },
+      blockquote: { color: "#928374", dim: true },
+      codeInline: "#83a598",
+      codeBlock: "#83a598",
+      link: "#b8bb26",
+      strikethrough: "#928374",
+      tableBorder: "#504945",
+      tableHeader: "#ebdbb2",
+      tableCell: "#ebdbb2",
+      muted: { color: "#928374", dim: true }
+    };
+  }
+});
+
+// src/ui/themes/gruvbox-light.json
+var gruvbox_light_default;
+var init_gruvbox_light = __esm({
+  "src/ui/themes/gruvbox-light.json"() {
+    gruvbox_light_default = {
+      name: "gruvbox-light",
+      label: "Gruvbox Light",
+      palette: {
+        background: "#fbf1c7",
+        foreground: "#3c3836",
+        primary: "#79740e",
+        secondary: "#928374",
+        success: "#79740e",
+        error: "#9d0006"
+      },
+      user: "#79740e",
+      assistant: null,
+      reasoning: { color: "#928374", dim: true },
+      info: { color: "#3c3836", dim: false },
+      error: "#9d0006",
+      warn: "#b57614",
+      tool: "#076678",
+      spinner: "#79740e",
+      permission: "#9d0006",
+      queue: { color: "#928374", dim: true },
+      accent: "#79740e",
+      modeBadge: {
+        plan: "#79740e",
+        auto: "#79740e",
+        edit: "#9d0006"
+      },
+      blockquote: { color: "#928374", dim: true },
+      codeInline: "#076678",
+      codeBlock: "#076678",
+      link: "#79740e",
+      strikethrough: "#928374",
+      tableBorder: "#d5c4a1",
+      tableHeader: "#3c3836",
+      tableCell: "#3c3836",
+      muted: { color: "#928374", dim: true }
+    };
+  }
+});
+
+// src/ui/themes/one-dark.json
+var one_dark_default;
+var init_one_dark = __esm({
+  "src/ui/themes/one-dark.json"() {
+    one_dark_default = {
+      name: "one-dark",
+      label: "One Dark",
+      palette: {
+        background: "#282c34",
+        foreground: "#abb2bf",
+        primary: "#61afef",
+        secondary: "#5c6370",
+        success: "#98c379",
+        error: "#e06c75"
+      },
+      user: "#61afef",
+      assistant: null,
+      reasoning: { color: "#5c6370", dim: true },
+      info: { color: "#abb2bf", dim: false },
+      error: "#e06c75",
+      warn: "#e5c07b",
+      tool: "#c678dd",
+      spinner: "#61afef",
+      permission: "#e06c75",
+      queue: { color: "#5c6370", dim: true },
+      accent: "#61afef",
+      modeBadge: {
+        plan: "#61afef",
+        auto: "#98c379",
+        edit: "#e06c75"
+      },
+      blockquote: { color: "#5c6370", dim: true },
+      codeInline: "#c678dd",
+      codeBlock: "#c678dd",
+      link: "#61afef",
+      strikethrough: "#5c6370",
+      tableBorder: "#3e4451",
+      tableHeader: "#abb2bf",
+      tableCell: "#abb2bf",
+      muted: { color: "#5c6370", dim: true }
+    };
+  }
+});
+
 // src/ui/theme.ts
-function buildTheme(name, label, palette, overrides) {
-  const base = {
-    name,
-    label,
+function normalizeTheme(json) {
+  const obj = json;
+  const palette = obj.palette;
+  const normalizeDim = (v) => {
+    if (v === void 0) return void 0;
+    if (typeof v === "string") return { color: v, dim: false };
+    const d = v;
+    return { color: String(d.color), dim: d.dim === true };
+  };
+  const normalizeColor2 = (v) => {
+    if (v === void 0) return void 0;
+    if (typeof v === "string") return v;
+    const d = v;
+    return String(d.color);
+  };
+  return {
+    name: String(obj.name),
+    label: String(obj.label),
     palette,
-    user: palette.primary,
-    tool: palette.secondary,
-    spinner: palette.primary,
-    accent: palette.primary,
-    error: palette.error,
-    warn: palette.error,
-    info: { color: palette.secondary, dim: false },
-    reasoning: { color: palette.secondary, dim: false },
-    permission: palette.error,
-    queue: { color: palette.secondary, dim: false },
-    assistant: void 0,
-    modeBadge: {
+    user: String(obj.user ?? palette.primary),
+    assistant: obj.assistant === null ? void 0 : typeof obj.assistant === "string" ? obj.assistant : void 0,
+    reasoning: normalizeDim(obj.reasoning) ?? { color: palette.secondary, dim: false },
+    info: normalizeDim(obj.info) ?? { color: palette.secondary, dim: false },
+    error: String(obj.error ?? palette.error),
+    warn: String(obj.warn ?? palette.error),
+    tool: String(obj.tool ?? palette.secondary),
+    spinner: String(obj.spinner ?? palette.primary),
+    permission: String(obj.permission ?? palette.error),
+    queue: normalizeDim(obj.queue) ?? { color: palette.secondary, dim: false },
+    accent: String(obj.accent ?? palette.primary),
+    modeBadge: obj.modeBadge ?? {
       plan: palette.primary,
       auto: palette.success,
       edit: palette.error
-    }
-  };
-  if (!overrides) return base;
-  return {
-    ...base,
-    ...overrides,
-    modeBadge: overrides.modeBadge ?? base.modeBadge,
-    info: overrides.info ?? base.info,
-    reasoning: overrides.reasoning ?? base.reasoning,
-    queue: overrides.queue ?? base.queue
+    },
+    blockquote: normalizeDim(obj.blockquote),
+    codeInline: normalizeColor2(obj.codeInline),
+    codeBlock: normalizeColor2(obj.codeBlock),
+    link: normalizeColor2(obj.link),
+    strikethrough: normalizeColor2(obj.strikethrough),
+    tableBorder: normalizeColor2(obj.tableBorder),
+    tableHeader: normalizeColor2(obj.tableHeader),
+    tableCell: normalizeColor2(obj.tableCell),
+    muted: normalizeDim(obj.muted)
   };
 }
+function setThemes(themes) {
+  THEMES = themes;
+}
 function resolveTheme(name) {
   if (!name) return THEMES[DEFAULT_THEME_NAME];
   return THEMES[name] ?? THEMES[DEFAULT_THEME_NAME];
@@ -12928,44 +13671,341 @@ function themeNames() {
 function themeList() {
   return Object.values(THEMES);
 }
-var everforestDark, everforestLight, kanagawaDark, draculaDark, THEMES, DEFAULT_THEME_NAME;
+var BUILT_IN_THEMES, THEMES, DEFAULT_THEME_NAME;
 var init_theme = __esm({
   "src/ui/theme.ts"() {
     "use strict";
-    everforestDark = buildTheme("everforest-dark", "everforest-dark", {
-      primary: "#a7c080",
-      secondary: "#d3c6aa",
-      success: "#a7c080",
-      error: "#e67e80"
-    });
-    everforestLight = buildTheme("everforest-light", "everforest-light", {
-      primary: "#c5e49a",
-      secondary: "#f0e6c8",
-      success: "#c5e49a",
-      error: "#e07070"
-    });
-    kanagawaDark = buildTheme("kanagawa-dark", "kanagawa-dark", {
-      primary: "#8aadf4",
-      secondary: "#f0e6c8",
-      success: "#a6e3a1",
-      error: "#f38ba8"
-    });
-    draculaDark = buildTheme("dracula-dark", "dracula-dark", {
-      primary: "#ff79c6",
-      secondary: "#f8f8f2",
-      success: "#50fa7b",
-      error: "#ff5555"
-    });
-    THEMES = {
-      "everforest-dark": everforestDark,
-      "everforest-light": everforestLight,
-      "kanagawa-dark": kanagawaDark,
-      "dracula-dark": draculaDark
+    init_everforest_dark();
+    init_everforest_light();
+    init_kanagawa_dark();
+    init_dracula_dark();
+    init_tokyo_night();
+    init_catppuccin_mocha();
+    init_catppuccin_latte();
+    init_solarized_dark();
+    init_solarized_light();
+    init_nord();
+    init_gruvbox_dark();
+    init_gruvbox_light();
+    init_one_dark();
+    BUILT_IN_THEMES = {
+      "everforest-dark": normalizeTheme(everforest_dark_default),
+      "everforest-light": normalizeTheme(everforest_light_default),
+      "kanagawa-dark": normalizeTheme(kanagawa_dark_default),
+      "dracula-dark": normalizeTheme(dracula_dark_default),
+      "tokyo-night": normalizeTheme(tokyo_night_default),
+      "catppuccin-mocha": normalizeTheme(catppuccin_mocha_default),
+      "catppuccin-latte": normalizeTheme(catppuccin_latte_default),
+      "solarized-dark": normalizeTheme(solarized_dark_default),
+      "solarized-light": normalizeTheme(solarized_light_default),
+      "nord": normalizeTheme(nord_default),
+      "gruvbox-dark": normalizeTheme(gruvbox_dark_default),
+      "gruvbox-light": normalizeTheme(gruvbox_light_default),
+      "one-dark": normalizeTheme(one_dark_default)
     };
+    THEMES = { ...BUILT_IN_THEMES };
     DEFAULT_THEME_NAME = "everforest-dark";
   }
 });
 
+// src/ui/wcag.ts
+function hexToRgb(hex) {
+  const m = hex.match(/^#([0-9a-fA-F]{6})$/);
+  if (!m) return null;
+  const v = parseInt(m[1], 16);
+  return {
+    r: v >> 16 & 255,
+    g: v >> 8 & 255,
+    b: v & 255
+  };
+}
+function relativeLuminance({ r, g, b }) {
+  const toLinear = (c) => {
+    const s = c / 255;
+    return s <= 0.03928 ? s / 12.92 : Math.pow((s + 0.055) / 1.055, 2.4);
+  };
+  return 0.2126 * toLinear(r) + 0.7152 * toLinear(g) + 0.0722 * toLinear(b);
+}
+function contrastRatio(a, b) {
+  const rgbA = hexToRgb(a);
+  const rgbB = hexToRgb(b);
+  if (!rgbA || !rgbB) return null;
+  const l1 = relativeLuminance(rgbA);
+  const l2 = relativeLuminance(rgbB);
+  const lighter = Math.max(l1, l2);
+  const darker = Math.min(l1, l2);
+  return (lighter + 0.05) / (darker + 0.05);
+}
+function checkContrast(foreground, background, required = 4.5) {
+  const ratio = contrastRatio(foreground, background);
+  if (ratio === null) return null;
+  if (ratio >= required) return null;
+  return {
+    pair: `${foreground} on ${background}`,
+    foreground,
+    background,
+    ratio: Math.round(ratio * 100) / 100,
+    required
+  };
+}
+var init_wcag = __esm({
+  "src/ui/wcag.ts"() {
+    "use strict";
+  }
+});
+
+// src/ui/theme-loader.ts
+import { readFile as readFile16, readdir as readdir4 } from "fs/promises";
+import { join as join21 } from "path";
+import { homedir as homedir14 } from "os";
+function projectThemesDir(cwd = process.cwd()) {
+  return join21(cwd, ".kimiflare", "themes");
+}
+function isHexColor(c) {
+  return /^#[0-9a-fA-F]{6}$/.test(c);
+}
+function validateHex(field, value, errors) {
+  if (value === void 0) return;
+  if (!isHexColor(value)) {
+    errors.push(`${field}: "${value}" is not a valid #RRGGBB hex color`);
+  }
+}
+function validatePalette(p, errors) {
+  if (!p || typeof p !== "object") {
+    errors.push("palette must be an object");
+    return null;
+  }
+  const palette = p;
+  const required = ["background", "foreground", "primary", "secondary", "success", "error"];
+  for (const key of required) {
+    if (typeof palette[key] !== "string") {
+      errors.push(`palette.${key} is required and must be a string`);
+    } else {
+      validateHex(`palette.${key}`, palette[key], errors);
+    }
+  }
+  if (errors.length > 0) return null;
+  return {
+    background: palette.background,
+    foreground: palette.foreground,
+    primary: palette.primary,
+    secondary: palette.secondary,
+    success: palette.success,
+    error: palette.error
+  };
+}
+function validateDimColor(field, value, errors) {
+  if (value === void 0) return void 0;
+  if (typeof value === "string") {
+    validateHex(field, value, errors);
+    return { color: value, dim: false };
+  }
+  if (!value || typeof value !== "object") {
+    errors.push(`${field} must be a string or { color, dim } object`);
+    return void 0;
+  }
+  const obj = value;
+  if (typeof obj.color !== "string") {
+    errors.push(`${field}.color is required`);
+    return void 0;
+  }
+  validateHex(`${field}.color`, obj.color, errors);
+  return {
+    color: obj.color,
+    dim: obj.dim === true
+  };
+}
+function validateModeBadge(value, errors) {
+  if (value === void 0) return void 0;
+  if (!value || typeof value !== "object") {
+    errors.push("modeBadge must be an object");
+    return void 0;
+  }
+  const obj = value;
+  const result = {};
+  for (const key of ["plan", "auto", "edit"]) {
+    if (typeof obj[key] !== "string") {
+      errors.push(`modeBadge.${key} is required`);
+    } else {
+      validateHex(`modeBadge.${key}`, obj[key], errors);
+      result[key] = obj[key];
+    }
+  }
+  return result;
+}
+function normalizeColor(v) {
+  if (v === void 0) return void 0;
+  if (typeof v === "string") return v;
+  const d = v;
+  return typeof d.color === "string" ? d.color : void 0;
+}
+async function loadThemesFromDir(dir, source) {
+  const themes = [];
+  const errors = [];
+  let files;
+  try {
+    files = await readdir4(dir);
+  } catch {
+    return { themes, errors };
+  }
+  for (const file of files.filter((f) => f.endsWith(".json"))) {
+    const path = join21(dir, file);
+    let raw;
+    try {
+      raw = await readFile16(path, "utf-8");
+    } catch (e) {
+      errors.push(`${path}: ${e instanceof Error ? e.message : String(e)}`);
+      continue;
+    }
+    let json;
+    try {
+      json = JSON.parse(raw);
+    } catch (e) {
+      errors.push(`${path}: invalid JSON \u2014 ${e instanceof Error ? e.message : String(e)}`);
+      continue;
+    }
+    if (!json || typeof json !== "object") {
+      errors.push(`${path}: root must be an object`);
+      continue;
+    }
+    const obj = json;
+    const fileErrors = [];
+    if (typeof obj.name !== "string" || obj.name.length === 0) {
+      fileErrors.push("name is required");
+    }
+    if (typeof obj.label !== "string" || obj.label.length === 0) {
+      fileErrors.push("label is required");
+    }
+    const palette = validatePalette(obj.palette, fileErrors);
+    if (fileErrors.length > 0) {
+      errors.push(...fileErrors.map((e) => `${path}: ${e}`));
+      continue;
+    }
+    if (!palette) continue;
+    const theme = {
+      name: obj.name,
+      label: obj.label,
+      palette,
+      user: typeof obj.user === "string" ? obj.user : palette.primary,
+      assistant: obj.assistant === null ? void 0 : typeof obj.assistant === "string" ? obj.assistant : void 0,
+      reasoning: validateDimColor("reasoning", obj.reasoning, fileErrors) ?? { color: palette.secondary, dim: false },
+      info: validateDimColor("info", obj.info, fileErrors) ?? { color: palette.secondary, dim: false },
+      error: typeof obj.error === "string" ? obj.error : palette.error,
+      warn: typeof obj.warn === "string" ? obj.warn : palette.error,
+      tool: typeof obj.tool === "string" ? obj.tool : palette.secondary,
+      spinner: typeof obj.spinner === "string" ? obj.spinner : palette.primary,
+      permission: typeof obj.permission === "string" ? obj.permission : palette.error,
+      queue: validateDimColor("queue", obj.queue, fileErrors) ?? { color: palette.secondary, dim: false },
+      accent: typeof obj.accent === "string" ? obj.accent : palette.primary,
+      modeBadge: validateModeBadge(obj.modeBadge, fileErrors) ?? {
+        plan: palette.primary,
+        auto: palette.success,
+        edit: palette.error
+      },
+      blockquote: validateDimColor("blockquote", obj.blockquote, fileErrors),
+      codeInline: normalizeColor(obj.codeInline),
+      codeBlock: normalizeColor(obj.codeBlock),
+      link: normalizeColor(obj.link),
+      strikethrough: normalizeColor(obj.strikethrough),
+      tableBorder: normalizeColor(obj.tableBorder),
+      tableHeader: normalizeColor(obj.tableHeader),
+      tableCell: normalizeColor(obj.tableCell),
+      muted: validateDimColor("muted", obj.muted, fileErrors)
+    };
+    if (fileErrors.length > 0) {
+      errors.push(...fileErrors.map((e) => `${path}: ${e}`));
+      continue;
+    }
+    const wcagIssues = [];
+    const bg = palette.background;
+    const check = (label, color) => {
+      if (!color) return;
+      const issue = checkContrast(color, bg);
+      if (issue) wcagIssues.push({ ...issue, pair: `${label} (${issue.pair})` });
+    };
+    check("foreground", palette.foreground);
+    check("user", theme.user);
+    check("assistant", theme.assistant);
+    check("reasoning", theme.reasoning.color);
+    check("info", theme.info.color);
+    check("error", theme.error);
+    check("warn", theme.warn);
+    check("tool", theme.tool);
+    check("accent", theme.accent);
+    check("link", theme.link);
+    check("codeInline", theme.codeInline);
+    check("codeBlock", theme.codeBlock);
+    check("tableHeader", theme.tableHeader);
+    check("tableCell", theme.tableCell);
+    themes.push({ theme, source, path, wcagIssues });
+  }
+  return { themes, errors };
+}
+async function loadAllThemes(cwd = process.cwd()) {
+  if (cachedResult) return cachedResult;
+  const themes = {};
+  const errors = [];
+  for (const [name, theme] of Object.entries(THEMES)) {
+    themes[name] = {
+      theme,
+      source: "built-in",
+      path: "<built-in>",
+      wcagIssues: []
+    };
+  }
+  const user = await loadThemesFromDir(USER_THEMES_DIR, "user");
+  for (const t of user.themes) {
+    themes[t.theme.name] = t;
+  }
+  errors.push(...user.errors);
+  const project = await loadThemesFromDir(projectThemesDir(cwd), "project");
+  for (const t of project.themes) {
+    themes[t.theme.name] = t;
+  }
+  errors.push(...project.errors);
+  cachedResult = { themes, errors };
+  return cachedResult;
+}
+function clearThemeCache() {
+  cachedResult = null;
+}
+async function loadAndMergeThemes(cwd = process.cwd()) {
+  clearThemeCache();
+  const { themes, errors } = await loadAllThemes(cwd);
+  const merged = {};
+  for (const [name, t] of Object.entries(THEMES)) {
+    merged[name] = t;
+  }
+  for (const t of Object.values(themes)) {
+    merged[t.theme.name] = t.theme;
+  }
+  setThemes(merged);
+  const wcagWarnings = [];
+  for (const t of Object.values(themes)) {
+    if (t.wcagIssues.length > 0 && t.source !== "built-in") {
+      wcagWarnings.push(
+        `Theme "${t.theme.label}" has WCAG contrast issues:
+` + t.wcagIssues.map((i) => `  ${i.pair}: ${i.ratio}:1 (needs ${i.required}:1)`).join("\n")
+      );
+    }
+  }
+  return { errors, wcagWarnings };
+}
+var USER_THEMES_DIR, cachedResult;
+var init_theme_loader = __esm({
+  "src/ui/theme-loader.ts"() {
+    "use strict";
+    init_wcag();
+    init_theme();
+    USER_THEMES_DIR = join21(
+      process.env.XDG_CONFIG_HOME || join21(homedir14(), ".config"),
+      "kimiflare",
+      "themes"
+    );
+    cachedResult = null;
+  }
+});
+
 // src/util/lsp-nudge.ts
 function maybeLspNudge(userText, lspEnabled, lspServers) {
   if (lspEnabled && Object.keys(lspServers).length > 0) {
@@ -13188,15 +14228,15 @@ var tui_report_exports = {};
 __export(tui_report_exports, {
   getCategoryReportText: () => getCategoryReportText
 });
-import { readFile as readFile16 } from "fs/promises";
-import { join as join21 } from "path";
-import { homedir as homedir14 } from "os";
+import { readFile as readFile17 } from "fs/promises";
+import { join as join22 } from "path";
+import { homedir as homedir15 } from "os";
 function usageDir3() {
-  const xdg = process.env.XDG_DATA_HOME || join21(homedir14(), ".local", "share");
-  return join21(xdg, "kimiflare");
+  const xdg = process.env.XDG_DATA_HOME || join22(homedir15(), ".local", "share");
+  return join22(xdg, "kimiflare");
 }
 function usagePath3() {
-  return join21(usageDir3(), "usage.json");
+  return join22(usageDir3(), "usage.json");
 }
 function today3() {
   return (/* @__PURE__ */ new Date()).toISOString().slice(0, 10);
@@ -13208,7 +14248,7 @@ function daysAgo2(n) {
 }
 async function loadLog3() {
   try {
-    const raw = await readFile16(usagePath3(), "utf8");
+    const raw = await readFile17(usagePath3(), "utf8");
     return JSON.parse(raw);
   } catch {
     return { version: 1, days: [], sessions: [] };
@@ -13274,11 +14314,11 @@ __export(app_exports, {
   shouldOpenMentionPicker: () => shouldOpenMentionPicker,
   shouldOpenSlashPicker: () => shouldOpenSlashPicker
 });
-import React14, { useState as useState10, useRef as useRef3, useEffect as useEffect6, useCallback as useCallback2 } from "react";
+import React14, { useState as useState11, useRef as useRef3, useEffect as useEffect7, useCallback as useCallback2 } from "react";
 import { Box as Box21, Text as Text22, useApp, useInput as useInput7, render } from "ink";
 import SelectInput11 from "ink-select-input";
 import { existsSync as existsSync3, statSync as statSync4 } from "fs";
-import { join as join22 } from "path";
+import { join as join23 } from "path";
 import { unlink as unlink3 } from "fs/promises";
 import { execSync as execSync2 } from "child_process";
 import { spawn as spawn4 } from "child_process";
@@ -13356,7 +14396,7 @@ function buildFilePickerIgnoreList(cwd) {
   ];
   const gitignorePatterns = [];
   try {
-    const gitignorePath = join22(cwd, ".gitignore");
+    const gitignorePath = join23(cwd, ".gitignore");
     const stats = statSync4(gitignorePath);
     if (stats.size > MAX_GITIGNORE_SIZE) {
       return hardcoded;
@@ -13514,12 +14554,12 @@ function App({
   initialCloudDeviceId
 }) {
   const { exit } = useApp();
-  const [cfg, setCfg] = useState10(initialCfg);
-  const [lspScope, setLspScope] = useState10(initialLspScope);
-  const [lspProjectPath, setLspProjectPath] = useState10(initialLspProjectPath);
-  const [cloudToken, setCloudToken] = useState10(initialCloudToken);
-  const [cloudDeviceId, setCloudDeviceId] = useState10(initialCloudDeviceId);
-  const [events, setRawEvents] = useState10([]);
+  const [cfg, setCfg] = useState11(initialCfg);
+  const [lspScope, setLspScope] = useState11(initialLspScope);
+  const [lspProjectPath, setLspProjectPath] = useState11(initialLspProjectPath);
+  const [cloudToken, setCloudToken] = useState11(initialCloudToken);
+  const [cloudDeviceId, setCloudDeviceId] = useState11(initialCloudDeviceId);
+  const [events, setRawEvents] = useState11([]);
   const setEvents = useCallback2(
     (updater) => {
       setRawEvents((prev) => {
@@ -13529,45 +14569,72 @@ function App({
     },
     []
   );
-  const [input, setInput] = useState10("");
-  const [busy, setBusy] = useState10(false);
-  const [usage, setUsage] = useState10(null);
-  const [sessionUsage, setSessionUsage] = useState10(null);
-  const [gatewayMeta, setGatewayMeta] = useState10(null);
-  const [cloudBudget, setCloudBudget] = useState10(null);
-  const [showReasoning, setShowReasoning] = useState10(false);
-  const [perm, setPerm] = useState10(null);
-  const [limitModal, setLimitModal] = useState10(null);
-  const [queue, setQueue] = useState10([]);
-  const [history, setHistory] = useState10([]);
-  const [historyIndex, setHistoryIndex] = useState10(-1);
-  const [draftInput, setDraftInput] = useState10("");
-  const [mode, setMode] = useState10("edit");
-  const [codeMode, setCodeMode] = useState10(false);
+  const [input, setInput] = useState11("");
+  const [busy, setBusy] = useState11(false);
+  const [usage, setUsage] = useState11(null);
+  const [sessionUsage, setSessionUsage] = useState11(null);
+  const [gatewayMeta, setGatewayMeta] = useState11(null);
+  const [cloudBudget, setCloudBudget] = useState11(null);
+  const [showReasoning, setShowReasoning] = useState11(false);
+  const [perm, setPerm] = useState11(null);
+  const [limitModal, setLimitModal] = useState11(null);
+  const [queue, setQueue] = useState11([]);
+  const [history, setHistory] = useState11([]);
+  const [historyIndex, setHistoryIndex] = useState11(-1);
+  const [draftInput, setDraftInput] = useState11("");
+  const [mode, setMode] = useState11("edit");
+  const [codeMode, setCodeMode] = useState11(false);
   const filePickerEnabled = initialCfg?.filePicker ?? true;
-  const [effort, setEffort] = useState10(
+  const [effort, setEffort] = useState11(
     initialCfg?.reasoningEffort ?? DEFAULT_REASONING_EFFORT
   );
-  const [resumeSessions, setResumeSessions] = useState10(null);
-  const [showHelpMenu, setShowHelpMenu] = useState10(false);
-  const [commandWizard, setCommandWizard] = useState10(null);
-  const [commandPicker, setCommandPicker] = useState10(null);
-  const [commandToDelete, setCommandToDelete] = useState10(null);
-  const [showCommandList, setShowCommandList] = useState10(false);
-  const [showLspWizard, setShowLspWizard] = useState10(false);
-  const [showRemoteDashboard, setShowRemoteDashboard] = useState10(false);
-  const [selectedRemoteSession, setSelectedRemoteSession] = useState10(null);
-  const [tasks, setTasks] = useState10([]);
-  const [tasksStartedAt, setTasksStartedAt] = useState10(null);
-  const [tasksStartTokens, setTasksStartTokens] = useState10(0);
-  const [turnStartedAt, setTurnStartedAt] = useState10(null);
-  const [verbose, setVerbose] = useState10(false);
-  const [hasUpdate, setHasUpdate] = useState10(initialUpdateResult?.hasUpdate ?? false);
-  const [latestVersion, setLatestVersion] = useState10(initialUpdateResult?.latestVersion ?? null);
-  const [theme, setTheme] = useState10(resolveTheme(initialCfg?.theme));
-  const [showThemePicker, setShowThemePicker] = useState10(false);
-  const [kimiMdStale, setKimiMdStale] = useState10(false);
-  useEffect6(() => {
+  const [resumeSessions, setResumeSessions] = useState11(null);
+  const [showHelpMenu, setShowHelpMenu] = useState11(false);
+  const [commandWizard, setCommandWizard] = useState11(null);
+  const [commandPicker, setCommandPicker] = useState11(null);
+  const [commandToDelete, setCommandToDelete] = useState11(null);
+  const [showCommandList, setShowCommandList] = useState11(false);
+  const [showLspWizard, setShowLspWizard] = useState11(false);
+  const [showRemoteDashboard, setShowRemoteDashboard] = useState11(false);
+  const [selectedRemoteSession, setSelectedRemoteSession] = useState11(null);
+  const [tasks, setTasks] = useState11([]);
+  const [tasksStartedAt, setTasksStartedAt] = useState11(null);
+  const [tasksStartTokens, setTasksStartTokens] = useState11(0);
+  const [turnStartedAt, setTurnStartedAt] = useState11(null);
+  const [turnPhase, setTurnPhase] = useState11("waiting");
+  const [currentToolName, setCurrentToolName] = useState11(null);
+  const [lastActivityAt, setLastActivityAt] = useState11(null);
+  const [verbose, setVerbose] = useState11(false);
+  const [hasUpdate, setHasUpdate] = useState11(initialUpdateResult?.hasUpdate ?? false);
+  const [latestVersion, setLatestVersion] = useState11(initialUpdateResult?.latestVersion ?? null);
+  const [theme, setTheme] = useState11(resolveTheme(initialCfg?.theme));
+  const [showThemePicker, setShowThemePicker] = useState11(false);
+  const [kimiMdStale, setKimiMdStale] = useState11(false);
+  useEffect7(() => {
+    let cancelled = false;
+    loadAndMergeThemes().then(({ errors, wcagWarnings }) => {
+      if (cancelled) return;
+      if (errors.length > 0) {
+        setEvents((e) => [
+          ...e,
+          { kind: "error", key: mkKey(), text: `theme load errors:
+${errors.join("\n")}` }
+        ]);
+      }
+      if (wcagWarnings.length > 0) {
+        setEvents((e) => [
+          ...e,
+          { kind: "info", key: mkKey(), text: `theme WCAG warnings:
+${wcagWarnings.join("\n")}` }
+        ]);
+      }
+      setTheme(resolveTheme(initialCfg?.theme));
+    });
+    return () => {
+      cancelled = true;
+    };
+  }, []);
+  useEffect7(() => {
     if (!cfg?.cloudMode || !initialCloudToken) return;
     let cancelled = false;
     const fetchBudget = async () => {
@@ -13582,11 +14649,11 @@ function App({
       cancelled = true;
     };
   }, [cfg?.cloudMode, initialCloudToken]);
-  const [cursorOffset, setCursorOffset] = useState10(0);
-  const [activePicker, setActivePicker] = useState10(null);
-  const [filePickerItems, setFilePickerItems] = useState10([]);
+  const [cursorOffset, setCursorOffset] = useState11(0);
+  const [activePicker, setActivePicker] = useState11(null);
+  const [filePickerItems, setFilePickerItems] = useState11([]);
   const filePickerLoadedRef = useRef3(false);
-  const [customCommandsVersion, setCustomCommandsVersion] = useState10(0);
+  const [customCommandsVersion, setCustomCommandsVersion] = useState11(0);
   const cacheStableRef = useRef3(initialCfg?.cacheStablePrompts !== false);
   const messagesRef = useRef3(
     makePrefixMessages(cacheStableRef.current, cfg?.model ?? DEFAULT_MODEL, "edit", ALL_TOOLS)
@@ -13628,7 +14695,7 @@ function App({
   const flushTimeoutRef = useRef3(null);
   const customCommandsRef = useRef3([]);
   const pickerCancelRef = useRef3(null);
-  useEffect6(() => {
+  useEffect7(() => {
     busyRef.current = busy;
   }, [busy]);
   const pickerAnchor = activePicker?.anchor ?? null;
@@ -13653,7 +14720,7 @@ function App({
     if (pickerKind !== "slash" || pickerQuery === null) return [];
     return fuzzyFilter(allSlashCommands, pickerQuery, (c) => c.name).slice(0, 50);
   }, [pickerKind, allSlashCommands, pickerQuery]);
-  useEffect6(() => {
+  useEffect7(() => {
     if (activePicker !== null) {
       const trigger = activePicker.kind === "file" ? "@" : "/";
       if (cursorOffset < activePicker.anchor) {
@@ -13710,14 +14777,14 @@ function App({
       return;
     }
   }, [input, cursorOffset, activePicker, filePickerEnabled]);
-  useEffect6(() => {
+  useEffect7(() => {
     if (activePicker?.kind !== "file") return;
     const max = Math.max(0, filteredFileItems.length - 1);
     if (activePicker.selected > max) {
       setActivePicker({ ...activePicker, selected: max });
     }
   }, [filteredFileItems.length, activePicker]);
-  useEffect6(() => {
+  useEffect7(() => {
     if (activePicker?.kind !== "slash") return;
     const max = Math.max(0, filteredSlashItems.length - 1);
     if (activePicker.selected > max) {
@@ -13761,7 +14828,7 @@ function App({
     pickerCancelRef.current = cursorOffset;
     setActivePicker(null);
   }, [cursorOffset]);
-  useEffect6(() => {
+  useEffect7(() => {
     const modalActive = showHelpMenu || commandWizard !== null || commandPicker !== null || commandToDelete !== null || showCommandList || showLspWizard || resumeSessions !== null || perm !== null || limitModal !== null;
     if (modalActive && activePicker !== null) {
       setActivePicker(null);
@@ -13778,7 +14845,7 @@ function App({
     limitModal,
     activePicker
   ]);
-  useEffect6(() => {
+  useEffect7(() => {
     if (!cfg) return;
     void Promise.resolve().then(() => (init_sessions(), sessions_exports)).then(
       ({ pruneSessions: pruneSessions2 }) => pruneSessions2().then((removed) => {
@@ -13804,7 +14871,7 @@ function App({
       }
     });
     if (cfg.memoryEnabled) {
-      const dbPath = cfg.memoryDbPath ?? join22(process.cwd(), ".kimiflare", "memory.db");
+      const dbPath = cfg.memoryDbPath ?? join23(process.cwd(), ".kimiflare", "memory.db");
       const manager = new MemoryManager({
         dbPath,
         accountId: cfg.accountId,
@@ -13853,7 +14920,7 @@ function App({
         } catch {
         }
       })();
-      if (existsSync3(join22(cwd, "KIMI.md"))) {
+      if (existsSync3(join23(cwd, "KIMI.md"))) {
         const lastRefresh = manager.getLastKimiMdRefreshTime(cwd);
         const driftCount = manager.countHighSignalMemoriesSince(cwd, lastRefresh);
         if (driftCount >= 5) {
@@ -13879,7 +14946,7 @@ function App({
       }
     });
   }, [cfg, setEvents]);
-  useEffect6(() => {
+  useEffect7(() => {
     const id = setInterval(() => {
       try {
         performance.clearMarks();
@@ -13904,7 +14971,7 @@ function App({
       ]);
     }
   }, [setEvents]);
-  useEffect6(() => {
+  useEffect7(() => {
     if (!cfg || updateCheckedRef.current) return;
     updateCheckedRef.current = true;
     if (initialUpdateResult) {
@@ -13955,7 +15022,7 @@ function App({
       }
     });
   }, [cfg, initialUpdateResult]);
-  useEffect6(() => {
+  useEffect7(() => {
     modeRef.current = mode;
     if (cacheStableRef.current) {
       messagesRef.current[1] = {
@@ -13982,10 +15049,10 @@ function App({
       executorRef.current.clearSessionPermissions();
     }
   }, [mode, cfg?.model]);
-  useEffect6(() => {
+  useEffect7(() => {
     effortRef.current = effort;
   }, [effort]);
-  useEffect6(() => {
+  useEffect7(() => {
     if (!cfg) return;
     const id = setInterval(() => {
       void checkForUpdate().then((result) => {
@@ -14140,7 +15207,7 @@ function App({
       ]);
     }
   }, [cfg]);
-  useEffect6(() => {
+  useEffect7(() => {
     if (cfg && !mcpInitRef.current) {
       void initMcp();
     }
@@ -14465,6 +15532,9 @@ function App({
     } finally {
       setBusy(false);
       setTurnStartedAt(null);
+      setTurnPhase("waiting");
+      setCurrentToolName(null);
+      setLastActivityAt(null);
       activeControllerRef.current = null;
       permResolveRef.current = null;
       limitResolveRef.current = null;
@@ -14524,7 +15594,7 @@ function App({
             lspManagerRef.current.notifyChange(path, content);
           } else {
             void import("fs/promises").then(
-              ({ readFile: readFile17 }) => readFile17(path, "utf8").then((c) => lspManagerRef.current.notifyChange(path, c)).catch(() => {
+              ({ readFile: readFile18 }) => readFile18(path, "utf8").then((c) => lspManagerRef.current.notifyChange(path, c)).catch(() => {
               })
             );
           }
@@ -14644,7 +15714,7 @@ function App({
           }
         }
       });
-      if (existsSync3(join22(cwd, "KIMI.md"))) {
+      if (existsSync3(join23(cwd, "KIMI.md"))) {
         if (cacheStableRef.current) {
           messagesRef.current[1] = {
             role: "system",
@@ -14699,6 +15769,9 @@ function App({
       if (asstId !== null) updateAssistant(asstId, () => ({ streaming: false }));
       setBusy(false);
       setTurnStartedAt(null);
+      setTurnPhase("waiting");
+      setCurrentToolName(null);
+      setLastActivityAt(null);
       activeAsstIdRef.current = null;
       activeControllerRef.current = null;
       permResolveRef.current = null;
@@ -14717,15 +15790,19 @@ function App({
     (picked) => {
       setShowThemePicker(false);
       if (!picked) return;
-      setCfg((c) => c ? { ...c, theme: picked.name } : c);
-      if (cfg) void saveConfig({ ...cfg, theme: picked.name }).catch(() => {
+      setCfg((c) => {
+        if (!c) return c;
+        const updated = { ...c, theme: picked.name };
+        void saveConfig(updated).catch(() => {
+        });
+        return updated;
       });
       setEvents((e) => [
         ...e,
         { kind: "info", key: mkKey(), text: `theme: ${picked.label} \u2014 restart to apply` }
       ]);
     },
-    [cfg]
+    []
   );
   const handleResumePick = useCallback2(
     async (picked) => {
@@ -15049,8 +16126,12 @@ use: /thinking low | medium | high`
           ]);
           return true;
         }
-        setCfg((c2) => c2 ? { ...c2, theme: next.name } : c2);
-        if (cfg) void saveConfig({ ...cfg, theme: next.name }).catch(() => {
+        setCfg((prev) => {
+          if (!prev) return prev;
+          const updated = { ...prev, theme: next.name };
+          void saveConfig(updated).catch(() => {
+          });
+          return updated;
         });
         setEvents((e) => [
           ...e,
@@ -15620,7 +16701,7 @@ ${lines.join("\n")}` }]);
         }
       }
       turnCounterRef.current += 1;
-      if (turnCounterRef.current % 15 === 0 && existsSync3(join22(process.cwd(), "KIMI.md")) && !kimiMdStale) {
+      if (turnCounterRef.current % 15 === 0 && existsSync3(join23(process.cwd(), "KIMI.md")) && !kimiMdStale) {
         setEvents((e) => [
           ...e,
           { kind: "info", key: mkKey(), text: "Tip: Rerunning /init occasionally helps KimiFlare stay accurate as your project evolves." }
@@ -15649,6 +16730,8 @@ ${lines.join("\n")}` }]);
         onAssistantStart: () => {
           const id = nextAssistantId++;
           activeAsstIdRef.current = id;
+          setTurnPhase("generating");
+          setLastActivityAt(Date.now());
           setEvents((e) => [
             ...e,
             { kind: "assistant", key: `asst_${id}`, id, text: "", reasoning: "", streaming: true }
@@ -15657,17 +16740,23 @@ ${lines.join("\n")}` }]);
         onReasoningDelta: (d) => {
           const id = activeAsstIdRef.current;
           if (id !== null) updateAssistant(id, (e) => ({ reasoning: e.reasoning + d }));
+          setLastActivityAt(Date.now());
         },
         onTextDelta: (d) => {
           const id = activeAsstIdRef.current;
           if (id !== null) updateAssistant(id, (e) => ({ text: e.text + d }));
+          setLastActivityAt(Date.now());
         },
         onAssistantFinal: () => {
           const id = activeAsstIdRef.current;
           if (id !== null) updateAssistant(id, () => ({ streaming: false }));
+          setTurnPhase("waiting");
         },
         onToolCallFinalized: (call) => {
           pendingToolCallsRef.current.set(call.id, call.function.name);
+          setTurnPhase("executing");
+          setCurrentToolName(call.function.name);
+          setLastActivityAt(Date.now());
           const spec = executorRef.current.list().find((t) => t.name === call.function.name);
           let renderMeta;
           let argsParsed = {};
@@ -15690,12 +16779,18 @@ ${lines.join("\n")}` }]);
               args: call.function.arguments,
               status: "running",
               render: renderMeta,
-              expanded: false
+              expanded: false,
+              startedAt: Date.now()
             }
           ]);
         },
         onToolResult: (r) => {
           pendingToolCallsRef.current.delete(r.tool_call_id);
+          setLastActivityAt(Date.now());
+          if (pendingToolCallsRef.current.size === 0) {
+            setTurnPhase("waiting");
+            setCurrentToolName(null);
+          }
           updateTool(r.tool_call_id, {
             status: r.ok ? "done" : "error",
             result: r.content
@@ -15802,7 +16897,7 @@ ${lines.join("\n")}` }]);
               lspManagerRef.current.notifyChange(path, content2);
             } else {
               void import("fs/promises").then(
-                ({ readFile: readFile17 }) => readFile17(path, "utf8").then((c) => lspManagerRef.current.notifyChange(path, c)).catch(() => {
+                ({ readFile: readFile18 }) => readFile18(path, "utf8").then((c) => lspManagerRef.current.notifyChange(path, c)).catch(() => {
                 })
               );
             }
@@ -15934,6 +17029,9 @@ ${lines.join("\n")}` }]);
         if (asstId !== null) updateAssistant(asstId, () => ({ streaming: false }));
         setBusy(false);
         setTurnStartedAt(null);
+        setTurnPhase("waiting");
+        setCurrentToolName(null);
+        setLastActivityAt(null);
         activeAsstIdRef.current = null;
         activeControllerRef.current = null;
         permResolveRef.current = null;
@@ -15950,7 +17048,7 @@ ${lines.join("\n")}` }]);
     },
     [cfg, handleSlash, updateAssistant, updateTool, saveSessionSafe, updateGatewayMeta, flushToolBatch]
   );
-  useEffect6(() => {
+  useEffect7(() => {
     if (!busy && queue.length > 0) {
       const next = queue[0];
       setQueue((q) => q.slice(1));
@@ -15978,7 +17076,7 @@ ${lines.join("\n")}` }]);
     [busy, processMessage]
   );
   submitRef.current = submit;
-  useEffect6(() => {
+  useEffect7(() => {
     if (compactSuggestedRef.current) return;
     if (usage && usage.prompt_tokens / CONTEXT_LIMIT >= AUTO_COMPACT_SUGGEST_PCT) {
       compactSuggestedRef.current = true;
@@ -16077,7 +17175,7 @@ ${lines.join("\n")}` }]);
       {
         servers: cfg?.lspServers ?? {},
         currentScope: lspScope,
-        hasProjectDir: existsSync3(join22(process.cwd(), ".kimiflare")),
+        hasProjectDir: existsSync3(join23(process.cwd(), ".kimiflare")),
         onDone: () => setShowLspWizard(false),
         onSave: (servers, enabled, scope) => {
           setCfg((c) => c ? { ...c, lspEnabled: enabled, lspServers: servers } : c);
@@ -16231,6 +17329,9 @@ ${lines.join("\n")}` }]);
           codeMode,
           cloudMode: cfg.cloudMode,
           cloudBudget,
+          phase: turnPhase,
+          currentTool: currentToolName,
+          lastActivityAt,
           kimiMdStale
         }
       ),
@@ -16380,6 +17481,7 @@ var init_app = __esm({
     init_theme_context();
     init_theme_picker();
     init_theme();
+    init_theme_loader();
     init_lsp_config();
     init_lsp_nudge();
     init_file_picker();