kimiflare 0.41.0 → 0.43.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;
   }
 });
 
@@ -1070,7 +1082,8 @@ async function logTurnDebug(ctx) {
     shadowStrip: ctx.shadowStrip,
     durationMs: ctx.durationMs,
     intentClassification: ctx.intentClassification,
-    codeMode: ctx.codeMode
+    codeMode: ctx.codeMode,
+    selectedSkills: ctx.selectedSkills?.map((s) => s.name)
   });
 }
 var LOG_VERSION;
@@ -2304,7 +2317,8 @@ ${sandboxResult.output}` : `${warningPrefix}${sandboxResult.output}`;
         shadowStrip: shadowStripMetrics,
         durationMs: Math.round(performance.now() - turnStart),
         intentClassification: opts2.intentClassification,
-        codeMode: opts2.codeMode
+        codeMode: opts2.codeMode,
+        selectedSkills: opts2.selectedSkills
       });
     }
     if (budgetExhausted) {
@@ -2624,7 +2638,12 @@ ${toolsBlock}`;
 Project context from ${ctx.name} (${ctx.lineCount} lines, treat as authoritative):
 ${ctx.content.trim()}` : "";
   const modeBlock = opts2.mode ? systemPromptForMode(opts2.mode) : "";
-  return env2 + "\n\n" + tools + lspBlock + contextBlock + modeBlock;
+  const skillsBlock = opts2.selectedSkills && opts2.selectedSkills.length > 0 ? `
+
+Active skills for this turn:
+${opts2.selectedSkills.map((s) => `--- ${s.name} ---
+${s.body}`).join("\n\n")}` : "";
+  return env2 + "\n\n" + tools + lspBlock + contextBlock + modeBlock + skillsBlock;
 }
 function buildSystemPrompt(opts2) {
   return buildStaticPrefix(opts2) + "\n\n" + buildSessionPrefix(opts2);
@@ -5004,8 +5023,8 @@ async function saveCloudCredentials(creds) {
 }
 async function clearCloudCredentials() {
   try {
-    const { unlink: unlink4 } = await import("fs/promises");
-    await unlink4(cloudCredPath());
+    const { unlink: unlink5 } = await import("fs/promises");
+    await unlink5(cloudCredPath());
   } catch {
   }
 }
@@ -6917,10 +6936,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 +6960,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 +6981,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 +6991,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 +7068,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 +7086,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 +7115,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 +7151,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 +7234,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 +7292,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 +7306,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 +7332,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 +7347,8 @@ var init_chat = __esm({
     EventView = React4.memo(function EventView2({
       evt,
       showReasoning,
-      verbose
+      verbose,
+      repeatedSigs
     }) {
       const theme = useTheme();
       if (evt.kind === "user") {
@@ -7222,7 +7378,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: [
@@ -7236,6 +7393,22 @@ var init_chat = __esm({
           evt.text
         ] });
       }
+      if (evt.kind === "meta") {
+        const parts = [];
+        if (evt.intentTier) {
+          parts.push(
+            evt.intentTier === "light" ? "Quick thought" : evt.intentTier === "medium" ? "Deep dive" : "Heavy lifting"
+          );
+        }
+        if (evt.skillsActive !== void 0 && evt.skillsActive > 0) {
+          parts.push(`${evt.skillsActive} skill${evt.skillsActive === 1 ? "" : "s"} on deck`);
+        }
+        if (evt.memoryRecalled) {
+          parts.push("Memory recalled");
+        }
+        if (parts.length === 0) return null;
+        return /* @__PURE__ */ jsx5(Text4, { color: theme.info.color, dimColor: true, children: parts.join(" \xB7 ") });
+      }
       if (evt.kind === "activity") {
         return /* @__PURE__ */ jsxs4(Text4, { italic: true, color: theme.info.dim ? theme.info.color : theme.palette.secondary, children: [
           "~ ",
@@ -7269,24 +7442,34 @@ 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, skillsActive, memoryRecalled, 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 labelParts = [];
+  if (skillsActive !== void 0 && skillsActive > 0) {
+    labelParts.push(`${skillsActive} skill${skillsActive === 1 ? "" : "s"} on deck`);
+  }
+  if (memoryRecalled) {
+    labelParts.push("Memory recalled");
+  }
+  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,13 +7481,15 @@ 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"
       ] })
     ] }),
+    labelParts.length > 0 && /* @__PURE__ */ jsx6(Box5, { children: /* @__PURE__ */ jsx6(Text5, { color: theme.info.color, dimColor: true, children: labelParts.join("  \xB7  ") }) }),
     usage && /* @__PURE__ */ jsxs5(Box5, { children: [
       /* @__PURE__ */ jsx6(Text5, { color: theme.info.color, children: buildRightParts(usage, contextLimit, sessionUsage, gatewayMeta, cloudMode, cloudBudget).join("  \xB7  ") }),
       warn ? /* @__PURE__ */ jsxs5(Text5, { color: theme.warn, bold: true, children: [
@@ -7370,7 +7555,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 +7645,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 +7734,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 +7760,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 +7806,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 +8347,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 +8389,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 +8581,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 +8604,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;
@@ -8788,7 +8973,7 @@ var init_onboarding = __esm({
 // src/ui/welcome.tsx
 import { Box as Box11, Text as Text12 } from "ink";
 import { jsx as jsx13, jsxs as jsxs11 } from "react/jsx-runtime";
-function Welcome({ accountId }) {
+function Welcome({ accountId, cloudMode }) {
   const theme = useTheme();
   return /* @__PURE__ */ jsxs11(Box11, { flexDirection: "column", marginBottom: 1, children: [
     /* @__PURE__ */ jsxs11(Box11, { marginBottom: 1, children: [
@@ -8798,7 +8983,7 @@ function Welcome({ accountId }) {
         "Ready when you are."
       ] })
     ] }),
-    accountId && /* @__PURE__ */ jsx13(Box11, { marginBottom: 1, children: /* @__PURE__ */ jsxs11(Text12, { color: theme.info.color, children: [
+    accountId && !cloudMode && /* @__PURE__ */ jsx13(Box11, { marginBottom: 1, children: /* @__PURE__ */ jsxs11(Text12, { color: theme.info.color, children: [
       "  ",
       "Check your Cloudflare billing: https://dash.cloudflare.com/",
       accountId,
@@ -8829,237 +9014,6 @@ var init_welcome = __esm({
   }
 });
 
-// src/ui/help-menu.tsx
-import { useState as useState6 } 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 customs = customCommands ?? [];
-  useInput3((_input, key) => {
-    if (key.escape) {
-      if (page !== "main") {
-        setPage("main");
-      } else {
-        onDone();
-      }
-    }
-  });
-  const handleSelect = (command) => {
-    onCommand(command);
-    onDone();
-  };
-  const categories = cloudMode ? CATEGORIES.filter((c) => c.key !== "gateway") : CATEGORIES;
-  if (page === "main") {
-    const items2 = categories.map((cat) => ({
-      label: cat.label,
-      value: cat.key,
-      key: cat.key
-    }));
-    if (customs.length > 0) {
-      items2.push({ label: "Run custom commands", value: "custom", key: "custom" });
-    }
-    items2.push({ label: "(close)", value: "__close__", key: "__close__" });
-    return /* @__PURE__ */ jsxs12(Box12, { flexDirection: "column", borderStyle: "round", borderColor: theme.accent, paddingX: 1, children: [
-      /* @__PURE__ */ jsx14(Text13, { color: theme.accent, bold: true, children: "Help" }),
-      /* @__PURE__ */ jsx14(Text13, { color: theme.info.color, dimColor: false, children: "Arrow keys to navigate, Enter to select, Esc to close." }),
-      /* @__PURE__ */ jsx14(Box12, { marginTop: 1, children: /* @__PURE__ */ jsx14(
-        SelectInput5,
-        {
-          items: items2,
-          onSelect: (item) => {
-            if (item.value === "__close__") {
-              onDone();
-            } else {
-              setPage(item.value);
-            }
-          }
-        }
-      ) }),
-      /* @__PURE__ */ jsx14(Box12, { marginTop: 1, flexDirection: "column", children: SINGLE_COMMANDS.map((cmd) => /* @__PURE__ */ jsx14(Text13, { color: theme.info.color, dimColor: false, children: `  ${cmd.command.padEnd(20)} ${cmd.description}` }, cmd.command)) }),
-      /* @__PURE__ */ jsx14(Box12, { marginTop: 1, children: /* @__PURE__ */ jsx14(Text13, { color: theme.info.color, dimColor: false, children: "keys: ctrl-c interrupt/exit \xB7 ctrl-r toggle reasoning \xB7 ctrl-o verbose \xB7 shift+tab cycle mode \xB7 \u2191/\u2193 history" }) })
-    ] });
-  }
-  if (page === "custom") {
-    const items2 = customs.map((c) => ({
-      label: `${`/${c.name}`.padEnd(28)} ${c.description ?? ""}`.trimEnd(),
-      value: `/${c.name}`,
-      key: c.name
-    }));
-    items2.push({ label: "\u2190 Back", value: "__back__", key: "__back__" });
-    return /* @__PURE__ */ jsxs12(Box12, { flexDirection: "column", borderStyle: "round", borderColor: theme.accent, paddingX: 1, children: [
-      /* @__PURE__ */ jsx14(Text13, { color: theme.accent, bold: true, children: "Custom commands" }),
-      /* @__PURE__ */ jsx14(Text13, { color: theme.info.color, dimColor: false, children: customs.length === 0 ? "no custom commands found in .kimiflare/commands/" : "Arrow keys to navigate, Enter to run, Esc to go back." }),
-      /* @__PURE__ */ jsx14(Box12, { marginTop: 1, children: /* @__PURE__ */ jsx14(
-        SelectInput5,
-        {
-          items: items2,
-          onSelect: (item) => {
-            if (item.value === "__back__") {
-              setPage("main");
-            } else {
-              handleSelect(item.value);
-            }
-          }
-        }
-      ) })
-    ] });
-  }
-  const category = categories.find((c) => c.key === page);
-  const selectable = category.commands.filter((cmd) => cmd.selectable !== false);
-  const staticCmds = category.commands.filter((cmd) => cmd.selectable === false);
-  const items = selectable.map((cmd) => ({
-    label: `${cmd.command.padEnd(28)} ${cmd.description}`,
-    value: cmd.command,
-    key: cmd.command
-  }));
-  items.push({ label: "\u2190 Back", value: "__back__", key: "__back__" });
-  return /* @__PURE__ */ jsxs12(Box12, { flexDirection: "column", borderStyle: "round", borderColor: theme.accent, paddingX: 1, children: [
-    /* @__PURE__ */ jsx14(Text13, { color: theme.accent, bold: true, children: category.label }),
-    /* @__PURE__ */ jsx14(Text13, { color: theme.info.color, dimColor: false, children: "Arrow keys to navigate, Enter to execute, Esc to go back." }),
-    /* @__PURE__ */ jsx14(Box12, { marginTop: 1, children: /* @__PURE__ */ jsx14(
-      SelectInput5,
-      {
-        items,
-        onSelect: (item) => {
-          if (item.value === "__back__") {
-            setPage("main");
-          } else {
-            handleSelect(item.value);
-          }
-        }
-      }
-    ) }),
-    staticCmds.length > 0 && /* @__PURE__ */ jsx14(Box12, { marginTop: 1, flexDirection: "column", children: staticCmds.map((cmd) => /* @__PURE__ */ jsx14(Text13, { color: theme.info.color, children: `  ${cmd.command.padEnd(28)} ${cmd.description}` }, cmd.command)) })
-  ] });
-}
-var CATEGORIES, SINGLE_COMMANDS;
-var init_help_menu = __esm({
-  "src/ui/help-menu.tsx"() {
-    "use strict";
-    init_theme_context();
-    CATEGORIES = [
-      {
-        key: "mode",
-        label: "Mode",
-        commands: [
-          { command: "/mode edit", description: "switch to edit mode" },
-          { command: "/mode plan", description: "switch to plan mode" },
-          { command: "/mode auto", description: "switch to auto mode" }
-        ]
-      },
-      {
-        key: "thinking",
-        label: "Thinking",
-        commands: [
-          { command: "/thinking low", description: "fast, lower quality" },
-          { command: "/thinking medium", description: "balanced" },
-          { command: "/thinking high", description: "slow, higher quality" }
-        ]
-      },
-      {
-        key: "session",
-        label: "Session",
-        commands: [
-          { command: "/resume", description: "pick a past conversation" },
-          { command: "/compact", description: "summarize old turns to free context" },
-          { command: "/clear", description: "clear current conversation" }
-        ]
-      },
-      {
-        key: "memory",
-        label: "Memory",
-        commands: [
-          { command: "/memory", description: "show memory stats" },
-          { command: "/memory on", description: "enable memory" },
-          { command: "/memory off", description: "disable memory" },
-          { command: "/memory clear", description: "wipe memories for this repo" },
-          { command: "/memory search <query>", description: "search stored memories", selectable: false }
-        ]
-      },
-      {
-        key: "cost",
-        label: "Cost",
-        commands: [
-          { command: "/cost", description: "show cost report" },
-          { command: "/cost on", description: "enable cost attribution by task type" },
-          { command: "/cost off", description: "disable cost attribution by task type" }
-        ]
-      },
-      {
-        key: "mcp",
-        label: "MCP",
-        commands: [
-          { command: "/mcp list", description: "list connected MCP servers and tools" },
-          { command: "/mcp reload", description: "reconnect all configured MCP servers" }
-        ]
-      },
-      {
-        key: "lsp",
-        label: "LSP",
-        commands: [
-          { command: "/lsp config", description: "add, edit, or remove language servers" },
-          { command: "/lsp list", description: "list active LSP servers" },
-          { command: "/lsp reload", description: "restart all configured LSP servers" },
-          { command: "/lsp scope", description: "show whether LSP config is project or global" }
-        ]
-      },
-      {
-        key: "gateway",
-        label: "Gateway",
-        commands: [
-          { command: "/gateway", description: "show gateway status" },
-          { command: "/gateway off", description: "disable AI Gateway (direct Workers AI)" },
-          { command: "/gateway skip-cache true", description: "enable skip-cache" },
-          { command: "/gateway skip-cache false", description: "disable skip-cache" },
-          { command: "/gateway collect-logs true", description: "enable log collection" },
-          { command: "/gateway collect-logs false", description: "disable log collection" },
-          { command: "/gateway metadata clear", description: "remove all metadata" },
-          { command: "/gateway <id>", description: "enable AI Gateway", selectable: false },
-          { command: "/gateway cache-ttl <seconds>", description: "set cache TTL", selectable: false },
-          { command: "/gateway metadata <key>=<value>", description: "add metadata", selectable: false }
-        ]
-      },
-      {
-        key: "info",
-        label: "Info",
-        commands: [
-          { command: "/cost", description: "show cost report" },
-          { command: "/model", description: "show current model" },
-          { command: "/update", description: "check for updates" },
-          { command: "/hello", description: "send a voice note to the creator" }
-        ]
-      },
-      {
-        key: "commands",
-        label: "Commands",
-        commands: [
-          { command: "/command create", description: "create a new custom slash command" },
-          { command: "/command edit", description: "edit an existing custom command" },
-          { command: "/command delete", description: "delete a custom command" },
-          { command: "/command list", description: "list all custom commands" }
-        ]
-      },
-      {
-        key: "config",
-        label: "Config",
-        commands: [
-          { command: "/init", description: "scan this repo and write a KIMI.md" },
-          { command: "/logout", description: "clear credentials" },
-          { command: "filePicker", description: "enabled by default; disable with KIMIFLARE_FILE_PICKER=0 or filePicker: false in config", selectable: false }
-        ]
-      }
-    ];
-    SINGLE_COMMANDS = [
-      { command: "/reasoning", description: "toggle show/hide model reasoning" },
-      { command: "/help", description: "show this menu" },
-      { command: "/exit", description: "exit kimiflare" }
-    ];
-  }
-});
-
 // src/remote/worker-client.ts
 var worker_client_exports = {};
 __export(worker_client_exports, {
@@ -9164,17 +9118,17 @@ var init_tui_deploy = __esm({
 });
 
 // src/ui/remote-dashboard.tsx
-import { useEffect as useEffect5, useState as useState7 } 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";
+import { useEffect as useEffect6, 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 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(() => {
+  useEffect6(() => {
     loadSessions();
   }, []);
   async function loadSessions() {
@@ -9210,7 +9164,7 @@ function RemoteDashboard({ onSelect, onCancel }) {
       setRefreshing(false);
     }
   }
-  useInput4((input, key) => {
+  useInput3((input, key) => {
     if (input === "r" || input === "R") {
       void loadSessions();
     }
@@ -9223,31 +9177,31 @@ function RemoteDashboard({ onSelect, onCancel }) {
     value: s.sessionId
   }));
   if (loading) {
-    return /* @__PURE__ */ jsx15(Box13, { flexDirection: "column", padding: 1, children: /* @__PURE__ */ jsx15(Text14, { color: theme.accent, children: "Loading remote sessions..." }) });
+    return /* @__PURE__ */ jsx14(Box12, { flexDirection: "column", padding: 1, children: /* @__PURE__ */ jsx14(Text13, { color: theme.accent, children: "Loading remote sessions..." }) });
   }
   if (error) {
-    return /* @__PURE__ */ jsxs13(Box13, { flexDirection: "column", padding: 1, children: [
-      /* @__PURE__ */ jsxs13(Text14, { color: theme.error, children: [
+    return /* @__PURE__ */ jsxs12(Box12, { flexDirection: "column", padding: 1, children: [
+      /* @__PURE__ */ jsxs12(Text13, { color: theme.error, children: [
         "Error: ",
         error
       ] }),
-      /* @__PURE__ */ jsx15(Text14, { dimColor: true, children: "Press R to retry, Esc to close" })
+      /* @__PURE__ */ jsx14(Text13, { dimColor: true, children: "Press R to retry, Esc to close" })
     ] });
   }
   if (sessions.length === 0) {
-    return /* @__PURE__ */ jsxs13(Box13, { flexDirection: "column", padding: 1, children: [
-      /* @__PURE__ */ jsx15(Text14, { color: theme.accent, children: "No remote sessions yet." }),
-      /* @__PURE__ */ jsx15(Text14, { dimColor: true, children: "Type /remote <prompt> to start one." }),
-      /* @__PURE__ */ jsx15(Text14, { dimColor: true, children: "Press Esc to close" })
+    return /* @__PURE__ */ jsxs12(Box12, { flexDirection: "column", padding: 1, children: [
+      /* @__PURE__ */ jsx14(Text13, { color: theme.accent, children: "No remote sessions yet." }),
+      /* @__PURE__ */ jsx14(Text13, { dimColor: true, children: "Type /remote <prompt> to start one." }),
+      /* @__PURE__ */ jsx14(Text13, { dimColor: true, children: "Press Esc to close" })
     ] });
   }
-  return /* @__PURE__ */ jsxs13(Box13, { flexDirection: "column", padding: 1, children: [
-    /* @__PURE__ */ jsxs13(Text14, { bold: true, color: theme.accent, children: [
+  return /* @__PURE__ */ jsxs12(Box12, { flexDirection: "column", padding: 1, children: [
+    /* @__PURE__ */ jsxs12(Text13, { bold: true, color: theme.accent, children: [
       "Recent remote tasks ",
       refreshing ? "(refreshing...)" : ""
     ] }),
-    /* @__PURE__ */ jsx15(Box13, { marginTop: 1, children: /* @__PURE__ */ jsx15(
-      SelectInput6,
+    /* @__PURE__ */ jsx14(Box12, { marginTop: 1, children: /* @__PURE__ */ jsx14(
+      SelectInput5,
       {
         items,
         onSelect: (item) => {
@@ -9256,7 +9210,7 @@ function RemoteDashboard({ onSelect, onCancel }) {
         }
       }
     ) }),
-    /* @__PURE__ */ jsx15(Box13, { marginTop: 1, children: /* @__PURE__ */ jsx15(Text14, { dimColor: true, children: "\u2191\u2193 navigate \u2022 Enter select \u2022 R refresh \u2022 Esc close" }) })
+    /* @__PURE__ */ jsx14(Box12, { marginTop: 1, children: /* @__PURE__ */ jsx14(Text13, { dimColor: true, children: "\u2191\u2193 navigate \u2022 Enter select \u2022 R refresh \u2022 Esc close" }) })
   ] });
 }
 function formatSessionLine(s) {
@@ -9289,7 +9243,7 @@ function RemoteSessionDetail({
 }) {
   const theme = useTheme();
   const [cancelling, setCancelling] = useState7(false);
-  useInput4((input, key) => {
+  useInput3((input, key) => {
     if (key.escape) {
       onBack();
     }
@@ -9309,50 +9263,50 @@ function RemoteSessionDetail({
     }
   }
   const isRunning = session.status === "running" || session.status === "pending";
-  return /* @__PURE__ */ jsxs13(Box13, { flexDirection: "column", padding: 1, children: [
-    /* @__PURE__ */ jsx15(Text14, { bold: true, color: theme.accent, children: "Remote Session" }),
-    /* @__PURE__ */ jsxs13(Box13, { marginTop: 1, flexDirection: "column", children: [
-      /* @__PURE__ */ jsxs13(Text14, { children: [
+  return /* @__PURE__ */ jsxs12(Box12, { flexDirection: "column", padding: 1, children: [
+    /* @__PURE__ */ jsx14(Text13, { bold: true, color: theme.accent, children: "Remote Session" }),
+    /* @__PURE__ */ jsxs12(Box12, { marginTop: 1, flexDirection: "column", children: [
+      /* @__PURE__ */ jsxs12(Text13, { children: [
         "ID:      ",
         session.sessionId
       ] }),
-      /* @__PURE__ */ jsxs13(Text14, { children: [
+      /* @__PURE__ */ jsxs12(Text13, { children: [
         "Repo:    ",
         session.repo
       ] }),
-      /* @__PURE__ */ jsxs13(Text14, { children: [
+      /* @__PURE__ */ jsxs12(Text13, { children: [
         "Status:  ",
         session.status
       ] }),
-      /* @__PURE__ */ jsxs13(Text14, { children: [
+      /* @__PURE__ */ jsxs12(Text13, { children: [
         "Prompt:  ",
         session.prompt
       ] }),
-      session.prUrl && /* @__PURE__ */ jsxs13(Text14, { children: [
+      session.prUrl && /* @__PURE__ */ jsxs12(Text13, { children: [
         "PR:      ",
         session.prUrl
       ] }),
-      session.errorMessage && /* @__PURE__ */ jsxs13(Text14, { color: theme.error, children: [
+      session.errorMessage && /* @__PURE__ */ jsxs12(Text13, { color: theme.error, children: [
         "Error:   ",
         session.errorMessage
       ] }),
-      session.tokensUsed !== void 0 && /* @__PURE__ */ jsxs13(Text14, { children: [
+      session.tokensUsed !== void 0 && /* @__PURE__ */ jsxs12(Text13, { children: [
         "Tokens:  ",
         formatTokens3(session.tokensUsed),
         session.tokensBudget ? ` / ${formatTokens3(session.tokensBudget)}` : ""
       ] }),
-      /* @__PURE__ */ jsxs13(Text14, { children: [
+      /* @__PURE__ */ jsxs12(Text13, { children: [
         "Created: ",
         new Date(session.createdAt).toLocaleString()
       ] }),
-      session.finishedAt && /* @__PURE__ */ jsxs13(Text14, { children: [
+      session.finishedAt && /* @__PURE__ */ jsxs12(Text13, { children: [
         "Finished: ",
         new Date(session.finishedAt).toLocaleString()
       ] })
     ] }),
-    /* @__PURE__ */ jsxs13(Box13, { marginTop: 1, flexDirection: "row", gap: 2, children: [
-      isRunning && onCancel && /* @__PURE__ */ jsx15(Text14, { color: theme.error, children: cancelling ? "Cancelling..." : "[C] Cancel session" }),
-      /* @__PURE__ */ jsx15(Text14, { dimColor: true, children: "Esc back" })
+    /* @__PURE__ */ jsxs12(Box12, { marginTop: 1, flexDirection: "row", gap: 2, children: [
+      isRunning && onCancel && /* @__PURE__ */ jsx14(Text13, { color: theme.error, children: cancelling ? "Cancelling..." : "[C] Cancel session" }),
+      /* @__PURE__ */ jsx14(Text13, { dimColor: true, children: "Esc back" })
     ] })
   ] });
 }
@@ -9409,6 +9363,240 @@ var init_classify = __esm({
   }
 });
 
+// src/skills/loader.ts
+import { readFile as readFile12, readdir as readdir3, stat as stat4 } from "fs/promises";
+import { join as join15, extname } from "path";
+import matter from "gray-matter";
+function normalizeManifest(raw, filePath) {
+  const name = typeof raw.name === "string" ? raw.name : "";
+  const description = typeof raw.description === "string" ? raw.description : "";
+  const match = Array.isArray(raw.match) ? raw.match.filter((m) => typeof m === "string") : DEFAULTS.match;
+  const scope = raw.scope === "project" ? "project" : DEFAULTS.scope;
+  const priority = typeof raw.priority === "number" ? raw.priority : DEFAULTS.priority;
+  const enabled = typeof raw.enabled === "boolean" ? raw.enabled : DEFAULTS.enabled;
+  if (!name) {
+    throw new Error(`Skill file missing required 'name' field: ${filePath}`);
+  }
+  return { name, description, match, scope, priority, enabled };
+}
+async function loadSkillFile(filePath) {
+  const raw = await readFile12(filePath, "utf-8");
+  const parsed = matter(raw);
+  const manifest = normalizeManifest(parsed.data, filePath);
+  const body = parsed.content.trim();
+  const estimatedTokens = Math.ceil(body.length / 4);
+  return {
+    name: manifest.name,
+    description: manifest.description,
+    match: manifest.match ?? DEFAULTS.match,
+    scope: manifest.scope ?? DEFAULTS.scope,
+    priority: manifest.priority ?? DEFAULTS.priority,
+    enabled: manifest.enabled ?? DEFAULTS.enabled,
+    body,
+    filePath,
+    estimatedTokens
+  };
+}
+async function loadSkillsFromDir(dirPath) {
+  try {
+    const entries = await readdir3(dirPath);
+    const files = [];
+    for (const entry of entries) {
+      const full = join15(dirPath, entry);
+      const s = await stat4(full);
+      if (s.isFile() && extname(entry) === ".md") {
+        files.push(full);
+      }
+    }
+    const skills = await Promise.all(files.map(loadSkillFile));
+    skills.sort((a, b) => a.priority - b.priority);
+    return skills;
+  } catch {
+    return [];
+  }
+}
+var DEFAULTS;
+var init_loader = __esm({
+  "src/skills/loader.ts"() {
+    "use strict";
+    DEFAULTS = {
+      scope: "global",
+      priority: 0,
+      enabled: true,
+      match: []
+    };
+  }
+});
+
+// src/skills/router.ts
+import { minimatch } from "minimatch";
+function matchSkill(skill, prompt, cwd) {
+  if (!skill.enabled) return false;
+  if (skill.match.length === 0) return true;
+  for (const pattern of skill.match) {
+    if (pattern.includes("/") || pattern.includes("*")) {
+      if (minimatch(cwd, pattern) || minimatch(cwd, `**/${pattern}`)) {
+        return true;
+      }
+    }
+    if (prompt.toLowerCase().includes(pattern.toLowerCase())) {
+      return true;
+    }
+  }
+  return false;
+}
+function findConflicts(skill, memorySnippets) {
+  const conflicts = [];
+  for (const mem of memorySnippets) {
+    const memLower = mem.toLowerCase();
+    const skillLower = skill.name.toLowerCase();
+    if (memLower.includes(skillLower) || skillLower.includes(memLower)) {
+      conflicts.push({
+        skillName: skill.name,
+        memoryContent: mem.slice(0, 200),
+        memoryId: ""
+        // populated by caller if available
+      });
+    }
+  }
+  return conflicts;
+}
+function selectSkills(skills, options) {
+  const tierBudget = TIER_BUDGETS[options.tier];
+  const effectiveBudget = Math.min(tierBudget, options.maxSkillTokens);
+  const matched = skills.filter((s) => matchSkill(s, options.prompt, options.cwd));
+  const selected = [];
+  const dropped = [];
+  const allConflicts = [];
+  let runningTotal = 0;
+  for (const skill of matched) {
+    const conflicts = findConflicts(skill, options.memorySnippets);
+    allConflicts.push(...conflicts);
+    if (runningTotal + skill.estimatedTokens <= effectiveBudget) {
+      selected.push(skill);
+      runningTotal += skill.estimatedTokens;
+    } else {
+      dropped.push(skill);
+    }
+  }
+  const budgetUsed = effectiveBudget > 0 ? Math.round(runningTotal / effectiveBudget * 100) : 0;
+  return {
+    selectedSkills: selected,
+    droppedSkills: dropped,
+    totalSkillTokens: runningTotal,
+    budgetUsed,
+    memoryConflicts: allConflicts
+  };
+}
+var TIER_BUDGETS;
+var init_router = __esm({
+  "src/skills/router.ts"() {
+    "use strict";
+    TIER_BUDGETS = {
+      light: 2e3,
+      medium: 8e3,
+      heavy: 24e3
+    };
+  }
+});
+
+// src/skills/index.ts
+async function routeSkills(skillDir, opts2) {
+  const skills = await loadSkillsFromDir(skillDir);
+  return selectSkills(skills, opts2);
+}
+var init_skills = __esm({
+  "src/skills/index.ts"() {
+    "use strict";
+    init_loader();
+    init_router();
+  }
+});
+
+// src/skills/manager.ts
+import { mkdir as mkdir7, writeFile as writeFile8, unlink as unlink2, readFile as readFile13 } from "fs/promises";
+import { join as join16 } from "path";
+import matter2 from "gray-matter";
+function getSkillDirs(cwd) {
+  return {
+    projectDir: join16(cwd, ".kimiflare", "skills"),
+    globalDir: join16(process.env.HOME ?? "", ".config", "kimiflare", "skills")
+  };
+}
+async function listAllSkills(cwd) {
+  const dirs = getSkillDirs(cwd);
+  const [project, global] = await Promise.all([
+    loadSkillsFromDir(dirs.projectDir).catch(() => []),
+    loadSkillsFromDir(dirs.globalDir).catch(() => [])
+  ]);
+  return { project, global };
+}
+async function createSkill(opts2) {
+  const dirs = getSkillDirs(opts2.cwd);
+  const dir = opts2.scope === "project" ? dirs.projectDir : dirs.globalDir;
+  const filepath = join16(dir, `${opts2.name}.md`);
+  const frontmatter = {
+    name: opts2.name,
+    enabled: true,
+    priority: 0
+  };
+  if (opts2.description) frontmatter.description = opts2.description;
+  if (opts2.match && opts2.match.length > 0) frontmatter.match = opts2.match;
+  const yaml = Object.entries(frontmatter).map(([k, v]) => {
+    if (Array.isArray(v)) return `${k}:
+${v.map((item) => `  - ${item}`).join("\n")}`;
+    return `${k}: ${v}`;
+  }).join("\n");
+  const content = `---
+${yaml}
+---
+
+# ${opts2.name}
+
+Add your instructions here.
+`;
+  await mkdir7(dir, { recursive: true });
+  await writeFile8(filepath, content, "utf8");
+  return { filepath };
+}
+async function deleteSkill(name, cwd) {
+  const all = await listAllSkills(cwd);
+  const skill = all.project.find((s) => s.name === name) ?? all.global.find((s) => s.name === name);
+  if (!skill) throw new Error(`skill "${name}" not found`);
+  await unlink2(skill.filePath);
+  return { filepath: skill.filePath };
+}
+async function setSkillEnabled(name, enabled, cwd) {
+  const all = await listAllSkills(cwd);
+  const skill = all.project.find((s) => s.name === name) ?? all.global.find((s) => s.name === name);
+  if (!skill) throw new Error(`skill "${name}" not found`);
+  const raw = await readFile13(skill.filePath, "utf-8");
+  const parsed = matter2(raw);
+  parsed.data.enabled = enabled;
+  const yaml = Object.entries(parsed.data).map(([k, v]) => {
+    if (Array.isArray(v)) return `${k}:
+${v.map((item) => `  - ${item}`).join("\n")}`;
+    return `${k}: ${v}`;
+  }).join("\n");
+  const content = `---
+${yaml}
+---
+${parsed.content}`;
+  await writeFile8(skill.filePath, content, "utf8");
+  return { filepath: skill.filePath };
+}
+async function findSkillFile(name, cwd) {
+  const all = await listAllSkills(cwd);
+  const skill = all.project.find((s) => s.name === name) ?? all.global.find((s) => s.name === name);
+  return skill?.filePath ?? null;
+}
+var init_manager3 = __esm({
+  "src/skills/manager.ts"() {
+    "use strict";
+    init_loader();
+  }
+});
+
 // src/sessions.ts
 var sessions_exports = {};
 __export(sessions_exports, {
@@ -9418,12 +9606,12 @@ __export(sessions_exports, {
   pruneSessions: () => pruneSessions,
   saveSession: () => saveSession
 });
-import { readFile as readFile12, writeFile as writeFile8, mkdir as mkdir7, readdir as readdir3, stat as stat4 } from "fs/promises";
+import { readFile as readFile14, writeFile as writeFile9, mkdir as mkdir8, readdir as readdir4, stat as stat5 } from "fs/promises";
 import { homedir as homedir10 } from "os";
-import { join as join15 } from "path";
+import { join as join17 } from "path";
 function sessionsDir2() {
-  const xdg = process.env.XDG_DATA_HOME || join15(homedir10(), ".local", "share");
-  return join15(xdg, "kimiflare", "sessions");
+  const xdg = process.env.XDG_DATA_HOME || join17(homedir10(), ".local", "share");
+  return join17(xdg, "kimiflare", "sessions");
 }
 function sanitize(text) {
   return text.toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-+|-+$/g, "").slice(0, 40);
@@ -9435,9 +9623,9 @@ function makeSessionId(firstPrompt) {
 }
 async function saveSession(file) {
   const dir = sessionsDir2();
-  await mkdir7(dir, { recursive: true });
-  const path = join15(dir, `${file.id}.json`);
-  await writeFile8(path, JSON.stringify(file, null, 2), "utf8");
+  await mkdir8(dir, { recursive: true });
+  const path = join17(dir, `${file.id}.json`);
+  await writeFile9(path, JSON.stringify(file, null, 2), "utf8");
   return path;
 }
 async function pruneSessions() {
@@ -9449,16 +9637,16 @@ async function listSessions(limit = 30, cwd) {
   const dir = sessionsDir2();
   let entries;
   try {
-    entries = await readdir3(dir);
+    entries = await readdir4(dir);
   } catch {
     return [];
   }
   const summaries = [];
   for (const name of entries) {
     if (!name.endsWith(".json")) continue;
-    const path = join15(dir, name);
+    const path = join17(dir, name);
     try {
-      const [s, raw] = await Promise.all([stat4(path), readFile12(path, "utf8")]);
+      const [s, raw] = await Promise.all([stat5(path), readFile14(path, "utf8")]);
       const parsed = JSON.parse(raw);
       if (cwd && parsed.cwd !== cwd) continue;
       const firstUser = parsed.messages.find((m) => m.role === "user");
@@ -9478,7 +9666,7 @@ async function listSessions(limit = 30, cwd) {
   return summaries.slice(0, limit);
 }
 async function loadSession(filePath) {
-  const raw = await readFile12(filePath, "utf8");
+  const raw = await readFile14(filePath, "utf8");
   return JSON.parse(raw);
 }
 var init_sessions = __esm({
@@ -9489,10 +9677,10 @@ var init_sessions = __esm({
 });
 
 // src/util/image.ts
-import { readFile as readFile13 } from "fs/promises";
+import { readFile as readFile15 } from "fs/promises";
 import { basename as basename3 } from "path";
 async function encodeImageFile(filePath) {
-  const buf = await readFile13(filePath);
+  const buf = await readFile15(filePath);
   if (buf.byteLength > MAX_IMAGE_BYTES) {
     throw new Error(
       `image too large (${(buf.byteLength / 1024 / 1024).toFixed(1)} MB); max is ${MAX_IMAGE_BYTES / 1024 / 1024} MB`
@@ -9528,15 +9716,15 @@ var init_image = __esm({
 });
 
 // src/usage-tracker.ts
-import { readFile as readFile14, writeFile as writeFile9, mkdir as mkdir8 } from "fs/promises";
+import { readFile as readFile16, writeFile as writeFile10, mkdir as mkdir9 } from "fs/promises";
 import { homedir as homedir11 } from "os";
-import { join as join16 } from "path";
+import { join as join18 } from "path";
 function usageDir2() {
-  const xdg = process.env.XDG_DATA_HOME || join16(homedir11(), ".local", "share");
-  return join16(xdg, "kimiflare");
+  const xdg = process.env.XDG_DATA_HOME || join18(homedir11(), ".local", "share");
+  return join18(xdg, "kimiflare");
 }
 function usagePath2() {
-  return join16(usageDir2(), "usage.json");
+  return join18(usageDir2(), "usage.json");
 }
 function today2() {
   return (/* @__PURE__ */ new Date()).toISOString().slice(0, 10);
@@ -9547,7 +9735,7 @@ function cutoffDate(daysBack) {
 }
 async function loadLog2() {
   try {
-    const raw = await readFile14(usagePath2(), "utf8");
+    const raw = await readFile16(usagePath2(), "utf8");
     const parsed = JSON.parse(raw);
     if (parsed.version === LOG_VERSION2) return parsed;
   } catch {
@@ -9555,8 +9743,8 @@ async function loadLog2() {
   return { version: LOG_VERSION2, days: [], sessions: [] };
 }
 async function saveLog(log) {
-  await mkdir8(usageDir2(), { recursive: true });
-  await writeFile9(usagePath2(), JSON.stringify(log, null, 2), "utf8");
+  await mkdir9(usageDir2(), { recursive: true });
+  await writeFile10(usagePath2(), JSON.stringify(log, null, 2), "utf8");
 }
 function getOrCreateDay(log, date) {
   let day = log.days.find((d) => d.date === date);
@@ -9772,7 +9960,7 @@ __export(db_exports, {
   updateMemoryEmbedding: () => updateMemoryEmbedding
 });
 import Database from "better-sqlite3";
-import { dirname as dirname7 } from "path";
+import { dirname as dirname8 } from "path";
 import { mkdirSync, statSync as statSync2 } from "fs";
 function initSchema(db) {
   db.exec(`
