skyloom 1.9.0 → 1.11.0

package/src/cli/main.ts

@@ -10,6 +10,7 @@ import { createSystemContext, orchestrateTask } from "../core/factory";
 import { loadConfig, USER_CONFIG_DIR } from "../core/config";
 import { classify } from "../core/router";
 import { InteractiveMode, ModeController } from "./mode";
+import { readInput, type TUIContext } from "./tui";
 
 const MODE = new ModeController();
 const VERSION = (() => { try { return require("../../package.json").version; } catch { return "1.5.2"; } })();
@@ -77,6 +78,12 @@ program.command("web").option("-p,--port <p>", "port", "3000")
 program.command("mcp").action(() => { import("../core/mcp_server").then(m => m.startMCPServer()); });
 program.command("config").action(() => { const c = loadConfig(); process.stdout.write(chalk.cyan("\nConfig: ") + USER_CONFIG_DIR + "\n"); for (const [n, a] of Object.entries(c.agents || {})) process.stdout.write(`  ${chalk.bold(n)}: ${(a as any).model || "default"}\n`); });
 program.command("init").action(() => { if (!fs.existsSync(USER_CONFIG_DIR)) fs.mkdirSync(USER_CONFIG_DIR, { recursive: true }); process.stdout.write(chalk.green("✓ ") + USER_CONFIG_DIR + "\n"); });
+program.command("apikey").description("Manage API keys (persisted to ~/.skyloom/config.yaml)")
+  .argument("[action]", "set|list").argument("[provider]", "e.g. deepseek").argument("[key]", "API key")
+  .action((action?: string, provider?: string, key?: string) => {
+    if (action === "set" && provider && key) { saveApiKey(provider, key); process.stdout.write(chalk.green("✓ Saved " + provider + " API key\n")); }
+    else { process.stdout.write(chalk.dim("Usage: sky apikey set deepseek YOUR_KEY\n")); }
+  });
 program.command("version").action(() => { process.stdout.write(`Skyloom v${VERSION}\n`); });
 
 /* ═══════════════════════════════════════
@@ -143,20 +150,45 @@ function render(text: string): string[] {
 /* ═══════════════════════════════════════
    Chat loop
    ═══════════════════════════════════════ */
-/* Check for API key availability */
+/* API key persistence — read from config file too */
 function checkApiKeys(): string | null {
-  const keys = ["DEEPSEEK_API_KEY","OPENAI_API_KEY","ANTHROPIC_API_KEY","GROQ_API_KEY","OPENROUTER_API_KEY"];
-  for (const k of keys) { if (process.env[k]) return k; }
+  // Check env vars
+  const envKeys = ["DEEPSEEK_API_KEY","OPENAI_API_KEY","ANTHROPIC_API_KEY","GROQ_API_KEY","OPENROUTER_API_KEY"];
+  for (const k of envKeys) { if (process.env[k]) return "env:" + k; }
+  // Check config file
+  try {
+    const path = require("path"); const fs = require("fs"); const yaml = require("yaml");
+    const cfgPath = path.join(require("os").homedir(), ".skyloom", "config.yaml");
+    if (fs.existsSync(cfgPath)) {
+      const cfg = yaml.parse(fs.readFileSync(cfgPath, "utf-8")) || {};
+      const keys = cfg.api_keys || {};
+      for (const [p, k] of Object.entries(keys)) { if (k) return "cfg:" + p; }
+    }
+  } catch { /* ignore */ }
   return null;
 }
 
