kimiflare 0.64.0 → 0.66.0

package/dist/index.js

@@ -401,11 +401,12 @@ var init_logger = __esm({
 });
 
 // src/util/sse.ts
-async function* readSSE(stream, signal, idleTimeoutMs) {
+async function* readSSE(stream, signal, idleTimeoutMs, postFirstByteIdleTimeoutMs) {
   const reader = stream.getReader();
   const decoder = new TextDecoder("utf-8");
   let buffer = "";
   let lastDataAt = Date.now();
+  let gotFirstByte = false;
   const onAbort = () => {
     reader.cancel(new DOMException("aborted", "AbortError")).catch(() => {
     });
@@ -427,16 +428,18 @@ async function* readSSE(stream, signal, idleTimeoutMs) {
   try {
     while (true) {
       if (signal?.aborted) throw new DOMException("aborted", "AbortError");
-      if (idleTimeoutMs !== void 0 && Date.now() - lastDataAt > idleTimeoutMs) {
-        logger.warn("sse:idle_timeout", { idleTimeoutMs });
+      const activeIdleTimeoutMs = gotFirstByte && postFirstByteIdleTimeoutMs !== void 0 ? postFirstByteIdleTimeoutMs : idleTimeoutMs;
+      if (activeIdleTimeoutMs !== void 0 && Date.now() - lastDataAt > activeIdleTimeoutMs) {
+        logger.warn("sse:idle_timeout", { idleTimeoutMs: activeIdleTimeoutMs, gotFirstByte });
         throw new DOMException(
-          `kimiflare: stream idle for ${idleTimeoutMs}ms \u2014 no data received from API`,
+          `kimiflare: stream idle for ${activeIdleTimeoutMs}ms \u2014 no data received from API`,
           "TimeoutError"
         );
       }
       const { done, value } = await abortRace(reader.read());
       if (done) break;
       lastDataAt = Date.now();
+      gotFirstByte = true;
       buffer += decoder.decode(value, { stream: true });
       buffer = buffer.replace(/\r\n/g, "\n");
       let sep3;
@@ -717,7 +720,7 @@ async function* runKimi(opts2) {
     if (meta) yield { type: "gateway_meta", meta };
     let lastUsage = null;
     logger.debug("runKimi:stream_start", { requestId });
-    for await (const ev of parseStream(res.body, opts2.signal, opts2.idleTimeoutMs)) {
+    for await (const ev of parseStream(res.body, opts2.signal, opts2.idleTimeoutMs, opts2.postFirstByteIdleTimeoutMs)) {
       if (ev.type === "usage") lastUsage = ev.usage;
       yield ev;
     }
@@ -799,12 +802,11 @@ function readGatewayMeta(headers) {
   if (model) meta.model = model;
   return Object.keys(meta).length > 0 ? meta : null;
 }
-async function* parseStream(body, signal, idleTimeoutMs = DEFAULT_IDLE_TIMEOUT_MS) {
+async function* parseStream(body, signal, idleTimeoutMs = DEFAULT_IDLE_TIMEOUT_MS, postFirstByteIdleTimeoutMs = DEFAULT_POST_FIRST_BYTE_IDLE_TIMEOUT_MS) {
   const toolCalls = /* @__PURE__ */ new Map();
   let lastUsage = null;
   let finishReason = null;
-  let lastDataAt = Date.now();
-  for await (const dataStr of readSSE(body, signal, idleTimeoutMs)) {
+  for await (const dataStr of readSSE(body, signal, idleTimeoutMs, postFirstByteIdleTimeoutMs)) {
     if (dataStr === "[DONE]") break;
     let chunk = null;
     try {
@@ -942,7 +944,7 @@ function sleep(ms, signal) {
     signal?.addEventListener("abort", onAbort, { once: true });
   });
 }
-var RETRYABLE_CODES, MAX_ATTEMPTS, DEFAULT_IDLE_TIMEOUT_MS;
+var RETRYABLE_CODES, MAX_ATTEMPTS, DEFAULT_IDLE_TIMEOUT_MS, DEFAULT_POST_FIRST_BYTE_IDLE_TIMEOUT_MS;
 var init_client = __esm({
   "src/agent/client.ts"() {
     "use strict";
@@ -954,6 +956,7 @@ var init_client = __esm({
     RETRYABLE_CODES = /* @__PURE__ */ new Set([3040]);
     MAX_ATTEMPTS = 5;
     DEFAULT_IDLE_TIMEOUT_MS = 6e4;
+    DEFAULT_POST_FIRST_BYTE_IDLE_TIMEOUT_MS = 3e4;
   }
 });
 
@@ -2155,7 +2158,7 @@ var init_session_state = __esm({
       }
       add(a) {
         while (this.totalChars() + a.raw.length > this.maxTotalChars && this.artifacts.size > 0) {
-          this.evictOldest();
+          this.evictSizeWeighted();
         }
         while (this.artifacts.size >= this.maxArtifacts) {
           this.evictOldest();
@@ -2196,6 +2199,21 @@ var init_session_state = __esm({
         }
         if (oldest) this.artifacts.delete(oldest.id);
       }
+      /** Evict the largest artifact among the oldest quartile (by timestamp).
+       *  Bounded by the oldest quartile so we never evict freshly-added artifacts;
+       *  size-weighted within that window so one big artifact gets dropped instead
+       *  of many small ones. */
+      evictSizeWeighted() {
+        const sorted = [...this.artifacts.values()].sort((a, b) => a.ts < b.ts ? -1 : 1);
+        if (sorted.length === 0) return;
+        const quartile = Math.max(1, Math.ceil(sorted.length / 4));
+        const candidates = sorted.slice(0, quartile);
+        let pick3 = candidates[0];
+        for (const a of candidates) {
+          if (a.raw.length > pick3.raw.length) pick3 = a;
+        }
+        this.artifacts.delete(pick3.id);
+      }
     };
   }
 });
@@ -3404,7 +3422,8 @@ Use console.log() to return results. Only console.log output will be sent back t
       cloudMode: opts2.cloudMode,
       cloudToken: opts2.cloudToken,
       cloudDeviceId: opts2.cloudDeviceId,
-      idleTimeoutMs: 6e4
+      idleTimeoutMs: opts2.idleTimeoutMs ?? 6e4,
+      postFirstByteIdleTimeoutMs: opts2.postFirstByteIdleTimeoutMs
     });
     let gotFirstChunk = false;
     for await (const ev of events) {
@@ -3454,7 +3473,7 @@ Use console.log() to return results. Only console.log output will be sent back t
     if (lastUsage) {
       opts2.callbacks.onUsageFinal?.(lastUsage, gatewayMeta);
       cumulativePromptTokens += lastUsage.prompt_tokens;
-      if (!budgetExhausted && opts2.maxInputTokens !== void 0 && opts2.maxInputTokens > 0 && cumulativePromptTokens >= opts2.maxInputTokens && toolCalls.length > 0) {
+      if (!budgetExhausted && opts2.maxInputTokens !== void 0 && opts2.maxInputTokens > 0 && cumulativePromptTokens >= opts2.maxInputTokens) {
         budgetExhausted = true;
       }
     }
@@ -3693,7 +3712,22 @@ ${sandboxResult.output}` : sandboxResult.output;
                       }
                     }
                   }
-                } catch {
+                } catch (err) {
+                  const sid = opts2.sessionId ?? "default";
+                  const next = (memoryExtractionErrorCounts.get(sid) ?? 0) + 1;
+                  memoryExtractionErrorCounts.set(sid, next);
+                  const msg = err instanceof Error ? err.message : String(err);
+                  logger.debug("memory:extract_error", {
+                    sessionId: opts2.sessionId,
+                    tool: tc.function.name,
+                    count: next,
+                    error: msg
+                  });
+                  if (next === 1) {
+                    opts2.callbacks.onWarning?.(
+                      `[memory] auto-extraction failed (${msg}). Subsequent failures will be counted silently; check /memory health.`
+                    );
+                  }
                 }
               })();
             }
@@ -3770,7 +3804,7 @@ function validateToolArguments(raw) {
     return "{}";
   }
 }
-var BudgetExhaustedError, AgentLoopError, codeModeApiCache, driftAccumulator, DRIFT_THRESHOLD, MAX_PROMPT_TOKENS, MAX_TOOL_CONTENT_CHARS;
+var BudgetExhaustedError, AgentLoopError, codeModeApiCache, driftAccumulator, DRIFT_THRESHOLD, memoryExtractionErrorCounts, MAX_PROMPT_TOKENS, MAX_TOOL_CONTENT_CHARS;
 var init_loop = __esm({
   "src/agent/loop.ts"() {
     "use strict";
@@ -3800,6 +3834,7 @@ var init_loop = __esm({
     codeModeApiCache = /* @__PURE__ */ new Map();
     driftAccumulator = /* @__PURE__ */ new Map();
     DRIFT_THRESHOLD = 5;
+    memoryExtractionErrorCounts = /* @__PURE__ */ new Map();
     MAX_PROMPT_TOKENS = 24e4;
     MAX_TOOL_CONTENT_CHARS = 1e4;
   }
@@ -3867,10 +3902,13 @@ var init_read = __esm({
       needsPermission: false,
       render: ({ path }) => ({ title: `read ${collapsePath(path, process.cwd())}` }),
       async run(args, ctx) {
+        if (ctx.signal?.aborted) throw new DOMException("aborted", "AbortError");
         const abs = resolvePath(ctx.cwd, args.path);
         const st = await stat2(abs);
         if (st.size > MAX_BYTES) throw new Error(`file too large: ${st.size} bytes (max ${MAX_BYTES})`);
-        const text = await readFile3(abs, "utf8");
+        if (ctx.signal?.aborted) throw new DOMException("aborted", "AbortError");
+        const text = await readFile3(abs, { encoding: "utf8", signal: ctx.signal });
+        if (ctx.signal?.aborted) throw new DOMException("aborted", "AbortError");
         const lines = text.split("\n");
         const start = Math.max(0, (args.offset ?? 1) - 1);
         const end = args.limit ? Math.min(lines.length, start + args.limit) : lines.length;
@@ -4162,14 +4200,31 @@ var init_glob = __esm({
       needsPermission: false,
       render: (args) => ({ title: `glob ${args.pattern ?? ""}${args.path ? ` in ${collapsePath(String(args.path), process.cwd())}` : ""}` }),
       async run(args, ctx) {
+        if (ctx.signal?.aborted) throw new DOMException("aborted", "AbortError");
         const root = args.path ? resolvePath(ctx.cwd, args.path) : ctx.cwd;
-        const entries = await fg(args.pattern, {
+        const stream = fg.stream(args.pattern, {
           cwd: root,
           absolute: true,
           dot: false,
           onlyFiles: false,
           stats: true
         });
+        const entries = [];
+        const onAbort = () => {
+          try {
+            stream.destroy(new DOMException("aborted", "AbortError"));
+          } catch {
+          }
+        };
+        ctx.signal?.addEventListener("abort", onAbort, { once: true });
+        try {
+          for await (const entry of stream) {
+            if (ctx.signal?.aborted) throw new DOMException("aborted", "AbortError");
+            entries.push(entry);
+          }
+        } finally {
+          ctx.signal?.removeEventListener("abort", onAbort);
+        }
         entries.sort((a, b) => (b.stats?.mtimeMs ?? 0) - (a.stats?.mtimeMs ?? 0));
         const paths = entries.slice(0, 200).map((e) => e.path);
         return paths.length ? paths.join("\n") : "(no matches)";
@@ -4193,14 +4248,14 @@ async function hasRipgrep() {
   }
   return cachedHasRg;
 }
-async function runRipgrep(args, root, mode) {
+async function runRipgrep(args, root, mode, signal) {
   const rgArgs = ["--no-heading", "--color=never", "--line-number"];
   if (args.case_insensitive) rgArgs.push("-i");
   if (args.glob) rgArgs.push("--glob", args.glob);
   if (mode === "files") rgArgs.push("-l");
   rgArgs.push("--", args.pattern, root);
   try {
-    const { stdout } = await pExecFile("rg", rgArgs, { maxBuffer: 10 * 1024 * 1024 });
+    const { stdout } = await pExecFile("rg", rgArgs, { maxBuffer: 10 * 1024 * 1024, signal });
     const trimmed = stdout.trim();
     if (!trimmed) return { content: "(no matches)", rawBytes: 0, reducedBytes: 0 };
     return {
@@ -4214,7 +4269,7 @@ async function runRipgrep(args, root, mode) {
     throw new Error(err.stderr || String(e));
   }
 }
-async function runJsFallback(args, root, mode) {
+async function runJsFallback(args, root, mode, signal) {
   const re = new RegExp(args.pattern, args.case_insensitive ? "i" : "");
   const globPattern = args.glob ? `**/${args.glob}` : "**/*";
   const files = await fg2(globPattern, {
@@ -4225,7 +4280,9 @@ async function runJsFallback(args, root, mode) {
     ignore: ["**/node_modules/**", "**/.git/**", "**/dist/**"]
   });
   const out = [];
-  for (const file of files.slice(0, 5e3)) {
+  for (let fi = 0; fi < Math.min(files.length, 5e3); fi++) {
+    if (signal?.aborted) throw new DOMException("aborted", "AbortError");
+    const file = files[fi];
     try {
       const content = await readFile6(file, "utf8");
       if (mode === "files") {
@@ -4280,10 +4337,11 @@ var init_grep = __esm({
       needsPermission: false,
       render: (args) => ({ title: `grep ${args.pattern ?? ""}${args.glob ? ` (${args.glob})` : ""}` }),
       async run(args, ctx) {
+        if (ctx.signal?.aborted) throw new DOMException("aborted", "AbortError");
         const root = args.path ? resolvePath(ctx.cwd, args.path) : ctx.cwd;
         const mode = args.output_mode ?? "content";
-        if (await hasRipgrep()) return runRipgrep(args, root, mode);
-        return runJsFallback(args, root, mode);
+        if (await hasRipgrep()) return runRipgrep(args, root, mode, ctx.signal);
+        return runJsFallback(args, root, mode, ctx.signal);
       }
     };
   }
@@ -9098,6 +9156,8 @@ var init_pricing = __esm({
 import { readFile as readFile13, writeFile as writeFile10, mkdir as mkdir10 } from "fs/promises";
 import { homedir as homedir11 } from "os";
 import { join as join18 } from "path";
+import { EventEmitter as EventEmitter2 } from "events";
+import { randomUUID } from "crypto";
 function usageDir2() {
   const xdg = process.env.XDG_DATA_HOME || join18(homedir11(), ".local", "share");
   return join18(xdg, "kimiflare");
@@ -9128,6 +9188,11 @@ async function saveLog(log2) {
   await mkdir10(usageDir2(), { recursive: true });
   await writeFile10(usagePath2(), JSON.stringify(log2, null, 2), "utf8");
 }
+function withLock(fn) {
+  const next = writeChain.then(fn, fn);
+  writeChain = next.catch(() => void 0);
+  return next;
+}
 async function loadHistory() {
   try {
     const raw = await readFile13(historyPath(), "utf8");
@@ -9229,34 +9294,100 @@ function pruneUsageLog(log2) {
   return { ...log2, days, sessions };
 }
 async function recordUsage(sessionId, usage, gateway) {
-  const log2 = pruneUsageLog(await loadLog2());
-  const date = today2();
-  const gatewaySnapshot = gateway ? await fetchGatewayUsageSnapshot(gateway).catch(() => gatewaySnapshotFromMeta(gateway.meta)) : void 0;
-  const cost = calculateCost(usage.prompt_tokens, usage.completion_tokens, usage.prompt_tokens_details?.cached_tokens ?? 0);
-  const totalCost = gatewaySnapshot?.cost ?? cost.total;
-  const day = getOrCreateDay(log2, date);
-  day.promptTokens += usage.prompt_tokens;
-  day.completionTokens += usage.completion_tokens;
-  day.cachedTokens += usage.prompt_tokens_details?.cached_tokens ?? 0;
-  day.cost += totalCost;
-  if (gatewaySnapshot) {
-    day.gatewayRequests = (day.gatewayRequests ?? 0) + 1;
-    day.gatewayCachedRequests = (day.gatewayCachedRequests ?? 0) + (gatewaySnapshot.cached ? 1 : 0);
-    day.gatewayCost = (day.gatewayCost ?? 0) + (gatewaySnapshot.cost ?? 0);
-  }
-  const session = getOrCreateSession(log2, sessionId, date);
-  session.promptTokens += usage.prompt_tokens;
-  session.completionTokens += usage.completion_tokens;
-  session.cachedTokens += usage.prompt_tokens_details?.cached_tokens ?? 0;
-  session.cost += totalCost;
-  if (gatewaySnapshot) {
-    session.gatewayRequests = (session.gatewayRequests ?? 0) + 1;
-    session.gatewayCachedRequests = (session.gatewayCachedRequests ?? 0) + (gatewaySnapshot.cached ? 1 : 0);
-    session.gatewayCost = (session.gatewayCost ?? 0) + (gatewaySnapshot.cost ?? 0);
-    session.gatewayLogs = [...session.gatewayLogs ?? [], gatewaySnapshot].slice(-100);
-  }
-  await saveLog(log2);
-  await upsertHistoryDay(day);
+  const cost = calculateCost(
+    usage.prompt_tokens,
+    usage.completion_tokens,
+    usage.prompt_tokens_details?.cached_tokens ?? 0
+  );
+  const estimatedCost = cost.total;
+  const cachedTokens = usage.prompt_tokens_details?.cached_tokens ?? 0;
+  const turnId = randomUUID();
+  const logId = gateway?.meta.logId;
+  await withLock(async () => {
+    const log2 = pruneUsageLog(await loadLog2());
+    const date = today2();
+    const day = getOrCreateDay(log2, date);
+    day.promptTokens += usage.prompt_tokens;
+    day.completionTokens += usage.completion_tokens;
+    day.cachedTokens += cachedTokens;
+    day.cost += estimatedCost;
+    const session = getOrCreateSession(log2, sessionId, date);
+    session.promptTokens += usage.prompt_tokens;
+    session.completionTokens += usage.completion_tokens;
+    session.cachedTokens += cachedTokens;
+    session.cost += estimatedCost;
+    const turn = {
+      turnId,
+      logId,
+      estimatedCost,
+      cacheStatus: gateway?.meta.cacheStatus
+    };
+    session.turns = [...session.turns ?? [], turn].slice(-MAX_TURNS_PER_SESSION);
+    if (gateway) {
+      const stub = gatewaySnapshotFromMeta(gateway.meta);
+      if (stub) {
+        session.gatewayRequests = (session.gatewayRequests ?? 0) + 1;
+        session.gatewayCachedRequests = (session.gatewayCachedRequests ?? 0) + (stub.cached ? 1 : 0);
+        session.gatewayLogs = [...session.gatewayLogs ?? [], stub].slice(-100);
+        day.gatewayRequests = (day.gatewayRequests ?? 0) + 1;
+        day.gatewayCachedRequests = (day.gatewayCachedRequests ?? 0) + (stub.cached ? 1 : 0);
+      }
+    }
+    await saveLog(log2);
+    await upsertHistoryDay(day);
+  });
+  usageEvents.emit("update", sessionId);
+  if (gateway && logId) {
+    void reconcileTurnCost(sessionId, turnId, gateway).catch(() => void 0);
+  }
+}
+async function reconcileTurnCost(sessionId, turnId, gateway) {
+  for (const delay of RECONCILE_DELAYS_MS) {
+    await new Promise((r) => setTimeout(r, delay));
+    let snapshot;
+    try {
+      snapshot = await fetchGatewayUsageSnapshot(gateway);
+    } catch {
+      continue;
+    }
+    if (!snapshot || typeof snapshot.cost !== "number") continue;
+    const patched = await withLock(async () => {
+      const log2 = pruneUsageLog(await loadLog2());
+      const session = log2.sessions.find((s) => s.id === sessionId);
+      const turn = session?.turns?.find((t) => t.turnId === turnId);
+      if (!session || !turn || turn.confirmedCost !== void 0) return false;
+      const delta = snapshot.cost - turn.estimatedCost;
+      turn.confirmedCost = snapshot.cost;
+      turn.durationMs = snapshot.duration;
+      turn.cacheStatus = snapshot.cacheStatus ?? turn.cacheStatus;
+      turn.reconciledAt = Date.now();
+      session.cost += delta;
+      session.gatewayCost = (session.gatewayCost ?? 0) + snapshot.cost;
+      const day = getOrCreateDay(log2, session.date);
+      day.cost += delta;
+      day.gatewayCost = (day.gatewayCost ?? 0) + snapshot.cost;
+      const logs = session.gatewayLogs ?? [];
+      const idx = snapshot.logId ? logs.findIndex((l) => l.logId === snapshot.logId) : -1;
+      if (idx >= 0) logs[idx] = snapshot;
+      else logs.push(snapshot);
+      session.gatewayLogs = logs.slice(-100);
+      await saveLog(log2);
+      await upsertHistoryDay(day);
+      return true;
+    });
+    if (patched) {
+      usageEvents.emit("update", sessionId);
+    }
+    return;
+  }
+  await withLock(async () => {
+    const log2 = await loadLog2();
+    const turn = log2.sessions.find((s) => s.id === sessionId)?.turns?.find((t) => t.turnId === turnId);
+    if (!turn || turn.confirmedCost !== void 0) return;
+    turn.reconcileFailed = true;
+    await saveLog(log2);
+  });
+  usageEvents.emit("update", sessionId);
 }
 function mergeDays(usageDays, historyDays) {
   const map = /* @__PURE__ */ new Map();
@@ -9270,7 +9401,18 @@ async function getCostReport(sessionId) {
   const allDays = mergeDays(log2.days, history);
   const date = today2();
   const currentMonth = date.slice(0, 7);
-  const session = sessionId ? log2.sessions.find((s) => s.id === sessionId) ?? { date, promptTokens: 0, completionTokens: 0, cachedTokens: 0, cost: 0 } : { date, promptTokens: 0, completionTokens: 0, cachedTokens: 0, cost: 0 };
+  const rawSession = sessionId ? log2.sessions.find((s) => s.id === sessionId) : void 0;
+  const session = rawSession ? {
+    date: rawSession.date,
+    promptTokens: rawSession.promptTokens,
+    completionTokens: rawSession.completionTokens,
+    cachedTokens: rawSession.cachedTokens,
+    cost: rawSession.cost,
+    gatewayRequests: rawSession.gatewayRequests,
+    gatewayCachedRequests: rawSession.gatewayCachedRequests,
+    gatewayCost: rawSession.gatewayCost,
+    reconcilePending: hasPendingReconcile(rawSession)
+  } : { date, promptTokens: 0, completionTokens: 0, cachedTokens: 0, cost: 0 };
   const todayUsage = log2.days.find((d) => d.date === date) ?? { date, promptTokens: 0, completionTokens: 0, cachedTokens: 0, cost: 0 };
   const monthUsage = {
     date: currentMonth,
@@ -9308,6 +9450,12 @@ async function getCostReport(sessionId) {
   }
   return { session, today: todayUsage, month: monthUsage, allTime };
 }
+function hasPendingReconcile(session) {
+  if (!session.turns) return false;
+  return session.turns.some(
+    (t) => t.logId && t.confirmedCost === void 0 && !t.reconcileFailed
+  );
+}
 async function getSessionGatewayLogs(sessionId) {
   const log2 = await loadLog2();
   const session = log2.sessions.find((s) => s.id === sessionId);
@@ -9367,7 +9515,7 @@ function formatCostReport(report) {
   add("All time", report.allTime);
   return lines.join("\n");
 }
-var LOG_VERSION2;
+var LOG_VERSION2, usageEvents, MAX_TURNS_PER_SESSION, RECONCILE_DELAYS_MS, writeChain;
 var init_usage_tracker = __esm({
   "src/usage-tracker.ts"() {
     "use strict";
@@ -9375,6 +9523,10 @@ var init_usage_tracker = __esm({
     init_pricing();
     init_storage_limits();
     LOG_VERSION2 = 1;
+    usageEvents = new EventEmitter2();
+    MAX_TURNS_PER_SESSION = 50;
+    RECONCILE_DELAYS_MS = [500, 1e3, 2e3, 4e3];
+    writeChain = Promise.resolve();
   }
 });
 
@@ -11523,6 +11675,10 @@ function StatusBar({ usage, sessionUsage, thinking, turnStartedAt, mode, context
     ] }),
     usage && /* @__PURE__ */ jsxs8(Box8, { children: [
       /* @__PURE__ */ jsx9(Text8, { color: theme.info.color, children: buildRightParts(usage, contextLimit, sessionUsage, gatewayMeta, cloudMode, cloudBudget).join("  \xB7  ") }),
+      sessionUsage?.reconcilePending ? /* @__PURE__ */ jsxs8(Text8, { color: theme.muted?.color ?? theme.info.color, dimColor: theme.muted?.dim ?? true, children: [
+        " ",
+        /* @__PURE__ */ jsx9(Spinner3, { type: "dots" })
+      ] }) : null,
       warn ? /* @__PURE__ */ jsxs8(Text8, { color: theme.warn, bold: true, children: [
         "  \xB7  ",
         "/compact recommended"
@@ -11542,10 +11698,11 @@ function buildRightParts(usage, contextLimit, sessionUsage, gatewayMeta, cloudMo
     const cached = sessionUsage.cachedTokens;
     parts.push(`in ${sessionUsage.promptTokens}${cached ? ` (${cached} cached)` : ""}`);
     parts.push(`ctx ${pct}%`);
+    const prefix = sessionUsage.reconcilePending ? "\u2248$" : "$";
     if (cloudMode) {
-      parts.push(`\x1B[9m$${sessionUsage.cost.toFixed(2)}\x1B[29m`);
+      parts.push(`\x1B[9m${prefix}${sessionUsage.cost.toFixed(2)}\x1B[29m`);
     } else {
-      parts.push(`$${sessionUsage.cost.toFixed(2)}`);
+      parts.push(`${prefix}${sessionUsage.cost.toFixed(2)}`);
     }
   } else {
     const cached = usage.prompt_tokens_details?.cached_tokens ?? 0;
@@ -17804,6 +17961,210 @@ var init_slash_picker = __esm({
   }
 });
 
+// src/ui/use-picker-controller.ts
+import { useCallback as useCallback5, useEffect as useEffect7, useMemo as useMemo2, useRef as useRef4, useState as useState14 } from "react";
+function filterPickerItems(items, query) {
+  return fuzzyFilter(items, query, (item) => item.name).slice(0, 50);
+}
+function shouldOpenMentionPicker(input, cursorOffset, pickerCancelOffset) {
+  if (pickerCancelOffset === cursorOffset) return false;
+  if (cursorOffset > 0 && input[cursorOffset - 1] === "@") {
+    const beforeAt = cursorOffset - 2;
+    return beforeAt < 0 || /\s/.test(input[beforeAt]);
+  }
+  return false;
+}
+function shouldOpenSlashPicker(input, cursorOffset, cancelOffset) {
+  if (cancelOffset === cursorOffset) return false;
+  if (cursorOffset === 0 || input[cursorOffset - 1] !== "/") return false;
+  return /^\s*$/.test(input.slice(0, cursorOffset - 1));
+}
+function insertSlashCommand(input, anchor, name) {
+  let tokenEnd = anchor + 1;
+  while (tokenEnd < input.length && !/\s/.test(input[tokenEnd])) tokenEnd++;
+  const head = input.slice(0, anchor + 1) + name;
+  const tail = " " + input.slice(tokenEnd).replace(/^\s+/, "");
+  return { value: head + tail, cursor: head.length + 1 };
+}
+function decidePickerTransition(active, input, cursorOffset, pickerCancelOffset, filePickerEnabled) {
+  if (active !== null) {
+    const trigger = active.kind === "file" ? "@" : "/";
+    if (cursorOffset < active.anchor) return { kind: "close" };
+    if (input[active.anchor] !== trigger) return { kind: "close" };
+    const query = input.slice(active.anchor + 1, cursorOffset);
+    if (/\s/.test(query)) return { kind: "close" };
+    return { kind: "none" };
+  }
+  if (pickerCancelOffset === cursorOffset) {
+    return { kind: "dropCancel" };
+  }
+  if (filePickerEnabled && shouldOpenMentionPicker(input, cursorOffset, pickerCancelOffset)) {
+    return {
+      kind: "open",
+      picker: { kind: "file", anchor: cursorOffset - 1, selected: 0 },
+      loadFiles: true
+    };
+  }
+  if (shouldOpenSlashPicker(input, cursorOffset, pickerCancelOffset)) {
+    return {
+      kind: "open",
+      picker: { kind: "slash", anchor: cursorOffset - 1, selected: 0 },
+      loadFiles: false
+    };
+  }
+  return { kind: "none" };
+}
+function usePickerController(opts2) {
+  const {
+    input,
+    cursorOffset,
+    setInput,
+    setCursorOffset,
+    filePickerEnabled,
+    allSlashCommands,
+    modalActive,
+    loadFilePickerItems,
+    onFileSelected,
+    onSlashSelected,
+    getRecentFiles
+  } = opts2;
+  const [active, setActive] = useState14(null);
+  const [fileItemsRaw, setFileItemsRaw] = useState14([]);
+  const filesLoadedRef = useRef4(false);
+  const cancelOffsetRef = useRef4(null);
+  const onFileSelectedRef = useRef4(onFileSelected);
+  onFileSelectedRef.current = onFileSelected;
+  const onSlashSelectedRef = useRef4(onSlashSelected);
+  onSlashSelectedRef.current = onSlashSelected;
+  const getRecentFilesRef = useRef4(getRecentFiles);
+  getRecentFilesRef.current = getRecentFiles;
+  const loadFilePickerItemsRef = useRef4(loadFilePickerItems);
+  loadFilePickerItemsRef.current = loadFilePickerItems;
+  const activeAnchor = active?.anchor ?? null;
+  const activeKind = active?.kind ?? null;
+  const query = useMemo2(() => {
+    if (activeAnchor === null) return "";
+    return input.slice(activeAnchor + 1, cursorOffset);
+  }, [input, cursorOffset, activeAnchor]);
+  const fileItems = useMemo2(() => {
+    if (activeKind !== "file") return [];
+    const items = filterPickerItems(fileItemsRaw, query).slice();
+    const recents = getRecentFilesRef.current();
+    return items.sort((a, b) => {
+      const aRecent = recents.get(a.name) ?? 0;
+      const bRecent = recents.get(b.name) ?? 0;
+      if (aRecent && !bRecent) return -1;
+      if (!aRecent && bRecent) return 1;
+      if (aRecent && bRecent) return bRecent - aRecent;
+      if (a.isDirectory && !b.isDirectory) return -1;
+      if (!a.isDirectory && b.isDirectory) return 1;
+      return a.name.localeCompare(b.name);
+    });
+  }, [activeKind, fileItemsRaw, query]);
+  const slashItems = useMemo2(() => {
+    if (activeKind !== "slash") return [];
+    return fuzzyFilter(allSlashCommands, query, (c) => c.name).slice(0, 50);
+  }, [activeKind, allSlashCommands, query]);
+  useEffect7(() => {
+    const t = decidePickerTransition(
+      active,
+      input,
+      cursorOffset,
+      cancelOffsetRef.current,
+      filePickerEnabled
+    );
+    if (t.kind === "close") {
+      setActive(null);
+      return;
+    }
+    if (t.kind === "dropCancel") {
+      cancelOffsetRef.current = null;
+      return;
+    }
+    if (t.kind === "open") {
+      setActive(t.picker);
+      if (t.loadFiles && !filesLoadedRef.current) {
+        filesLoadedRef.current = true;
+        void loadFilePickerItemsRef.current().then((items) => setFileItemsRaw(items)).catch(() => setFileItemsRaw([]));
+      }
+    }
+  }, [input, cursorOffset, active, filePickerEnabled]);
+  useEffect7(() => {
+    if (active?.kind !== "file") return;
+    const max = Math.max(0, fileItems.length - 1);
+    if (active.selected > max) {
+      setActive({ ...active, selected: max });
+    }
+  }, [fileItems.length, active]);
+  useEffect7(() => {
+    if (active?.kind !== "slash") return;
+    const max = Math.max(0, slashItems.length - 1);
+    if (active.selected > max) {
+      setActive({ ...active, selected: max });
+    }
+  }, [slashItems.length, active]);
+  useEffect7(() => {
+    if (modalActive && active !== null) {
+      setActive(null);
+    }
+  }, [modalActive, active]);
+  const onUp = useCallback5(() => {
+    setActive((p) => {
+      if (!p) return null;
+      const next = Math.max(0, p.selected - 1);
+      return next === p.selected ? p : { ...p, selected: next };
+    });
+  }, []);
+  const onDown = useCallback5(() => {
+    setActive((p) => {
+      if (!p) return null;
+      const max = p.kind === "file" ? Math.max(0, fileItems.length - 1) : Math.max(0, slashItems.length - 1);
+      const next = Math.min(max, p.selected + 1);
+      return next === p.selected ? p : { ...p, selected: next };
+    });
+  }, [fileItems.length, slashItems.length]);
+  const onSelect = useCallback5(() => {
+    if (!active) return;
+    if (active.kind === "file") {
+      const item2 = fileItems[active.selected];
+      if (!item2) return;
+      onFileSelectedRef.current?.(item2.name);
+      const insert = item2.name + (item2.isDirectory ? "/" : " ");
+      const newInput = input.slice(0, active.anchor) + insert + input.slice(cursorOffset);
+      setInput(newInput);
+      setCursorOffset(active.anchor + insert.length);
+      setActive(null);
+      return;
+    }
+    const item = slashItems[active.selected];
+    if (!item) return;
+    const { value } = insertSlashCommand(input, active.anchor, item.name);
+    setActive(null);
+    onSlashSelectedRef.current(value);
+  }, [active, fileItems, slashItems, input, cursorOffset, setInput, setCursorOffset]);
+  const onCancel = useCallback5(() => {
+    cancelOffsetRef.current = cursorOffset;
+    setActive(null);
+  }, [cursorOffset]);
+  return {
+    active,
+    isActive: active !== null,
+    query,
+    fileItems,
+    slashItems,
+    onUp,
+    onDown,
+    onSelect,
+    onCancel
+  };
+}
+var init_use_picker_controller = __esm({
+  "src/ui/use-picker-controller.ts"() {
+    "use strict";
+    init_fuzzy();
+  }
+});
+
 // src/cost-attribution/tui-report.ts
 var tui_report_exports = {};
 __export(tui_report_exports, {
@@ -17889,13 +18250,9 @@ var init_tui_report = __esm({
 var app_exports = {};
 __export(app_exports, {
   buildFilePickerIgnoreList: () => buildFilePickerIgnoreList,
-  filterPickerItems: () => filterPickerItems,
-  insertSlashCommand: () => insertSlashCommand,
-  renderApp: () => renderApp,
-  shouldOpenMentionPicker: () => shouldOpenMentionPicker,
-  shouldOpenSlashPicker: () => shouldOpenSlashPicker
+  renderApp: () => renderApp
 });
-import React15, { useState as useState14, useRef as useRef4, useEffect as useEffect7, useCallback as useCallback5 } from "react";
+import React15, { useState as useState15, useRef as useRef5, useEffect as useEffect8, useCallback as useCallback6 } from "react";
 import { Box as Box25, Text as Text26, useApp, useInput as useInput10, render } from "ink";
 import SelectInput9 from "ink-select-input";
 import { existsSync as existsSync4, statSync as statSync4 } from "fs";
@@ -18004,29 +18361,6 @@ function buildFilePickerIgnoreList(cwd) {
   }
   return [...hardcoded, ...gitignorePatterns];
 }
-function filterPickerItems(items, query) {
-  return fuzzyFilter(items, query, (item) => item.name).slice(0, 50);
-}
-function shouldOpenMentionPicker(input, cursorOffset, pickerCancelOffset) {
-  if (pickerCancelOffset === cursorOffset) return false;
-  if (cursorOffset > 0 && input[cursorOffset - 1] === "@") {
-    const beforeAt = cursorOffset - 2;
-    return beforeAt < 0 || /\s/.test(input[beforeAt]);
-  }
-  return false;
-}
-function shouldOpenSlashPicker(input, cursorOffset, cancelOffset) {
-  if (cancelOffset === cursorOffset) return false;
-  if (cursorOffset === 0 || input[cursorOffset - 1] !== "/") return false;
-  return /^\s*$/.test(input.slice(0, cursorOffset - 1));
-}
-function insertSlashCommand(input, anchor, name) {
-  let tokenEnd = anchor + 1;
-  while (tokenEnd < input.length && !/\s/.test(input[tokenEnd])) tokenEnd++;
-  const head = input.slice(0, anchor + 1) + name;
-  const tail = " " + input.slice(tokenEnd).replace(/^\s+/, "");
-  return { value: head + tail, cursor: head.length + 1 };
-}
 function gatewayFromConfig(cfg) {
   if (process.env.KIMIFLARE_DISABLE_AI_GATEWAY === "1") return void 0;
   if (!cfg.aiGatewayId) return void 0;
@@ -18158,13 +18492,13 @@ function App({
   initialCloudDeviceId
 }) {
   const { exit } = useApp();
-  const [cfg, setCfg] = useState14(initialCfg);
-  const [lspScope, setLspScope] = useState14(initialLspScope);
-  const [lspProjectPath, setLspProjectPath] = useState14(initialLspProjectPath);
-  const [cloudToken, setCloudToken] = useState14(initialCloudToken);
-  const [cloudDeviceId, setCloudDeviceId] = useState14(initialCloudDeviceId);
-  const [events, setRawEvents] = useState14([]);
-  const setEvents = useCallback5(
+  const [cfg, setCfg] = useState15(initialCfg);
+  const [lspScope, setLspScope] = useState15(initialLspScope);
+  const [lspProjectPath, setLspProjectPath] = useState15(initialLspProjectPath);
+  const [cloudToken, setCloudToken] = useState15(initialCloudToken);
+  const [cloudDeviceId, setCloudDeviceId] = useState15(initialCloudDeviceId);
+  const [events, setRawEvents] = useState15([]);
+  const setEvents = useCallback6(
     (updater) => {
       setRawEvents((prev) => {
         const next = typeof updater === "function" ? updater(prev) : updater;
@@ -18173,13 +18507,24 @@ function App({
     },
     []
   );
-  const [input, setInput] = useState14("");
-  const [busy, setBusy] = useState14(false);
-  const [usage, setUsage] = useState14(null);
-  const [sessionUsage, setSessionUsage] = useState14(null);
-  const [gatewayMeta, setGatewayMeta] = useState14(null);
-  const [cloudBudget, setCloudBudget] = useState14(null);
-  const [showReasoning, setShowReasoning] = useState14(false);
+  const [input, setInput] = useState15("");
+  const [busy, setBusy] = useState15(false);
+  const [usage, setUsage] = useState15(null);
+  const [sessionUsage, setSessionUsage] = useState15(null);
+  useEffect8(() => {
+    const handler = (sid) => {
+      if (sessionIdRef.current && sid === sessionIdRef.current) {
+        void getCostReport(sid).then((report) => setSessionUsage(report.session));
+      }
+    };
+    usageEvents.on("update", handler);
+    return () => {
+      usageEvents.off("update", handler);
+    };
+  }, []);
+  const [gatewayMeta, setGatewayMeta] = useState15(null);
+  const [cloudBudget, setCloudBudget] = useState15(null);
+  const [showReasoning, setShowReasoning] = useState15(false);
   const {
     pending: perm,
     askPermission: askForPermission,
@@ -18200,52 +18545,52 @@ function App({
       ]);
     }
   );
-  const [limitModal, setLimitModal] = useState14(null);
-  const [loopModal, setLoopModal] = useState14(null);
-  const [queue, setQueue] = useState14([]);
-  const [history, setHistory] = useState14([]);
-  const [historyIndex, setHistoryIndex] = useState14(-1);
-  const [draftInput, setDraftInput] = useState14("");
-  const [mode, setMode] = useState14("edit");
-  const [codeMode, setCodeMode] = useState14(false);
+  const [limitModal, setLimitModal] = useState15(null);
+  const [loopModal, setLoopModal] = useState15(null);
+  const [queue, setQueue] = useState15([]);
+  const [history, setHistory] = useState15([]);
+  const [historyIndex, setHistoryIndex] = useState15(-1);
+  const [draftInput, setDraftInput] = useState15("");
+  const [mode, setMode] = useState15("edit");
+  const [codeMode, setCodeMode] = useState15(false);
   const filePickerEnabled = initialCfg?.filePicker ?? true;
-  const [effort, setEffort] = useState14(
+  const [effort, setEffort] = useState15(
     initialCfg?.reasoningEffort ?? DEFAULT_REASONING_EFFORT
   );
-  const [resumeSessions, setResumeSessions] = useState14(null);
-  const [checkpointSession, setCheckpointSession] = useState14(null);
-  const [checkpointList, setCheckpointList] = useState14([]);
-  const [commandWizard, setCommandWizard] = useState14(null);
-  const [commandPicker, setCommandPicker] = useState14(null);
-  const [commandToDelete, setCommandToDelete] = useState14(null);
-  const [showCommandList, setShowCommandList] = useState14(false);
-  const [showLspWizard, setShowLspWizard] = useState14(false);
-  const [showRemoteDashboard, setShowRemoteDashboard] = useState14(false);
-  const [selectedRemoteSession, setSelectedRemoteSession] = useState14(null);
-  const [showInboxModal, setShowInboxModal] = useState14(false);
-  const [tasks, setTasks] = useState14([]);
-  const [tasksStartedAt, setTasksStartedAt] = useState14(null);
-  const [tasksStartTokens, setTasksStartTokens] = useState14(0);
-  const [turnStartedAt, setTurnStartedAt] = useState14(null);
-  const [turnPhase, setTurnPhase] = useState14("waiting");
-  const [currentToolName, setCurrentToolName] = useState14(null);
-  const [lastActivityAt, setLastActivityAt] = useState14(null);
-  const [verbose, setVerbose] = useState14(false);
-  const [hasUpdate, setHasUpdate] = useState14(initialUpdateResult?.hasUpdate ?? false);
-  const [latestVersion, setLatestVersion] = useState14(initialUpdateResult?.latestVersion ?? null);
-  const [theme, setTheme] = useState14(resolveTheme(initialCfg?.theme));
-  const [showThemePicker, setShowThemePicker] = useState14(false);
-  const [originalTheme, setOriginalTheme] = useState14(null);
-  const [skillsActive, setSkillsActive] = useState14(0);
-  const [memoryRecalled, setMemoryRecalled] = useState14(false);
-  const [intentTier, setIntentTier] = useState14(null);
-  const [kimiMdStale, setKimiMdStale] = useState14(false);
-  const [gitBranch, setGitBranch] = useState14(null);
-  const [lastSessionTopic, setLastSessionTopic] = useState14(null);
-  useEffect7(() => {
+  const [resumeSessions, setResumeSessions] = useState15(null);
+  const [checkpointSession, setCheckpointSession] = useState15(null);
+  const [checkpointList, setCheckpointList] = useState15([]);
+  const [commandWizard, setCommandWizard] = useState15(null);
+  const [commandPicker, setCommandPicker] = useState15(null);
+  const [commandToDelete, setCommandToDelete] = useState15(null);
+  const [showCommandList, setShowCommandList] = useState15(false);
+  const [showLspWizard, setShowLspWizard] = useState15(false);
+  const [showRemoteDashboard, setShowRemoteDashboard] = useState15(false);
+  const [selectedRemoteSession, setSelectedRemoteSession] = useState15(null);
+  const [showInboxModal, setShowInboxModal] = useState15(false);
+  const [tasks, setTasks] = useState15([]);
+  const [tasksStartedAt, setTasksStartedAt] = useState15(null);
+  const [tasksStartTokens, setTasksStartTokens] = useState15(0);
+  const [turnStartedAt, setTurnStartedAt] = useState15(null);
+  const [turnPhase, setTurnPhase] = useState15("waiting");
+  const [currentToolName, setCurrentToolName] = useState15(null);
+  const [lastActivityAt, setLastActivityAt] = useState15(null);
+  const [verbose, setVerbose] = useState15(false);
+  const [hasUpdate, setHasUpdate] = useState15(initialUpdateResult?.hasUpdate ?? false);
+  const [latestVersion, setLatestVersion] = useState15(initialUpdateResult?.latestVersion ?? null);
+  const [theme, setTheme] = useState15(resolveTheme(initialCfg?.theme));
+  const [showThemePicker, setShowThemePicker] = useState15(false);
+  const [originalTheme, setOriginalTheme] = useState15(null);
+  const [skillsActive, setSkillsActive] = useState15(0);
+  const [memoryRecalled, setMemoryRecalled] = useState15(false);
+  const [intentTier, setIntentTier] = useState15(null);
+  const [kimiMdStale, setKimiMdStale] = useState15(false);
+  const [gitBranch, setGitBranch] = useState15(null);
+  const [lastSessionTopic, setLastSessionTopic] = useState15(null);
+  useEffect8(() => {
     setGitBranch(detectGitBranch());
   }, []);
-  useEffect7(() => {
+  useEffect8(() => {
     void Promise.resolve().then(() => (init_sessions(), sessions_exports)).then(
       ({ listSessions: listSessions2 }) => listSessions2(1).then((sessions) => {
         const last = sessions[0];
@@ -18255,7 +18600,7 @@ function App({
       })
     );
   }, []);
-  useEffect7(() => {
+  useEffect8(() => {
     const onSigint = () => {
       logger.info("sigint:fired", {
         hasHandler: sigintHandlerRef.current !== null
@@ -18267,7 +18612,7 @@ function App({
       process.off("SIGINT", onSigint);
     };
   }, []);
-  useEffect7(() => {
+  useEffect8(() => {
     let cancelled = false;
     loadAndMergeThemes().then(({ errors, wcagWarnings }) => {
       if (cancelled) return;
@@ -18291,7 +18636,7 @@ ${wcagWarnings.join("\n")}` }
       cancelled = true;
     };
   }, []);
-  useEffect7(() => {
+  useEffect8(() => {
     if (!cfg?.cloudMode || !initialCloudToken) return;
     let cancelled = false;
     const fetchBudget = async () => {
@@ -18317,81 +18662,56 @@ ${wcagWarnings.join("\n")}` }
       cancelled = true;
     };
   }, [cfg?.cloudMode, initialCloudToken]);
-  const [cursorOffset, setCursorOffset] = useState14(0);
-  const [activePicker, setActivePicker] = useState14(null);
-  const [filePickerItems, setFilePickerItems] = useState14([]);
-  const filePickerLoadedRef = useRef4(false);
-  const [customCommandsVersion, setCustomCommandsVersion] = useState14(0);
-  const cacheStableRef = useRef4(initialCfg?.cacheStablePrompts !== false);
-  const messagesRef = useRef4(
+  const [cursorOffset, setCursorOffset] = useState15(0);
+  const [customCommandsVersion, setCustomCommandsVersion] = useState15(0);
+  const cacheStableRef = useRef5(initialCfg?.cacheStablePrompts !== false);
+  const messagesRef = useRef5(
     makePrefixMessages(cacheStableRef.current, cfg?.model ?? DEFAULT_MODEL, "edit", ALL_TOOLS)
   );
-  const executorRef = useRef4(new ToolExecutor(ALL_TOOLS));
-  const activeAsstIdRef = useRef4(null);
-  const sessionScopeRef = useRef4(new AbortScope());
-  const activeScopeRef = useRef4(null);
-  const supervisorRef = useRef4(new TurnSupervisor());
-  const isAbortingRef = useRef4(false);
-  const lastEscapeAtRef = useRef4(0);
-  const sigintHandlerRef = useRef4(null);
-  const limitResolveRef = useRef4(null);
-  const loopResolveRef = useRef4(null);
-  const pendingToolCallsRef = useRef4(/* @__PURE__ */ new Map());
-  const sessionIdRef = useRef4(null);
-  const sessionCreatedAtRef = useRef4(null);
-  const sessionTitleRef = useRef4(null);
-  const modeRef = useRef4(mode);
-  const effortRef = useRef4(effort);
-  const tasksRef = useRef4([]);
-  const usageRef = useRef4(null);
-  const gatewayMetaRef = useRef4(null);
-  const lastApiErrorRef = useRef4(null);
-  const updateCheckedRef = useRef4(false);
-  const sessionStateRef = useRef4(emptySessionState());
-  const artifactStoreRef = useRef4(new ArtifactStore());
-  const compiledContextRef = useRef4(initialCfg?.compiledContext === true);
-  const updateNudgedRef = useRef4(false);
-  const compactSuggestedRef = useRef4(false);
-  const mcpManagerRef = useRef4(new McpManager());
-  const mcpToolsRef = useRef4([]);
-  const mcpInitRef = useRef4(false);
-  const submitRef = useRef4(() => {
+  const executorRef = useRef5(new ToolExecutor(ALL_TOOLS));
+  const activeAsstIdRef = useRef5(null);
+  const sessionScopeRef = useRef5(new AbortScope());
+  const activeScopeRef = useRef5(null);
+  const supervisorRef = useRef5(new TurnSupervisor());
+  const isAbortingRef = useRef5(false);
+  const lastEscapeAtRef = useRef5(0);
+  const sigintHandlerRef = useRef5(null);
+  const limitResolveRef = useRef5(null);
+  const loopResolveRef = useRef5(null);
+  const pendingToolCallsRef = useRef5(/* @__PURE__ */ new Map());
+  const sessionIdRef = useRef5(null);
+  const sessionCreatedAtRef = useRef5(null);
+  const sessionTitleRef = useRef5(null);
+  const modeRef = useRef5(mode);
+  const effortRef = useRef5(effort);
+  const tasksRef = useRef5([]);
+  const usageRef = useRef5(null);
+  const gatewayMetaRef = useRef5(null);
+  const lastApiErrorRef = useRef5(null);
+  const updateCheckedRef = useRef5(false);
+  const sessionStateRef = useRef5(emptySessionState());
+  const artifactStoreRef = useRef5(new ArtifactStore());
+  const compiledContextRef = useRef5(initialCfg?.compiledContext === true);
+  const updateNudgedRef = useRef5(false);
+  const compactSuggestedRef = useRef5(false);
+  const mcpManagerRef = useRef5(new McpManager());
+  const mcpToolsRef = useRef5([]);
+  const mcpInitRef = useRef5(false);
+  const submitRef = useRef5(() => {
   });
-  const lspManagerRef = useRef4(new LspManager());
-  const lspToolsRef = useRef4([]);
-  const lspInitRef = useRef4(false);
-  const busyRef = useRef4(busy);
-  const memoryManagerRef = useRef4(null);
-  const sessionStartRecallRef = useRef4(null);
-  const kimiMdStaleNudgedRef = useRef4(false);
-  const turnCounterRef = useRef4(0);
-  const pendingTextRef = useRef4(/* @__PURE__ */ new Map());
-  const flushTimeoutRef = useRef4(null);
-  const customCommandsRef = useRef4([]);
-  const pickerCancelRef = useRef4(null);
-  const recentFilesRef = useRef4(/* @__PURE__ */ new Map());
+  const lspManagerRef = useRef5(new LspManager());
+  const lspToolsRef = useRef5([]);
+  const lspInitRef = useRef5(false);
+  const busyRef = useRef5(busy);
+  const memoryManagerRef = useRef5(null);
+  const sessionStartRecallRef = useRef5(null);
+  const kimiMdStaleNudgedRef = useRef5(false);
+  const turnCounterRef = useRef5(0);
+  const pendingTextRef = useRef5(/* @__PURE__ */ new Map());
+  const flushTimeoutRef = useRef5(null);
+  const customCommandsRef = useRef5([]);
+  const recentFilesRef = useRef5(/* @__PURE__ */ new Map());
   const MAX_RECENT_FILES = 10;
-  const pickerAnchor = activePicker?.anchor ?? null;
-  const pickerKind = activePicker?.kind ?? null;
-  const pickerQuery = React15.useMemo(() => {
-    if (pickerAnchor === null) return null;
-    return input.slice(pickerAnchor + 1, cursorOffset);
-  }, [input, cursorOffset, pickerAnchor]);
-  const filteredFileItems = React15.useMemo(() => {
-    if (pickerKind !== "file" || pickerQuery === null) return [];
-    const items = filterPickerItems(filePickerItems, pickerQuery).slice();
-    const now2 = Date.now();
-    return items.sort((a, b) => {
-      const aRecent = recentFilesRef.current.get(a.name) ?? 0;
-      const bRecent = recentFilesRef.current.get(b.name) ?? 0;
-      if (aRecent && !bRecent) return -1;
-      if (!aRecent && bRecent) return 1;
-      if (aRecent && bRecent) return bRecent - aRecent;
-      if (a.isDirectory && !b.isDirectory) return -1;
-      if (!a.isDirectory && b.isDirectory) return 1;
-      return a.name.localeCompare(b.name);
-    });
-  }, [pickerKind, filePickerItems, pickerQuery]);
   const allSlashCommands = React15.useMemo(() => {
     const customs = customCommandsRef.current.filter((c) => !BUILTIN_COMMAND_NAMES.has(c.name.toLowerCase())).map((c) => ({
       name: c.name,
@@ -18400,138 +18720,43 @@ ${wcagWarnings.join("\n")}` }
     }));
     return [...BUILTIN_COMMANDS, ...customs];
   }, [customCommandsVersion]);
-  const filteredSlashItems = React15.useMemo(() => {
-    if (pickerKind !== "slash" || pickerQuery === null) return [];
-    return fuzzyFilter(allSlashCommands, pickerQuery, (c) => c.name).slice(0, 50);
-  }, [pickerKind, allSlashCommands, pickerQuery]);
-  useEffect7(() => {
-    if (activePicker !== null) {
-      const trigger = activePicker.kind === "file" ? "@" : "/";
-      if (cursorOffset < activePicker.anchor) {
-        setActivePicker(null);
-        return;
-      }
-      if (input[activePicker.anchor] !== trigger) {
-        setActivePicker(null);
-        return;
-      }
-      const query = input.slice(activePicker.anchor + 1, cursorOffset);
-      if (/\s/.test(query)) {
-        setActivePicker(null);
-        return;
-      }
-      return;
-    }
-    if (pickerCancelRef.current === cursorOffset) {
-      pickerCancelRef.current = null;
-      return;
-    }
-    if (filePickerEnabled && shouldOpenMentionPicker(input, cursorOffset, pickerCancelRef.current)) {
-      setActivePicker({ kind: "file", anchor: cursorOffset - 1, selected: 0 });
-      if (!filePickerLoadedRef.current) {
-        filePickerLoadedRef.current = true;
-        const cwd = process.cwd();
-        void fg4("**/*", {
-          cwd,
-          ignore: buildFilePickerIgnoreList(cwd),
-          dot: false,
-          absolute: false,
-          onlyFiles: false,
-          markDirectories: true
-        }).then((entries) => {
-          const strings = entries.slice(0, 300);
-          const items = strings.map((e) => ({
-            name: e.endsWith("/") ? e.slice(0, -1) : e,
-            isDirectory: e.endsWith("/")
-          }));
-          items.sort((a, b) => {
-            if (a.isDirectory && !b.isDirectory) return -1;
-            if (!a.isDirectory && b.isDirectory) return 1;
-            return a.name.localeCompare(b.name);
-          });
-          setFilePickerItems(items);
-        }).catch(() => {
-          setFilePickerItems([]);
-        });
-      }
-      return;
-    }
-    if (shouldOpenSlashPicker(input, cursorOffset, pickerCancelRef.current)) {
-      setActivePicker({ kind: "slash", anchor: cursorOffset - 1, selected: 0 });
-      return;
-    }
-  }, [input, cursorOffset, activePicker, filePickerEnabled]);
-  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]);
-  useEffect7(() => {
-    if (activePicker?.kind !== "slash") return;
-    const max = Math.max(0, filteredSlashItems.length - 1);
-    if (activePicker.selected > max) {
-      setActivePicker({ ...activePicker, selected: max });
-    }
-  }, [filteredSlashItems.length, activePicker]);
-  const handlePickerUp = useCallback5(() => {
-    setActivePicker((p) => {
-      if (!p) return null;
-      const next = Math.max(0, p.selected - 1);
-      return next === p.selected ? p : { ...p, selected: next };
+  const modalActive = commandWizard !== null || commandPicker !== null || commandToDelete !== null || showCommandList || showLspWizard || resumeSessions !== null || checkpointSession !== null || perm !== null || limitModal !== null || loopModal !== null || showInboxModal;
+  const loadFilePickerItems = useCallback6(async () => {
+    const cwd = process.cwd();
+    const entries = await fg4("**/*", {
+      cwd,
+      ignore: buildFilePickerIgnoreList(cwd),
+      dot: false,
+      absolute: false,
+      onlyFiles: false,
+      markDirectories: true
     });
-  }, []);
-  const handlePickerDown = useCallback5(() => {
-    setActivePicker((p) => {
-      if (!p) return null;
-      const max = p.kind === "file" ? Math.max(0, filteredFileItems.length - 1) : Math.max(0, filteredSlashItems.length - 1);
-      const next = Math.min(max, p.selected + 1);
-      return next === p.selected ? p : { ...p, selected: next };
+    const strings = entries.slice(0, 300);
+    const items = strings.map((e) => ({
+      name: e.endsWith("/") ? e.slice(0, -1) : e,
+      isDirectory: e.endsWith("/")
+    }));
+    items.sort((a, b) => {
+      if (a.isDirectory && !b.isDirectory) return -1;
+      if (!a.isDirectory && b.isDirectory) return 1;
+      return a.name.localeCompare(b.name);
     });
-  }, [filteredFileItems.length, filteredSlashItems.length]);
-  const handlePickerSelect = useCallback5(() => {
-    if (!activePicker) return;
-    if (activePicker.kind === "file") {
-      const item2 = filteredFileItems[activePicker.selected];
-      if (!item2) return;
-      trackRecentFile(recentFilesRef, item2.name, MAX_RECENT_FILES);
-      const insert = item2.name + (item2.isDirectory ? "/" : " ");
-      const newInput = input.slice(0, activePicker.anchor) + insert + input.slice(cursorOffset);
-      setInput(newInput);
-      setCursorOffset(activePicker.anchor + insert.length);
-      setActivePicker(null);
-      return;
-    }
-    const item = filteredSlashItems[activePicker.selected];
-    if (!item) return;
-    const { value } = insertSlashCommand(input, activePicker.anchor, item.name);
-    setActivePicker(null);
-    submitRef.current(value);
-  }, [activePicker, filteredFileItems, filteredSlashItems, input, cursorOffset]);
-  const handlePickerCancel = useCallback5(() => {
-    pickerCancelRef.current = cursorOffset;
-    setActivePicker(null);
-  }, [cursorOffset]);
-  useEffect7(() => {
-    const modalActive = commandWizard !== null || commandPicker !== null || commandToDelete !== null || showCommandList || showLspWizard || resumeSessions !== null || checkpointSession !== null || perm !== null || limitModal !== null || loopModal !== null || showInboxModal;
-    if (modalActive && activePicker !== null) {
-      setActivePicker(null);
-    }
-  }, [
-    commandWizard,
-    commandPicker,
-    commandToDelete,
-    showCommandList,
-    showLspWizard,
-    resumeSessions,
-    perm,
-    limitModal,
-    loopModal,
-    showInboxModal,
-    activePicker
-  ]);
-  useEffect7(() => {
+    return items;
+  }, []);
+  const picker = usePickerController({
+    input,
+    cursorOffset,
+    setInput,
+    setCursorOffset,
+    filePickerEnabled,
+    allSlashCommands,
+    modalActive,
+    loadFilePickerItems,
+    onFileSelected: (name) => trackRecentFile(recentFilesRef, name, MAX_RECENT_FILES),
+    onSlashSelected: (value) => submitRef.current(value),
+    getRecentFiles: () => recentFilesRef.current
+  });
+  useEffect8(() => {
     if (!cfg) return;
     void Promise.resolve().then(() => (init_sessions(), sessions_exports)).then(
       ({ pruneSessions: pruneSessions2 }) => pruneSessions2().then((removed) => {
@@ -18643,7 +18868,7 @@ ${wcagWarnings.join("\n")}` }
       }
     });
   }, [cfg, setEvents]);
-  useEffect7(() => {
+  useEffect8(() => {
     const id = setInterval(() => {
       try {
         performance.clearMarks();
@@ -18653,7 +18878,7 @@ ${wcagWarnings.join("\n")}` }
     }, 3e5);
     return () => clearInterval(id);
   }, []);
-  const reloadCustomCommands = useCallback5(async () => {
+  const reloadCustomCommands = useCallback6(async () => {
     const { commands, warnings } = await loadCustomCommands(process.cwd());
     customCommandsRef.current = commands;
     setCustomCommandsVersion((v) => v + 1);
@@ -18668,7 +18893,7 @@ ${wcagWarnings.join("\n")}` }
       ]);
     }
   }, [setEvents]);
-  useEffect7(() => {
+  useEffect8(() => {
     if (!cfg || updateCheckedRef.current) return;
     updateCheckedRef.current = true;
     if (initialUpdateResult) {
@@ -18719,7 +18944,7 @@ ${wcagWarnings.join("\n")}` }
       }
     });
   }, [cfg, initialUpdateResult]);
-  useEffect7(() => {
+  useEffect8(() => {
     modeRef.current = mode;
     if (cacheStableRef.current) {
       messagesRef.current[1] = {
@@ -18746,10 +18971,10 @@ ${wcagWarnings.join("\n")}` }
       executorRef.current.clearSessionPermissions();
     }
   }, [mode, cfg?.model]);
-  useEffect7(() => {
+  useEffect8(() => {
     effortRef.current = effort;
   }, [effort]);
-  useEffect7(() => {
+  useEffect8(() => {
     if (!cfg) return;
     const id = setInterval(() => {
       void checkForUpdate().then((result) => {
@@ -18780,7 +19005,7 @@ ${wcagWarnings.join("\n")}` }
     }, 30 * 60 * 1e3);
     return () => clearInterval(id);
   }, [cfg]);
-  const initMcp = useCallback5(async () => {
+  const initMcp = useCallback6(async () => {
     if (!cfg?.mcpServers || mcpInitRef.current) return;
     mcpInitRef.current = true;
     const manager = mcpManagerRef.current;
@@ -18845,7 +19070,7 @@ ${wcagWarnings.join("\n")}` }
       ]);
     }
   }, [cfg]);
-  const initLsp = useCallback5(async () => {
+  const initLsp = useCallback6(async () => {
     if (!cfg?.lspEnabled || !cfg?.lspServers || lspInitRef.current) {
       if (lspInitRef.current) return;
       if (!cfg?.lspEnabled) {
@@ -18908,7 +19133,7 @@ ${wcagWarnings.join("\n")}` }
       ]);
     }
   }, [cfg]);
-  useEffect7(() => {
+  useEffect8(() => {
     if (cfg && !mcpInitRef.current) {
       void initMcp();
     }
@@ -18916,7 +19141,7 @@ ${wcagWarnings.join("\n")}` }
       void initLsp();
     }
   }, [cfg, initMcp, initLsp]);
-  const ensureSessionId = useCallback5(() => {
+  const ensureSessionId = useCallback6(() => {
     if (sessionIdRef.current) return sessionIdRef.current;
     const firstUser = messagesRef.current.find((m) => m.role === "user");
     let firstText = "session";
@@ -18929,7 +19154,7 @@ ${wcagWarnings.join("\n")}` }
     sessionIdRef.current = makeSessionId(firstText);
     return sessionIdRef.current;
   }, []);
-  const saveSessionSafe = useCallback5(async () => {
+  const saveSessionSafe = useCallback6(async () => {
     if (!cfg) return;
     ensureSessionId();
     const now2 = (/* @__PURE__ */ new Date()).toISOString();
@@ -18955,7 +19180,7 @@ ${wcagWarnings.join("\n")}` }
       ]);
     }
   }, [cfg, ensureSessionId]);
-  const onIterationEnd = useCallback5(
+  const onIterationEnd = useCallback6(
     async (messages, signal) => {
       if (signal.aborted) return messages;
       if (!shouldCompact({ messages })) return messages;
@@ -19156,7 +19381,7 @@ ${wcagWarnings.join("\n")}` }
       void lspManagerRef.current.stopAll().finally(() => exit());
     }
   };
-  const flushAssistantUpdates = useCallback5(() => {
+  const flushAssistantUpdates = useCallback6(() => {
     flushTimeoutRef.current = null;
     const pending = pendingTextRef.current;
     if (pending.size === 0) return;
@@ -19174,7 +19399,7 @@ ${wcagWarnings.join("\n")}` }
       })
     );
   }, []);
-  const updateAssistant = useCallback5(
+  const updateAssistant = useCallback6(
     (id, patch) => {
       const result = patch({ text: "", reasoning: "" });
       const assistantResult = result;
@@ -19203,7 +19428,7 @@ ${wcagWarnings.join("\n")}` }
     },
     [flushAssistantUpdates]
   );
-  const updateTool = useCallback5(
+  const updateTool = useCallback6(
     (id, patch) => {
       setEvents(
         (evts) => evts.map(
@@ -19213,11 +19438,11 @@ ${wcagWarnings.join("\n")}` }
     },
     []
   );
-  const updateGatewayMeta = useCallback5((meta) => {
+  const updateGatewayMeta = useCallback6((meta) => {
     gatewayMetaRef.current = meta;
     setGatewayMeta(meta);
   }, []);
-  const runCompact = useCallback5(async () => {
+  const runCompact = useCallback6(async () => {
     if (!cfg) return;
     if (busy) {
       setEvents((e) => [...e, { kind: "info", key: mkKey(), text: "can't compact while model is running" }]);
@@ -19313,11 +19538,11 @@ ${wcagWarnings.join("\n")}` }
       pendingToolCallsRef.current.clear();
     }
   }, [cfg, busy, saveSessionSafe]);
-  const openResumePicker = useCallback5(async () => {
+  const openResumePicker = useCallback6(async () => {
     const sessions = await listSessions(200, process.cwd());
     setResumeSessions(sessions);
   }, []);
-  const runInit = useCallback5(async () => {
+  const runInit = useCallback6(async () => {
     if (!cfg) return;
     if (busy) {
       setEvents((e) => [...e, { kind: "info", key: mkKey(), text: "can't /init while model is running" }]);
@@ -19612,7 +19837,7 @@ ${wcagWarnings.join("\n")}` }
       pendingToolCallsRef.current.clear();
     }
   }, [cfg, busy, updateAssistant, updateTool, updateGatewayMeta]);
-  const handleThemePick = useCallback5(
+  const handleThemePick = useCallback6(
     (picked) => {
       setShowThemePicker(false);
       if (!picked) return;
@@ -19630,7 +19855,7 @@ ${wcagWarnings.join("\n")}` }
     },
     []
   );
-  const doResumeSession = useCallback5(
+  const doResumeSession = useCallback6(
     async (filePath, checkpointId) => {
       try {
         const file = checkpointId ? (await loadSessionFromCheckpoint(filePath, checkpointId)).file : await loadSession(filePath);
@@ -19682,7 +19907,7 @@ ${wcagWarnings.join("\n")}` }
     },
     []
   );
-  const handleResumePick = useCallback5(
+  const handleResumePick = useCallback6(
     async (picked) => {
       setResumeSessions(null);
       if (!picked) return;
@@ -19704,7 +19929,7 @@ ${wcagWarnings.join("\n")}` }
     },
     [doResumeSession]
   );
-  const handleCheckpointPick = useCallback5(
+  const handleCheckpointPick = useCallback6(
     async (checkpointId) => {
       const session = checkpointSession;
       setCheckpointSession(null);
@@ -19723,7 +19948,7 @@ ${wcagWarnings.join("\n")}` }
     },
     [checkpointSession, doResumeSession]
   );
-  const handleSlash = useCallback5(
+  const handleSlash = useCallback6(
     (cmd) => {
       const raw = cmd.trim();
       const [head, ...rest] = raw.split(/\s+/);
@@ -20696,7 +20921,7 @@ ${lines.join("\n")}` }]);
     },
     [cfg, exit, usage, theme, mode, openResumePicker, runCompact, runInit, initMcp, setCfg, setShowRemoteDashboard, setSelectedRemoteSession]
   );
-  const handleCommandSave = useCallback5(
+  const handleCommandSave = useCallback6(
     async (opts2) => {
       setCommandWizard(null);
       try {
@@ -20718,7 +20943,7 @@ ${lines.join("\n")}` }]);
     },
     [commandWizard, reloadCustomCommands, setEvents]
   );
-  const handleCommandDelete = useCallback5(
+  const handleCommandDelete = useCallback6(
     async (cmd) => {
       setCommandToDelete(null);
       try {
@@ -20737,7 +20962,7 @@ ${lines.join("\n")}` }]);
     },
     [reloadCustomCommands, setEvents]
   );
-  const processMessage = useCallback5(
+  const processMessage = useCallback6(
     async (text, displayText, opts2) => {
       if (!cfg) return;
       let trimmed = text.trim();
@@ -21254,14 +21479,14 @@ ${lines.join("\n")}` }]);
     },
     [cfg, handleSlash, updateAssistant, updateTool, saveSessionSafe, updateGatewayMeta]
   );
-  useEffect7(() => {
+  useEffect8(() => {
     if (!busy && queue.length > 0 && supervisorRef.current.phase === "idle") {
       const next = queue[0];
       setQueue((q) => q.slice(1));
       processMessage(next.full, next.display, { queuedKey: next.key });
     }
   }, [busy, queue, processMessage]);
-  const submit = useCallback5(
+  const submit = useCallback6(
     (full, display) => {
       const trimmedFull = full.trim();
       if (!trimmedFull) return;
@@ -21284,7 +21509,7 @@ ${lines.join("\n")}` }]);
     [processMessage]
   );
   submitRef.current = submit;
-  useEffect7(() => {
+  useEffect8(() => {
     if (compactSuggestedRef.current) return;
     if (usage && usage.prompt_tokens / CONTEXT_LIMIT >= AUTO_COMPACT_SUGGEST_PCT) {
       compactSuggestedRef.current = true;
@@ -21548,21 +21773,21 @@ ${lines.join("\n")}` }]);
           intentTier: intentTier ?? void 0
         }
       ),
-      activePicker?.kind === "file" && /* @__PURE__ */ jsx27(
+      picker.active?.kind === "file" && /* @__PURE__ */ jsx27(
         FilePicker,
         {
-          items: filteredFileItems,
-          selectedIndex: activePicker.selected,
-          query: pickerQuery ?? "",
+          items: picker.fileItems,
+          selectedIndex: picker.active.selected,
+          query: picker.query,
           recentFiles: new Set(recentFilesRef.current.keys())
         }
       ),
-      activePicker?.kind === "slash" && /* @__PURE__ */ jsx27(
+      picker.active?.kind === "slash" && /* @__PURE__ */ jsx27(
         SlashPicker,
         {
-          items: filteredSlashItems,
-          selectedIndex: activePicker.selected,
-          query: pickerQuery ?? ""
+          items: picker.slashItems,
+          selectedIndex: picker.active.selected,
+          query: picker.query
         }
       ),
       /* @__PURE__ */ jsxs25(Box25, { marginTop: 1, children: [
@@ -21576,11 +21801,11 @@ ${lines.join("\n")}` }]);
             enablePaste: true,
             cursorOffset,
             onCursorChange: setCursorOffset,
-            pickerActive: activePicker !== null,
-            onPickerUp: handlePickerUp,
-            onPickerDown: handlePickerDown,
-            onPickerSelect: handlePickerSelect,
-            onPickerCancel: handlePickerCancel,
+            pickerActive: picker.isActive,
+            onPickerUp: picker.onUp,
+            onPickerDown: picker.onDown,
+            onPickerSelect: picker.onSelect,
+            onPickerCancel: picker.onCancel,
             onHistoryUp: () => {
               if (history.length === 0) return;
               if (historyIndex === -1) {
@@ -21718,7 +21943,7 @@ var init_app = __esm({
     init_lsp_nudge();
     init_file_picker();
     init_slash_picker();
-    init_fuzzy();
+    init_use_picker_controller();
     MAX_GITIGNORE_SIZE = 1 * 1024 * 1024;
     FEEDBACK_WORKER_URL2 = "https://hello.kimiflare.com";
     CONTEXT_LIMIT = 262e3;