@@ -9857,7 +10045,7 @@ function openMemoryDb(dbPath) {
   if (dbInstance) {
     dbInstance.close();
   }
-  mkdirSync(dirname7(dbPath), { recursive: true });
+  mkdirSync(dirname8(dbPath), { recursive: true });
   dbInstance = new Database(dbPath);
   dbInstance.pragma("journal_mode = WAL");
   dbInstance.pragma("foreign_keys = ON");
@@ -10507,7 +10695,7 @@ function pickTopicKey(content, existingKeys) {
   return normalized;
 }
 var SECRET_PATTERNS, VERIFY_SYSTEM, HYPOTHETICAL_QUERIES_SYSTEM, MemoryManager;
-var init_manager3 = __esm({
+var init_manager4 = __esm({
   "src/memory/manager.ts"() {
     "use strict";
     init_client();
@@ -10852,16 +11040,16 @@ Context: This memory was explicitly provided by the user during a conversation.`
 });
 
 // src/util/state.ts
-import { readFile as readFile15, writeFile as writeFile10, mkdir as mkdir9 } from "fs/promises";
+import { readFile as readFile17, writeFile as writeFile11, mkdir as mkdir10 } from "fs/promises";
 import { homedir as homedir12 } from "os";
-import { join as join18 } from "path";
+import { join as join20 } from "path";
 function statePath() {
-  const xdg = process.env.XDG_CONFIG_HOME || join18(homedir12(), ".config");
-  return join18(xdg, "kimiflare", "state.json");
+  const xdg = process.env.XDG_CONFIG_HOME || join20(homedir12(), ".config");
+  return join20(xdg, "kimiflare", "state.json");
 }
 async function readState() {
   try {
-    const raw = await readFile15(statePath(), "utf8");
+    const raw = await readFile17(statePath(), "utf8");
     return JSON.parse(raw);
   } catch {
     return {};
@@ -10869,8 +11057,8 @@ async function readState() {
 }
 async function writeState(state) {
   const path = statePath();
-  await mkdir9(join18(path, ".."), { recursive: true });
-  await writeFile10(path, JSON.stringify(state, null, 2) + "\n", "utf8");
+  await mkdir10(join20(path, ".."), { recursive: true });
+  await writeFile11(path, JSON.stringify(state, null, 2) + "\n", "utf8");
 }
 async function markCreatorMessageSeen(version) {
   const state = await readState();
@@ -10944,14 +11132,14 @@ var init_frontmatter = __esm({
 // src/commands/loader.ts
 import { open, realpath } from "fs/promises";
 import { homedir as homedir13 } from "os";
-import { join as join19, relative as relative4, sep as sep2 } from "path";
+import { join as join21, relative as relative4, sep as sep2 } from "path";
 import fg3 from "fast-glob";
 function projectCommandsDir(cwd = process.cwd()) {
-  return join19(cwd, ".kimiflare", "commands");
+  return join21(cwd, ".kimiflare", "commands");
 }
 function globalCommandsDir() {
-  const xdg = process.env.XDG_CONFIG_HOME || join19(homedir13(), ".config");
-  return join19(xdg, "kimiflare", "commands");
+  const xdg = process.env.XDG_CONFIG_HOME || join21(homedir13(), ".config");
+  return join21(xdg, "kimiflare", "commands");
 }
 async function loadCustomCommands(cwd = process.cwd()) {
   const warnings = [];
@@ -11090,7 +11278,7 @@ function filenameToCommandName(file, rootDir) {
   return parts.join("/");
 }
 var MAX_COMMAND_FILE_BYTES;
-var init_loader = __esm({
+var init_loader2 = __esm({
   "src/commands/loader.ts"() {
     "use strict";
     init_mode();
@@ -11308,6 +11496,7 @@ var init_builtins = __esm({
       { name: "gateway", argHint: "[status|off|<id>|cache-ttl|skip-cache|...]", description: "Manage AI Gateway", source: "builtin" },
       { name: "mcp", argHint: "[list|reload]", description: "Manage MCP servers", source: "builtin" },
       { name: "lsp", argHint: "[config|list|reload|scope]", description: "Manage language servers", source: "builtin" },
+      { name: "skills", argHint: "[list|add|edit|delete|enable|disable]", description: "Manage skills", source: "builtin" },
       { name: "command", argHint: "[create|edit|delete|list]", description: "Manage custom slash commands", source: "builtin" },
       { name: "resume", description: "Pick a past conversation to resume", source: "builtin" },
       { name: "compact", description: "Summarize old turns to free context", source: "builtin" },
@@ -11327,8 +11516,8 @@ var init_builtins = __esm({
 });
 
 // src/commands/save.ts
-import { mkdir as mkdir10, writeFile as writeFile11, unlink as unlink2 } from "fs/promises";
-import { dirname as dirname8 } from "path";
+import { mkdir as mkdir11, writeFile as writeFile12, unlink as unlink3 } from "fs/promises";
+import { dirname as dirname9 } from "path";
 async function saveCustomCommand(opts2) {
   const dir = opts2.source === "project" ? projectCommandsDir(opts2.cwd) : globalCommandsDir();
   const filepath = `${dir}/${opts2.name}.md`;
@@ -11339,26 +11528,26 @@ async function saveCustomCommand(opts2) {
   if (opts2.effort) data.effort = opts2.effort;
   const frontmatter = serializeFrontmatter(data);
   const content = frontmatter + opts2.template;
-  await mkdir10(dirname8(filepath), { recursive: true });
-  await writeFile11(filepath, content, "utf8");
+  await mkdir11(dirname9(filepath), { recursive: true });
+  await writeFile12(filepath, content, "utf8");
   return { filepath };
 }
 async function deleteCustomCommand(cmd) {
-  await unlink2(cmd.filepath);
+  await unlink3(cmd.filepath);
 }
 var init_save = __esm({
   "src/commands/save.ts"() {
     "use strict";
     init_frontmatter();
-    init_loader();
+    init_loader2();
   }
 });
 
 // src/ui/command-wizard.tsx
 import { useState as useState8 } 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";
+import { Box as Box13, Text as Text14, useInput as useInput4, useWindowSize as useWindowSize2 } from "ink";
+import SelectInput6 from "ink-select-input";
+import { Fragment as Fragment2, jsx as jsx15, jsxs as jsxs13 } from "react/jsx-runtime";
 function CommandWizard({ mode, initial, existingNames, builtinNames, onDone, onSave }) {
   const theme = useTheme();
   const [step, setStep] = useState8("name");
@@ -11382,7 +11571,7 @@ function CommandWizard({ mode, initial, existingNames, builtinNames, onDone, onS
     if (existingNames.includes(trimmed) && !isEditingSelf(trimmed)) return `/${trimmed} already exists`;
     return null;
   };
-  useInput5((_input, key) => {
+  useInput4((_input, key) => {
     if (key.escape) {
       onDone();
     }
@@ -11482,8 +11671,8 @@ ${template}`;
   const renderStep = () => {
     switch (step) {
       case "name":
-        return /* @__PURE__ */ jsxs14(Fragment2, { children: [
-          /* @__PURE__ */ jsxs14(Text15, { color: theme.accent, bold: true, children: [
+        return /* @__PURE__ */ jsxs13(Fragment2, { children: [
+          /* @__PURE__ */ jsxs13(Text14, { color: theme.accent, bold: true, children: [
             mode === "create" ? "Create" : "Edit",
             " custom command \u2014 Name (",
             stepIndex,
@@ -11491,8 +11680,8 @@ ${template}`;
             totalSteps,
             ")"
           ] }),
-          error && /* @__PURE__ */ jsx16(Text15, { color: theme.error, children: error }),
-          /* @__PURE__ */ jsx16(Box14, { marginTop: 1, children: /* @__PURE__ */ jsx16(
+          error && /* @__PURE__ */ jsx15(Text14, { color: theme.error, children: error }),
+          /* @__PURE__ */ jsx15(Box13, { marginTop: 1, children: /* @__PURE__ */ jsx15(
             CustomTextInput,
             {
               value: name,
@@ -11501,11 +11690,11 @@ ${template}`;
               focus: true
             }
           ) }),
-          /* @__PURE__ */ jsx16(Text15, { color: theme.info.color, children: "letters, numbers, _ - / only; must start with a letter" })
+          /* @__PURE__ */ jsx15(Text14, { color: theme.info.color, children: "letters, numbers, _ - / only; must start with a letter" })
         ] });
       case "description":
-        return /* @__PURE__ */ jsxs14(Fragment2, { children: [
-          /* @__PURE__ */ jsxs14(Text15, { color: theme.accent, bold: true, children: [
+        return /* @__PURE__ */ jsxs13(Fragment2, { children: [
+          /* @__PURE__ */ jsxs13(Text14, { color: theme.accent, bold: true, children: [
             mode === "create" ? "Create" : "Edit",
             " custom command \u2014 Description (",
             stepIndex,
@@ -11513,7 +11702,7 @@ ${template}`;
             totalSteps,
             ")"
           ] }),
-          /* @__PURE__ */ jsx16(Box14, { marginTop: 1, children: /* @__PURE__ */ jsx16(
+          /* @__PURE__ */ jsx15(Box13, { marginTop: 1, children: /* @__PURE__ */ jsx15(
             CustomTextInput,
             {
               value: description,
@@ -11522,49 +11711,49 @@ ${template}`;
               focus: true
             }
           ) }),
-          /* @__PURE__ */ jsx16(Text15, { color: theme.info.color, children: "Press Enter to skip" })
+          /* @__PURE__ */ jsx15(Text14, { color: theme.info.color, children: "Press Enter to skip" })
         ] });
       case "template": {
-        const guide = /* @__PURE__ */ jsxs14(Box14, { flexDirection: "column", paddingLeft: 1, children: [
-          /* @__PURE__ */ jsx16(Text15, { color: theme.accent, bold: true, children: "What is this?" }),
-          /* @__PURE__ */ jsx16(Text15, { color: theme.info.color, children: "A prompt template \u2014 instructions to the AI." }),
-          /* @__PURE__ */ jsxs14(Text15, { color: theme.info.color, children: [
+        const guide = /* @__PURE__ */ jsxs13(Box13, { flexDirection: "column", paddingLeft: 1, children: [
+          /* @__PURE__ */ jsx15(Text14, { color: theme.accent, bold: true, children: "What is this?" }),
+          /* @__PURE__ */ jsx15(Text14, { color: theme.info.color, children: "A prompt template \u2014 instructions to the AI." }),
+          /* @__PURE__ */ jsxs13(Text14, { color: theme.info.color, children: [
             "When you type /",
             name || "yourcommand",
             " later, this gets sent to the model."
           ] }),
-          /* @__PURE__ */ jsxs14(Box14, { marginTop: 1, flexDirection: "column", children: [
-            /* @__PURE__ */ jsx16(Text15, { color: theme.accent, bold: true, children: "Variables" }),
-            /* @__PURE__ */ jsxs14(Text15, { color: theme.info.color, children: [
+          /* @__PURE__ */ jsxs13(Box13, { marginTop: 1, flexDirection: "column", children: [
+            /* @__PURE__ */ jsx15(Text14, { color: theme.accent, bold: true, children: "Variables" }),
+            /* @__PURE__ */ jsxs13(Text14, { color: theme.info.color, children: [
               "  ",
               "$1, $2 ...     \u2192 arguments you type"
             ] }),
-            /* @__PURE__ */ jsxs14(Text15, { color: theme.info.color, children: [
+            /* @__PURE__ */ jsxs13(Text14, { color: theme.info.color, children: [
               "  ",
               "$ARGUMENTS     \u2192 everything after the command"
             ] })
           ] }),
-          /* @__PURE__ */ jsxs14(Box14, { marginTop: 1, flexDirection: "column", children: [
-            /* @__PURE__ */ jsx16(Text15, { color: theme.accent, bold: true, children: "Dynamic inlines" }),
-            /* @__PURE__ */ jsxs14(Text15, { color: theme.info.color, children: [
+          /* @__PURE__ */ jsxs13(Box13, { marginTop: 1, flexDirection: "column", children: [
+            /* @__PURE__ */ jsx15(Text14, { color: theme.accent, bold: true, children: "Dynamic inlines" }),
+            /* @__PURE__ */ jsxs13(Text14, { color: theme.info.color, children: [
               "  ",
               "!`git diff`    \u2192 shell output inlined"
             ] }),
-            /* @__PURE__ */ jsxs14(Text15, { color: theme.info.color, children: [
+            /* @__PURE__ */ jsxs13(Text14, { color: theme.info.color, children: [
               "  ",
               "@README.md     \u2192 file contents inlined"
             ] })
           ] }),
-          /* @__PURE__ */ jsxs14(Box14, { marginTop: 1, flexDirection: "column", children: [
-            /* @__PURE__ */ jsx16(Text15, { color: theme.accent, bold: true, children: "Example" }),
-            /* @__PURE__ */ jsx16(Text15, { color: theme.info.color, children: "Review this PR diff:" }),
-            /* @__PURE__ */ jsx16(Text15, { color: theme.info.color, children: "!`git diff main...HEAD`" }),
-            /* @__PURE__ */ jsx16(Text15, { color: theme.info.color, children: "Focus on: $1" })
+          /* @__PURE__ */ jsxs13(Box13, { marginTop: 1, flexDirection: "column", children: [
+            /* @__PURE__ */ jsx15(Text14, { color: theme.accent, bold: true, children: "Example" }),
+            /* @__PURE__ */ jsx15(Text14, { color: theme.info.color, children: "Review this PR diff:" }),
+            /* @__PURE__ */ jsx15(Text14, { color: theme.info.color, children: "!`git diff main...HEAD`" }),
+            /* @__PURE__ */ jsx15(Text14, { color: theme.info.color, children: "Focus on: $1" })
           ] })
         ] });
-        const inputArea = /* @__PURE__ */ jsxs14(Box14, { flexDirection: "column", flexGrow: 1, children: [
-          error && /* @__PURE__ */ jsx16(Text15, { color: theme.error, children: error }),
-          /* @__PURE__ */ jsx16(Box14, { marginTop: 1, children: /* @__PURE__ */ jsx16(
+        const inputArea = /* @__PURE__ */ jsxs13(Box13, { flexDirection: "column", flexGrow: 1, children: [
+          error && /* @__PURE__ */ jsx15(Text14, { color: theme.error, children: error }),
+          /* @__PURE__ */ jsx15(Box13, { marginTop: 1, children: /* @__PURE__ */ jsx15(
             CustomTextInput,
             {
               value: template,
@@ -11574,13 +11763,13 @@ ${template}`;
               enablePaste: true
             }
           ) }),
-          columns < 100 && /* @__PURE__ */ jsxs14(Fragment2, { children: [
-            /* @__PURE__ */ jsx16(Text15, { color: theme.info.color, children: "Paste multi-line templates with Ctrl+V." }),
-            /* @__PURE__ */ jsx16(Text15, { color: theme.info.color, children: "Variables: $1 $2 ... $ARGUMENTS  Shell: !`cmd`  File: @path" })
+          columns < 100 && /* @__PURE__ */ jsxs13(Fragment2, { children: [
+            /* @__PURE__ */ jsx15(Text14, { color: theme.info.color, children: "Paste multi-line templates with Ctrl+V." }),
+            /* @__PURE__ */ jsx15(Text14, { color: theme.info.color, children: "Variables: $1 $2 ... $ARGUMENTS  Shell: !`cmd`  File: @path" })
           ] })
         ] });
-        return /* @__PURE__ */ jsxs14(Fragment2, { children: [
-          /* @__PURE__ */ jsxs14(Text15, { color: theme.accent, bold: true, children: [
+        return /* @__PURE__ */ jsxs13(Fragment2, { children: [
+          /* @__PURE__ */ jsxs13(Text14, { color: theme.accent, bold: true, children: [
             mode === "create" ? "Create" : "Edit",
             " custom command \u2014 Template (",
             stepIndex,
@@ -11588,10 +11777,10 @@ ${template}`;
             totalSteps,
             ")"
           ] }),
-          columns >= 100 ? /* @__PURE__ */ jsxs14(Box14, { flexDirection: "row", marginTop: 1, children: [
-            /* @__PURE__ */ jsx16(Box14, { flexDirection: "column", width: "50%", children: inputArea }),
-            /* @__PURE__ */ jsx16(Box14, { flexDirection: "column", width: "50%", children: guide })
-          ] }) : /* @__PURE__ */ jsx16(Box14, { flexDirection: "column", marginTop: 1, children: inputArea })
+          columns >= 100 ? /* @__PURE__ */ jsxs13(Box13, { flexDirection: "row", marginTop: 1, children: [
+            /* @__PURE__ */ jsx15(Box13, { flexDirection: "column", width: "50%", children: inputArea }),
+            /* @__PURE__ */ jsx15(Box13, { flexDirection: "column", width: "50%", children: guide })
+          ] }) : /* @__PURE__ */ jsx15(Box13, { flexDirection: "column", marginTop: 1, children: inputArea })
         ] });
       }
       case "advanced": {
@@ -11600,8 +11789,8 @@ ${template}`;
           { label: "Skip", value: "skip", key: "skip" },
           { label: "\u2190 Cancel", value: "cancel", key: "cancel" }
         ];
-        return /* @__PURE__ */ jsxs14(Fragment2, { children: [
-          /* @__PURE__ */ jsxs14(Text15, { color: theme.accent, bold: true, children: [
+        return /* @__PURE__ */ jsxs13(Fragment2, { children: [
+          /* @__PURE__ */ jsxs13(Text14, { color: theme.accent, bold: true, children: [
             mode === "create" ? "Create" : "Edit",
             " custom command \u2014 Options (",
             stepIndex,
@@ -11609,8 +11798,8 @@ ${template}`;
             totalSteps,
             ")"
           ] }),
-          /* @__PURE__ */ jsx16(Box14, { marginTop: 1, children: /* @__PURE__ */ jsx16(
-            SelectInput7,
+          /* @__PURE__ */ jsx15(Box13, { marginTop: 1, children: /* @__PURE__ */ jsx15(
+            SelectInput6,
             {
               items,
               onSelect: (item) => {
@@ -11629,17 +11818,17 @@ ${template}`;
           { label: cmdMode === "auto" ? "auto \xB7 current" : "auto", value: "auto", key: "auto" },
           { label: "\u2190 Back", value: "__back__", key: "__back__" }
         ];
-        return /* @__PURE__ */ jsxs14(Fragment2, { children: [
-          /* @__PURE__ */ jsxs14(Text15, { color: theme.accent, bold: true, children: [
+        return /* @__PURE__ */ jsxs13(Fragment2, { children: [
+          /* @__PURE__ */ jsxs13(Text14, { color: theme.accent, bold: true, children: [
             "Mode override (",
             stepIndex,
             "/",
             totalSteps,
             ")"
           ] }),
-          /* @__PURE__ */ jsx16(Text15, { color: theme.info.color, children: "Saved to file but not yet enforced at runtime" }),
-          /* @__PURE__ */ jsx16(Box14, { marginTop: 1, children: /* @__PURE__ */ jsx16(
-            SelectInput7,
+          /* @__PURE__ */ jsx15(Text14, { color: theme.info.color, children: "Saved to file but not yet enforced at runtime" }),
+          /* @__PURE__ */ jsx15(Box13, { marginTop: 1, children: /* @__PURE__ */ jsx15(
+            SelectInput6,
             {
               items,
               onSelect: (item) => {
@@ -11658,16 +11847,16 @@ ${template}`;
           { label: cmdEffort === "high" ? "high \xB7 current" : "high", value: "high", key: "high" },
           { label: "\u2190 Back", value: "__back__", key: "__back__" }
         ];
-        return /* @__PURE__ */ jsxs14(Fragment2, { children: [
-          /* @__PURE__ */ jsxs14(Text15, { color: theme.accent, bold: true, children: [
+        return /* @__PURE__ */ jsxs13(Fragment2, { children: [
+          /* @__PURE__ */ jsxs13(Text14, { color: theme.accent, bold: true, children: [
             "Reasoning effort (",
             stepIndex,
             "/",
             totalSteps,
             ")"
           ] }),
-          /* @__PURE__ */ jsx16(Box14, { marginTop: 1, children: /* @__PURE__ */ jsx16(
-            SelectInput7,
+          /* @__PURE__ */ jsx15(Box13, { marginTop: 1, children: /* @__PURE__ */ jsx15(
+            SelectInput6,
             {
               items,
               onSelect: (item) => {
@@ -11679,15 +11868,15 @@ ${template}`;
         ] });
       }
       case "model":
-        return /* @__PURE__ */ jsxs14(Fragment2, { children: [
-          /* @__PURE__ */ jsxs14(Text15, { color: theme.accent, bold: true, children: [
+        return /* @__PURE__ */ jsxs13(Fragment2, { children: [
+          /* @__PURE__ */ jsxs13(Text14, { color: theme.accent, bold: true, children: [
             "Model override (",
             stepIndex,
             "/",
             totalSteps,
             ")"
           ] }),
-          /* @__PURE__ */ jsx16(Box14, { marginTop: 1, children: /* @__PURE__ */ jsx16(
+          /* @__PURE__ */ jsx15(Box13, { marginTop: 1, children: /* @__PURE__ */ jsx15(
             CustomTextInput,
             {
               value: cmdModel ?? "",
@@ -11696,7 +11885,7 @@ ${template}`;
               focus: true
             }
           ) }),
-          /* @__PURE__ */ jsx16(Text15, { color: theme.info.color, children: "Press Enter to skip" })
+          /* @__PURE__ */ jsx15(Text14, { color: theme.info.color, children: "Press Enter to skip" })
         ] });
       case "location": {
         const items = [
@@ -11704,16 +11893,16 @@ ${template}`;
           { label: source === "global" ? "Global \xB7 current" : "Global", value: "global", key: "global" },
           { label: "\u2190 Back", value: "__back__", key: "__back__" }
         ];
-        return /* @__PURE__ */ jsxs14(Fragment2, { children: [
-          /* @__PURE__ */ jsxs14(Text15, { color: theme.accent, bold: true, children: [
+        return /* @__PURE__ */ jsxs13(Fragment2, { children: [
+          /* @__PURE__ */ jsxs13(Text14, { color: theme.accent, bold: true, children: [
             "Save location (",
             stepIndex,
             "/",
             totalSteps,
             ")"
           ] }),
-          /* @__PURE__ */ jsx16(Box14, { marginTop: 1, children: /* @__PURE__ */ jsx16(
-            SelectInput7,
+          /* @__PURE__ */ jsx15(Box13, { marginTop: 1, children: /* @__PURE__ */ jsx15(
+            SelectInput6,
             {
               items,
               onSelect: (item) => {
@@ -11722,7 +11911,7 @@ ${template}`;
               }
             }
           ) }),
-          /* @__PURE__ */ jsx16(Text15, { color: theme.info.color, children: "Project: .kimiflare/commands/    Global: ~/.config/kimiflare/commands/" })
+          /* @__PURE__ */ jsx15(Text14, { color: theme.info.color, children: "Project: .kimiflare/commands/    Global: ~/.config/kimiflare/commands/" })
         ] });
       }
       case "confirm": {
@@ -11730,8 +11919,8 @@ ${template}`;
           { label: "Save", value: "save", key: "save" },
           { label: "Cancel", value: "cancel", key: "cancel" }
         ];
-        return /* @__PURE__ */ jsxs14(Fragment2, { children: [
-          /* @__PURE__ */ jsxs14(Text15, { color: theme.accent, bold: true, children: [
+        return /* @__PURE__ */ jsxs13(Fragment2, { children: [
+          /* @__PURE__ */ jsxs13(Text14, { color: theme.accent, bold: true, children: [
             mode === "create" ? "Create" : "Edit",
             " custom command \u2014 Confirm (",
             stepIndex,
@@ -11739,14 +11928,14 @@ ${template}`;
             totalSteps,
             ")"
           ] }),
-          /* @__PURE__ */ jsxs14(Text15, { color: theme.info.color, children: [
+          /* @__PURE__ */ jsxs13(Text14, { color: theme.info.color, children: [
             source === "project" ? ".kimiflare/commands/" : "~/.config/kimiflare/commands/",
             name,
             ".md"
           ] }),
-          /* @__PURE__ */ jsx16(Box14, { marginTop: 1, flexDirection: "column", children: previewContent().split("\n").map((line, i) => /* @__PURE__ */ jsx16(Text15, { color: theme.info.color, children: line || " " }, i)) }),
-          /* @__PURE__ */ jsx16(Box14, { marginTop: 1, children: /* @__PURE__ */ jsx16(
-            SelectInput7,
+          /* @__PURE__ */ jsx15(Box13, { marginTop: 1, flexDirection: "column", children: previewContent().split("\n").map((line, i) => /* @__PURE__ */ jsx15(Text14, { color: theme.info.color, children: line || " " }, i)) }),
+          /* @__PURE__ */ jsx15(Box13, { marginTop: 1, children: /* @__PURE__ */ jsx15(
+            SelectInput6,
             {
               items,
               onSelect: (item) => handleConfirm(item.value)
@@ -11756,7 +11945,7 @@ ${template}`;
       }
     }
   };
-  return /* @__PURE__ */ jsx16(Box14, { flexDirection: "column", borderStyle: "round", borderColor: theme.accent, paddingX: 1, children: renderStep() });
+  return /* @__PURE__ */ jsx15(Box13, { flexDirection: "column", borderStyle: "round", borderColor: theme.accent, paddingX: 1, children: renderStep() });
 }
 var NAME_RE;
 var init_command_wizard = __esm({
@@ -11770,12 +11959,12 @@ var init_command_wizard = __esm({
 
 // src/init/context-generator.ts
 import { existsSync as existsSync2, statSync as statSync3 } from "fs";
-import { join as join20 } from "path";
+import { join as join22 } from "path";
 function detectFlavor(cwd) {
   for (const [flavor, signatures] of Object.entries(FLAVOR_SIGNATURES)) {
     if (flavor === "generic") continue;
     for (const sig of signatures) {
-      const path = join20(cwd, sig);
+      const path = join22(cwd, sig);
       if (sig.includes("*")) {
         try {
           const parts = sig.split("*");
@@ -11796,14 +11985,14 @@ function detectFlavor(cwd) {
 }
 function findFile(cwd, candidates) {
   for (const c of candidates) {
-    if (existsSync2(join20(cwd, c))) return c;
+    if (existsSync2(join22(cwd, c))) return c;
   }
   return null;
 }
 function findSourceRoots(cwd) {
   const roots = [];
   for (const r of SOURCE_ROOT_CANDIDATES) {
-    const p = join20(cwd, r);
+    const p = join22(cwd, r);
     try {
       const s = statSync3(p);
       if (s.isDirectory()) roots.push(r);
@@ -11814,9 +12003,9 @@ function findSourceRoots(cwd) {
 }
 function findCiConfig(cwd) {
   for (const c of CI_PATHS) {
-    if (existsSync2(join20(cwd, c))) {
+    if (existsSync2(join22(cwd, c))) {
       try {
-        const s = statSync3(join20(cwd, c));
+        const s = statSync3(join22(cwd, c));
         return s.isDirectory() ? c : c;
       } catch {
       }
@@ -11953,7 +12142,7 @@ function analyzeProject(cwd) {
     ciConfig: findCiConfig(cwd),
     readme: findFile(cwd, ["README.md", "README.rst", "README.txt", "Readme.md"]),
     sourceRoots: findSourceRoots(cwd),
-    hasGit: existsSync2(join20(cwd, ".git"))
+    hasGit: existsSync2(join22(cwd, ".git"))
   };
 }
 function bashDiscoveryCommands(profile) {
@@ -12118,7 +12307,7 @@ Aim for 100\u2013200 lines total. Use markdown tables where they save space.
 }
 function buildInitPrompt(cwd) {
   const existingName = ["KIMI.md", "KIMIFLARE.md", "AGENT.md"].find(
-    (n) => existsSync2(join20(cwd, n))
+    (n) => existsSync2(join22(cwd, n))
   );
   const isRefresh = existingName !== void 0;
   const targetFilename = existingName ?? "KIMI.md";
@@ -12201,9 +12390,9 @@ var init_context_generator = __esm({
 });
 
 // src/ui/command-picker.tsx
-import { Box as Box15, Text as Text16 } from "ink";
-import SelectInput8 from "ink-select-input";
-import { jsx as jsx17, jsxs as jsxs15 } from "react/jsx-runtime";
+import { Box as Box14, Text as Text15 } from "ink";
+import SelectInput7 from "ink-select-input";
+import { jsx as jsx16, jsxs as jsxs14 } from "react/jsx-runtime";
 function CommandPicker({ commands, title, onPick }) {
   const theme = useTheme();
   const items = commands.map((cmd) => ({
@@ -12212,11 +12401,11 @@ function CommandPicker({ commands, title, onPick }) {
     key: cmd.name
   }));
   items.push({ label: "\u2190 Cancel", value: null, key: "__cancel__" });
-  return /* @__PURE__ */ jsxs15(Box15, { flexDirection: "column", borderStyle: "round", borderColor: theme.accent, paddingX: 1, children: [
-    /* @__PURE__ */ jsx17(Text16, { color: theme.accent, bold: true, children: title }),
-    /* @__PURE__ */ jsx17(Text16, { color: theme.info.color, dimColor: false, children: "Arrow keys to navigate, Enter to select." }),
-    /* @__PURE__ */ jsx17(Box15, { marginTop: 1, children: /* @__PURE__ */ jsx17(
-      SelectInput8,
+  return /* @__PURE__ */ jsxs14(Box14, { flexDirection: "column", borderStyle: "round", borderColor: theme.accent, paddingX: 1, children: [
+    /* @__PURE__ */ jsx16(Text15, { color: theme.accent, bold: true, children: title }),
+    /* @__PURE__ */ jsx16(Text15, { color: theme.info.color, dimColor: false, children: "Arrow keys to navigate, Enter to select." }),
+    /* @__PURE__ */ jsx16(Box14, { marginTop: 1, children: /* @__PURE__ */ jsx16(
+      SelectInput7,
       {
         items,
         onSelect: (item) => {
@@ -12238,64 +12427,64 @@ var init_command_picker = __esm({
 });
 
 // src/ui/command-list.tsx
-import { Box as Box16, Text as Text17, useInput as useInput6 } from "ink";
-import { jsx as jsx18, jsxs as jsxs16 } from "react/jsx-runtime";
+import { Box as Box15, Text as Text16, useInput as useInput5 } from "ink";
+import { jsx as jsx17, jsxs as jsxs15 } from "react/jsx-runtime";
 function CommandList({ commands, onDone }) {
   const theme = useTheme();
-  useInput6((_input, key) => {
+  useInput5((_input, key) => {
     if (key.escape) {
       onDone();
     }
   });
-  return /* @__PURE__ */ jsxs16(Box16, { flexDirection: "column", borderStyle: "round", borderColor: theme.accent, paddingX: 1, children: [
-    /* @__PURE__ */ jsx18(Text17, { color: theme.accent, bold: true, children: "Custom commands" }),
-    /* @__PURE__ */ jsx18(Text17, { color: theme.info.color, dimColor: false, children: "Esc to close." }),
-    /* @__PURE__ */ jsxs16(Box16, { marginTop: 1, flexDirection: "column", children: [
-      commands.length === 0 && /* @__PURE__ */ jsx18(Text17, { color: theme.info.color, children: "No custom commands found." }),
-      commands.map((cmd) => /* @__PURE__ */ jsxs16(Box16, { flexDirection: "column", marginBottom: 1, children: [
-        /* @__PURE__ */ jsxs16(Text17, { color: theme.accent, bold: true, children: [
+  return /* @__PURE__ */ jsxs15(Box15, { flexDirection: "column", borderStyle: "round", borderColor: theme.accent, paddingX: 1, children: [
+    /* @__PURE__ */ jsx17(Text16, { color: theme.accent, bold: true, children: "Custom commands" }),
+    /* @__PURE__ */ jsx17(Text16, { color: theme.info.color, dimColor: false, children: "Esc to close." }),
+    /* @__PURE__ */ jsxs15(Box15, { marginTop: 1, flexDirection: "column", children: [
+      commands.length === 0 && /* @__PURE__ */ jsx17(Text16, { color: theme.info.color, children: "No custom commands found." }),
+      commands.map((cmd) => /* @__PURE__ */ jsxs15(Box15, { flexDirection: "column", marginBottom: 1, children: [
+        /* @__PURE__ */ jsxs15(Text16, { color: theme.accent, bold: true, children: [
           "/",
           cmd.name
         ] }),
-        /* @__PURE__ */ jsxs16(Text17, { color: theme.info.color, children: [
+        /* @__PURE__ */ jsxs15(Text16, { color: theme.info.color, children: [
           "  ",
           "source:  ",
           cmd.source
         ] }),
-        /* @__PURE__ */ jsxs16(Text17, { color: theme.info.color, children: [
+        /* @__PURE__ */ jsxs15(Text16, { color: theme.info.color, children: [
           "  ",
           "path:    ",
           cmd.filepath
         ] }),
-        cmd.description && /* @__PURE__ */ jsxs16(Text17, { color: theme.info.color, children: [
+        cmd.description && /* @__PURE__ */ jsxs15(Text16, { color: theme.info.color, children: [
           "  ",
           "desc:    ",
           cmd.description
         ] }),
-        cmd.mode && /* @__PURE__ */ jsxs16(Text17, { color: theme.info.color, children: [
+        cmd.mode && /* @__PURE__ */ jsxs15(Text16, { color: theme.info.color, children: [
           "  ",
           "mode:    ",
           cmd.mode
         ] }),
-        cmd.effort && /* @__PURE__ */ jsxs16(Text17, { color: theme.info.color, children: [
+        cmd.effort && /* @__PURE__ */ jsxs15(Text16, { color: theme.info.color, children: [
           "  ",
           "effort:  ",
           cmd.effort
         ] }),
-        cmd.model && /* @__PURE__ */ jsxs16(Text17, { color: theme.info.color, children: [
+        cmd.model && /* @__PURE__ */ jsxs15(Text16, { color: theme.info.color, children: [
           "  ",
           "model:   ",
           cmd.model
         ] }),
-        /* @__PURE__ */ jsxs16(Text17, { color: theme.info.color, children: [
+        /* @__PURE__ */ jsxs15(Text16, { color: theme.info.color, children: [
           "  ",
           "template:"
         ] }),
-        cmd.template.split("\n").slice(0, 5).map((line, i) => /* @__PURE__ */ jsxs16(Text17, { color: theme.info.color, children: [
+        cmd.template.split("\n").slice(0, 5).map((line, i) => /* @__PURE__ */ jsxs15(Text16, { color: theme.info.color, children: [
           "    ",
           line || " "
         ] }, i)),
-        cmd.template.split("\n").length > 5 && /* @__PURE__ */ jsxs16(Text17, { color: theme.info.color, children: [
+        cmd.template.split("\n").length > 5 && /* @__PURE__ */ jsxs15(Text16, { color: theme.info.color, children: [
           "    ",
           "..."
         ] })
@@ -12312,10 +12501,10 @@ var init_command_list = __esm({
 
 // src/ui/lsp-wizard.tsx
 import { useState as useState9 } from "react";
-import { Box as Box17, Text as Text18 } from "ink";
-import SelectInput9 from "ink-select-input";
+import { Box as Box16, Text as Text17 } from "ink";
+import SelectInput8 from "ink-select-input";
 import { spawn as spawn3 } from "child_process";
-import { jsx as jsx19, jsxs as jsxs17 } from "react/jsx-runtime";
+import { jsx as jsx18, jsxs as jsxs16 } from "react/jsx-runtime";
 function LspWizard({ servers, currentScope, hasProjectDir, onDone, onSave }) {
   const theme = useTheme();
   const [page, setPage] = useState9("main");
@@ -12426,11 +12615,11 @@ function LspWizard({ servers, currentScope, hasProjectDir, onDone, onSave }) {
     { label: "(close)", value: "__close__", key: "__close__" }
   ];
   if (page === "main") {
-    return /* @__PURE__ */ jsxs17(Box17, { flexDirection: "column", borderStyle: "round", borderColor: theme.accent, paddingX: 1, children: [
-      /* @__PURE__ */ jsx19(Text18, { color: theme.accent, bold: true, children: "LSP Servers" }),
-      /* @__PURE__ */ jsx19(Text18, { color: theme.info.color, dimColor: false, children: "Arrow keys to navigate, Enter to select." }),
-      /* @__PURE__ */ jsx19(Box17, { marginTop: 1, children: /* @__PURE__ */ jsx19(
-        SelectInput9,
+    return /* @__PURE__ */ jsxs16(Box16, { flexDirection: "column", borderStyle: "round", borderColor: theme.accent, paddingX: 1, children: [
+      /* @__PURE__ */ jsx18(Text17, { color: theme.accent, bold: true, children: "LSP Servers" }),
+      /* @__PURE__ */ jsx18(Text17, { color: theme.info.color, dimColor: false, children: "Arrow keys to navigate, Enter to select." }),
+      /* @__PURE__ */ jsx18(Box16, { marginTop: 1, children: /* @__PURE__ */ jsx18(
+        SelectInput8,
         {
           items: mainItems,
           onSelect: (item) => {
@@ -12457,11 +12646,11 @@ function LspWizard({ servers, currentScope, hasProjectDir, onDone, onSave }) {
       }),
       { label: "\u2190 Back", value: "__back__", key: "__back__" }
     ];
-    return /* @__PURE__ */ jsxs17(Box17, { flexDirection: "column", borderStyle: "round", borderColor: theme.accent, paddingX: 1, children: [
-      /* @__PURE__ */ jsx19(Text18, { color: theme.accent, bold: true, children: "Add LSP Server" }),
-      /* @__PURE__ */ jsx19(Text18, { color: theme.info.color, dimColor: false, children: "Select a language server to configure." }),
-      /* @__PURE__ */ jsx19(Box17, { marginTop: 1, children: /* @__PURE__ */ jsx19(
-        SelectInput9,
+    return /* @__PURE__ */ jsxs16(Box16, { flexDirection: "column", borderStyle: "round", borderColor: theme.accent, paddingX: 1, children: [
+      /* @__PURE__ */ jsx18(Text17, { color: theme.accent, bold: true, children: "Add LSP Server" }),
+      /* @__PURE__ */ jsx18(Text17, { color: theme.info.color, dimColor: false, children: "Select a language server to configure." }),
+      /* @__PURE__ */ jsx18(Box16, { marginTop: 1, children: /* @__PURE__ */ jsx18(
+        SelectInput8,
         {
           items,
           onSelect: (item) => {
@@ -12488,19 +12677,19 @@ function LspWizard({ servers, currentScope, hasProjectDir, onDone, onSave }) {
       { label: isSuccess ? "Save to config \u2713" : "Save anyway", value: "save", key: "save" },
       { label: "\u2190 Back", value: "__back__", key: "__back__" }
     ];
-    return /* @__PURE__ */ jsxs17(Box17, { flexDirection: "column", borderStyle: "round", borderColor: theme.accent, paddingX: 1, children: [
-      /* @__PURE__ */ jsxs17(Text18, { color: theme.accent, bold: true, children: [
+    return /* @__PURE__ */ jsxs16(Box16, { flexDirection: "column", borderStyle: "round", borderColor: theme.accent, paddingX: 1, children: [
+      /* @__PURE__ */ jsxs16(Text17, { color: theme.accent, bold: true, children: [
         "Install ",
         selectedPreset.name
       ] }),
-      /* @__PURE__ */ jsx19(Text18, { color: theme.info.color, dimColor: false, children: selectedPreset.installHint }),
-      /* @__PURE__ */ jsxs17(Box17, { marginTop: 1, flexDirection: "column", children: [
-        /* @__PURE__ */ jsx19(Text18, { color: theme.info.color, dimColor: false, children: "Command:" }),
-        /* @__PURE__ */ jsx19(Text18, { color: theme.accent, children: selectedPreset.installCommand || "(none required)" })
+      /* @__PURE__ */ jsx18(Text17, { color: theme.info.color, dimColor: false, children: selectedPreset.installHint }),
+      /* @__PURE__ */ jsxs16(Box16, { marginTop: 1, flexDirection: "column", children: [
+        /* @__PURE__ */ jsx18(Text17, { color: theme.info.color, dimColor: false, children: "Command:" }),
+        /* @__PURE__ */ jsx18(Text17, { color: theme.accent, children: selectedPreset.installCommand || "(none required)" })
       ] }),
-      installState.output && /* @__PURE__ */ jsx19(Box17, { marginTop: 1, flexDirection: "column", children: /* @__PURE__ */ jsx19(Text18, { color: isSuccess ? theme.accent : theme.error, children: installState.output.slice(-500) }) }),
-      /* @__PURE__ */ jsx19(Box17, { marginTop: 1, children: /* @__PURE__ */ jsx19(
-        SelectInput9,
+      installState.output && /* @__PURE__ */ jsx18(Box16, { marginTop: 1, flexDirection: "column", children: /* @__PURE__ */ jsx18(Text17, { color: isSuccess ? theme.accent : theme.error, children: installState.output.slice(-500) }) }),
+      /* @__PURE__ */ jsx18(Box16, { marginTop: 1, children: /* @__PURE__ */ jsx18(
+        SelectInput8,
         {
           items,
           onSelect: (item) => {
@@ -12517,16 +12706,16 @@ function LspWizard({ servers, currentScope, hasProjectDir, onDone, onSave }) {
           }
         }
       ) }),
-      isSuccess && /* @__PURE__ */ jsx19(Box17, { marginTop: 1, children: /* @__PURE__ */ jsx19(Text18, { color: theme.accent, children: "Server saved. Run /lsp reload to start it." }) })
+      isSuccess && /* @__PURE__ */ jsx18(Box16, { marginTop: 1, children: /* @__PURE__ */ jsx18(Text17, { color: theme.accent, children: "Server saved. Run /lsp reload to start it." }) })
     ] });
   }
   if (page === "custom-name") {
-    return /* @__PURE__ */ jsxs17(Box17, { flexDirection: "column", borderStyle: "round", borderColor: theme.accent, paddingX: 1, children: [
-      /* @__PURE__ */ jsx19(Text18, { color: theme.accent, bold: true, children: "Custom LSP Server \u2014 Name" }),
-      /* @__PURE__ */ jsx19(Text18, { color: theme.info.color, dimColor: false, children: "Enter a name for this server (e.g., my-server)." }),
-      /* @__PURE__ */ jsxs17(Box17, { marginTop: 1, children: [
-        /* @__PURE__ */ jsx19(Text18, { color: theme.accent, children: "\u203A " }),
-        /* @__PURE__ */ jsx19(
+    return /* @__PURE__ */ jsxs16(Box16, { flexDirection: "column", borderStyle: "round", borderColor: theme.accent, paddingX: 1, children: [
+      /* @__PURE__ */ jsx18(Text17, { color: theme.accent, bold: true, children: "Custom LSP Server \u2014 Name" }),
+      /* @__PURE__ */ jsx18(Text17, { color: theme.info.color, dimColor: false, children: "Enter a name for this server (e.g., my-server)." }),
+      /* @__PURE__ */ jsxs16(Box16, { marginTop: 1, children: [
+        /* @__PURE__ */ jsx18(Text17, { color: theme.accent, children: "\u203A " }),
+        /* @__PURE__ */ jsx18(
           CustomTextInput,
           {
             value: customName,
@@ -12540,8 +12729,8 @@ function LspWizard({ servers, currentScope, hasProjectDir, onDone, onSave }) {
           }
         )
       ] }),
-      /* @__PURE__ */ jsx19(Box17, { marginTop: 1, children: /* @__PURE__ */ jsx19(
-        SelectInput9,
+      /* @__PURE__ */ jsx18(Box16, { marginTop: 1, children: /* @__PURE__ */ jsx18(
+        SelectInput8,
         {
           items: [{ label: "\u2190 Back", value: "__back__", key: "__back__" }],
           onSelect: () => setPage("add")
@@ -12550,12 +12739,12 @@ function LspWizard({ servers, currentScope, hasProjectDir, onDone, onSave }) {
     ] });
   }
   if (page === "custom-command") {
-    return /* @__PURE__ */ jsxs17(Box17, { flexDirection: "column", borderStyle: "round", borderColor: theme.accent, paddingX: 1, children: [
-      /* @__PURE__ */ jsx19(Text18, { color: theme.accent, bold: true, children: "Custom LSP Server \u2014 Command" }),
-      /* @__PURE__ */ jsx19(Text18, { color: theme.info.color, dimColor: false, children: "Enter the command to start the server (space-separated)." }),
-      /* @__PURE__ */ jsxs17(Box17, { marginTop: 1, children: [
-        /* @__PURE__ */ jsx19(Text18, { color: theme.accent, children: "\u203A " }),
-        /* @__PURE__ */ jsx19(
+    return /* @__PURE__ */ jsxs16(Box16, { flexDirection: "column", borderStyle: "round", borderColor: theme.accent, paddingX: 1, children: [
+      /* @__PURE__ */ jsx18(Text17, { color: theme.accent, bold: true, children: "Custom LSP Server \u2014 Command" }),
+      /* @__PURE__ */ jsx18(Text17, { color: theme.info.color, dimColor: false, children: "Enter the command to start the server (space-separated)." }),
+      /* @__PURE__ */ jsxs16(Box16, { marginTop: 1, children: [
+        /* @__PURE__ */ jsx18(Text17, { color: theme.accent, children: "\u203A " }),
+        /* @__PURE__ */ jsx18(
           CustomTextInput,
           {
             value: customCommand,
@@ -12569,8 +12758,8 @@ function LspWizard({ servers, currentScope, hasProjectDir, onDone, onSave }) {
           }
         )
       ] }),
-      /* @__PURE__ */ jsx19(Box17, { marginTop: 1, children: /* @__PURE__ */ jsx19(
-        SelectInput9,
+      /* @__PURE__ */ jsx18(Box16, { marginTop: 1, children: /* @__PURE__ */ jsx18(
+        SelectInput8,
         {
           items: [{ label: "\u2190 Back", value: "__back__", key: "__back__" }],
           onSelect: () => setPage("custom-name")
@@ -12593,11 +12782,11 @@ function LspWizard({ servers, currentScope, hasProjectDir, onDone, onSave }) {
       },
       { label: "\u2190 Back", value: "__back__", key: "__back__" }
     ];
-    return /* @__PURE__ */ jsxs17(Box17, { flexDirection: "column", borderStyle: "round", borderColor: theme.accent, paddingX: 1, children: [
-      /* @__PURE__ */ jsx19(Text18, { color: theme.accent, bold: true, children: "Save LSP Config" }),
-      /* @__PURE__ */ jsx19(Text18, { color: theme.info.color, dimColor: false, children: "Where should this server configuration be saved?" }),
-      /* @__PURE__ */ jsx19(Box17, { marginTop: 1, children: /* @__PURE__ */ jsx19(
-        SelectInput9,
+    return /* @__PURE__ */ jsxs16(Box16, { flexDirection: "column", borderStyle: "round", borderColor: theme.accent, paddingX: 1, children: [
+      /* @__PURE__ */ jsx18(Text17, { color: theme.accent, bold: true, children: "Save LSP Config" }),
+      /* @__PURE__ */ jsx18(Text17, { color: theme.info.color, dimColor: false, children: "Where should this server configuration be saved?" }),
+      /* @__PURE__ */ jsx18(Box16, { marginTop: 1, children: /* @__PURE__ */ jsx18(
+        SelectInput8,
         {
           items,
           onSelect: (item) => {
@@ -12615,11 +12804,11 @@ function LspWizard({ servers, currentScope, hasProjectDir, onDone, onSave }) {
   if (page === "edit") {
     const keys = Object.keys(servers);
     if (keys.length === 0) {
-      return /* @__PURE__ */ jsxs17(Box17, { flexDirection: "column", borderStyle: "round", borderColor: theme.accent, paddingX: 1, children: [
-        /* @__PURE__ */ jsx19(Text18, { color: theme.accent, bold: true, children: "Edit LSP Server" }),
-        /* @__PURE__ */ jsx19(Text18, { color: theme.info.color, children: "No servers configured." }),
-        /* @__PURE__ */ jsx19(Box17, { marginTop: 1, children: /* @__PURE__ */ jsx19(
-          SelectInput9,
+      return /* @__PURE__ */ jsxs16(Box16, { flexDirection: "column", borderStyle: "round", borderColor: theme.accent, paddingX: 1, children: [
+        /* @__PURE__ */ jsx18(Text17, { color: theme.accent, bold: true, children: "Edit LSP Server" }),
+        /* @__PURE__ */ jsx18(Text17, { color: theme.info.color, children: "No servers configured." }),
+        /* @__PURE__ */ jsx18(Box16, { marginTop: 1, children: /* @__PURE__ */ jsx18(
+          SelectInput8,
           {
             items: [{ label: "\u2190 Back", value: "__back__", key: "__back__" }],
             onSelect: () => setPage("main")
@@ -12639,11 +12828,11 @@ function LspWizard({ servers, currentScope, hasProjectDir, onDone, onSave }) {
       }),
       { label: "\u2190 Back", value: "__back__", key: "__back__" }
     ];
-    return /* @__PURE__ */ jsxs17(Box17, { flexDirection: "column", borderStyle: "round", borderColor: theme.accent, paddingX: 1, children: [
-      /* @__PURE__ */ jsx19(Text18, { color: theme.accent, bold: true, children: "Edit LSP Server" }),
-      /* @__PURE__ */ jsx19(Text18, { color: theme.info.color, dimColor: false, children: "Select a server to toggle enabled/disabled." }),
-      /* @__PURE__ */ jsx19(Box17, { marginTop: 1, children: /* @__PURE__ */ jsx19(
-        SelectInput9,
+    return /* @__PURE__ */ jsxs16(Box16, { flexDirection: "column", borderStyle: "round", borderColor: theme.accent, paddingX: 1, children: [
+      /* @__PURE__ */ jsx18(Text17, { color: theme.accent, bold: true, children: "Edit LSP Server" }),
+      /* @__PURE__ */ jsx18(Text17, { color: theme.info.color, dimColor: false, children: "Select a server to toggle enabled/disabled." }),
+      /* @__PURE__ */ jsx18(Box16, { marginTop: 1, children: /* @__PURE__ */ jsx18(
+        SelectInput8,
         {
           items,
           onSelect: (item) => {
@@ -12660,11 +12849,11 @@ function LspWizard({ servers, currentScope, hasProjectDir, onDone, onSave }) {
   if (page === "delete") {
     const keys = Object.keys(servers);
     if (keys.length === 0) {
-      return /* @__PURE__ */ jsxs17(Box17, { flexDirection: "column", borderStyle: "round", borderColor: theme.accent, paddingX: 1, children: [
-        /* @__PURE__ */ jsx19(Text18, { color: theme.accent, bold: true, children: "Delete LSP Server" }),
-        /* @__PURE__ */ jsx19(Text18, { color: theme.info.color, children: "No servers configured." }),
-        /* @__PURE__ */ jsx19(Box17, { marginTop: 1, children: /* @__PURE__ */ jsx19(
-          SelectInput9,
+      return /* @__PURE__ */ jsxs16(Box16, { flexDirection: "column", borderStyle: "round", borderColor: theme.accent, paddingX: 1, children: [
+        /* @__PURE__ */ jsx18(Text17, { color: theme.accent, bold: true, children: "Delete LSP Server" }),
+        /* @__PURE__ */ jsx18(Text17, { color: theme.info.color, children: "No servers configured." }),
+        /* @__PURE__ */ jsx18(Box16, { marginTop: 1, children: /* @__PURE__ */ jsx18(
+          SelectInput8,
           {
             items: [{ label: "\u2190 Back", value: "__back__", key: "__back__" }],
             onSelect: () => setPage("main")
@@ -12680,11 +12869,11 @@ function LspWizard({ servers, currentScope, hasProjectDir, onDone, onSave }) {
       })),
       { label: "\u2190 Back", value: "__back__", key: "__back__" }
     ];
-    return /* @__PURE__ */ jsxs17(Box17, { flexDirection: "column", borderStyle: "round", borderColor: theme.accent, paddingX: 1, children: [
-      /* @__PURE__ */ jsx19(Text18, { color: theme.accent, bold: true, children: "Delete LSP Server" }),
-      /* @__PURE__ */ jsx19(Text18, { color: theme.info.color, dimColor: false, children: "Select a server to remove from config." }),
-      /* @__PURE__ */ jsx19(Box17, { marginTop: 1, children: /* @__PURE__ */ jsx19(
-        SelectInput9,
+    return /* @__PURE__ */ jsxs16(Box16, { flexDirection: "column", borderStyle: "round", borderColor: theme.accent, paddingX: 1, children: [
+      /* @__PURE__ */ jsx18(Text17, { color: theme.accent, bold: true, children: "Delete LSP Server" }),
+      /* @__PURE__ */ jsx18(Text17, { color: theme.info.color, dimColor: false, children: "Select a server to remove from config." }),
+      /* @__PURE__ */ jsx18(Box16, { marginTop: 1, children: /* @__PURE__ */ jsx18(
+        SelectInput8,
         {
           items,
           onSelect: (item) => {
@@ -12700,15 +12889,15 @@ function LspWizard({ servers, currentScope, hasProjectDir, onDone, onSave }) {
   }
   if (page === "list") {
     const keys = Object.keys(servers);
-    return /* @__PURE__ */ jsxs17(Box17, { flexDirection: "column", borderStyle: "round", borderColor: theme.accent, paddingX: 1, children: [
-      /* @__PURE__ */ jsx19(Text18, { color: theme.accent, bold: true, children: "Configured LSP Servers" }),
-      keys.length === 0 ? /* @__PURE__ */ jsx19(Text18, { color: theme.info.color, children: "No servers configured." }) : /* @__PURE__ */ jsx19(Box17, { marginTop: 1, flexDirection: "column", children: keys.map((k) => {
+    return /* @__PURE__ */ jsxs16(Box16, { flexDirection: "column", borderStyle: "round", borderColor: theme.accent, paddingX: 1, children: [
+      /* @__PURE__ */ jsx18(Text17, { color: theme.accent, bold: true, children: "Configured LSP Servers" }),
+      keys.length === 0 ? /* @__PURE__ */ jsx18(Text17, { color: theme.info.color, children: "No servers configured." }) : /* @__PURE__ */ jsx18(Box16, { marginTop: 1, flexDirection: "column", children: keys.map((k) => {
         const s = servers[k];
         const status = s.enabled !== false ? "enabled" : "disabled";
-        return /* @__PURE__ */ jsx19(Text18, { color: theme.info.color, children: `  ${k.padEnd(16)} ${status}  ${s.command.join(" ")}` }, k);
+        return /* @__PURE__ */ jsx18(Text17, { color: theme.info.color, children: `  ${k.padEnd(16)} ${status}  ${s.command.join(" ")}` }, k);
       }) }),
-      /* @__PURE__ */ jsx19(Box17, { marginTop: 1, children: /* @__PURE__ */ jsx19(
-        SelectInput9,
+      /* @__PURE__ */ jsx18(Box16, { marginTop: 1, children: /* @__PURE__ */ jsx18(
+        SelectInput8,
         {
           items: [{ label: "\u2190 Back", value: "__back__", key: "__back__" }],
           onSelect: () => setPage("main")
@@ -12834,9 +13023,9 @@ var init_lsp_wizard = __esm({
 });
 
 // src/ui/theme-picker.tsx
-import { Box as Box18, Text as Text19 } from "ink";
-import SelectInput10 from "ink-select-input";
-import { jsx as jsx20, jsxs as jsxs18 } from "react/jsx-runtime";
+import { Box as Box17, Text as Text18 } from "ink";
+import SelectInput9 from "ink-select-input";
+import { jsx as jsx19, jsxs as jsxs17 } from "react/jsx-runtime";
 function PaletteSwatches({ palette }) {
   const colors = [
     palette.primary,
@@ -12844,7 +13033,7 @@ function PaletteSwatches({ palette }) {
     palette.success,
     palette.error
   ];
-  return /* @__PURE__ */ jsx20(Box18, { children: colors.map((c, i) => /* @__PURE__ */ jsx20(Text19, { color: c, children: "\u2588" }, i)) });
+  return /* @__PURE__ */ jsx19(Box17, { children: colors.map((c, i) => /* @__PURE__ */ jsx19(Text18, { color: c, children: "\u2588" }, i)) });
 }
 function ThemePicker({ themes, onPick }) {
   const current = useTheme();
@@ -12852,10 +13041,10 @@ function ThemePicker({ themes, onPick }) {
     ...themes.map((t) => ({ label: t.label, value: t.name })),
     { label: "< Back", value: "__back__" }
   ];
-  return /* @__PURE__ */ jsxs18(Box18, { flexDirection: "column", borderStyle: "round", borderColor: current.accent, paddingX: 1, children: [
-    /* @__PURE__ */ jsx20(Text19, { color: current.accent, bold: true, children: "Pick a theme (restart to apply)" }),
-    /* @__PURE__ */ jsx20(Box18, { marginTop: 1, children: /* @__PURE__ */ jsx20(
-      SelectInput10,
+  return /* @__PURE__ */ jsxs17(Box17, { flexDirection: "column", borderStyle: "round", borderColor: current.accent, paddingX: 1, children: [
+    /* @__PURE__ */ jsx19(Text18, { color: current.accent, bold: true, children: "Pick a theme (restart to apply)" }),
+    /* @__PURE__ */ jsx19(Box17, { marginTop: 1, children: /* @__PURE__ */ jsx19(
+      SelectInput9,
       {
         items,
         onSelect: (item) => {
@@ -12869,9 +13058,9 @@ function ThemePicker({ themes, onPick }) {
         itemComponent: ({ label, isSelected }) => {
           const t = themes.find((x) => x.label === label);
           const color = t?.accent ?? current.accent;
-          return /* @__PURE__ */ jsxs18(Box18, { children: [
-            /* @__PURE__ */ jsx20(Text19, { color, bold: isSelected, dimColor: !isSelected, children: label }),
-            t && /* @__PURE__ */ jsx20(Box18, { marginLeft: 1, children: /* @__PURE__ */ jsx20(PaletteSwatches, { palette: t.palette }) })
+          return /* @__PURE__ */ jsxs17(Box17, { children: [
+            /* @__PURE__ */ jsx19(Text18, { color, bold: isSelected, dimColor: !isSelected, children: label }),
+            t && /* @__PURE__ */ jsx19(Box17, { marginLeft: 1, children: /* @__PURE__ */ jsx19(PaletteSwatches, { palette: t.palette }) })
           ] });
         }
       }
@@ -12885,39 +13074,628 @@ var init_theme_picker = __esm({
   }
 });
 
-// src/ui/theme.ts
-function buildTheme(name, label, palette, overrides) {
-  const base = {
-    name,
-    label,
+// 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 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 +13706,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 readFile18, readdir as readdir5 } from "fs/promises";
+import { join as join23 } from "path";
+import { homedir as homedir14 } from "os";
+function projectThemesDir(cwd = process.cwd()) {
+  return join23(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 readdir5(dir);
+  } catch {
+    return { themes, errors };
+  }
+  for (const file of files.filter((f) => f.endsWith(".json"))) {
+    const path = join23(dir, file);
+    let raw;
+    try {
+      raw = await readFile18(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 = join23(
+      process.env.XDG_CONFIG_HOME || join23(homedir14(), ".config"),
+      "kimiflare",
+      "themes"
+    );
+    cachedResult = null;
+  }
+});
+
 // src/util/lsp-nudge.ts
 function maybeLspNudge(userText, lspEnabled, lspServers) {
   if (lspEnabled && Object.keys(lspServers).length > 0) {
@@ -13015,8 +14090,8 @@ var init_lsp_nudge = __esm({
 });
 
 // src/ui/file-picker.tsx
-import { Box as Box19, Text as Text20 } from "ink";
-import { jsx as jsx21, jsxs as jsxs19 } from "react/jsx-runtime";
+import { Box as Box18, Text as Text19 } from "ink";
+import { jsx as jsx20, jsxs as jsxs18 } from "react/jsx-runtime";
 function FilePicker({ items, selectedIndex, query }) {
   const theme = useTheme();
   let startIndex = 0;
@@ -13026,12 +14101,12 @@ function FilePicker({ items, selectedIndex, query }) {
   const visible = items.slice(startIndex, startIndex + VISIBLE_LIMIT);
   const hasMoreAbove = startIndex > 0;
   const hasMoreBelow = items.length > startIndex + VISIBLE_LIMIT;
-  return /* @__PURE__ */ jsxs19(Box19, { flexDirection: "column", borderStyle: "round", borderColor: theme.accent, paddingX: 1, children: [
-    /* @__PURE__ */ jsx21(Text20, { color: theme.accent, bold: true, children: query ? `Files matching "${query}"` : "Mention a file" }),
-    /* @__PURE__ */ jsx21(Text20, { color: theme.info.color, dimColor: false, children: "Arrow keys to navigate, Enter to select, Esc to cancel." }),
-    /* @__PURE__ */ jsxs19(Box19, { marginTop: 1, flexDirection: "column", children: [
-      visible.length === 0 && /* @__PURE__ */ jsx21(Text20, { color: theme.info.color, children: "No matches" }),
-      hasMoreAbove && /* @__PURE__ */ jsxs19(Text20, { color: theme.info.color, children: [
+  return /* @__PURE__ */ jsxs18(Box18, { flexDirection: "column", borderStyle: "round", borderColor: theme.accent, paddingX: 1, children: [
+    /* @__PURE__ */ jsx20(Text19, { color: theme.accent, bold: true, children: query ? `Files matching "${query}"` : "Mention a file" }),
+    /* @__PURE__ */ jsx20(Text19, { color: theme.info.color, dimColor: false, children: "Arrow keys to navigate, Enter to select, Esc to cancel." }),
+    /* @__PURE__ */ jsxs18(Box18, { marginTop: 1, flexDirection: "column", children: [
+      visible.length === 0 && /* @__PURE__ */ jsx20(Text19, { color: theme.info.color, children: "No matches" }),
+      hasMoreAbove && /* @__PURE__ */ jsxs18(Text19, { color: theme.info.color, children: [
         "\u2026 ",
         startIndex,
         " more above"
@@ -13040,12 +14115,12 @@ function FilePicker({ items, selectedIndex, query }) {
         const actualIndex = startIndex + i;
         const isSelected = actualIndex === selectedIndex;
         const label = item.isDirectory ? `${item.name}/` : item.name;
-        return /* @__PURE__ */ jsxs19(Text20, { color: isSelected ? theme.accent : void 0, bold: isSelected, children: [
+        return /* @__PURE__ */ jsxs18(Text19, { color: isSelected ? theme.accent : void 0, bold: isSelected, children: [
           isSelected ? "\u203A " : "  ",
           label
         ] }, item.name);
       }),
-      hasMoreBelow && /* @__PURE__ */ jsxs19(Text20, { color: theme.info.color, children: [
+      hasMoreBelow && /* @__PURE__ */ jsxs18(Text19, { color: theme.info.color, children: [
         "\u2026 ",
         items.length - (startIndex + VISIBLE_LIMIT),
         " more below"
@@ -13063,8 +14138,8 @@ var init_file_picker = __esm({
 });
 
 // src/ui/slash-picker.tsx
-import { Box as Box20, Text as Text21 } from "ink";
-import { jsx as jsx22, jsxs as jsxs20 } from "react/jsx-runtime";
+import { Box as Box19, Text as Text20 } from "ink";
+import { jsx as jsx21, jsxs as jsxs19 } from "react/jsx-runtime";
 function sourceBadge(source) {
   if (source === "builtin") return "";
   if (source === "project") return "project";
@@ -13084,12 +14159,12 @@ function SlashPicker({ items, selectedIndex, query }) {
   const hasMoreBelow = items.length > startIndex + VISIBLE_LIMIT2;
   const longestLabel = visible.reduce((m, it) => Math.max(m, commandLabel(it).length), 0);
   const nameColWidth = Math.max(NAME_COL_MIN_WIDTH, longestLabel + NAME_DESC_GAP);
-  return /* @__PURE__ */ jsxs20(Box20, { flexDirection: "column", borderStyle: "round", borderColor: theme.accent, paddingX: 1, children: [
-    /* @__PURE__ */ jsx22(Text21, { color: theme.accent, bold: true, children: query ? `Commands matching "/${query}"` : "Slash commands" }),
-    /* @__PURE__ */ jsx22(Text21, { color: theme.info.color, children: "Arrow keys to navigate, Enter to select, Esc to cancel." }),
-    /* @__PURE__ */ jsxs20(Box20, { marginTop: 1, flexDirection: "column", children: [
-      visible.length === 0 && /* @__PURE__ */ jsx22(Text21, { color: theme.info.color, children: "No matches" }),
-      hasMoreAbove && /* @__PURE__ */ jsxs20(Text21, { color: theme.info.color, children: [
+  return /* @__PURE__ */ jsxs19(Box19, { flexDirection: "column", borderStyle: "round", borderColor: theme.accent, paddingX: 1, children: [
+    /* @__PURE__ */ jsx21(Text20, { color: theme.accent, bold: true, children: query ? `Commands matching "/${query}"` : "Slash commands" }),
+    /* @__PURE__ */ jsx21(Text20, { color: theme.info.color, children: "Arrow keys to navigate, Enter to select, Esc to cancel." }),
+    /* @__PURE__ */ jsxs19(Box19, { marginTop: 1, flexDirection: "column", children: [
+      visible.length === 0 && /* @__PURE__ */ jsx21(Text20, { color: theme.info.color, children: "No matches" }),
+      hasMoreAbove && /* @__PURE__ */ jsxs19(Text20, { color: theme.info.color, children: [
         "\u2026 ",
         startIndex,
         " more above"
@@ -13099,16 +14174,16 @@ function SlashPicker({ items, selectedIndex, query }) {
         const isSelected = actualIndex === selectedIndex;
         const nameCol = commandLabel(item).padEnd(nameColWidth);
         const badge = sourceBadge(item.source);
-        return /* @__PURE__ */ jsxs20(Text21, { color: isSelected ? theme.accent : void 0, bold: isSelected, children: [
+        return /* @__PURE__ */ jsxs19(Text20, { color: isSelected ? theme.accent : void 0, bold: isSelected, children: [
           isSelected ? "\u203A " : "  ",
           nameCol,
-          /* @__PURE__ */ jsxs20(Text21, { color: theme.info.color, children: [
+          /* @__PURE__ */ jsxs19(Text20, { color: theme.info.color, children: [
             item.description,
             badge && `  [${badge}]`
           ] })
         ] }, item.name);
       }),
-      hasMoreBelow && /* @__PURE__ */ jsxs20(Text21, { color: theme.info.color, children: [
+      hasMoreBelow && /* @__PURE__ */ jsxs19(Text20, { color: theme.info.color, children: [
         "\u2026 ",
         items.length - (startIndex + VISIBLE_LIMIT2),
         " more below"
@@ -13188,15 +14263,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 readFile19 } from "fs/promises";
+import { join as join24 } 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 || join24(homedir15(), ".local", "share");
+  return join24(xdg, "kimiflare");
 }
 function usagePath3() {
-  return join21(usageDir3(), "usage.json");
+  return join24(usageDir3(), "usage.json");
 }
 function today3() {
   return (/* @__PURE__ */ new Date()).toISOString().slice(0, 10);
@@ -13208,7 +14283,7 @@ function daysAgo2(n) {
 }
 async function loadLog3() {
   try {
-    const raw = await readFile16(usagePath3(), "utf8");
+    const raw = await readFile19(usagePath3(), "utf8");
     return JSON.parse(raw);
   } catch {
     return { version: 1, days: [], sessions: [] };
@@ -13274,18 +14349,18 @@ __export(app_exports, {
   shouldOpenMentionPicker: () => shouldOpenMentionPicker,
   shouldOpenSlashPicker: () => shouldOpenSlashPicker
 });
-import React14, { useState as useState10, useRef as useRef3, useEffect as useEffect6, 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 React13, { useState as useState10, useRef as useRef3, useEffect as useEffect7, useCallback as useCallback2 } from "react";
+import { Box as Box20, Text as Text21, useApp, useInput as useInput6, render } from "ink";
+import SelectInput10 from "ink-select-input";
 import { existsSync as existsSync3, statSync as statSync4 } from "fs";
-import { join as join22 } from "path";
-import { unlink as unlink3 } from "fs/promises";
+import { join as join25 } from "path";
+import { unlink as unlink4 } from "fs/promises";
 import { execSync as execSync2 } from "child_process";
 import { spawn as spawn4 } from "child_process";
 import { platform as platform2 } from "os";
 import fg4 from "fast-glob";
 import { readFileSync as readFileSync3 } from "fs";
-import { jsx as jsx23, jsxs as jsxs21 } from "react/jsx-runtime";
+import { jsx as jsx22, jsxs as jsxs20 } from "react/jsx-runtime";
 function buildFilePickerIgnoreList(cwd) {
   const hardcoded = [
     // Dependencies
@@ -13356,7 +14431,7 @@ function buildFilePickerIgnoreList(cwd) {
   ];
   const gitignorePatterns = [];
   try {
-    const gitignorePath = join22(cwd, ".gitignore");
+    const gitignorePath = join25(cwd, ".gitignore");
     const stats = statSync4(gitignorePath);
     if (stats.size > MAX_GITIGNORE_SIZE) {
       return hardcoded;
@@ -13549,7 +14624,6 @@ function App({
     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);
@@ -13561,13 +14635,45 @@ function App({
   const [tasksStartedAt, setTasksStartedAt] = useState10(null);
   const [tasksStartTokens, setTasksStartTokens] = useState10(0);
   const [turnStartedAt, setTurnStartedAt] = useState10(null);
+  const [turnPhase, setTurnPhase] = useState10("waiting");
+  const [currentToolName, setCurrentToolName] = useState10(null);
+  const [lastActivityAt, setLastActivityAt] = 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 [originalTheme, setOriginalTheme] = useState10(null);
+  const [skillsActive, setSkillsActive] = useState10(0);
+  const [memoryRecalled, setMemoryRecalled] = useState10(false);
+  const [intentTier, setIntentTier] = useState10(null);
+  const skillsDirRef = useRef3(join25(process.cwd(), ".kimiflare", "skills"));
   const [kimiMdStale, setKimiMdStale] = useState10(false);
-  useEffect6(() => {
+  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 () => {
@@ -13628,20 +14734,20 @@ function App({
   const flushTimeoutRef = useRef3(null);
   const customCommandsRef = useRef3([]);
   const pickerCancelRef = useRef3(null);
-  useEffect6(() => {
+  useEffect7(() => {
     busyRef.current = busy;
   }, [busy]);
   const pickerAnchor = activePicker?.anchor ?? null;
   const pickerKind = activePicker?.kind ?? null;
-  const pickerQuery = React14.useMemo(() => {
+  const pickerQuery = React13.useMemo(() => {
     if (pickerAnchor === null) return null;
     return input.slice(pickerAnchor + 1, cursorOffset);
   }, [input, cursorOffset, pickerAnchor]);
-  const filteredFileItems = React14.useMemo(() => {
+  const filteredFileItems = React13.useMemo(() => {
     if (pickerKind !== "file" || pickerQuery === null) return [];
     return filterPickerItems(filePickerItems, pickerQuery);
   }, [pickerKind, filePickerItems, pickerQuery]);
-  const allSlashCommands = React14.useMemo(() => {
+  const allSlashCommands = React13.useMemo(() => {
     const customs = customCommandsRef.current.filter((c) => !BUILTIN_COMMAND_NAMES.has(c.name.toLowerCase())).map((c) => ({
       name: c.name,
       description: c.description ?? "",
@@ -13649,11 +14755,11 @@ function App({
     }));
     return [...BUILTIN_COMMANDS, ...customs];
   }, [customCommandsVersion]);
-  const filteredSlashItems = React14.useMemo(() => {
+  const filteredSlashItems = React13.useMemo(() => {
     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 +14816,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,13 +14867,12 @@ function App({
     pickerCancelRef.current = cursorOffset;
     setActivePicker(null);
   }, [cursorOffset]);
-  useEffect6(() => {
-    const modalActive = showHelpMenu || commandWizard !== null || commandPicker !== null || commandToDelete !== null || showCommandList || showLspWizard || resumeSessions !== null || perm !== null || limitModal !== null;
+  useEffect7(() => {
+    const modalActive = commandWizard !== null || commandPicker !== null || commandToDelete !== null || showCommandList || showLspWizard || resumeSessions !== null || perm !== null || limitModal !== null;
     if (modalActive && activePicker !== null) {
       setActivePicker(null);
     }
   }, [
-    showHelpMenu,
     commandWizard,
     commandPicker,
     commandToDelete,
@@ -13778,7 +14883,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 +14909,7 @@ function App({
       }
     });
     if (cfg.memoryEnabled) {
-      const dbPath = cfg.memoryDbPath ?? join22(process.cwd(), ".kimiflare", "memory.db");
+      const dbPath = cfg.memoryDbPath ?? join25(process.cwd(), ".kimiflare", "memory.db");
       const manager = new MemoryManager({
         dbPath,
         accountId: cfg.accountId,
@@ -13853,7 +14958,7 @@ function App({
         } catch {
         }
       })();
-      if (existsSync3(join22(cwd, "KIMI.md"))) {
+      if (existsSync3(join25(cwd, "KIMI.md"))) {
         const lastRefresh = manager.getLastKimiMdRefreshTime(cwd);
         const driftCount = manager.countHighSignalMemoriesSince(cwd, lastRefresh);
         if (driftCount >= 5) {
@@ -13879,7 +14984,7 @@ function App({
       }
     });
   }, [cfg, setEvents]);
-  useEffect6(() => {
+  useEffect7(() => {
     const id = setInterval(() => {
       try {
         performance.clearMarks();
@@ -13904,7 +15009,7 @@ function App({
       ]);
     }
   }, [setEvents]);
-  useEffect6(() => {
+  useEffect7(() => {
     if (!cfg || updateCheckedRef.current) return;
     updateCheckedRef.current = true;
     if (initialUpdateResult) {
@@ -13955,7 +15060,7 @@ function App({
       }
     });
   }, [cfg, initialUpdateResult]);
-  useEffect6(() => {
+  useEffect7(() => {
     modeRef.current = mode;
     if (cacheStableRef.current) {
       messagesRef.current[1] = {
@@ -13982,10 +15087,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 +15245,7 @@ function App({
       ]);
     }
   }, [cfg]);
-  useEffect6(() => {
+  useEffect7(() => {
     if (cfg && !mcpInitRef.current) {
       void initMcp();
     }
@@ -14256,7 +15361,7 @@ function App({
     },
     [cfg]
   );
-  useInput7((inputChar, key) => {
+  useInput6((inputChar, key) => {
     if (key.ctrl && inputChar === "c") {
       const hadPerm = permResolveRef.current !== null;
       const hadLimit = limitResolveRef.current !== null;
@@ -14280,7 +15385,7 @@ function App({
       return;
     }
     if (key.escape) {
-      const modalOpen = perm !== null || limitModal !== null || showHelpMenu || showLspWizard || showCommandList || commandWizard !== null || commandToDelete !== null || resumeSessions !== null || showThemePicker;
+      const modalOpen = perm !== null || limitModal !== null || showLspWizard || showCommandList || commandWizard !== null || commandToDelete !== null || resumeSessions !== null || showThemePicker;
       if (!modalOpen && busyRef.current && activeControllerRef.current) {
         if (permResolveRef.current) {
           permResolveRef.current("deny");
@@ -14465,6 +15570,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 +15632,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: readFile20 }) => readFile20(path, "utf8").then((c) => lspManagerRef.current.notifyChange(path, c)).catch(() => {
               })
             );
           }
@@ -14644,7 +15752,7 @@ function App({
           }
         }
       });
-      if (existsSync3(join22(cwd, "KIMI.md"))) {
+      if (existsSync3(join25(cwd, "KIMI.md"))) {
         if (cacheStableRef.current) {
           messagesRef.current[1] = {
             role: "system",
@@ -14699,6 +15807,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 +15828,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 +16164,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,
@@ -15073,6 +16192,118 @@ use: /thinking low | medium | high`
         setEvents((e) => [...e, { kind: "info", key: mkKey(), text: "mode: edit" }]);
         return true;
       }
+      if (c === "/skills") {
+        const sub = rest[0]?.toLowerCase() ?? "";
+        const subRest = rest.slice(1).join(" ").trim();
+        if (sub === "list" || sub === "") {
+          void listAllSkills(process.cwd()).then((all) => {
+            const lines = [];
+            if (all.project.length > 0) {
+              lines.push("project skills:");
+              for (const s of all.project) {
+                const status = s.enabled ? "\u2713" : "\u2717";
+                lines.push(`  ${status} ${s.name} \u2014 ${s.description || "no description"} (${s.estimatedTokens} tokens)`);
+              }
+            }
+            if (all.global.length > 0) {
+              lines.push("global skills:");
+              for (const s of all.global) {
+                const status = s.enabled ? "\u2713" : "\u2717";
+                lines.push(`  ${status} ${s.name} \u2014 ${s.description || "no description"} (${s.estimatedTokens} tokens)`);
+              }
+            }
+            if (lines.length === 0) {
+              lines.push("no skills found. create one with /skills add <name>");
+            }
+            setEvents((e) => [...e, { kind: "info", key: mkKey(), text: lines.join("\n") }]);
+          }).catch((err) => {
+            setEvents((e) => [...e, { kind: "error", key: mkKey(), text: `failed to list skills: ${err.message}` }]);
+          });
+          return true;
+        }
+        if (sub === "add") {
+          const name = subRest.trim();
+          if (!name) {
+            setEvents((e) => [...e, { kind: "info", key: mkKey(), text: "usage: /skills add <name>" }]);
+            return true;
+          }
+          void createSkill({ name, scope: "project", cwd: process.cwd() }).then((result) => {
+            setEvents((e) => [
+              ...e,
+              { kind: "info", key: mkKey(), text: `created skill '${name}' \u2192 ${result.filepath}` },
+              { kind: "info", key: mkKey(), text: `edit the file to add your instructions` }
+            ]);
+          }).catch((err) => {
+            setEvents((e) => [...e, { kind: "error", key: mkKey(), text: `failed to create skill: ${err.message}` }]);
+          });
+          return true;
+        }
+        if (sub === "edit") {
+          const name = subRest.trim();
+          if (!name) {
+            setEvents((e) => [...e, { kind: "info", key: mkKey(), text: "usage: /skills edit <name>" }]);
+            return true;
+          }
+          void findSkillFile(name, process.cwd()).then((filepath) => {
+            if (!filepath) {
+              setEvents((e) => [...e, { kind: "error", key: mkKey(), text: `skill '${name}' not found` }]);
+              return;
+            }
+            setEvents((e) => [
+              ...e,
+              { kind: "info", key: mkKey(), text: `skill '${name}' \u2192 ${filepath}` },
+              { kind: "info", key: mkKey(), text: `open it in your editor to make changes` }
+            ]);
+          }).catch((err) => {
+            setEvents((e) => [...e, { kind: "error", key: mkKey(), text: `failed to find skill: ${err.message}` }]);
+          });
+          return true;
+        }
+        if (sub === "delete") {
+          const name = subRest.trim();
+          if (!name) {
+            setEvents((e) => [...e, { kind: "info", key: mkKey(), text: "usage: /skills delete <name>" }]);
+            return true;
+          }
+          void deleteSkill(name, process.cwd()).then((result) => {
+            setEvents((e) => [...e, { kind: "info", key: mkKey(), text: `deleted skill '${name}' (${result.filepath})` }]);
+          }).catch((err) => {
+            setEvents((e) => [...e, { kind: "error", key: mkKey(), text: `failed to delete skill: ${err.message}` }]);
+          });
+          return true;
+        }
+        if (sub === "enable") {
+          const name = subRest.trim();
+          if (!name) {
+            setEvents((e) => [...e, { kind: "info", key: mkKey(), text: "usage: /skills enable <name>" }]);
+            return true;
+          }
+          void setSkillEnabled(name, true, process.cwd()).then((result) => {
+            setEvents((e) => [...e, { kind: "info", key: mkKey(), text: `enabled skill '${name}' (${result.filepath})` }]);
+          }).catch((err) => {
+            setEvents((e) => [...e, { kind: "error", key: mkKey(), text: `failed to enable skill: ${err.message}` }]);
+          });
+          return true;
+        }
+        if (sub === "disable") {
+          const name = subRest.trim();
+          if (!name) {
+            setEvents((e) => [...e, { kind: "info", key: mkKey(), text: "usage: /skills disable <name>" }]);
+            return true;
+          }
+          void setSkillEnabled(name, false, process.cwd()).then((result) => {
+            setEvents((e) => [...e, { kind: "info", key: mkKey(), text: `disabled skill '${name}' (${result.filepath})` }]);
+          }).catch((err) => {
+            setEvents((e) => [...e, { kind: "error", key: mkKey(), text: `failed to disable skill: ${err.message}` }]);
+          });
+          return true;
+        }
+        setEvents((e) => [
+          ...e,
+          { kind: "info", key: mkKey(), text: "usage: /skills list | add <name> | edit <name> | delete <name> | enable <name> | disable <name>" }
+        ]);
+        return true;
+      }
       if (c === "/memory") {
         if (!cfg) return true;
         if (arg === "on") {
@@ -15277,7 +16508,7 @@ ${lines.join("\n")}` }]);
         return true;
       }
       if (c === "/logout") {
-        unlink3(configPath()).catch(() => {
+        unlink4(configPath()).catch(() => {
         });
         setEvents((e) => [
           ...e,
@@ -15475,23 +16706,27 @@ ${lines.join("\n")}` }]);
         return true;
       }
       if (c === "/help") {
-        setShowHelpMenu(true);
+        const lines = [
+          "commands:",
+          "  /mode edit|plan|auto     switch agent mode",
+          "  /thinking low|medium|high set reasoning effort",
+          "  /skills list|add|edit|... manage skills",
+          "  /memory on|off|clear      manage memory",
+          "  /cost                     show cost report",
+          "  /compact                  summarize old turns",
+          "  /resume                   pick a past session",
+          "  /clear                    clear conversation",
+          "  /init                     scan repo and write KIMI.md",
+          "  /update                   check for updates",
+          "  /exit                     exit kimiflare"
+        ];
+        setEvents((e) => [...e, { kind: "info", key: mkKey(), text: lines.join("\n") }]);
         return true;
       }
       return false;
     },
     [cfg, exit, usage, effort, theme, mode, openResumePicker, runCompact, runInit, initMcp, setCfg, setShowRemoteDashboard, setSelectedRemoteSession]
   );
-  const handleHelpCommand = useCallback2(
-    (command) => {
-      setShowHelpMenu(false);
-      const executed = handleSlash(command);
-      if (!executed) {
-        setEvents((e) => [...e, { kind: "error", key: mkKey(), text: `unknown command: ${command}` }]);
-      }
-    },
-    [handleSlash]
-  );
   const handleCommandSave = useCallback2(
     async (opts2) => {
       setCommandWizard(null);
@@ -15620,7 +16855,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(join25(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." }
@@ -15631,6 +16866,22 @@ ${lines.join("\n")}` }]);
       setGatewayMeta(null);
       setTurnStartedAt(Date.now());
       const classification = classifyIntent(trimmed);
+      setIntentTier(classification.tier);
+      let skillResult;
+      try {
+        skillResult = await routeSkills(skillsDirRef.current, {
+          cwd: process.cwd(),
+          prompt: trimmed,
+          memorySnippets: [],
+          // TODO: wire memory snippets when available
+          tier: classification.tier,
+          maxSkillTokens: CONTEXT_LIMIT - 1e4
+          // leave headroom
+        });
+        setSkillsActive(skillResult.selectedSkills.length);
+      } catch {
+        setSkillsActive(0);
+      }
       const effortForTier = {
         light: "low",
         medium: "medium",
@@ -15639,6 +16890,40 @@ ${lines.join("\n")}` }]);
       const turnReasoningEffort = overrideEffort ?? effortForTier[classification.tier] ?? effortRef.current;
       const effectiveCodeMode = classification.tier === "heavy";
       setCodeMode(effectiveCodeMode);
+      const selectedSkills = skillResult?.selectedSkills.map((s) => ({ name: s.name, body: s.body }));
+      if (cacheStableRef.current) {
+        messagesRef.current[1] = {
+          role: "system",
+          content: buildSessionPrefix({
+            cwd: process.cwd(),
+            tools: [...ALL_TOOLS, ...mcpToolsRef.current, ...lspToolsRef.current],
+            model: cfg.model,
+            mode: modeRef.current,
+            selectedSkills
+          })
+        };
+      } else {
+        messagesRef.current[0] = {
+          role: "system",
+          content: buildSystemPrompt({
+            cwd: process.cwd(),
+            tools: [...ALL_TOOLS, ...mcpToolsRef.current, ...lspToolsRef.current],
+            model: cfg.model,
+            mode: modeRef.current,
+            selectedSkills
+          })
+        };
+      }
+      setEvents((e) => [
+        ...e,
+        {
+          kind: "meta",
+          key: mkKey(),
+          intentTier: classification.tier,
+          skillsActive: skillResult?.selectedSkills.length ?? 0,
+          memoryRecalled: false
+        }
+      ]);
       const triageActivity = narrativizeInfo("", { tier: classification.tier, codeMode: effectiveCodeMode });
       if (triageActivity) {
         setEvents((e) => [...e, { kind: "activity", key: mkKey(), text: triageActivity.text, feature: triageActivity.feature }]);
@@ -15649,6 +16934,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 +16944,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 +16983,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
@@ -15797,12 +17096,13 @@ ${lines.join("\n")}` }]);
           cloudDeviceId: cloudDeviceId ?? initialCloudDeviceId,
           onIterationEnd,
           intentClassification: classification,
+          selectedSkills,
           onFileChange: (path, content2) => {
             if (content2) {
               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: readFile20 }) => readFile20(path, "utf8").then((c) => lspManagerRef.current.notifyChange(path, c)).catch(() => {
                 })
               );
             }
@@ -15934,6 +17234,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 +17253,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 +17281,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;
@@ -15993,7 +17296,7 @@ ${lines.join("\n")}` }]);
     }
   }, [usage]);
   if (!cfg) {
-    return /* @__PURE__ */ jsx23(ThemeProvider, { theme, children: /* @__PURE__ */ jsx23(
+    return /* @__PURE__ */ jsx22(ThemeProvider, { theme, children: /* @__PURE__ */ jsx22(
       Onboarding,
       {
         onCancel: () => exit(),
@@ -16025,10 +17328,10 @@ ${lines.join("\n")}` }]);
     ) });
   }
   if (resumeSessions !== null) {
-    return /* @__PURE__ */ jsx23(ThemeProvider, { theme, children: /* @__PURE__ */ jsx23(Box21, { flexDirection: "column", children: /* @__PURE__ */ jsx23(ResumePicker, { sessions: resumeSessions, onPick: handleResumePick }) }) });
+    return /* @__PURE__ */ jsx22(ThemeProvider, { theme, children: /* @__PURE__ */ jsx22(Box20, { flexDirection: "column", children: /* @__PURE__ */ jsx22(ResumePicker, { sessions: resumeSessions, onPick: handleResumePick }) }) });
   }
   if (showRemoteDashboard) {
-    return /* @__PURE__ */ jsx23(ThemeProvider, { theme, children: /* @__PURE__ */ jsx23(Box21, { flexDirection: "column", children: selectedRemoteSession ? /* @__PURE__ */ jsx23(
+    return /* @__PURE__ */ jsx22(ThemeProvider, { theme, children: /* @__PURE__ */ jsx22(Box20, { flexDirection: "column", children: selectedRemoteSession ? /* @__PURE__ */ jsx22(
       RemoteSessionDetail,
       {
         session: selectedRemoteSession,
@@ -16051,7 +17354,7 @@ ${lines.join("\n")}` }]);
           setShowRemoteDashboard(false);
         }
       }
-    ) : /* @__PURE__ */ jsx23(
+    ) : /* @__PURE__ */ jsx22(
       RemoteDashboard,
       {
         onSelect: (session) => setSelectedRemoteSession(session),
@@ -16059,25 +17362,13 @@ ${lines.join("\n")}` }]);
       }
     ) }) });
   }
-  if (showHelpMenu) {
-    return /* @__PURE__ */ jsx23(ThemeProvider, { theme, children: /* @__PURE__ */ jsx23(Box21, { flexDirection: "column", children: /* @__PURE__ */ jsx23(
-      HelpMenu,
-      {
-        customCommands: customCommandsRef.current.filter((c) => !BUILTIN_COMMAND_NAMES.has(c.name.toLowerCase())).map((c) => ({ name: c.name, description: c.description })),
-        costAttributionEnabled: cfg?.costAttribution,
-        cloudMode: cfg?.cloudMode,
-        onDone: () => setShowHelpMenu(false),
-        onCommand: handleHelpCommand
-      }
-    ) }) });
-  }
   if (showLspWizard) {
-    return /* @__PURE__ */ jsx23(ThemeProvider, { theme, children: /* @__PURE__ */ jsx23(Box21, { flexDirection: "column", children: /* @__PURE__ */ jsx23(
+    return /* @__PURE__ */ jsx22(ThemeProvider, { theme, children: /* @__PURE__ */ jsx22(Box20, { flexDirection: "column", children: /* @__PURE__ */ jsx22(
       LspWizard,
       {
         servers: cfg?.lspServers ?? {},
         currentScope: lspScope,
-        hasProjectDir: existsSync3(join22(process.cwd(), ".kimiflare")),
+        hasProjectDir: existsSync3(join25(process.cwd(), ".kimiflare")),
         onDone: () => setShowLspWizard(false),
         onSave: (servers, enabled, scope) => {
           setCfg((c) => c ? { ...c, lspEnabled: enabled, lspServers: servers } : c);
@@ -16109,7 +17400,7 @@ ${lines.join("\n")}` }]);
     ) }) });
   }
   if (commandWizard) {
-    return /* @__PURE__ */ jsx23(ThemeProvider, { theme, children: /* @__PURE__ */ jsx23(Box21, { flexDirection: "column", children: /* @__PURE__ */ jsx23(
+    return /* @__PURE__ */ jsx22(ThemeProvider, { theme, children: /* @__PURE__ */ jsx22(Box20, { flexDirection: "column", children: /* @__PURE__ */ jsx22(
       CommandWizard,
       {
         mode: commandWizard.mode,
@@ -16122,7 +17413,7 @@ ${lines.join("\n")}` }]);
     ) }) });
   }
   if (commandPicker) {
-    return /* @__PURE__ */ jsx23(ThemeProvider, { theme, children: /* @__PURE__ */ jsx23(Box21, { flexDirection: "column", children: /* @__PURE__ */ jsx23(
+    return /* @__PURE__ */ jsx22(ThemeProvider, { theme, children: /* @__PURE__ */ jsx22(Box20, { flexDirection: "column", children: /* @__PURE__ */ jsx22(
       CommandPicker,
       {
         commands: customCommandsRef.current,
@@ -16140,15 +17431,15 @@ ${lines.join("\n")}` }]);
     ) }) });
   }
   if (commandToDelete) {
-    return /* @__PURE__ */ jsx23(ThemeProvider, { theme, children: /* @__PURE__ */ jsxs21(Box21, { flexDirection: "column", borderStyle: "round", borderColor: theme.accent, paddingX: 1, children: [
-      /* @__PURE__ */ jsxs21(Text22, { color: theme.accent, bold: true, children: [
+    return /* @__PURE__ */ jsx22(ThemeProvider, { theme, children: /* @__PURE__ */ jsxs20(Box20, { flexDirection: "column", borderStyle: "round", borderColor: theme.accent, paddingX: 1, children: [
+      /* @__PURE__ */ jsxs20(Text21, { color: theme.accent, bold: true, children: [
         "Delete /",
         commandToDelete.name,
         "?"
       ] }),
-      /* @__PURE__ */ jsx23(Text22, { color: theme.info.color, children: commandToDelete.filepath }),
-      /* @__PURE__ */ jsx23(Box21, { marginTop: 1, children: /* @__PURE__ */ jsx23(
-        SelectInput11,
+      /* @__PURE__ */ jsx22(Text21, { color: theme.info.color, children: commandToDelete.filepath }),
+      /* @__PURE__ */ jsx22(Box20, { marginTop: 1, children: /* @__PURE__ */ jsx22(
+        SelectInput10,
         {
           items: [
             { label: "Yes, delete", value: "yes", key: "yes" },
@@ -16166,7 +17457,7 @@ ${lines.join("\n")}` }]);
     ] }) });
   }
   if (showCommandList) {
-    return /* @__PURE__ */ jsx23(ThemeProvider, { theme, children: /* @__PURE__ */ jsx23(Box21, { flexDirection: "column", children: /* @__PURE__ */ jsx23(
+    return /* @__PURE__ */ jsx22(ThemeProvider, { theme, children: /* @__PURE__ */ jsx22(Box20, { flexDirection: "column", children: /* @__PURE__ */ jsx22(
       CommandList,
       {
         commands: customCommandsRef.current,
@@ -16175,12 +17466,12 @@ ${lines.join("\n")}` }]);
     ) }) });
   }
   if (showThemePicker) {
-    return /* @__PURE__ */ jsx23(ThemeProvider, { theme, children: /* @__PURE__ */ jsx23(Box21, { flexDirection: "column", children: /* @__PURE__ */ jsx23(ThemePicker, { themes: themeList(), onPick: handleThemePick }) }) });
+    return /* @__PURE__ */ jsx22(ThemeProvider, { theme, children: /* @__PURE__ */ jsx22(Box20, { flexDirection: "column", children: /* @__PURE__ */ jsx22(ThemePicker, { themes: themeList(), onPick: handleThemePick }) }) });
   }
   const hasConversation = events.some((e) => e.kind === "user" || e.kind === "assistant");
-  return /* @__PURE__ */ jsx23(ThemeProvider, { theme, children: /* @__PURE__ */ jsxs21(Box21, { flexDirection: "column", children: [
-    !hasConversation && events.length === 0 ? /* @__PURE__ */ jsx23(Welcome, { accountId: cfg.accountId }) : /* @__PURE__ */ jsx23(ChatView, { events, showReasoning, verbose, suppressTools: mode === "plan" }),
-    perm ? /* @__PURE__ */ jsx23(
+  return /* @__PURE__ */ jsx22(ThemeProvider, { theme, children: /* @__PURE__ */ jsxs20(Box20, { flexDirection: "column", children: [
+    !hasConversation && events.length === 0 ? /* @__PURE__ */ jsx22(Welcome, { accountId: cfg.accountId, cloudMode: cfg.cloudMode }) : /* @__PURE__ */ jsx22(ChatView, { events, showReasoning, verbose, suppressTools: mode === "plan" }),
+    perm ? /* @__PURE__ */ jsx22(
       PermissionModal,
       {
         tool: perm.tool,
@@ -16191,7 +17482,7 @@ ${lines.join("\n")}` }]);
           setPerm(null);
         }
       }
-    ) : limitModal ? /* @__PURE__ */ jsx23(
+    ) : limitModal ? /* @__PURE__ */ jsx22(
       LimitModal,
       {
         limit: limitModal.limit,
@@ -16201,8 +17492,8 @@ ${lines.join("\n")}` }]);
           setLimitModal(null);
         }
       }
-    ) : /* @__PURE__ */ jsxs21(Box21, { flexDirection: "column", marginTop: 1, children: [
-      tasks.length > 0 && /* @__PURE__ */ jsx23(
+    ) : /* @__PURE__ */ jsxs20(Box20, { flexDirection: "column", marginTop: 1, children: [
+      tasks.length > 0 && /* @__PURE__ */ jsx22(
         TaskList,
         {
           tasks,
@@ -16210,11 +17501,11 @@ ${lines.join("\n")}` }]);
           tokensDelta: Math.max(0, (usage?.prompt_tokens ?? 0) - tasksStartTokens)
         }
       ),
-      queue.length > 0 && /* @__PURE__ */ jsx23(Box21, { flexDirection: "column", marginBottom: 1, children: queue.map((q, i) => /* @__PURE__ */ jsxs21(Text22, { color: theme.info.color, children: [
+      queue.length > 0 && /* @__PURE__ */ jsx22(Box20, { flexDirection: "column", marginBottom: 1, children: queue.map((q, i) => /* @__PURE__ */ jsxs20(Text21, { color: theme.info.color, children: [
         "\u23F3 ",
         q.display
       ] }, `queue_${i}`)) }),
-      /* @__PURE__ */ jsx23(
+      /* @__PURE__ */ jsx22(
         StatusBar,
         {
           model: cfg.model,
@@ -16231,10 +17522,15 @@ ${lines.join("\n")}` }]);
           codeMode,
           cloudMode: cfg.cloudMode,
           cloudBudget,
+          skillsActive,
+          memoryRecalled,
+          phase: turnPhase,
+          currentTool: currentToolName,
+          lastActivityAt,
           kimiMdStale
         }
       ),
-      activePicker?.kind === "file" && /* @__PURE__ */ jsx23(
+      activePicker?.kind === "file" && /* @__PURE__ */ jsx22(
         FilePicker,
         {
           items: filteredFileItems,
@@ -16242,7 +17538,7 @@ ${lines.join("\n")}` }]);
           query: pickerQuery ?? ""
         }
       ),
-      activePicker?.kind === "slash" && /* @__PURE__ */ jsx23(
+      activePicker?.kind === "slash" && /* @__PURE__ */ jsx22(
         SlashPicker,
         {
           items: filteredSlashItems,
@@ -16250,9 +17546,9 @@ ${lines.join("\n")}` }]);
           query: pickerQuery ?? ""
         }
       ),
-      /* @__PURE__ */ jsxs21(Box21, { marginTop: 1, children: [
-        /* @__PURE__ */ jsx23(Text22, { color: "#d699b6", children: "\u203A " }),
-        /* @__PURE__ */ jsx23(
+      /* @__PURE__ */ jsxs20(Box20, { marginTop: 1, children: [
+        /* @__PURE__ */ jsx22(Text21, { color: "#d699b6", children: "\u203A " }),
+        /* @__PURE__ */ jsx22(
           CustomTextInput,
           {
             value: input,
@@ -16309,7 +17605,7 @@ ${lines.join("\n")}` }]);
 }
 async function renderApp(cfg, updateResult, lspScope = "global", lspProjectPath = null, cloudToken, cloudDeviceId) {
   const instance = render(
-    /* @__PURE__ */ jsx23(
+    /* @__PURE__ */ jsx22(
       App,
       {
         initialCfg: cfg,
@@ -16352,7 +17648,6 @@ var init_app = __esm({
     init_update_check();
     init_onboarding();
     init_welcome();
-    init_help_menu();
     init_config();
     init_worker_client();
     init_session_store();
@@ -16361,14 +17656,16 @@ var init_app = __esm({
     init_remote_dashboard();
     init_mode();
     init_classify();
+    init_skills();
+    init_manager3();
     init_sessions();
     init_image();
     init_usage_tracker();
-    init_manager3();
+    init_manager4();
     init_storage_limits();
     init_state();
     init_version();
-    init_loader();
+    init_loader2();
     init_renderer2();
     init_builtins();
     init_save();
@@ -16380,6 +17677,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();