+/** Save API key to config file */
+function saveApiKey(provider: string, key: string): void {
+  const path = require("path"); const fs = require("fs"); const yaml = require("yaml");
+  const cfgPath = path.join(require("os").homedir(), ".skyloom", "config.yaml");
+  const dir = path.dirname(cfgPath);
+  if (!fs.existsSync(dir)) fs.mkdirSync(dir, { recursive: true });
+  let cfg: any = {};
+  if (fs.existsSync(cfgPath)) { try { cfg = yaml.parse(fs.readFileSync(cfgPath, "utf-8")) || {}; } catch { } }
+  if (!cfg.api_keys) cfg.api_keys = {};
+  cfg.api_keys[provider] = key;
+  fs.writeFileSync(cfgPath, yaml.stringify(cfg), "utf-8");
+}
+
 async function chat(agentName: string, modelOverride?: string): Promise<void> {
   const haveKey = checkApiKeys();
   if (!haveKey) {
     process.stdout.write("\n" + chalk.yellow("  ⚠ No API key configured.\n"));
-    process.stdout.write(chalk.dim("  Set one:  $env:DEEPSEEK_API_KEY = \"sk-your-key\"  (PowerShell)\n"));
-    process.stdout.write(chalk.dim("            export DEEPSEEK_API_KEY=sk-your-key    (Bash)\n\n"));
-    process.stdout.write(chalk.dim("  Then run: sky\n\n"));
+    process.stdout.write(chalk.dim("  Quick setup:\n"));
+    process.stdout.write(chalk.dim("    sky apikey set deepseek sk-your-key-here\n"));
+    process.stdout.write(chalk.dim("  Or env var:\n"));
+    process.stdout.write(chalk.dim("    $env:DEEPSEEK_API_KEY = \"sk-your-key\"\n\n"));
     process.exit(1);
   }
 
@@ -186,46 +218,56 @@ async function chat(agentName: string, modelOverride?: string): Promise<void> {
 
   process.stdout.write(chalk.dim("  Key: " + haveKey + "\n\n"));
 
-  const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
+  // ── TUI loop ──
+  const ctx_: TUIContext = { agent: currentAgent, agents: ctx.agentMap, model: "default", cost: "$0", width: 80, height: 24 };
 
-  function ask() { rl.question(chalk.cyan("  " + currentAgent.displayName + " ❯ "), handler); }
-  async function handler(inp: string) {
-    inp = inp.trim();
-    if (!inp) { ask(); return; }
+  while (true) {
+    const inp = await readInput(process.stdin, process.stdout, ctx_);
+    if (!inp) continue;
 
     const cmdL = inp.toLowerCase();
 
     // Agent switch
+    let switched = false;
     for (const n of AGENT_NAMES) {
-      if (cmdL === "/" + n) { const a = ctx.agentMap.get(n); if (a) { await a.init(); currentAgent = a; } process.stdout.write(chalk.dim("  ⟳ " + AGENT_DISPLAY[n] + "\n")); ask(); return; }
+      if (cmdL === "/" + n) { const a = ctx.agentMap.get(n); if (a) { await a.init(); currentAgent = a; ctx_.agent = a; } switched = true; break; }
     }
-
-    if (cmdL === "/quit" || cmdL === "/exit") { process.stdout.write(chalk.dim("\n  Session ended\n")); rl.close(); await ctx.closeAll(); process.exit(0); return; }
-    if (cmdL === "/help") { process.stdout.write(helpText()); ask(); return; }
-    if (cmdL === "/clear") { console.clear(); welcome(agent); process.stdout.write(chalk.dim("  Key: " + haveKey + "\n\n")); ask(); return; }
-    if (cmdL === "/status") { process.stdout.write(chalk.bold("\n  " + currentAgent.displayName + " (" + currentAgent.name + ")\n") + chalk.dim("  State: " + currentAgent.state + "  ·  Memory: " + currentAgent.memory.shortTerm.length + " msgs\n\n")); ask(); return; }
-    if (cmdL === "/cost") { process.stdout.write(chalk.bold("\n  Total: " + formatCost(ctx.llm.getTotalCost()) + "\n\n")); ask(); return; }
-    if (cmdL === "/compact") { const r = await currentAgent.compact(); process.stdout.write(chalk.green("  ✓ " + r + "\n\n")); ask(); return; }
-    if (cmdL === "/version") { process.stdout.write("  Skyloom v" + VERSION + "\n"); ask(); return; }
-    if (cmdL.startsWith("/task ")) { const g = inp.slice(6); process.stdout.write(chalk.cyan("\n  ✦ " + g + "\n\n")); await runTask(g); ask(); return; }
-    if (inp.startsWith("/")) { process.stdout.write(helpText()); ask(); return; }
+    if (switched) continue;
+    if (cmdL === "/quit" || cmdL === "/exit") break;
+    if (cmdL === "/clear") { console.clear(); continue; }
+    if (cmdL === "/help") { process.stdout.write(helpText()); continue; }
+    if (cmdL === "/version") { process.stdout.write("  Skyloom v" + VERSION + "\n"); continue; }
+    if (cmdL === "/status") { process.stdout.write(chalk.bold("\n  " + currentAgent.displayName + " (" + currentAgent.name + ")\n") + chalk.dim("  State: " + currentAgent.state + "  ·  Memory: " + currentAgent.memory.shortTerm.length + " msgs\n\n")); continue; }
+    if (cmdL === "/cost") { process.stdout.write(chalk.bold("\n  Total: " + formatCost(ctx.llm.getTotalCost()) + "\n\n")); continue; }
+    if (cmdL === "/cost reset") { (ctx.llm as any).resetUsageStats?.(); process.stdout.write(chalk.dim("  Stats reset\n")); continue; }
+    if (cmdL === "/compact") { const r = await currentAgent.compact(); process.stdout.write(chalk.green("  ✓ " + r + "\n\n")); continue; }
+    if (cmdL === "/memory") { process.stdout.write(chalk.dim("  Short-term: " + currentAgent.memory.shortTerm.length + " msgs  ·  Working: " + Object.keys(currentAgent.memory.working).length + " keys\n")); continue; }
+    if (cmdL === "/memory clear") { await currentAgent.memory.clearShortTerm(); process.stdout.write(chalk.dim("  Memory cleared\n")); continue; }
+    if (cmdL === "/workspace") { process.stdout.write(chalk.dim("  " + (ctx.workspacePath || "default") + "\n")); continue; }
+    if (cmdL === "/sessions") { const ss = await currentAgent.memory.listSessions(); process.stdout.write(chalk.bold("\n  Sessions:\n")); for (const s of ss.slice(0, 10)) process.stdout.write(chalk.dim("  " + s.id?.slice(0, 10) + "... " + s.preview + " (" + s.messageCount + " msgs)\n")); continue; }
+    if (cmdL === "/mcp") { process.stdout.write(chalk.dim("  " + (ctx.mcpStatus?.join(", ") || "none") + "\n")); continue; }
+    if (cmdL.startsWith("/apikey set ")) { const p = inp.split(/\s+/); if (p.length >= 4) { saveApiKey(p[2], p[3]); process.stdout.write(chalk.green("  ✓ Saved " + p[2] + " API key\n")); } else { process.stdout.write(chalk.yellow("  Usage: /apikey set <provider> <key>\n")); } continue; }
+    if (cmdL === "/apikey") { process.stdout.write(chalk.bold("\n  API Keys:\n")); for (const p of ["openai","deepseek","anthropic","groq","openrouter"]) { process.stdout.write(chalk.dim("  " + p.padEnd(14) + (!!process.env[p.toUpperCase() + "_API_KEY"] ? chalk.green("env") : chalk.dim("—")) + "\n")); } process.stdout.write("\n"); continue; }
+    if (cmdL.startsWith("/task ")) { const g = inp.slice(6); process.stdout.write(chalk.cyan("\n  ✦ " + g + "\n\n")); await runTask(g); continue; }
+    if (cmdL.startsWith("/model")) { process.stdout.write(chalk.dim("  Configure in ~/.skyloom/config.yaml\n\n")); continue; }
+    if (inp.startsWith("/")) { process.stdout.write(helpText()); continue; }
 
     // ── Chat ──
     process.stdout.write(chalk.dim("  " + currentAgent.displayName + " thinking...\r"));
     try {
       const response = await currentAgent.chat(inp);
       process.stdout.write("\r" + " ".repeat(40) + "\r\n");
-      const lines = render(response);
-      for (const l of lines) process.stdout.write(l + "\n");
+      for (const l of render(response)) process.stdout.write(l + "\n");
       process.stdout.write("\n");
     } catch (e: any) {
       process.stdout.write("\r" + " ".repeat(40) + "\r");
       process.stdout.write(chalk.red("  ✗ " + (e.message || e) + "\n\n"));
     }
-    ask();
   }
 
-  ask();
+  process.stdout.write(chalk.dim("\n  Session ended\n"));
+  await ctx.closeAll();
+  process.exit(0);
 }
 
 /* ═══════════════════════════════════════

package/src/cli/tui.ts

@@ -0,0 +1,268 @@
+/**
+ * 天空织机 TUI — Full-screen terminal interface
+ *
+ * Layout:
+ *   ┌─────────────────────────────────────────┐
+ *   │ ≋ 雾 Fog · deepseek-chat · $0.02 · ⏻   │ ← header bar
+ *   ├──────────┬──────────────────────────────┤
+ *   │ ☼ 晴 Fair│  ✦ 你好！有什么可以帮你的？  │
+ *   │ ✱ 霜     │                              │ ← messages
+ *   │ ≋ 雾 ▸   │  用户消息右对齐               │
+ *   │ ❉ 雪     │                              │
+ *   │ ∘ 露     │                              │
+ *   │ ⸽ 雨     │                              │
+ *   ├──────────┴──────────────────────────────┤
+ *   │ ┌─ /fog  /rain  /frost  /snow  ───────┐│ ← command palette (popup)
+ *   │ ▶ /fog    Switch to Fog                ││
+ *   │   /rain   Switch to Rain               ││
+ *   │ └──────────────────────────────────────┘│
+ *   │ > hello world                    [send] │ ← input bar
+ *   └─────────────────────────────────────────┘
+ */
+
+import * as readline from "readline";
+import chalk from "chalk";
+
+export interface TUIContext {
+  agent: any;
+  agents: Map<string, any>;
+  model: string;
+  cost: string;
+  width: number;
+  height: number;
+}
+
+/* ── Slash commands with icons ── */
+const AGENT_CMDS: [string, string, string][] = [
+  ["≋", "/fog", "雾 Fog · 松烟墨"],
+  ["⸽", "/rain", "雨 Rain · 石青"],
+  ["✱", "/frost", "霜 Frost · 石绿"],
+  ["❉", "/snow", "雪 Snow · 铅白"],
+  ["∘", "/dew", "露 Dew · 赭石"],
+  ["☼", "/fair", "晴 Fair · 朱砂"],
+];
+
+const ACTION_CMDS: [string, string][] = [
+  ["/help", "所有命令"],
+  ["/clear", "清屏"],
+  ["/status", "状态总览"],
+  ["/cost", "费用统计"],
+  ["/cost reset", "费用归零"],
+  ["/compact", "压缩上下文"],
+  ["/retry", "重发上条"],
+  ["/apikey set <p> <k>", "保存API Key"],
+  ["/apikey", "查看API Key"],
+  ["/model", "模型管理"],
+  ["/task <goal>", "多Agent编排"],
+  ["/memory", "记忆状态"],
+  ["/memory clear", "清除记忆"],
+  ["/sessions", "会话列表"],
+  ["/workspace", "工作空间"],
+  ["/mcp", "MCP服务器"],
+  ["/version", "版本信息"],
+  ["/quit", "退出"],
+];
+
+/* ── Box drawing characters ── */
+const B = { tl: "┌", tr: "┐", bl: "└", br: "┘", h: "─", v: "│", l: "├", r: "┤", cross: "┼", t: "┬", b: "┴", L: "░", o: "●" };
+
+function bar(start: string, fill: string, end: string, width: number): string {
+  return start + fill.repeat(Math.max(0, width)) + end;
+}
+
+/* ── Render sidebar ── */
+function renderSidebar(agent: any, agents: Map<string, any>, h: number): string[] {
+  const lines: string[] = [];
+  const W = 14; // sidebar width in chars
+
+  // Header
+  lines.push(chalk.cyan(bar(B.L + " 天空织机 ".padEnd(W - 2, B.L) + B.r, "", "", 0)));
+  lines.push(chalk.dim(B.v + " Skyloom    " + B.v));
+
+  for (const n of ["fog", "rain", "frost", "snow", "dew", "fair"]) {
+    const isActive = agent.name === n;
+    const display: Record<string, string> = { fog: "≋ 雾 Fog", rain: "⸽ 雨 Rain", frost: "✱ 霜 Frost", snow: "❉ 雪 Snow", dew: "∘ 露 Dew", fair: "☼ 晴 Fair" };
+    const line = isActive
+      ? chalk.cyan(B.v + " " + B.o + " " + display[n].padEnd(W - 5) + B.v)
+      : chalk.dim(B.v + "   " + display[n].padEnd(W - 5) + B.v);
+    lines.push(line);
+  }
+
+  // Fill remaining space
+  for (let i = lines.length; i < h; i++) {
+    lines.push(chalk.dim(B.v + " ".repeat(W - 2) + B.v));
+  }
+
+  // Footer
+  try {
+    const cu = agent.contextUsage();
+    const pct = cu.pct || 0;
+    lines.push(chalk.dim(B.v + " ctx " + String(pct).padStart(3) + "%" + " ".repeat(W - 10) + B.v));
+  } catch { lines.push(chalk.dim(B.v + " ".repeat(W - 2) + B.v)); }
+
+  lines.push(chalk.dim(bar(B.bl, B.h, B.br, W - 2)));
+  return lines;
+}
+
+/* ── Render command palette ── */
+function renderPalette(filter: string, selIdx: number, width: number): string[] {
+  const lines: string[] = [];
+  const W = Math.min(width - 4, 56);
+
+  // Agent section first
+  const agentMatches = AGENT_CMDS.filter(([, cmd]) => cmd.includes(filter) || filter === "/");
+  const actionMatches = ACTION_CMDS.filter(([cmd]) => cmd.includes(filter));
+
+  const allItems: string[] = [];
+  for (const [icon, cmd, desc] of agentMatches) allItems.push(`${icon} ${cmd.padEnd(16)} ${desc}`);
+  for (const [cmd, desc] of actionMatches) allItems.push(`  ${cmd.padEnd(18)} ${desc}`);
+
+  if (allItems.length === 0 && filter.length > 1) {
+    // No matches — show message
+    lines.push(chalk.dim(bar(B.tl, B.h, B.tr, W)));
+    lines.push(chalk.dim(B.v + "  未找到匹配命令 (esc 关闭)".padEnd(W) + B.v));
+    lines.push(chalk.dim(bar(B.bl, B.h, B.br, W)));
+    return lines;
+  }
+
+  if (allItems.length === 0) return lines;
+
+  const start = Math.max(0, Math.min(selIdx - 5, allItems.length - 10));
+  const end = Math.min(allItems.length, start + 10);
+
+  lines.push(chalk.dim(bar(B.tl, B.h, B.tr, W - 5)) + "  ".padEnd(5));
+
+  for (let i = start; i < end; i++) {
+    const item = allItems[i];
+    const isSelected = i === selIdx;
+    const pad = W - item.replace(/\x1b\[[0-9;]*m/g, "").length + 2; // account for ANSI codes
+    lines.push(isSelected
+      ? chalk.cyan(B.v + " ▶ " + item).padEnd(W + 10) + chalk.cyan(B.v)
+      : chalk.dim(B.v + "   " + item).padEnd(W + 10) + chalk.dim(B.v));
+  }
+
+  lines.push(chalk.dim(bar(B.bl, B.h, B.br, W - 5)) + "  ".padEnd(5));
+  return lines;
+}
+
+/* ── Render message ── */
+function renderMessage(role: string, text: string, width: number): string[] {
+  const lines: string[] = [];
+  const maxW = Math.min(width - 24, 60);
+  const prefix = role === "user" ? "  " : "  ";
+  const suffix = role === "user" ? "" : "";
+
+  for (const para of text.split("\n")) {
+    let remaining = para;
+    while (remaining.length > 0) {
+      const cut = remaining.length > maxW ? remaining.lastIndexOf(" ", maxW) : remaining.length;
+      const idx = cut > 0 ? cut : maxW;
+      const line = remaining.slice(0, idx).trimEnd();
+      if (role === "user") {
+        lines.push(chalk.dim(" ".repeat(Math.max(0, width - line.length - 4))) + chalk.cyan(line) + "  ");
+      } else if (role === "assistant") {
+        lines.push(prefix + line + suffix);
+      } else {
+        lines.push(chalk.dim("  " + line));
+      }
+      remaining = remaining.slice(idx).trimStart();
+    }
+  }
+  return lines;
+}
+
+/* ── Read input with command palette ── */
+export function readInput(stdin: NodeJS.ReadStream, stdout: NodeJS.WriteStream, ctx: TUIContext): Promise<string> {
+  return new Promise(resolve => {
+    let buf = "";
+    let cursor = 0;
+    let palette = false;
+    let selIdx = 0;
+
+    function render() {
+      // Clear screen and render full TUI
+      readline.cursorTo(stdout, 0, 0);
+      readline.clearScreenDown(stdout);
+
+      const w = stdout.columns || 80;
+      const h = stdout.rows || 24;
+      const sidebarW = 16;
+
+      // Header
+      stdout.write(chalk.bgBlack.cyan(" 天空织机 Skyloom v1.10 ".padEnd(w - 20, " ")) + chalk.bgBlack.dim(" deepseek".padEnd(10)) + chalk.bgBlack("\n"));
+      stdout.write(chalk.dim(bar("", B.h, "", w)) + "\n");
+
+      // Sidebar
+      const sidebar = renderSidebar(ctx.agent, ctx.agents, h - 5);
+      for (let i = 0; i < sidebar.length && i < h - 5; i++) {
+        stdout.write(sidebar[i] + "\n");
+      }
+
+      // Command palette (overlaid)
+      if (palette) {
+        const paletteLines = renderPalette(buf, selIdx, w);
+        // Move cursor up to position palette below header
+        const paletteY = 2;
+        for (let i = 0; i < paletteLines.length; i++) {
+          stdout.write(`\x1b[${paletteY + i};${sidebarW}H`); // position cursor
+          stdout.write(paletteLines[i]);
+        }
+      }
+
+      // Input bar at bottom
+      readline.cursorTo(stdout, sidebarW, h - 1);
+      stdout.write(chalk.dim(B.l + B.h.repeat(w - sidebarW - 2) + B.r));
+      readline.cursorTo(stdout, sidebarW, h);
+      stdout.write(chalk.cyan(" > ") + buf.slice(0, cursor) + chalk.inverse(buf[cursor] || " ") + buf.slice(cursor + 1));
+    }
+
+    if (!stdin.isTTY) {
+      const rl = readline.createInterface({ input: stdin });
+      rl.on("line", (line) => { rl.close(); resolve(line.trim()); });
+      return;
+    }
+
+    stdin.setRawMode(true);
+    stdin.resume();
+    render();
+
+    let escBuf = "";
+    stdin.on("data", (data: Buffer) => {
+      const str = data.toString();
+      escBuf += str;
+
+      if (escBuf.startsWith("\x1b[") && escBuf.length >= 3) {
+        const code = escBuf[2]; escBuf = "";
+        if (code === "A") { if (palette) selIdx = Math.max(0, selIdx - 1); render(); return; }
+        if (code === "B") { if (palette) { const all = [...AGENT_CMDS.map(c => c[1]), ...ACTION_CMDS.map(c => c[0])]; selIdx = Math.min(all.filter(a => a.includes(buf)).length - 1, selIdx + 1); } render(); return; }
+        if (code === "C") { if (cursor < buf.length) cursor++; render(); return; }
+        if (code === "D") { if (cursor > 0) cursor--; render(); return; }
+      }
+
+      for (const ch of escBuf) {
+        escBuf = "";
+        if (ch === "\x1b") { palette = false; render(); return; }
+        if (ch === "\r" || ch === "\n") {
+          if (palette) {
+            const all = [...AGENT_CMDS.map(c => c[1]), ...ACTION_CMDS.map(c => c[0])];
+            const filtered = all.filter(a => a.includes(buf));
+            if (filtered[selIdx]) buf = filtered[selIdx];
+            palette = false;
+            render();
+            stdin.setRawMode(false); stdin.pause(); resolve(buf.trim()); return;
+          }
+          stdin.setRawMode(false); stdin.pause(); resolve(buf.trim()); return;
+        }
+        if (ch === "\t") { /* ignore */ return; }
+        if (ch === "\x7f" || ch === "\b") { if (cursor > 0) { buf = buf.slice(0, cursor - 1) + buf.slice(cursor); cursor--; } if (!buf) palette = false; render(); return; }
+        if (ch === "\x03") { stdin.setRawMode(false); stdin.pause(); resolve("/quit"); return; }
+        if (ch >= " ") {
+          buf = buf.slice(0, cursor) + ch + buf.slice(cursor); cursor++;
+          if (ch === "/") { palette = true; selIdx = 0; }
+          else if (palette) selIdx = 0;
+          render(); return;
+        }
+      }
+    });
+  });
+}

package/src/core/llm.ts

@@ -756,9 +756,23 @@ export class LLMClient {
     else { const l = model.toLowerCase(); if (l.includes("claude")) provider = "anthropic"; else if (l.includes("deepseek")) provider = "deepseek"; else if (l.includes("groq")) provider = "groq"; else if (l.includes("openrouter")) provider = "openrouter"; else if (l.includes("gemini")) provider = "gemini"; }
     const envMap = getProviderEnvMap();
     const envVar = envMap.get(provider) || (provider.toUpperCase() + "_API_KEY");
-    const key = process.env[envVar];
-    if (!key) throw new Error("Missing " + envVar + ". Set environment variable or configure in ~/.skyloom/config.yaml");
-    return key;
+
+    // 1. Check environment variable first
+    let key = process.env[envVar];
+    if (key) return key;
+
+    // 2. Check config file (~/.skyloom/config.yaml)
+    try {
+      const fs = require("fs"); const path = require("path"); const yaml = require("yaml");
+      const cfgPath = path.join(require("os").homedir(), ".skyloom", "config.yaml");
+      if (fs.existsSync(cfgPath)) {
+        const cfg = yaml.parse(fs.readFileSync(cfgPath, "utf-8")) || {};
+        const keys = cfg.api_keys || {};
+        if (keys[provider]) return keys[provider];
+      }
+    } catch { /* ignore */ }
+
+    throw new Error("Missing " + envVar + ". Run: sky apikey set " + provider + " YOUR_KEY");
   }
 
   private getBaseUrl(model: string): string {