kimiflare 0.34.0 → 0.35.0

package/dist/index.js

@@ -83,7 +83,7 @@ async function loadConfig() {
   const envCacheStable = process.env.KIMIFLARE_CACHE_STABLE_PROMPTS;
   const cacheStablePrompts = envCacheStable === "0" || envCacheStable === "false" ? false : true;
   const envCompiled = process.env.KIMIFLARE_COMPILED_CONTEXT;
-  const compiledContext = envCompiled === "1" || envCompiled === "true" ? true : false;
+  const compiledContext = envCompiled === "0" || envCompiled === "false" ? false : true;
   const envImageTurns = process.env.KIMIFLARE_IMAGE_HISTORY_TURNS;
   const imageHistoryTurns = envImageTurns ? parseInt(envImageTurns, 10) : void 0;
   const envMemoryEnabled = readBooleanEnv("KIMIFLARE_MEMORY_ENABLED");
@@ -92,9 +92,35 @@ async function loadConfig() {
   const envMemoryMaxEntries = readNumberEnv("KIMIFLARE_MEMORY_MAX_ENTRIES");
   const envMemoryEmbeddingModel = process.env.KIMIFLARE_MEMORY_EMBEDDING_MODEL;
   const envPlumbingModel = process.env.KIMIFLARE_PLUMBING_MODEL;
+  const envMemoryExtractionModel = process.env.KIMIFLARE_MEMORY_EXTRACTION_MODEL;
   const envCodeMode = readBooleanEnv("KIMIFLARE_CODE_MODE");
   const envCostAttribution = readBooleanEnv("KIMI_COST_ATTRIBUTION");
   const envFilePicker = readBooleanEnv("KIMIFLARE_FILE_PICKER");
+  const envCloudMode = readBooleanEnv("KIMIFLARE_CLOUD");
+  if (envCloudMode) {
+    return {
+      accountId: "",
+      apiToken: "",
+      model: envModel,
+      cloudMode: true,
+      reasoningEffort: envEffort,
+      coauthor: envCoauthor?.enabled ?? true,
+      coauthorName: envCoauthor?.name,
+      coauthorEmail: envCoauthor?.email,
+      cacheStablePrompts,
+      compiledContext,
+      imageHistoryTurns: Number.isNaN(imageHistoryTurns) ? void 0 : imageHistoryTurns,
+      memoryEnabled: envMemoryEnabled,
+      memoryDbPath: envMemoryDbPath,
+      memoryMaxAgeDays: envMemoryMaxAgeDays,
+      memoryMaxEntries: envMemoryMaxEntries,
+      memoryEmbeddingModel: envMemoryEmbeddingModel,
+      plumbingModel: envPlumbingModel,
+      codeMode: envCodeMode,
+      costAttribution: envCostAttribution ?? false,
+      filePicker: envFilePicker ?? true
+    };
+  }
   if (envAccount && envToken) {
     return {
       accountId: envAccount,
@@ -112,20 +138,46 @@ async function loadConfig() {
       cacheStablePrompts,
       compiledContext,
       imageHistoryTurns: Number.isNaN(imageHistoryTurns) ? void 0 : imageHistoryTurns,
-      memoryEnabled: envMemoryEnabled,
+      memoryEnabled: envMemoryEnabled ?? true,
       memoryDbPath: envMemoryDbPath,
       memoryMaxAgeDays: envMemoryMaxAgeDays,
       memoryMaxEntries: envMemoryMaxEntries,
       memoryEmbeddingModel: envMemoryEmbeddingModel,
       plumbingModel: envPlumbingModel,
-      codeMode: envCodeMode,
-      costAttribution: envCostAttribution ?? false,
+      memoryExtractionModel: envMemoryExtractionModel,
+      codeMode: envCodeMode ?? true,
+      costAttribution: envCostAttribution ?? true,
       filePicker: envFilePicker ?? true
     };
   }
   try {
     const raw = await readFile(configPath(), "utf8");
     const parsed = JSON.parse(raw);
+    if (parsed.cloudMode) {
+      return {
+        accountId: envAccount ?? parsed.accountId ?? "",
+        apiToken: envToken ?? parsed.apiToken ?? "",
+        model: envModel ?? parsed.model ?? DEFAULT_MODEL,
+        cloudMode: true,
+        reasoningEffort: envEffort ?? parsed.reasoningEffort,
+        coauthor: envCoauthor?.enabled ?? parsed.coauthor ?? true,
+        coauthorName: envCoauthor?.name ?? parsed.coauthorName,
+        coauthorEmail: envCoauthor?.email ?? parsed.coauthorEmail,
+        mcpServers: parsed.mcpServers,
+        cacheStablePrompts: parsed.cacheStablePrompts ?? cacheStablePrompts,
+        compiledContext: parsed.compiledContext ?? compiledContext,
+        imageHistoryTurns: Number.isNaN(imageHistoryTurns) ? parsed.imageHistoryTurns : imageHistoryTurns,
+        memoryEnabled: envMemoryEnabled ?? parsed.memoryEnabled,
+        memoryDbPath: envMemoryDbPath ?? parsed.memoryDbPath,
+        memoryMaxAgeDays: envMemoryMaxAgeDays ?? parsed.memoryMaxAgeDays,
+        memoryMaxEntries: envMemoryMaxEntries ?? parsed.memoryMaxEntries,
+        memoryEmbeddingModel: envMemoryEmbeddingModel ?? parsed.memoryEmbeddingModel,
+        plumbingModel: envPlumbingModel ?? parsed.plumbingModel,
+        codeMode: envCodeMode ?? parsed.codeMode,
+        costAttribution: envCostAttribution ?? parsed.costAttribution ?? false,
+        filePicker: envFilePicker ?? parsed.filePicker ?? true
+      };
+    }
     if (parsed.accountId && parsed.apiToken) {
       return {
         accountId: envAccount ?? parsed.accountId,
@@ -144,15 +196,17 @@ async function loadConfig() {
         cacheStablePrompts: parsed.cacheStablePrompts ?? cacheStablePrompts,
         compiledContext: parsed.compiledContext ?? compiledContext,
         imageHistoryTurns: Number.isNaN(imageHistoryTurns) ? parsed.imageHistoryTurns : imageHistoryTurns,
-        memoryEnabled: envMemoryEnabled ?? parsed.memoryEnabled,
+        memoryEnabled: envMemoryEnabled ?? parsed.memoryEnabled ?? true,
         memoryDbPath: envMemoryDbPath ?? parsed.memoryDbPath,
         memoryMaxAgeDays: envMemoryMaxAgeDays ?? parsed.memoryMaxAgeDays,
         memoryMaxEntries: envMemoryMaxEntries ?? parsed.memoryMaxEntries,
         memoryEmbeddingModel: envMemoryEmbeddingModel ?? parsed.memoryEmbeddingModel,
         plumbingModel: envPlumbingModel ?? parsed.plumbingModel,
-        codeMode: envCodeMode ?? parsed.codeMode,
-        costAttribution: envCostAttribution ?? parsed.costAttribution ?? false,
-        filePicker: envFilePicker ?? parsed.filePicker ?? true
+        memoryExtractionModel: envMemoryExtractionModel ?? parsed.memoryExtractionModel,
+        codeMode: envCodeMode ?? parsed.codeMode ?? true,
+        costAttribution: envCostAttribution ?? parsed.costAttribution ?? true,
+        filePicker: envFilePicker ?? parsed.filePicker ?? true,
+        cloudMode: envCloudMode ?? parsed.cloudMode
       };
     }
   } catch {
@@ -440,7 +494,7 @@ async function* runKimi(opts2) {
     let res;
     try {
       const headers = {
-        Authorization: `Bearer ${opts2.apiToken}`,
+        Authorization: `Bearer ${opts2.cloudMode && opts2.cloudToken ? opts2.cloudToken : opts2.apiToken}`,
         "Content-Type": "application/json",
         "User-Agent": getUserAgent(),
         ...gatewayHeaders
@@ -497,6 +551,12 @@ function validateModelId(model) {
 }
 function buildKimiRequestTarget(opts2) {
   validateModelId(opts2.model);
+  if (opts2.cloudMode) {
+    return {
+      url: "https://api.kimiflare.com/v1/chat",
+      headers: opts2.cloudToken ? { Authorization: `Bearer ${opts2.cloudToken}` } : {}
+    };
+  }
   if (!opts2.gateway?.id) {
     return {
       url: `https://api.cloudflare.com/client/v4/accounts/${encodeURIComponent(opts2.accountId)}/ai/run/${opts2.model}`,
@@ -553,44 +613,51 @@ async function* parseStream(body, signal) {
       lastUsage = chunk.usage;
       yield { type: "usage", usage: chunk.usage };
     }
+    if (typeof chunk.response === "string") {
+      const resp = chunk.response;
+      if (resp.length) {
+        yield { type: "text", delta: resp };
+      }
+    }
     const choice = chunk.choices?.[0];
-    if (!choice) continue;
-    const d = choice.delta;
-    if (d) {
-      if (typeof d.reasoning_content === "string" && d.reasoning_content.length) {
-        yield { type: "reasoning", delta: d.reasoning_content };
-      }
-      if (typeof d.content === "string" && d.content.length) {
-        yield { type: "text", delta: d.content };
-      }
-      if (Array.isArray(d.tool_calls)) {
-        for (const tc of d.tool_calls) {
-          const idx = typeof tc.index === "number" ? tc.index : 0;
-          let buf = toolCalls.get(idx);
-          const incomingName = tc.function?.name ?? null;
-          const incomingId = tc.id ?? null;
-          if (!buf) {
-            buf = { id: incomingId ?? `tc_${idx}`, name: incomingName ?? "", args: "" };
-            toolCalls.set(idx, buf);
-            if (buf.name) {
-              yield { type: "tool_call_start", index: idx, id: buf.id, name: buf.name };
+    if (choice) {
+      const d = choice.delta;
+      if (d) {
+        if (typeof d.reasoning_content === "string" && d.reasoning_content.length) {
+          yield { type: "reasoning", delta: d.reasoning_content };
+        }
+        if (typeof d.content === "string" && d.content.length) {
+          yield { type: "text", delta: d.content };
+        }
+        if (Array.isArray(d.tool_calls)) {
+          for (const tc of d.tool_calls) {
+            const idx = typeof tc.index === "number" ? tc.index : 0;
+            let buf = toolCalls.get(idx);
+            const incomingName = tc.function?.name ?? null;
+            const incomingId = tc.id ?? null;
+            if (!buf) {
+              buf = { id: incomingId ?? `tc_${idx}`, name: incomingName ?? "", args: "" };
+              toolCalls.set(idx, buf);
+              if (buf.name) {
+                yield { type: "tool_call_start", index: idx, id: buf.id, name: buf.name };
+              }
+            } else {
+              if (!buf.name && incomingName) {
+                buf.name = incomingName;
+                yield { type: "tool_call_start", index: idx, id: buf.id, name: buf.name };
+              }
+              if (buf.id.startsWith("tc_") && incomingId) buf.id = incomingId;
             }
-          } else {
-            if (!buf.name && incomingName) {
-              buf.name = incomingName;
-              yield { type: "tool_call_start", index: idx, id: buf.id, name: buf.name };
+            const argDelta = tc.function?.arguments;
+            if (typeof argDelta === "string" && argDelta.length) {
+              buf.args += argDelta;
+              yield { type: "tool_call_args", index: idx, argsDelta: argDelta };
             }
-            if (buf.id.startsWith("tc_") && incomingId) buf.id = incomingId;
-          }
-          const argDelta = tc.function?.arguments;
-          if (typeof argDelta === "string" && argDelta.length) {
-            buf.args += argDelta;
-            yield { type: "tool_call_args", index: idx, argsDelta: argDelta };
           }
         }
       }
+      if (choice.finish_reason) finishReason = choice.finish_reason;
     }
-    if (choice.finish_reason) finishReason = choice.finish_reason;
   }
   for (const [idx, buf] of [...toolCalls.entries()].sort((a, b) => a[0] - b[0])) {
     if (!buf.name) continue;
@@ -965,10 +1032,129 @@ function safeJsonParse(text) {
     return null;
   }
 }
-var EXTRACTORS;
+function truncate(str, max) {
+  if (str.length <= max) return str;
+  return str.slice(0, max) + "\u2026";
+}
+async function callLlm(messages, llmOpts, maxTokens = 64) {
+  if (!llmOpts) return "";
+  const events = runKimi({
+    accountId: llmOpts.accountId,
+    apiToken: llmOpts.apiToken,
+    model: llmOpts.model,
+    messages,
+    temperature: 0.1,
+    maxCompletionTokens: maxTokens,
+    gateway: llmOpts.gateway,
+    signal: llmOpts.signal
+  });
+  let text = "";
+  for await (const ev of events) {
+    if (ev.type === "text") text += ev.delta;
+  }
+  return text.trim().replace(/^["']|["']$/g, "").replace(/\s+/g, " ").toLowerCase();
+}
+async function synthesizeEditEvent(file, toolName, toolArgs, assistantMessage, llmOpts) {
+  if (!llmOpts) return null;
+  const oldString = typeof toolArgs.old_string === "string" ? toolArgs.old_string : "";
+  const newString = typeof toolArgs.new_string === "string" ? toolArgs.new_string : "";
+  const fullContent = typeof toolArgs.content === "string" ? toolArgs.content : "";
+  const isWrite = toolName === "write";
+  const before = isWrite ? "(new file)" : truncate(oldString, 600);
+  const after = isWrite ? truncate(fullContent, 600) : truncate(newString, 600);
+  const intent = assistantMessage ? assistantMessage.slice(-300).trim() : "";
+  const changeContext = `File: ${file}
+Tool: ${toolName}
+
+Before:
+${before}
+
+After:
+${after}${intent ? `
+
+Context: ${intent}` : ""}`;
+  const summary1 = await callLlm(
+    [
+      { role: "system", content: EDIT_SYNTHESIS_SYSTEM },
+      { role: "user", content: `${changeContext}
+
+Summary:` }
+    ],
+    llmOpts
+  );
+  if (summary1.length >= 10 && summary1.length <= 200) {
+    const verdict = await callLlm(
+      [
+        { role: "system", content: VERIFIER_SYSTEM },
+        {
+          role: "user",
+          content: `${changeContext}
+
+Proposed summary: "${summary1}"
+
+Is this accurate?`
+        }
+      ],
+      llmOpts,
+      8
+    );
+    if (verdict.startsWith("yes")) return summary1;
+  }
+  const retrySystem = `${EDIT_SYNTHESIS_SYSTEM}
+
+CRITICAL: The previous summary was rejected. Be specific. Include concrete details from the After section.`;
+  const summary2 = await callLlm(
+    [
+      { role: "system", content: retrySystem },
+      { role: "user", content: `${changeContext}
+
+Summary:` }
+    ],
+    llmOpts
+  );
+  if (summary2.length >= 10 && summary2.length <= 200) {
+    const verdict2 = await callLlm(
+      [
+        { role: "system", content: VERIFIER_SYSTEM },
+        {
+          role: "user",
+          content: `${changeContext}
+
+Proposed summary: "${summary2}"
+
+Is this accurate?`
+        }
+      ],
+      llmOpts,
+      8
+    );
+    if (verdict2.startsWith("yes")) return summary2;
+  }
+  return null;
+}
+var EDIT_SYNTHESIS_SYSTEM, VERIFIER_SYSTEM, EXTRACTORS;
 var init_extractors = __esm({
   "src/memory/extractors.ts"() {
     "use strict";
+    init_client();
+    EDIT_SYNTHESIS_SYSTEM = `You summarize a SINGLE code edit. Write ONE concise sentence (max 20 words) describing exactly what changed.
+
+Rules:
+- Use ONLY the Before/After diff below.
+- For new files: describe the file's content or purpose. Never say just "added a new file".
+- For edits: describe the specific code change.
+
+Examples:
+- Created test-memory.md containing the text "Memory test".
+- Fixed race condition in loop.ts by adding AbortSignal guard.
+- Added vitest dependency and removed jest from package.json.
+
+Respond with only the summary sentence. No quotes, no preamble.`;
+    VERIFIER_SYSTEM = `You verify whether a summary accurately describes a code edit.
+Answer exactly "yes" if the summary correctly captures what changed in the file.
+Answer exactly "no" if the summary is vague, wrong, or misses the actual change.
+
+Respond with only "yes" or "no".`;
     EXTRACTORS = [
       {
         id: "package_json",
@@ -1022,9 +1208,27 @@ var init_extractors = __esm({
       {
         id: "edit_event",
         match: (tool, file) => (tool === "edit" || tool === "write") && !!file,
-        extract: (_content, file) => {
+        extract: async (_content, file, ctx) => {
           if (!file) return null;
           const safeKey = file.replace(/[^a-zA-Z0-9]/g, "_");
+          if (ctx?.llmOpts && (ctx.toolArgs || ctx.assistantMessage)) {
+            const summary = await synthesizeEditEvent(
+              file,
+              ctx.toolArgs?._toolName || "edit",
+              ctx.toolArgs || {},
+              ctx.assistantMessage,
+              ctx.llmOpts
+            );
+            if (summary) {
+              return {
+                content: summary,
+                category: "event",
+                importance: 3,
+                topicKey: `event_edit_${safeKey}`,
+                relatedFiles: [file]
+              };
+            }
+          }
           return {
             content: `File modified: ${file}.`,
             category: "event",
@@ -1179,6 +1383,8 @@ var init_api_generator = __esm({
 });
 
 // src/code-mode/sandbox.ts
+import { join as join6, dirname as dirname3 } from "path";
+import { pathToFileURL } from "url";
 function stripTypescript(code) {
   let js = code;
   js = js.replace(/interface\s+\w+\s*\{[\s\S]*?\n\}/g, "");
@@ -1195,6 +1401,36 @@ function stripTypescript(code) {
   js = js.replace(/\n{3,}/g, "\n\n");
   return js.trim();
 }
+async function loadTypescript(cwd) {
+  let dir = cwd;
+  while (dir !== dirname3(dir)) {
+    try {
+      const tsPath = join6(dir, "node_modules", "typescript", "lib", "typescript.js");
+      return await import(pathToFileURL(tsPath).href);
+    } catch {
+    }
+    dir = dirname3(dir);
+  }
+  return null;
+}
+async function transpileOrStrip(code, cwd) {
+  const ts = await loadTypescript(cwd);
+  if (ts) {
+    const result = ts.transpileModule(code, {
+      compilerOptions: {
+        module: ts.ModuleKind.ES2022,
+        target: ts.ScriptTarget.ES2022,
+        esModuleInterop: true,
+        isolatedModules: true
+      }
+    });
+    return { js: result.outputText, warnings: [] };
+  }
+  return {
+    js: stripTypescript(code),
+    warnings: ["TypeScript not found in node_modules. Using fallback parser; install typescript for reliable transpilation."]
+  };
+}
 async function runWithIsolatedVm(opts2) {
   const { Isolate } = await import("isolated-vm");
   const isolate = new Isolate({ memoryLimit: opts2.memoryLimitMB ?? 128 });
@@ -1242,7 +1478,7 @@ async function runWithIsolatedVm(opts2) {
   await context.eval(`var api = {
 ${apiMethods}
 };`);
-  const jsCode = stripTypescript(opts2.code);
+  const { js: jsCode, warnings } = await transpileOrStrip(opts2.code, opts2.ctx.cwd);
   const wrapped = `(async function() {
 ${jsCode}
 })();`;
@@ -1253,11 +1489,11 @@ ${jsCode}
     await new Promise((r) => setTimeout(r, 10));
   } catch (err) {
     const message2 = err instanceof Error ? err.message : String(err);
-    return { output: "", logs, error: message2, toolCalls };
+    return { output: "", logs, error: message2, toolCalls, warnings };
   } finally {
     isolate.dispose();
   }
-  return { output: logs.join("\n"), logs, toolCalls };
+  return { output: logs.join("\n"), logs, toolCalls, warnings };
 }
 async function runWithNodeVm(opts2) {
   const { runInNewContext } = await import("vm");
@@ -1325,7 +1561,7 @@ async function runWithNodeVm(opts2) {
       return result.content;
     };
   }
-  const jsCode = stripTypescript(opts2.code);
+  const { js: jsCode, warnings } = await transpileOrStrip(opts2.code, opts2.ctx.cwd);
   const wrapped = `"use strict";
 (async function() {
 ${jsCode}
@@ -1336,9 +1572,9 @@ ${jsCode}
     await new Promise((r) => setTimeout(r, 10));
   } catch (err) {
     const message2 = err instanceof Error ? err.message : String(err);
-    return { output: "", logs, error: message2, toolCalls };
+    return { output: "", logs, error: message2, toolCalls, warnings };
   }
-  return { output: logs.join("\n"), logs, toolCalls };
+  return { output: logs.join("\n"), logs, toolCalls, warnings };
 }
 async function runInSandbox(opts2) {
   try {
@@ -1499,7 +1735,9 @@ Use console.log() to return results. Only console.log output will be sent back t
       maxCompletionTokens: opts2.maxCompletionTokens,
       reasoningEffort: opts2.reasoningEffort,
       sessionId: opts2.sessionId,
-      gateway: opts2.gateway
+      gateway: opts2.gateway,
+      cloudMode: opts2.cloudMode,
+      cloudToken: opts2.cloudToken
     });
     for await (const ev of events) {
       switch (ev.type) {
@@ -1678,10 +1916,13 @@ Use console.log() to return results. Only console.log output will be sent back t
           toolResults.push(toolResult);
           opts2.callbacks.onToolResult?.(toolResult);
         }
-        const resultContent = sandboxResult.error ? `Error: ${sandboxResult.error}
+        const warningPrefix = sandboxResult.warnings?.length ? `Warning: ${sandboxResult.warnings.join(" ")}
+
+` : "";
+        const resultContent = sandboxResult.error ? `${warningPrefix}Error: ${sandboxResult.error}
 
 Output:
-${sandboxResult.output}` : sandboxResult.output;
+${sandboxResult.output}` : `${warningPrefix}${sandboxResult.output}`;
         const result = {
           tool_call_id: tc.id,
           name: "execute_code",
@@ -1715,25 +1956,44 @@ ${sandboxResult.output}` : sandboxResult.output;
         opts2.callbacks.onToolResult?.(result);
         if (opts2.memoryManager) {
           let filePath;
+          let toolArgs = {};
           try {
-            const args = JSON.parse(tc.function.arguments || "{}");
-            filePath = args.path;
+            toolArgs = JSON.parse(tc.function.arguments || "{}");
+            filePath = toolArgs.path;
           } catch {
           }
+          const lastAssistant = [...opts2.messages].reverse().find(
+            (m) => m.role === "assistant" && m.tool_calls && m.tool_calls.length > 0
+          );
+          const assistantMessage = lastAssistant?.content ?? "";
+          const llmOpts = opts2.memoryManager.getExtractionLlmOpts();
           for (const extractor of EXTRACTORS) {
             if (extractor.match(tc.function.name, filePath)) {
-              const memory = extractor.extract(result.content, filePath);
-              if (memory) {
-                void opts2.memoryManager.remember(
-                  memory.content,
-                  memory.category,
-                  memory.importance,
-                  opts2.cwd,
-                  opts2.sessionId ?? "unknown",
-                  opts2.signal
-                ).catch(() => {
-                });
-              }
+              void (async () => {
+                try {
+                  const memory = await extractor.extract(result.content, filePath, {
+                    toolArgs: { ...toolArgs, _toolName: tc.function.name },
+                    assistantMessage: typeof assistantMessage === "string" ? assistantMessage : "",
+                    llmOpts: {
+                      ...llmOpts,
+                      signal: opts2.signal
+                    }
+                  });
+                  if (memory) {
+                    await opts2.memoryManager.remember(
+                      memory.content,
+                      memory.category,
+                      memory.importance,
+                      opts2.cwd,
+                      opts2.sessionId ?? "unknown",
+                      opts2.signal,
+                      void 0,
+                      memory.topicKey
+                    );
+                  }
+                } catch {
+                }
+              })();
             }
           }
         }
@@ -2014,11 +2274,11 @@ var init_mode = __esm({
 
 // src/agent/system-prompt.ts
 import { platform, release, homedir as homedir3 } from "os";
-import { basename, join as join6 } from "path";
+import { basename, join as join7 } from "path";
 import { readFileSync as readFileSync2, statSync } from "fs";
 function loadContextFile(cwd) {
   for (const name of CONTEXT_FILENAMES) {
-    const path = join6(cwd, name);
+    const path = join7(cwd, name);
     try {
       const s = statSync(path);
       if (!s.isFile() || s.size > MAX_CONTEXT_BYTES) continue;
@@ -2173,7 +2433,7 @@ var init_read = __esm({
 
 // src/tools/write.ts
 import { mkdir as mkdir4, readFile as readFile4, writeFile as writeFile3 } from "fs/promises";
-import { dirname as dirname3 } from "path";
+import { dirname as dirname4 } from "path";
 var writeTool;
 var init_write = __esm({
   "src/tools/write.ts"() {
@@ -2203,7 +2463,7 @@ var init_write = __esm({
           before = await readFile4(abs, "utf8");
         } catch {
         }
-        await mkdir4(dirname3(abs), { recursive: true });
+        await mkdir4(dirname4(abs), { recursive: true });
         await writeFile3(abs, args.content, "utf8");
         const verb = before ? "Overwrote" : "Created";
         return `${verb} ${args.path} (${args.content.length} chars).`;
@@ -2270,7 +2530,7 @@ var init_edit = __esm({
 // src/tools/bash.ts
 import { spawn } from "child_process";
 import { tmpdir } from "os";
-import { join as join7 } from "path";
+import { join as join8 } from "path";
 function formatBashTitle(raw) {
   let cmd = (raw ?? "").trim();
   const m = cmd.match(/^cd\s+([^\s&;]+)\s*(?:&&|;)\s*(.*)$/);
@@ -2288,7 +2548,7 @@ function injectCoauthor(command, coauthor) {
   const mentionsGit = /\bgit\b/.test(trimmed);
   if (!createsCommit && !isRebaseContinue && !mentionsGit) return command;
   if (movesHeadOnly) return command;
-  const tmpFile = join7(tmpdir(), `kf-coauthor-${Date.now()}-${Math.random().toString(36).slice(2, 8)}`);
+  const tmpFile = join8(tmpdir(), `kf-coauthor-${Date.now()}-${Math.random().toString(36).slice(2, 8)}`);
   const amendBlock = `
     if ! git log -1 --pretty=%B 2>/dev/null | grep -qF "${trailer}"; then
       git log -1 --pretty=%B | git interpret-trailers --trailer "${trailer}" > "${tmpFile}" && git commit --amend -F "${tmpFile}" --no-edit && rm -f "${tmpFile}"
@@ -3452,16 +3712,16 @@ var init_executor = __esm({
 // src/util/update-check.ts
 import { readFile as readFile7, writeFile as writeFile5, mkdir as mkdir5 } from "fs/promises";
 import { homedir as homedir5 } from "os";
-import { join as join8, dirname as dirname4 } from "path";
+import { join as join9, dirname as dirname5 } from "path";
 import { fileURLToPath as fileURLToPath2 } from "url";
 function cachePath() {
-  const xdg = process.env.XDG_CONFIG_HOME || join8(homedir5(), ".config");
-  return join8(xdg, "kimiflare", "update-check.json");
+  const xdg = process.env.XDG_CONFIG_HOME || join9(homedir5(), ".config");
+  return join9(xdg, "kimiflare", "update-check.json");
 }
 async function findPackageJson(startDir) {
   let dir = startDir;
   while (true) {
-    const candidate = join8(dir, "package.json");
+    const candidate = join9(dir, "package.json");
     try {
       const raw = await readFile7(candidate, "utf8");
       const parsed = JSON.parse(raw);
@@ -3470,14 +3730,14 @@ async function findPackageJson(startDir) {
       }
     } catch {
     }
-    const parent = dirname4(dir);
+    const parent = dirname5(dir);
     if (parent === dir) break;
     dir = parent;
   }
   return null;
 }
 async function readLocalVersion() {
-  const here = dirname4(fileURLToPath2(import.meta.url));
+  const here = dirname5(fileURLToPath2(import.meta.url));
   const found = await findPackageJson(here);
   return found?.version ?? null;
 }
@@ -3494,7 +3754,7 @@ async function readCache() {
 }
 async function writeCache(entry) {
   const p = cachePath();
-  await mkdir5(dirname4(p), { recursive: true });
+  await mkdir5(dirname5(p), { recursive: true });
   await writeFile5(p, JSON.stringify(entry), "utf8");
 }
 async function fetchLatestVersion() {
@@ -3554,20 +3814,20 @@ var init_update_check = __esm({
 // src/remote/session-store.ts
 import { readFile as readFile8, writeFile as writeFile6, mkdir as mkdir6, readdir as readdir2 } from "fs/promises";
 import { homedir as homedir6 } from "os";
-import { join as join9 } from "path";
+import { join as join10 } from "path";
 function remoteDir() {
-  const xdg = process.env.XDG_DATA_HOME || join9(homedir6(), ".config");
-  return join9(xdg, "kimiflare", "remote");
+  const xdg = process.env.XDG_DATA_HOME || join10(homedir6(), ".config");
+  return join10(xdg, "kimiflare", "remote");
 }
 async function saveRemoteSession(session) {
   const dir = remoteDir();
   await mkdir6(dir, { recursive: true });
-  const path = join9(dir, `${session.sessionId}.json`);
+  const path = join10(dir, `${session.sessionId}.json`);
   await writeFile6(path, JSON.stringify(session, null, 2) + "\n", "utf8");
 }
 async function loadRemoteSession(sessionId) {
   try {
-    const path = join9(remoteDir(), `${sessionId}.json`);
+    const path = join10(remoteDir(), `${sessionId}.json`);
     const raw = await readFile8(path, "utf8");
     return JSON.parse(raw);
   } catch {
@@ -3582,7 +3842,7 @@ async function listRemoteSessions() {
     for (const file of files) {
       if (!file.endsWith(".json")) continue;
       try {
-        const raw = await readFile8(join9(dir, file), "utf8");
+        const raw = await readFile8(join10(dir, file), "utf8");
         sessions.push(JSON.parse(raw));
       } catch {
       }
@@ -3604,7 +3864,7 @@ var init_session_store = __esm({
 
 // src/remote/deploy.ts
 import { execSync } from "child_process";
-import { join as join10, dirname as dirname5 } from "path";
+import { join as join11, dirname as dirname6 } from "path";
 import { fileURLToPath as fileURLToPath3 } from "url";
 import { randomBytes } from "crypto";
 function generateSecret() {
@@ -3639,7 +3899,7 @@ async function* deployForTui() {
   yield { message: "Docker OK" };
   yield { message: "Building remote agent bundle..." };
   try {
-    runCapture("npm run build:remote-agent", join10(REMOTE_DIR, ".."));
+    runCapture("npm run build:remote-agent", join11(REMOTE_DIR, ".."));
     yield { message: "Agent bundle built" };
   } catch (err) {
     yield { message: `Build failed: ${err instanceof Error ? err.message : String(err)}`, error: true };
@@ -3768,9 +4028,9 @@ var init_deploy = __esm({
   "src/remote/deploy.ts"() {
     "use strict";
     init_config();
-    __dirname = dirname5(fileURLToPath3(import.meta.url));
-    REMOTE_DIR = join10(__dirname, "..", "..", "..", "remote");
-    WORKER_DIR = join10(REMOTE_DIR, "worker");
+    __dirname = dirname6(fileURLToPath3(import.meta.url));
+    REMOTE_DIR = join11(__dirname, "..", "..", "..", "remote");
+    WORKER_DIR = join11(REMOTE_DIR, "worker");
   }
 });
 
@@ -4194,11 +4454,11 @@ var init_heuristic = __esm({
 
 // src/cost-attribution/classify-from-session.ts
 import { readFile as readFile9 } from "fs/promises";
-import { join as join11 } from "path";
+import { join as join12 } from "path";
 import { homedir as homedir7 } from "os";
 function sessionsDir() {
-  const xdg = process.env.XDG_DATA_HOME || join11(homedir7(), ".local", "share");
-  return join11(xdg, "kimiflare", "sessions");
+  const xdg = process.env.XDG_DATA_HOME || join12(homedir7(), ".local", "share");
+  return join12(xdg, "kimiflare", "sessions");
 }
 function parseToolCalls(calls) {
   return calls.map((c) => {
@@ -4212,7 +4472,7 @@ function parseToolCalls(calls) {
 }
 async function classifyFromSessionFile(sessionId) {
   try {
-    const raw = await readFile9(join11(sessionsDir(), `${sessionId}.json`), "utf8");
+    const raw = await readFile9(join12(sessionsDir(), `${sessionId}.json`), "utf8");
     const session = JSON.parse(raw);
     const messages = session.messages ?? [];
     const turns = [];
@@ -4246,14 +4506,14 @@ __export(cli_exports, {
   runCostCommand: () => runCostCommand
 });
 import { readFile as readFile10 } from "fs/promises";
-import { join as join12 } from "path";
+import { join as join13 } from "path";
 import { homedir as homedir8 } from "os";
 function usageDir() {
-  const xdg = process.env.XDG_DATA_HOME || join12(homedir8(), ".local", "share");
-  return join12(xdg, "kimiflare");
+  const xdg = process.env.XDG_DATA_HOME || join13(homedir8(), ".local", "share");
+  return join13(xdg, "kimiflare");
 }
 function usagePath() {
-  return join12(usageDir(), "usage.json");
+  return join13(usageDir(), "usage.json");
 }
 function today() {
   return (/* @__PURE__ */ new Date()).toISOString().slice(0, 10);
@@ -4351,6 +4611,98 @@ var init_cli = __esm({
   }
 });
 
+// src/cloud/auth.ts
+var auth_exports = {};
+__export(auth_exports, {
+  authenticateDevice: () => authenticateDevice,
+  clearCloudCredentials: () => clearCloudCredentials,
+  loadCloudCredentials: () => loadCloudCredentials,
+  saveCloudCredentials: () => saveCloudCredentials
+});
+import { readFile as readFile11, writeFile as writeFile7 } from "fs/promises";
+import { homedir as homedir9 } from "os";
+import { join as join14 } from "path";
+function cloudCredPath() {
+  const xdg = process.env.XDG_CONFIG_HOME || join14(homedir9(), ".config");
+  return join14(xdg, "kimiflare", "cloud.json");
+}
+function generateCode() {
+  const chars = "ABCDEFGHJKLMNPQRSTUVWXYZ23456789";
+  let out = "";
+  for (let i = 0; i < 8; i++) {
+    out += chars[Math.floor(Math.random() * chars.length)];
+  }
+  return out;
+}
+async function loadCloudCredentials() {
+  try {
+    const raw = await readFile11(cloudCredPath(), "utf8");
+    const parsed = JSON.parse(raw);
+    if (parsed.expiresAt && parsed.expiresAt > Date.now() / 1e3) {
+      return parsed;
+    }
+  } catch {
+  }
+  return null;
+}
+async function saveCloudCredentials(creds) {
+  const p = cloudCredPath();
+  await writeFile7(p, JSON.stringify(creds, null, 2), "utf8");
+}
+async function clearCloudCredentials() {
+  try {
+    const { unlink: unlink4 } = await import("fs/promises");
+    await unlink4(cloudCredPath());
+  } catch {
+  }
+}
+async function authenticateDevice(onStatus) {
+  const deviceCode = `device-${generateCode()}-${Date.now()}`;
+  const userCode = `${generateCode()}-${generateCode()}`;
+  const registerRes = await fetch(`${CLOUD_API_URL}/auth/device`, {
+    method: "POST",
+    headers: { "Content-Type": "application/json" },
+    body: JSON.stringify({ device_code: deviceCode, user_code: userCode })
+  });
+  if (!registerRes.ok) {
+    const err = await registerRes.json().catch(() => ({}));
+    throw new Error(`Failed to register device: ${err.error || registerRes.statusText}`);
+  }
+  const authUrl = `${CLOUD_API_URL}/auth/github?code=${encodeURIComponent(userCode)}`;
+  onStatus({ url: authUrl, userCode, polling: false });
+  const startTime = Date.now();
+  while (Date.now() - startTime < POLL_TIMEOUT_MS) {
+    await new Promise((r) => setTimeout(r, POLL_INTERVAL_MS));
+    onStatus({ url: authUrl, userCode, polling: true });
+    const pollRes = await fetch(`${CLOUD_API_URL}/auth/poll`, {
+      method: "POST",
+      headers: { "Content-Type": "application/json" },
+      body: JSON.stringify({ device_code: deviceCode })
+    });
+    if (!pollRes.ok) continue;
+    const pollData = await pollRes.json();
+    if (pollData.status === "approved" && pollData.access_token) {
+      const creds = {
+        accessToken: pollData.access_token,
+        expiresAt: Math.floor(Date.now() / 1e3) + 7 * 24 * 60 * 60
+        // 7 days
+      };
+      await saveCloudCredentials(creds);
+      return creds;
+    }
+  }
+  throw new Error("Authentication timed out. Please try again.");
+}
+var CLOUD_API_URL, POLL_INTERVAL_MS, POLL_TIMEOUT_MS;
+var init_auth = __esm({
+  "src/cloud/auth.ts"() {
+    "use strict";
+    CLOUD_API_URL = "https://api.kimiflare.com";
+    POLL_INTERVAL_MS = 5e3;
+    POLL_TIMEOUT_MS = 10 * 60 * 1e3;
+  }
+});
+
 // src/remote/tui-auth.ts
 var tui_auth_exports = {};
 __export(tui_auth_exports, {
@@ -5260,9 +5612,9 @@ var init_connection = __esm({
 });
 
 // src/lsp/protocol.ts
-import { pathToFileURL, fileURLToPath as fileURLToPath4 } from "url";
+import { pathToFileURL as pathToFileURL2, fileURLToPath as fileURLToPath4 } from "url";
 function toUri(path) {
-  return pathToFileURL(path).href;
+  return pathToFileURL2(path).href;
 }
 function fromUri(uri) {
   return fileURLToPath4(uri);
@@ -6402,7 +6754,7 @@ import { useEffect, useState } 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 }) {
+function StatusBar({ model, usage, sessionUsage, thinking, turnStartedAt, mode, effort, contextLimit, hasUpdate, latestVersion, gatewayMeta, codeMode, cloudMode }) {
   const theme = useTheme();
   const [now2, setNow] = useState(Date.now());
   const modeColor = mode === "plan" ? theme.modeBadge.plan : mode === "auto" ? theme.modeBadge.auto : theme.modeBadge.edit;
@@ -6414,6 +6766,7 @@ function StatusBar({ model, usage, sessionUsage, thinking, turnStartedAt, mode,
   }, [thinking, turnStartedAt]);
   const elapsed = turnStartedAt !== null ? formatElapsed(now2 - turnStartedAt) : null;
   const leftParts = [`${shortModel(model)}`, effort];
+  if (cloudMode) leftParts.push("CLOUD");
   if (codeMode) leftParts.push("CODE");
   return /* @__PURE__ */ jsxs5(Box5, { flexDirection: "column", children: [
     /* @__PURE__ */ jsxs5(Box5, { children: [
@@ -7468,15 +7821,25 @@ var init_text_input = __esm({
 // src/ui/onboarding.tsx
 import { useState as useState5 } from "react";
 import { Box as Box9, Text as Text10 } from "ink";
+import SelectInput3 from "ink-select-input";
 import { Fragment, jsx as jsx11, jsxs as jsxs9 } from "react/jsx-runtime";
 function Onboarding({ onDone }) {
   const theme = useTheme();
-  const [step, setStep] = useState5("accountId");
+  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 stepIndex = STEPS.indexOf(step) + 1;
+  const handleModeSelect = (item) => {
+    if (item.value === "cloud") {
+      setMode("cloud");
+      setStep("cloudDone");
+    } else {
+      setMode("byok");
+      setStep("accountId");
+    }
+  };
   const handleAccountIdSubmit = (value) => {
     const trimmed = value.trim();
     if (!trimmed) return;
@@ -7495,7 +7858,7 @@ function Onboarding({ onDone }) {
     setStep("confirm");
   };
   const handleConfirm = async () => {
-    const cfg = { accountId, apiToken, model };
+    const cfg = mode === "cloud" ? { accountId: "", apiToken: "", model, cloudMode: true } : { accountId, apiToken, model };
     try {
       const path = await saveConfig(cfg);
       setSavedPath(path);
@@ -7504,6 +7867,19 @@ function Onboarding({ onDone }) {
       setSavedPath(`error: ${e.message}`);
     }
   };
+  const handleCloudSave = async () => {
+    const cfg = { accountId: "", apiToken: "", model: DEFAULT_MODEL, cloudMode: true };
+    try {
+      const path = await saveConfig(cfg);
+      setSavedPath(path);
+      onDone(cfg);
+    } catch (e) {
+      setSavedPath(`error: ${e.message}`);
+    }
+  };
+  const byokSteps = ["accountId", "apiToken", "model", "confirm"];
+  const stepIndex = step === "mode" ? 1 : step === "cloudDone" ? 2 : byokSteps.indexOf(step) + 2;
+  const totalSteps = mode === "cloud" ? 2 : byokSteps.length + 1;
   return /* @__PURE__ */ jsxs9(Box9, { flexDirection: "column", paddingY: 1, children: [
     /* @__PURE__ */ jsxs9(Box9, { marginBottom: 1, children: [
       /* @__PURE__ */ jsx11(Text10, { bold: true, color: theme.palette.primary, children: "kimiflare" }),
@@ -7516,9 +7892,22 @@ function Onboarding({ onDone }) {
       "Step ",
       stepIndex,
       " of ",
-      STEPS.length
+      totalSteps
     ] }),
     /* @__PURE__ */ jsxs9(Box9, { marginTop: 1, flexDirection: "column", children: [
+      step === "mode" && /* @__PURE__ */ jsxs9(Fragment, { children: [
+        /* @__PURE__ */ jsx11(Text10, { children: "How do you want to connect?" }),
+        /* @__PURE__ */ jsx11(Box9, { marginTop: 1, children: /* @__PURE__ */ jsx11(
+          SelectInput3,
+          {
+            items: [
+              { label: "Cloud (managed) \u2014 no API key needed", value: "cloud" },
+              { label: "BYOK \u2014 bring your own Cloudflare key", value: "byok" }
+            ],
+            onSelect: handleModeSelect
+          }
+        ) })
+      ] }),
       step === "accountId" && /* @__PURE__ */ jsxs9(Fragment, { children: [
         /* @__PURE__ */ jsx11(Text10, { children: "Enter your Cloudflare Account ID" }),
         /* @__PURE__ */ jsxs9(Box9, { marginTop: 1, children: [
@@ -7608,6 +7997,23 @@ function Onboarding({ onDone }) {
           )
         ] })
       ] }),
+      step === "cloudDone" && /* @__PURE__ */ jsxs9(Fragment, { children: [
+        /* @__PURE__ */ jsx11(Text10, { children: "Cloud mode selected" }),
+        /* @__PURE__ */ jsx11(Text10, { color: theme.info.color, children: "No API key needed. Run `kimiflare auth cloud` to sign in." }),
+        /* @__PURE__ */ jsx11(Box9, { marginTop: 1, children: /* @__PURE__ */ jsx11(Text10, { children: "Press Enter to save, or Ctrl+C to cancel" }) }),
+        /* @__PURE__ */ jsxs9(Box9, { marginTop: 1, children: [
+          /* @__PURE__ */ jsx11(Text10, { color: theme.palette.primary, children: "\u203A " }),
+          /* @__PURE__ */ jsx11(
+            CustomTextInput,
+            {
+              value: "",
+              onChange: () => {
+              },
+              onSubmit: handleCloudSave
+            }
+          )
+        ] })
+      ] }),
       savedPath && /* @__PURE__ */ jsxs9(Text10, { color: theme.palette.success, children: [
         "Config saved to ",
         savedPath
@@ -7615,14 +8021,12 @@ function Onboarding({ onDone }) {
     ] })
   ] });
 }
-var STEPS;
 var init_onboarding = __esm({
   "src/ui/onboarding.tsx"() {
     "use strict";
     init_text_input();
     init_config();
     init_theme_context();
-    STEPS = ["accountId", "apiToken", "model", "confirm"];
   }
 });
 
@@ -7673,9 +8077,9 @@ var init_welcome = __esm({
 // src/ui/help-menu.tsx
 import { useState as useState6 } from "react";
 import { Box as Box11, Text as Text12, useInput as useInput2 } from "ink";
-import SelectInput3 from "ink-select-input";
+import SelectInput4 from "ink-select-input";
 import { jsx as jsx13, jsxs as jsxs11 } from "react/jsx-runtime";
-function HelpMenu({ customCommands, costAttributionEnabled, onDone, onCommand }) {
+function HelpMenu({ customCommands, costAttributionEnabled, cloudMode, onDone, onCommand }) {
   const theme = useTheme();
   const [page, setPage] = useState6("main");
   const customs = customCommands ?? [];
@@ -7692,8 +8096,9 @@ function HelpMenu({ customCommands, costAttributionEnabled, onDone, onCommand })
     onCommand(command);
     onDone();
   };
+  const categories = cloudMode ? CATEGORIES.filter((c) => c.key !== "gateway") : CATEGORIES;
   if (page === "main") {
-    const items2 = CATEGORIES.map((cat) => ({
+    const items2 = categories.map((cat) => ({
       label: cat.label,
       value: cat.key,
       key: cat.key
@@ -7706,7 +8111,7 @@ function HelpMenu({ customCommands, costAttributionEnabled, onDone, onCommand })
       /* @__PURE__ */ jsx13(Text12, { color: theme.accent, bold: true, children: "Help" }),
       /* @__PURE__ */ jsx13(Text12, { color: theme.info.color, dimColor: false, children: "Arrow keys to navigate, Enter to select, Esc to close." }),
       /* @__PURE__ */ jsx13(Box11, { marginTop: 1, children: /* @__PURE__ */ jsx13(
-        SelectInput3,
+        SelectInput4,
         {
           items: items2,
           onSelect: (item) => {
@@ -7733,7 +8138,7 @@ function HelpMenu({ customCommands, costAttributionEnabled, onDone, onCommand })
       /* @__PURE__ */ jsx13(Text12, { color: theme.accent, bold: true, children: "Custom commands" }),
       /* @__PURE__ */ jsx13(Text12, { 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__ */ jsx13(Box11, { marginTop: 1, children: /* @__PURE__ */ jsx13(
-        SelectInput3,
+        SelectInput4,
         {
           items: items2,
           onSelect: (item) => {
@@ -7747,7 +8152,7 @@ function HelpMenu({ customCommands, costAttributionEnabled, onDone, onCommand })
       ) })
     ] });
   }
-  const category = CATEGORIES.find((c) => c.key === page);
+  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) => ({
@@ -7760,7 +8165,7 @@ function HelpMenu({ customCommands, costAttributionEnabled, onDone, onCommand })
     /* @__PURE__ */ jsx13(Text12, { color: theme.accent, bold: true, children: category.label }),
     /* @__PURE__ */ jsx13(Text12, { color: theme.info.color, dimColor: false, children: "Arrow keys to navigate, Enter to execute, Esc to go back." }),
     /* @__PURE__ */ jsx13(Box11, { marginTop: 1, children: /* @__PURE__ */ jsx13(
-      SelectInput3,
+      SelectInput4,
       {
         items,
         onSelect: (item) => {
@@ -8006,7 +8411,7 @@ var init_tui_deploy = __esm({
 // src/ui/remote-dashboard.tsx
 import { useEffect as useEffect4, useState as useState7 } from "react";
 import { Box as Box12, Text as Text13, useInput as useInput3 } from "ink";
-import SelectInput4 from "ink-select-input";
+import SelectInput5 from "ink-select-input";
 import { jsx as jsx14, jsxs as jsxs12 } from "react/jsx-runtime";
 function RemoteDashboard({ onSelect, onCancel }) {
   const theme = useTheme();
@@ -8087,7 +8492,7 @@ function RemoteDashboard({ onSelect, onCancel }) {
       refreshing ? "(refreshing...)" : ""
     ] }),
     /* @__PURE__ */ jsx14(Box12, { marginTop: 1, children: /* @__PURE__ */ jsx14(
-      SelectInput4,
+      SelectInput5,
       {
         items,
         onSelect: (item) => {
@@ -8258,12 +8663,12 @@ __export(sessions_exports, {
   pruneSessions: () => pruneSessions,
   saveSession: () => saveSession
 });
-import { readFile as readFile11, writeFile as writeFile7, mkdir as mkdir7, readdir as readdir3, stat as stat4 } from "fs/promises";
-import { homedir as homedir9 } from "os";
-import { join as join13 } from "path";
+import { readFile as readFile12, writeFile as writeFile8, mkdir as mkdir7, readdir as readdir3, stat as stat4 } from "fs/promises";
+import { homedir as homedir10 } from "os";
+import { join as join15 } from "path";
 function sessionsDir2() {
-  const xdg = process.env.XDG_DATA_HOME || join13(homedir9(), ".local", "share");
-  return join13(xdg, "kimiflare", "sessions");
+  const xdg = process.env.XDG_DATA_HOME || join15(homedir10(), ".local", "share");
+  return join15(xdg, "kimiflare", "sessions");
 }
 function sanitize(text) {
   return text.toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-+|-+$/g, "").slice(0, 40);
@@ -8276,8 +8681,8 @@ function makeSessionId(firstPrompt) {
 async function saveSession(file) {
   const dir = sessionsDir2();
   await mkdir7(dir, { recursive: true });
-  const path = join13(dir, `${file.id}.json`);
-  await writeFile7(path, JSON.stringify(file, null, 2), "utf8");
+  const path = join15(dir, `${file.id}.json`);
+  await writeFile8(path, JSON.stringify(file, null, 2), "utf8");
   return path;
 }
 async function pruneSessions() {
@@ -8296,9 +8701,9 @@ async function listSessions(limit = 30, cwd) {
   const summaries = [];
   for (const name of entries) {
     if (!name.endsWith(".json")) continue;
-    const path = join13(dir, name);
+    const path = join15(dir, name);
     try {
-      const [s, raw] = await Promise.all([stat4(path), readFile11(path, "utf8")]);
+      const [s, raw] = await Promise.all([stat4(path), readFile12(path, "utf8")]);
       const parsed = JSON.parse(raw);
       if (cwd && parsed.cwd !== cwd) continue;
       const firstUser = parsed.messages.find((m) => m.role === "user");
@@ -8318,7 +8723,7 @@ async function listSessions(limit = 30, cwd) {
   return summaries.slice(0, limit);
 }
 async function loadSession(filePath) {
-  const raw = await readFile11(filePath, "utf8");
+  const raw = await readFile12(filePath, "utf8");
   return JSON.parse(raw);
 }
 var init_sessions = __esm({
@@ -8329,10 +8734,10 @@ var init_sessions = __esm({
 });
 
 // src/util/image.ts
-import { readFile as readFile12 } from "fs/promises";
+import { readFile as readFile13 } from "fs/promises";
 import { basename as basename3 } from "path";
 async function encodeImageFile(filePath) {
-  const buf = await readFile12(filePath);
+  const buf = await readFile13(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`
@@ -8368,15 +8773,15 @@ var init_image = __esm({
 });
 
 // src/usage-tracker.ts
-import { readFile as readFile13, writeFile as writeFile8, mkdir as mkdir8 } from "fs/promises";
-import { homedir as homedir10 } from "os";
-import { join as join14 } from "path";
+import { readFile as readFile14, writeFile as writeFile9, mkdir as mkdir8 } from "fs/promises";
+import { homedir as homedir11 } from "os";
+import { join as join16 } from "path";
 function usageDir2() {
-  const xdg = process.env.XDG_DATA_HOME || join14(homedir10(), ".local", "share");
-  return join14(xdg, "kimiflare");
+  const xdg = process.env.XDG_DATA_HOME || join16(homedir11(), ".local", "share");
+  return join16(xdg, "kimiflare");
 }
 function usagePath2() {
-  return join14(usageDir2(), "usage.json");
+  return join16(usageDir2(), "usage.json");
 }
 function today2() {
   return (/* @__PURE__ */ new Date()).toISOString().slice(0, 10);
@@ -8387,7 +8792,7 @@ function cutoffDate(daysBack) {
 }
 async function loadLog2() {
   try {
-    const raw = await readFile13(usagePath2(), "utf8");
+    const raw = await readFile14(usagePath2(), "utf8");
     const parsed = JSON.parse(raw);
     if (parsed.version === LOG_VERSION2) return parsed;
   } catch {
@@ -8396,7 +8801,7 @@ async function loadLog2() {
 }
 async function saveLog(log) {
   await mkdir8(usageDir2(), { recursive: true });
-  await writeFile8(usagePath2(), JSON.stringify(log, null, 2), "utf8");
+  await writeFile9(usagePath2(), JSON.stringify(log, null, 2), "utf8");
 }
 function getOrCreateDay(log, date) {
   let day = log.days.find((d) => d.date === date);
@@ -8602,7 +9007,7 @@ __export(db_exports, {
   updateMemoryEmbedding: () => updateMemoryEmbedding
 });
 import Database from "better-sqlite3";
-import { dirname as dirname6 } from "path";
+import { dirname as dirname7 } from "path";
 import { mkdirSync, statSync as statSync2 } from "fs";
 function initSchema(db) {
   db.exec(`
@@ -8687,7 +9092,7 @@ function openMemoryDb(dbPath) {
   if (dbInstance) {
     dbInstance.close();
   }
-  mkdirSync(dirname6(dbPath), { recursive: true });
+  mkdirSync(dirname7(dbPath), { recursive: true });
   dbInstance = new Database(dbPath);
   dbInstance.pragma("journal_mode = WAL");
   dbInstance.pragma("foreign_keys = ON");
@@ -9392,6 +9797,18 @@ Return a JSON array of strings. Example:
           gateway: this.opts.gateway
         };
       }
+      get extractionLlmOpts() {
+        return {
+          accountId: this.opts.accountId,
+          apiToken: this.opts.apiToken,
+          model: this.opts.extractionModel ?? "@cf/meta/llama-3.2-3b-instruct",
+          gateway: this.opts.gateway
+        };
+      }
+      /** Expose extraction LLM opts so the agent loop can pass them to extractors. */
+      getExtractionLlmOpts() {
+        return this.extractionLlmOpts;
+      }
       shouldRedact() {
         return this.opts.redactSecrets !== false;
       }
@@ -9399,7 +9816,7 @@ Return a JSON array of strings. Example:
        * Store a memory with verification, topic-key normalization, hypothetical queries,
        * secret redaction, and supersession.
        */
-      async remember(content, category, importance, repoPath, sessionId, signal, agentRole) {
+      async remember(content, category, importance, repoPath, sessionId, signal, agentRole, topicKey) {
         if (!this.db) throw new Error("Memory DB not open");
         let safeContent = this.shouldRedact() ? redactSecrets(content) : content;
         if (!safeContent.trim()) {
@@ -9412,10 +9829,10 @@ Return a JSON array of strings. Example:
         if (verified.corrected_content) {
           safeContent = verified.corrected_content;
         }
-        const topicKey = this.normalizeTopicKey(safeContent, repoPath);
+        const resolvedTopicKey = topicKey?.trim() || this.normalizeTopicKey(safeContent, repoPath);
         const supersededIds = [];
-        if (topicKey) {
-          const existing = findMemoriesByTopicKey(this.db, repoPath, topicKey);
+        if (resolvedTopicKey) {
+          const existing = findMemoriesByTopicKey(this.db, repoPath, resolvedTopicKey);
           for (const old of existing) {
             supersedeMemory(this.db, old.id, "pending");
             supersededIds.push(old.id);
@@ -9436,7 +9853,7 @@ Return a JSON array of strings. Example:
           sourceSessionId: sessionId,
           repoPath,
           importance: Math.max(1, Math.min(5, importance)),
-          topicKey: topicKey ?? void 0,
+          topicKey: resolvedTopicKey ?? void 0,
           agentRole
         };
         const memory = insertMemory(this.db, input, embeddings[0]);
@@ -9614,16 +10031,16 @@ Context: This memory was explicitly provided by the user during a conversation.`
 });
 
 // src/util/state.ts
-import { readFile as readFile14, writeFile as writeFile9, mkdir as mkdir9 } from "fs/promises";
-import { homedir as homedir11 } from "os";
-import { join as join16 } from "path";
+import { readFile as readFile15, writeFile as writeFile10, mkdir as mkdir9 } from "fs/promises";
+import { homedir as homedir12 } from "os";
+import { join as join18 } from "path";
 function statePath() {
-  const xdg = process.env.XDG_CONFIG_HOME || join16(homedir11(), ".config");
-  return join16(xdg, "kimiflare", "state.json");
+  const xdg = process.env.XDG_CONFIG_HOME || join18(homedir12(), ".config");
+  return join18(xdg, "kimiflare", "state.json");
 }
 async function readState() {
   try {
-    const raw = await readFile14(statePath(), "utf8");
+    const raw = await readFile15(statePath(), "utf8");
     return JSON.parse(raw);
   } catch {
     return {};
@@ -9631,8 +10048,8 @@ async function readState() {
 }
 async function writeState(state) {
   const path = statePath();
-  await mkdir9(join16(path, ".."), { recursive: true });
-  await writeFile9(path, JSON.stringify(state, null, 2) + "\n", "utf8");
+  await mkdir9(join18(path, ".."), { recursive: true });
+  await writeFile10(path, JSON.stringify(state, null, 2) + "\n", "utf8");
 }
 async function markCreatorMessageSeen(version) {
   const state = await readState();
@@ -9705,15 +10122,15 @@ var init_frontmatter = __esm({
 
 // src/commands/loader.ts
 import { open, realpath } from "fs/promises";
-import { homedir as homedir12 } from "os";
-import { join as join17, relative as relative4, sep as sep2 } from "path";
+import { homedir as homedir13 } from "os";
+import { join as join19, relative as relative4, sep as sep2 } from "path";
 import fg3 from "fast-glob";
 function projectCommandsDir(cwd = process.cwd()) {
-  return join17(cwd, ".kimiflare", "commands");
+  return join19(cwd, ".kimiflare", "commands");
 }
 function globalCommandsDir() {
-  const xdg = process.env.XDG_CONFIG_HOME || join17(homedir12(), ".config");
-  return join17(xdg, "kimiflare", "commands");
+  const xdg = process.env.XDG_CONFIG_HOME || join19(homedir13(), ".config");
+  return join19(xdg, "kimiflare", "commands");
 }
 async function loadCustomCommands(cwd = process.cwd()) {
   const warnings = [];
@@ -10089,8 +10506,8 @@ var init_builtins = __esm({
 });
 
 // src/commands/save.ts
-import { mkdir as mkdir10, writeFile as writeFile10, unlink as unlink2 } from "fs/promises";
-import { dirname as dirname7 } from "path";
+import { mkdir as mkdir10, writeFile as writeFile11, unlink as unlink2 } from "fs/promises";
+import { dirname as dirname8 } from "path";
 async function saveCustomCommand(opts2) {
   const dir = opts2.source === "project" ? projectCommandsDir(opts2.cwd) : globalCommandsDir();
   const filepath = `${dir}/${opts2.name}.md`;
@@ -10101,8 +10518,8 @@ async function saveCustomCommand(opts2) {
   if (opts2.effort) data.effort = opts2.effort;
   const frontmatter = serializeFrontmatter(data);
   const content = frontmatter + opts2.template;
-  await mkdir10(dirname7(filepath), { recursive: true });
-  await writeFile10(filepath, content, "utf8");
+  await mkdir10(dirname8(filepath), { recursive: true });
+  await writeFile11(filepath, content, "utf8");
   return { filepath };
 }
 async function deleteCustomCommand(cmd) {
@@ -10119,7 +10536,7 @@ var init_save = __esm({
 // src/ui/command-wizard.tsx
 import { useState as useState8 } from "react";
 import { Box as Box13, Text as Text14, useInput as useInput4, useWindowSize as useWindowSize2 } from "ink";
-import SelectInput5 from "ink-select-input";
+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();
@@ -10372,7 +10789,7 @@ ${template}`;
             ")"
           ] }),
           /* @__PURE__ */ jsx15(Box13, { marginTop: 1, children: /* @__PURE__ */ jsx15(
-            SelectInput5,
+            SelectInput6,
             {
               items,
               onSelect: (item) => {
@@ -10401,7 +10818,7 @@ ${template}`;
           ] }),
           /* @__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(
-            SelectInput5,
+            SelectInput6,
             {
               items,
               onSelect: (item) => {
@@ -10429,7 +10846,7 @@ ${template}`;
             ")"
           ] }),
           /* @__PURE__ */ jsx15(Box13, { marginTop: 1, children: /* @__PURE__ */ jsx15(
-            SelectInput5,
+            SelectInput6,
             {
               items,
               onSelect: (item) => {
@@ -10475,7 +10892,7 @@ ${template}`;
             ")"
           ] }),
           /* @__PURE__ */ jsx15(Box13, { marginTop: 1, children: /* @__PURE__ */ jsx15(
-            SelectInput5,
+            SelectInput6,
             {
               items,
               onSelect: (item) => {
@@ -10508,7 +10925,7 @@ ${template}`;
           ] }),
           /* @__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(
-            SelectInput5,
+            SelectInput6,
             {
               items,
               onSelect: (item) => handleConfirm(item.value)
@@ -10532,7 +10949,7 @@ var init_command_wizard = __esm({
 
 // src/ui/command-picker.tsx
 import { Box as Box14, Text as Text15 } from "ink";
-import SelectInput6 from "ink-select-input";
+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();
@@ -10546,7 +10963,7 @@ function CommandPicker({ commands, title, onPick }) {
     /* @__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(
-      SelectInput6,
+      SelectInput7,
       {
         items,
         onSelect: (item) => {
@@ -10643,7 +11060,7 @@ var init_command_list = __esm({
 // src/ui/lsp-wizard.tsx
 import { useState as useState9 } from "react";
 import { Box as Box16, Text as Text17 } from "ink";
-import SelectInput7 from "ink-select-input";
+import SelectInput8 from "ink-select-input";
 import { spawn as spawn3 } from "child_process";
 import { jsx as jsx18, jsxs as jsxs16 } from "react/jsx-runtime";
 function LspWizard({ servers, currentScope, hasProjectDir, onDone, onSave }) {
@@ -10760,7 +11177,7 @@ function LspWizard({ servers, currentScope, hasProjectDir, onDone, onSave }) {
       /* @__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(
-        SelectInput7,
+        SelectInput8,
         {
           items: mainItems,
           onSelect: (item) => {
@@ -10791,7 +11208,7 @@ function LspWizard({ servers, currentScope, hasProjectDir, onDone, onSave }) {
       /* @__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(
-        SelectInput7,
+        SelectInput8,
         {
           items,
           onSelect: (item) => {
@@ -10830,7 +11247,7 @@ function LspWizard({ servers, currentScope, hasProjectDir, onDone, onSave }) {
       ] }),
       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(
-        SelectInput7,
+        SelectInput8,
         {
           items,
           onSelect: (item) => {
@@ -10871,7 +11288,7 @@ function LspWizard({ servers, currentScope, hasProjectDir, onDone, onSave }) {
         )
       ] }),
       /* @__PURE__ */ jsx18(Box16, { marginTop: 1, children: /* @__PURE__ */ jsx18(
-        SelectInput7,
+        SelectInput8,
         {
           items: [{ label: "\u2190 Back", value: "__back__", key: "__back__" }],
           onSelect: () => setPage("add")
@@ -10900,7 +11317,7 @@ function LspWizard({ servers, currentScope, hasProjectDir, onDone, onSave }) {
         )
       ] }),
       /* @__PURE__ */ jsx18(Box16, { marginTop: 1, children: /* @__PURE__ */ jsx18(
-        SelectInput7,
+        SelectInput8,
         {
           items: [{ label: "\u2190 Back", value: "__back__", key: "__back__" }],
           onSelect: () => setPage("custom-name")
@@ -10927,7 +11344,7 @@ function LspWizard({ servers, currentScope, hasProjectDir, onDone, onSave }) {
       /* @__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(
-        SelectInput7,
+        SelectInput8,
         {
           items,
           onSelect: (item) => {
@@ -10949,7 +11366,7 @@ function LspWizard({ servers, currentScope, hasProjectDir, onDone, onSave }) {
         /* @__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(
-          SelectInput7,
+          SelectInput8,
           {
             items: [{ label: "\u2190 Back", value: "__back__", key: "__back__" }],
             onSelect: () => setPage("main")
@@ -10973,7 +11390,7 @@ function LspWizard({ servers, currentScope, hasProjectDir, onDone, onSave }) {
       /* @__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(
-        SelectInput7,
+        SelectInput8,
         {
           items,
           onSelect: (item) => {
@@ -10994,7 +11411,7 @@ function LspWizard({ servers, currentScope, hasProjectDir, onDone, onSave }) {
         /* @__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(
-          SelectInput7,
+          SelectInput8,
           {
             items: [{ label: "\u2190 Back", value: "__back__", key: "__back__" }],
             onSelect: () => setPage("main")
@@ -11014,7 +11431,7 @@ function LspWizard({ servers, currentScope, hasProjectDir, onDone, onSave }) {
       /* @__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(
-        SelectInput7,
+        SelectInput8,
         {
           items,
           onSelect: (item) => {
@@ -11038,7 +11455,7 @@ function LspWizard({ servers, currentScope, hasProjectDir, onDone, onSave }) {
         return /* @__PURE__ */ jsx18(Text17, { color: theme.info.color, children: `  ${k.padEnd(16)} ${status}  ${s.command.join(" ")}` }, k);
       }) }),
       /* @__PURE__ */ jsx18(Box16, { marginTop: 1, children: /* @__PURE__ */ jsx18(
-        SelectInput7,
+        SelectInput8,
         {
           items: [{ label: "\u2190 Back", value: "__back__", key: "__back__" }],
           onSelect: () => setPage("main")
@@ -11165,7 +11582,7 @@ var init_lsp_wizard = __esm({
 
 // src/ui/theme-picker.tsx
 import { Box as Box17, Text as Text18 } from "ink";
-import SelectInput8 from "ink-select-input";
+import SelectInput9 from "ink-select-input";
 import { jsx as jsx19, jsxs as jsxs17 } from "react/jsx-runtime";
 function PaletteSwatches({ palette }) {
   const colors = [
@@ -11185,7 +11602,7 @@ function ThemePicker({ themes, onPick, onPreview }) {
   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" }),
     /* @__PURE__ */ jsx19(Box17, { marginTop: 1, children: /* @__PURE__ */ jsx19(
-      SelectInput8,
+      SelectInput9,
       {
         items,
         onHighlight: (item) => {
@@ -11523,15 +11940,15 @@ var tui_report_exports = {};
 __export(tui_report_exports, {
   getCategoryReportText: () => getCategoryReportText
 });
-import { readFile as readFile15 } from "fs/promises";
-import { join as join18 } from "path";
-import { homedir as homedir13 } from "os";
+import { readFile as readFile16 } from "fs/promises";
+import { join as join20 } from "path";
+import { homedir as homedir14 } from "os";
 function usageDir3() {
-  const xdg = process.env.XDG_DATA_HOME || join18(homedir13(), ".local", "share");
-  return join18(xdg, "kimiflare");
+  const xdg = process.env.XDG_DATA_HOME || join20(homedir14(), ".local", "share");
+  return join20(xdg, "kimiflare");
 }
 function usagePath3() {
-  return join18(usageDir3(), "usage.json");
+  return join20(usageDir3(), "usage.json");
 }
 function today3() {
   return (/* @__PURE__ */ new Date()).toISOString().slice(0, 10);
@@ -11543,7 +11960,7 @@ function daysAgo2(n) {
 }
 async function loadLog3() {
   try {
-    const raw = await readFile15(usagePath3(), "utf8");
+    const raw = await readFile16(usagePath3(), "utf8");
     return JSON.parse(raw);
   } catch {
     return { version: 1, days: [], sessions: [] };
@@ -11611,9 +12028,9 @@ __export(app_exports, {
 });
 import React14, { useState as useState10, useRef as useRef3, useEffect as useEffect5, useCallback } from "react";
 import { Box as Box20, Text as Text21, useApp, useInput as useInput6, render } from "ink";
-import SelectInput9 from "ink-select-input";
+import SelectInput10 from "ink-select-input";
 import { existsSync as existsSync2, statSync as statSync3 } from "fs";
-import { join as join19 } from "path";
+import { join as join21 } from "path";
 import { unlink as unlink3 } from "fs/promises";
 import { execSync as execSync2 } from "child_process";
 import { spawn as spawn4 } from "child_process";
@@ -11691,7 +12108,7 @@ function buildFilePickerIgnoreList(cwd) {
   ];
   const gitignorePatterns = [];
   try {
-    const gitignorePath = join19(cwd, ".gitignore");
+    const gitignorePath = join21(cwd, ".gitignore");
     const stats = statSync3(gitignorePath);
     if (stats.size > MAX_GITIGNORE_SIZE) {
       return hardcoded;
@@ -11844,7 +12261,8 @@ function App({
   initialCfg,
   initialUpdateResult,
   initialLspScope,
-  initialLspProjectPath
+  initialLspProjectPath,
+  initialCloudToken
 }) {
   const { exit } = useApp();
   const [cfg, setCfg] = useState10(initialCfg);
@@ -12108,13 +12526,14 @@ function App({
       }
     });
     if (cfg.memoryEnabled) {
-      const dbPath = cfg.memoryDbPath ?? join19(process.cwd(), ".kimiflare", "memory.db");
+      const dbPath = cfg.memoryDbPath ?? join21(process.cwd(), ".kimiflare", "memory.db");
       const manager = new MemoryManager({
         dbPath,
         accountId: cfg.accountId,
         apiToken: cfg.apiToken,
         model: cfg.model,
         plumbingModel: cfg.plumbingModel,
+        extractionModel: cfg.memoryExtractionModel,
         embeddingModel: cfg.memoryEmbeddingModel,
         gateway: gatewayFromConfig(cfg),
         maxAgeDays: cfg.memoryMaxAgeDays ?? RETENTION.memoryMaxAgeDays,
@@ -12756,7 +13175,7 @@ function App({
       return;
     }
     const cwd = process.cwd();
-    const existingName = ["KIMI.md", "KIMIFLARE.md", "AGENT.md"].find((n) => existsSync2(join19(cwd, n)));
+    const existingName = ["KIMI.md", "KIMIFLARE.md", "AGENT.md"].find((n) => existsSync2(join21(cwd, n)));
     const isRefresh = existingName !== void 0;
     const promptParts = [
       isRefresh ? `Regenerate ${existingName} at the repository root to refresh project context. If the file already exists, read it first and preserve anything still accurate, updating only what has changed.` : "Generate a KIMI.md at the repository root so future agents have project context.",
@@ -12807,15 +13226,15 @@ function App({
         sessionId: ensureSessionId(),
         memoryManager: memoryManagerRef.current,
         codeMode: effectiveCodeMode,
-        maxInputTokens: effectiveCodeMode ? 2e5 : void 0,
-        continueOnLimit: effectiveCodeMode ? true : void 0,
+        cloudMode: cfg.cloudMode,
+        cloudToken: initialCloudToken,
         onIterationEnd,
         onFileChange: (path, content) => {
           if (content) {
             lspManagerRef.current.notifyChange(path, content);
           } else {
             void import("fs/promises").then(
-              ({ readFile: readFile16 }) => readFile16(path, "utf8").then((c) => lspManagerRef.current.notifyChange(path, c)).catch(() => {
+              ({ readFile: readFile17 }) => readFile17(path, "utf8").then((c) => lspManagerRef.current.notifyChange(path, c)).catch(() => {
               })
             );
           }
@@ -12909,7 +13328,7 @@ function App({
           })
         }
       });
-      if (existsSync2(join19(cwd, "KIMI.md"))) {
+      if (existsSync2(join21(cwd, "KIMI.md"))) {
         if (cacheStableRef.current) {
           messagesRef.current[1] = {
             role: "system",
@@ -13138,6 +13557,10 @@ function App({
           setEvents((e) => [...e, { kind: "info", key: mkKey(), text: "no config loaded" }]);
           return true;
         }
+        if (cfg.cloudMode) {
+          setEvents((e) => [...e, { kind: "info", key: mkKey(), text: "AI Gateway is managed by Kimiflare Cloud" }]);
+          return true;
+        }
         const sub = rest[0]?.toLowerCase() ?? "";
         const subArg = rest.slice(1).join(" ").trim();
         if (!sub || sub === "status") {
@@ -14008,8 +14431,8 @@ ${lines.join("\n")}` }]);
           memoryManager: memoryManagerRef.current,
           keepLastImageTurns: cfg.imageHistoryTurns ?? 2,
           codeMode: effectiveCodeMode,
-          maxInputTokens: effectiveCodeMode ? 2e5 : void 0,
-          continueOnLimit: effectiveCodeMode ? true : void 0,
+          cloudMode: cfg.cloudMode,
+          cloudToken: initialCloudToken,
           onIterationEnd,
           intentClassification: classification,
           onFileChange: (path, content2) => {
@@ -14017,7 +14440,7 @@ ${lines.join("\n")}` }]);
               lspManagerRef.current.notifyChange(path, content2);
             } else {
               void import("fs/promises").then(
-                ({ readFile: readFile16 }) => readFile16(path, "utf8").then((c) => lspManagerRef.current.notifyChange(path, c)).catch(() => {
+                ({ readFile: readFile17 }) => readFile17(path, "utf8").then((c) => lspManagerRef.current.notifyChange(path, c)).catch(() => {
                 })
               );
             }
@@ -14198,12 +14621,28 @@ ${lines.join("\n")}` }]);
     return /* @__PURE__ */ jsx22(ThemeProvider, { theme, children: /* @__PURE__ */ jsx22(
       Onboarding,
       {
-        onDone: (newCfg) => {
+        onDone: async (newCfg) => {
           setCfg(newCfg);
-          setEvents((e) => [
-            ...e,
-            { kind: "info", key: mkKey(), text: "configuration saved \u2014 welcome to kimiflare!" }
-          ]);
+          if (newCfg.cloudMode) {
+            const { loadCloudCredentials: loadCloudCredentials2 } = await Promise.resolve().then(() => (init_auth(), auth_exports));
+            const creds = await loadCloudCredentials2();
+            if (creds) {
+              setEvents((e) => [
+                ...e,
+                { kind: "info", key: mkKey(), text: "configuration saved \u2014 welcome to kimiflare! (cloud mode)" }
+              ]);
+            } else {
+              setEvents((e) => [
+                ...e,
+                { kind: "info", key: mkKey(), text: "cloud mode configured \u2014 run `kimiflare auth cloud` to sign in" }
+              ]);
+            }
+          } else {
+            setEvents((e) => [
+              ...e,
+              { kind: "info", key: mkKey(), text: "configuration saved \u2014 welcome to kimiflare!" }
+            ]);
+          }
         }
       }
     ) });
@@ -14249,6 +14688,7 @@ ${lines.join("\n")}` }]);
       {
         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
       }
@@ -14260,7 +14700,7 @@ ${lines.join("\n")}` }]);
       {
         servers: cfg?.lspServers ?? {},
         currentScope: lspScope,
-        hasProjectDir: existsSync2(join19(process.cwd(), ".kimiflare")),
+        hasProjectDir: existsSync2(join21(process.cwd(), ".kimiflare")),
         onDone: () => setShowLspWizard(false),
         onSave: (servers, enabled, scope) => {
           setCfg((c) => c ? { ...c, lspEnabled: enabled, lspServers: servers } : c);
@@ -14331,7 +14771,7 @@ ${lines.join("\n")}` }]);
       ] }),
       /* @__PURE__ */ jsx22(Text21, { color: theme.info.color, children: commandToDelete.filepath }),
       /* @__PURE__ */ jsx22(Box20, { marginTop: 1, children: /* @__PURE__ */ jsx22(
-        SelectInput9,
+        SelectInput10,
         {
           items: [
             { label: "Yes, delete", value: "yes", key: "yes" },
@@ -14401,7 +14841,8 @@ ${lines.join("\n")}` }]);
           hasUpdate,
           latestVersion,
           gatewayMeta,
-          codeMode
+          codeMode,
+          cloudMode: cfg.cloudMode
         }
       ),
       activePicker?.kind === "file" && /* @__PURE__ */ jsx22(
@@ -14477,7 +14918,7 @@ ${lines.join("\n")}` }]);
     ] })
   ] }) });
 }
-async function renderApp(cfg, updateResult, lspScope = "global", lspProjectPath = null) {
+async function renderApp(cfg, updateResult, lspScope = "global", lspProjectPath = null, cloudToken) {
   const instance = render(
     /* @__PURE__ */ jsx22(
       App,
@@ -14485,7 +14926,8 @@ async function renderApp(cfg, updateResult, lspScope = "global", lspProjectPath
         initialCfg: cfg,
         initialUpdateResult: updateResult,
         initialLspScope: lspScope,
-        initialLspProjectPath: lspProjectPath
+        initialLspProjectPath: lspProjectPath,
+        initialCloudToken: cloudToken
       }
     ),
     {
@@ -14676,7 +15118,7 @@ function createRemoteCommand() {
 
 // src/index.tsx
 var program = new Command2();
-program.name("kimiflare").description("Terminal coding agent powered by Kimi-K2.6 on Cloudflare Workers AI.").version(getAppVersion()).option("-p, --print <prompt>", "one-shot mode: send prompt, stream reply to stdout, exit").option("-m, --model <id>", "model id (defaults to @cf/moonshotai/kimi-k2.6)").option("--dangerously-allow-all", "auto-approve every permission prompt (print mode only)").option("--reasoning", "include reasoning in stdout (print mode only)").option("--continue-on-limit", "reset tool-call counter and continue when the 50-call limit is hit (print mode only)").option("--max-input-tokens <n>", "cumulative prompt token budget; exits 42 when exhausted (print mode only)", (v) => parseInt(v, 10));
+program.name("kimiflare").description("Terminal coding agent powered by Kimi-K2.6 on Cloudflare Workers AI.").version(getAppVersion()).option("-p, --print <prompt>", "one-shot mode: send prompt, stream reply to stdout, exit").option("-m, --model <id>", "model id (defaults to @cf/moonshotai/kimi-k2.6)").option("--cloud", "use Kimiflare Cloud (api.kimiflare.com) instead of direct Workers AI").option("--dangerously-allow-all", "auto-approve every permission prompt (print mode only)").option("--reasoning", "include reasoning in stdout (print mode only)").option("--continue-on-limit", "reset tool-call counter and continue when the 50-call limit is hit (print mode only)").option("--max-input-tokens <n>", "cumulative prompt token budget; exits 42 when exhausted (print mode only)", (v) => parseInt(v, 10));
 program.command("cost").description("Show cost attribution by task type (requires costAttribution enabled)").option("-w, --week", "last 7 days (default)").option("-m, --month", "last 30 days").option("-d, --day", "today only").option("-s, --session <id>", "single session detail").option("-c, --category <name>", "filter by category").option("--json", "machine-readable output").option("--reclassify", "re-run classification on all sessions").option("--local-only", "skip Cloudflare reconciliation").action(async (cmdOpts) => {
   const cfg = await loadConfig();
   const enabled = cfg?.costAttribution ?? false;
@@ -14689,6 +15131,25 @@ program.command("cost").description("Show cost attribution by task type (require
   const { runCostCommand: runCostCommand2 } = await Promise.resolve().then(() => (init_cli(), cli_exports));
   await runCostCommand2({ ...cmdOpts, config: cfg });
 });
+program.command("usage").description("Show Kimiflare Cloud token usage (requires cloud authentication)").action(async () => {
+  const { loadCloudCredentials: loadCloudCredentials2 } = await Promise.resolve().then(() => (init_auth(), auth_exports));
+  const creds = await loadCloudCredentials2();
+  if (!creds) {
+    console.error("Not authenticated with Kimiflare Cloud. Run: kimiflare auth cloud");
+    process.exit(1);
+  }
+  const res = await fetch("https://api.kimiflare.com/v1/usage", {
+    headers: { Authorization: `Bearer ${creds.accessToken}` }
+  });
+  if (!res.ok) {
+    console.error(`Failed to fetch usage: ${res.status} ${res.statusText}`);
+    process.exit(1);
+  }
+  const usage = await res.json();
+  console.log(`Token budget: ${usage.remaining.toLocaleString()} / ${usage.input_token_limit.toLocaleString()} remaining`);
+  console.log(`Used: ${usage.input_tokens_used.toLocaleString()}`);
+  console.log(`Grant expires: ${usage.expires_at}`);
+});
 program.addCommand(createRemoteCommand());
 program.command("auth").description("Authenticate with external services").addCommand(
   new Command2("github").description("Authenticate with GitHub via OAuth device flow").action(async () => {
@@ -14705,6 +15166,37 @@ Open: ${step.url}`);
       if (step.error) process.exit(1);
     }
   })
+).addCommand(
+  new Command2("cloud").description("Authenticate with Kimiflare Cloud").action(async () => {
+    const { authenticateDevice: authenticateDevice2 } = await Promise.resolve().then(() => (init_auth(), auth_exports));
+    try {
+      const creds = await authenticateDevice2(({ url, userCode, polling }) => {
+        if (!polling) {
+          console.log(`
+Kimiflare Cloud Authentication`);
+          console.log(`
+1. Open this URL in your browser:`);
+          console.log(`   ${url}`);
+          console.log(`
+2. Sign in with GitHub
+`);
+        }
+      });
+      console.log(`Authenticated! Token expires at ${new Date(creds.expiresAt * 1e3).toISOString()}`);
+      const usageRes = await fetch("https://api.kimiflare.com/v1/usage", {
+        headers: { Authorization: `Bearer ${creds.accessToken}` }
+      });
+      if (usageRes.ok) {
+        const usage = await usageRes.json();
+        console.log(`
+Token budget: ${usage.remaining.toLocaleString()} / ${usage.input_token_limit.toLocaleString()} remaining`);
+        console.log(`Grant expires: ${usage.expires_at}`);
+      }
+    } catch (err) {
+      console.error("Authentication failed:", err instanceof Error ? err.message : String(err));
+      process.exit(1);
+    }
+  })
 );
 program.action(async () => {
   await main();
@@ -14727,10 +15219,25 @@ async function main() {
     lspScope = resolved.scope;
     lspProjectPath = resolved.projectPath;
   }
+  const cloudMode = opts.cloud ?? cfg?.cloudMode ?? false;
+  let cloudToken;
+  if (cloudMode) {
+    const { loadCloudCredentials: loadCloudCredentials2, authenticateDevice: authenticateDevice2 } = await Promise.resolve().then(() => (init_auth(), auth_exports));
+    let cloudCreds = await loadCloudCredentials2();
+    if (!cloudCreds) {
+      console.error("kimiflare: cloud mode requires authentication.\nRun: kimiflare auth cloud\n");
+      process.exit(2);
+    }
+    cloudToken = cloudCreds.accessToken;
+    cfg = {
+      ...cfg ?? { accountId: "", apiToken: "", model: DEFAULT_MODEL },
+      cloudMode: true
+    };
+  }
   if (opts.print !== void 0) {
     if (!cfg) {
       console.error(
-        'kimiflare: missing credentials.\nSet CLOUDFLARE_ACCOUNT_ID and CLOUDFLARE_API_TOKEN, or write them to\n  ~/.config/kimiflare/config.json  (chmod 600)\n  { "accountId": "...", "apiToken": "...", "model": "@cf/moonshotai/kimi-k2.6" }'
+        'kimiflare: missing credentials.\nSet CLOUDFLARE_ACCOUNT_ID and CLOUDFLARE_API_TOKEN, or write them to\n  ~/.config/kimiflare/config.json  (chmod 600)\n  { "accountId": "...", "apiToken": "...", "model": "@cf/moonshotai/kimi-k2.6" }\nOr use cloud mode: kimiflare --cloud -p "..."'
       );
       process.exit(2);
     }
@@ -14742,6 +15249,7 @@ async function main() {
       allowAll: !!opts.dangerouslyAllowAll,
       showReasoning: !!opts.reasoning,
       codeMode: cfg.codeMode,
+      cloudToken,
       continueOnLimit: !!opts.continueOnLimit,
       maxInputTokens: opts.maxInputTokens,
       updateResult
@@ -14757,9 +15265,9 @@ async function main() {
   const { renderApp: renderApp2 } = await Promise.resolve().then(() => (init_app(), app_exports));
   if (cfg) {
     const model = opts.model ?? cfg.model ?? DEFAULT_MODEL;
-    await renderApp2({ ...cfg, model }, updateResult, lspScope, lspProjectPath);
+    await renderApp2({ ...cfg, model }, updateResult, lspScope, lspProjectPath, cloudToken);
   } else {
-    await renderApp2(null, updateResult, lspScope, lspProjectPath);
+    await renderApp2(null, updateResult, lspScope, lspProjectPath, cloudToken);
   }
 }
 function gatewayFromPrintOpts(opts2) {
@@ -14773,6 +15281,10 @@ function gatewayFromPrintOpts(opts2) {
   };
 }
 async function runPrintMode(opts2) {
+  if (opts2.cloudMode) {
+    process.stderr.write(`[cloud mode: api.kimiflare.com]
+`);
+  }
   if (opts2.updateResult.hasUpdate) {
     process.stderr.write(
       `\x1B[33mkimiflare update available: ${opts2.updateResult.localVersion} \u2192 ${opts2.updateResult.latestVersion}\x1B[0m
@@ -14805,6 +15317,8 @@ async function runPrintMode(opts2) {
       codeMode: opts2.codeMode,
       continueOnLimit: opts2.continueOnLimit,
       maxInputTokens: opts2.maxInputTokens,
+      cloudMode: opts2.cloudMode,
+      cloudToken: opts2.cloudToken,
       coauthor: opts2.coauthor !== false ? { name: opts2.coauthorName || "kimiflare", email: opts2.coauthorEmail || "kimiflare@proton.me" } : void 0,
       callbacks: {
         onReasoningDelta: opts2.showReasoning ? (delta) => {