skyloom 1.13.6 → 1.13.8

package/src/cli/main.ts

@@ -13,6 +13,7 @@ import { agentTheme } from "../core/theme";
 import { classify } from "../core/router";
 import { InteractiveMode, ModeController } from "./mode";
 import { readLine, renderPalette, StreamRenderer } from "./tui";
+import { loomChat } from "./loom_chat";
 
 const MODE = new ModeController();
 const VERSION = (() => { try { return require("../../package.json").version; } catch { return "1.5.2"; } })();
@@ -68,7 +69,9 @@ const program = new Command()
   .name("sky").description("天空织机 Skyloom").version(VERSION);
 
 program.command("chat").argument("[agent]", "agent name", "fog")
-  .option("-m,--model <m>", "model").action(async (a: string, o: { model?: string }) => { await chat(a, o.model); });
+  .option("-m,--model <m>", "model")
+  .option("--classic", "linear scrolling UI instead of the full-screen loom")
+  .action(async (a: string, o: { model?: string; classic?: boolean }) => { await chat(a, o.model, o.classic); });
 program.command("task").argument("[goal]", "task goal")
   .action(async (g?: string) => { if (g) await runTask(g); });
 program.command("web").option("-p,--port <p>", "port", "3000")
@@ -186,6 +189,15 @@ async function streamResponse(agent: any, input: string): Promise<void> {
           break;
         case "tool_done":
           out.write("  " + (ev.success ? chalk.hex("#3a7a6e")("✓") : chalk.hex("#b3342d")("✗")) + " " + chalk.dim(String(ev.tool_name)) + "\n");
+          if (ev.tool_name === "todo_write" && ev.success) {
+            try {
+              const items = agent.memory.getWorking("todos") || [];
+              if (items.length) {
+                const { renderTodoList } = require("../tools/todo");
+                out.write(chalk.dim("  ☰ " + renderTodoList(items).split("\n").join("\n    ")) + "\n");
+              }
+            } catch { /* best-effort */ }
+          }
           mode = "none";
           break;
         case "truncated":
@@ -294,7 +306,7 @@ async function setupWizard(): Promise<{ provider: string; key: string; model: st
   return { provider: prov.id, key: key.trim(), model };
 }
 
-async function chat(agentName: string, modelOverride?: string): Promise<void> {
+async function chat(agentName: string, modelOverride?: string, classic?: boolean): Promise<void> {
   const haveKey = checkApiKeys();
   if (!haveKey) {
     process.stdout.write("\n" + chalk.cyan("  ✦ 天空织机 Skyloom ✦\n"));
@@ -338,6 +350,18 @@ async function chat(agentName: string, modelOverride?: string): Promise<void> {
     });
   } catch { /* security module optional */ }
 
+  // ── 立轴 (full-screen loom) is the default on a real terminal;
+  //    --classic / SKYLOOM_CLASSIC=1 / pipes fall back to the linear UI. ──
+  const wantLoom =
+    !classic &&
+    !process.env.SKYLOOM_CLASSIC &&
+    !!process.stdout.isTTY && !!process.stdin.isTTY &&
+    (process.stdout.rows || 24) >= 14 && (process.stdout.columns || 80) >= 60;
+  if (wantLoom) {
+    await loomChat(ctx, agent, { version: VERSION, setupWizard, saveApiKey });
+    return; // loomChat exits the process itself
+  }
+
   // eslint-disable-next-line prefer-const
   let currentAgent = agent; // mutable for agent switching
   let lastSessions: any[] = []; // index→session map for /resume <n>
@@ -346,7 +370,7 @@ async function chat(agentName: string, modelOverride?: string): Promise<void> {
   process.stdout.write(chalk.dim("  · 输入 / 看命令（Tab 补全）· ↑↓ 翻历史 · Ctrl-C 退出\n\n"));
 
   while (true) {
-    const inp = await readLine(currentAgent.name);
+    let inp = await readLine(currentAgent.name);
     if (!inp) continue;
 
     // Bare "/" → show the inline command palette
@@ -419,11 +443,139 @@ async function chat(agentName: string, modelOverride?: string): Promise<void> {
     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 === "/plan" || cmdL === "/auto" || cmdL === "/default") {
+      MODE.set(cmdL === "/plan" ? InteractiveMode.PLAN : cmdL === "/auto" ? InteractiveMode.AUTO : InteractiveMode.DEFAULT);
+      currentAgent.planMode = MODE.current === InteractiveMode.PLAN;
+      process.stdout.write(chalk.dim(`  模式 → ${MODE.current} · ${MODE.describe()}\n`));
+      continue;
+    }
+    if (cmdL === "/context") {
+      try {
+        const d = currentAgent.contextDetail();
+        process.stdout.write(chalk.bold(`\n  上下文 ${d.estimatedTokens}/${d.maxTokens} tokens (${d.pct}%)`) + chalk.dim(` · ${d.model}\n`));
+        process.stdout.write(chalk.dim(`  系统提示 ≈${d.systemPromptTokens} tk · 工具 ${d.toolCount} 个\n`));
+        for (const [role, v] of Object.entries(d.byRole as Record<string, { tokens: number; count: number }>)) {
+          process.stdout.write(chalk.dim(`  ${role.padEnd(9)} ${String(v.tokens).padStart(6)} tk · ${v.count} 条\n`));
+        }
+        process.stdout.write("\n");
+      } catch (e: any) { process.stdout.write(chalk.dim(`  无法获取: ${e?.message || e}\n`)); }
+      continue;
+    }
+    if (cmdL === "/tools") {
+      const stats = (currentAgent as any).toolRegistry?.getStats?.() || [];
+      if (!stats.length) { process.stdout.write(chalk.dim("  本会话当前灵还没有工具调用\n")); continue; }
+      process.stdout.write(chalk.bold(`\n  工具调用 · ${currentAgent.name}\n`));
+      for (const s of stats.slice(0, 12)) {
+        const extra = `${s.failures ? ` ✗${s.failures}` : ""}${s.cacheHits ? ` ⊙${s.cacheHits}` : ""}${s.breaker !== "closed" ? ` [熔断:${s.breaker}]` : ""}`;
+        process.stdout.write(chalk.dim(`  ${s.name.padEnd(16)} ${s.calls} 次 · ${s.avgMs}ms${extra}\n`));
+      }
+      process.stdout.write("\n");
+      continue;
+    }
+    if (cmdL === "/verify") {
+      const { resolveVerifyConfig, runVerify } = require("../core/verify");
+      const vc = resolveVerifyConfig((ctx as any).config);
+      if (!vc.commands.length) { process.stdout.write(chalk.dim("  未配置验证命令 — config.yaml verify.commands 或 SKY.md ## Verify\n")); continue; }
+      process.stdout.write(chalk.dim(`  ⚙ verify · ${vc.commands.length} 条命令\n`));
+      const vr = runVerify(vc);
+      process.stdout.write("  " + vr.report.split("\n").slice(0, 30).join("\n  ") + "\n");
+      continue;
+    }
+    if (cmdL === "/init") {
+      const { INIT_PROMPT } = require("../core/skymd");
+      process.stdout.write(chalk.dim("  开始扫描项目，生成 SKY.md …\n"));
+      try { await streamResponse(currentAgent, INIT_PROMPT); currentAgent.reloadProjectMemory(); }
+      catch (e: any) { process.stdout.write(chalk.red("  ✗ " + (e.message || e) + "\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 === "/setup") { const r = await setupWizard(); if (r) process.stdout.write(chalk.green(`  ${r.provider} · ${r.model} — Ready!\n`)); continue; }
-    if (cmdL.startsWith("/model")) { process.stdout.write(chalk.dim("  Run /setup to reconfigure models\n")); continue; }
+    if (cmdL === "/model" || cmdL.startsWith("/model ")) {
+      const { setAgentModel, setUnifiedModel, clearAgentModel, setAgentApiKey, describeAgentLLM } = require("../core/model_config");
+      const cfg = (ctx as any).config;
+      const parts = inp.split(/\s+/).slice(1);
+      if (parts.length === 0) {
+        const d = describeAgentLLM(cfg, currentAgent.name);
+        process.stdout.write(chalk.bold(`\n  ${currentAgent.name} · ${d.model}`) + chalk.dim(` (${d.source === "agent" ? "独立配置" : "统一配置"} · ${d.provider || "?"} · key:${d.keySource})\n`));
+        process.stdout.write(chalk.dim(`  统一默认: ${cfg.default_model || cfg.llm?.default_model || "gpt-4o"}\n`));
+        process.stdout.write(chalk.dim("  /model <id> 单独换 · /model unified <id> 改默认 · /model reset 回统一 · /model key <key>\n\n"));
+        continue;
+      }
+      if (parts[0] === "reset") { clearAgentModel(cfg, currentAgent.name); process.stdout.write(chalk.green(`  ✓ ${currentAgent.name} 已回到统一配置\n`)); continue; }
+      if (parts[0] === "unified" || parts[0] === "default") {
+        if (!parts[1]) { process.stdout.write(chalk.dim("  用法: /model unified <模型id>\n")); continue; }
+        const r = setUnifiedModel(cfg, parts[1]);
+        process.stdout.write(r.ok ? chalk.green(`  ✓ 统一默认 → ${parts[1]}\n`) : chalk.dim(`  '${parts[1]}' 不在目录中${r.suggestions.length ? " · 可选: " + r.suggestions.join(", ") : ""}\n`));
+        continue;
+      }
+      if (parts[0] === "key") {
+        if (!parts[1]) { process.stdout.write(chalk.dim("  用法: /model key <api-key>\n")); continue; }
+        setAgentApiKey(cfg, currentAgent.name, parts[1]);
+        process.stdout.write(chalk.green(`  ✓ ${currentAgent.name} 的独立 API key 已保存\n`));
+        continue;
+      }
+      const r = setAgentModel(cfg, currentAgent.name, parts[0]);
+      process.stdout.write(r.ok ? chalk.green(`  ✓ ${currentAgent.name} → ${parts[0]}`) + chalk.dim(" · 下一条消息生效\n") : chalk.dim(`  '${parts[0]}' 不在目录中${r.suggestions.length ? " · 可选: " + r.suggestions.join(", ") : ""}\n`));
+      continue;
+    }
+    if (cmdL === "/rewind" || cmdL.startsWith("/rewind ")) {
+      const { getFileCheckpoints } = require("../core/file_checkpoint");
+      const cp = getFileCheckpoints();
+      const arg = inp.slice(7).trim();
+      const r = cp.rewind(/^\d+$/.test(arg) ? parseInt(arg, 10) : 1);
+      if (r.turns === 0) {
+        const turns = cp.list();
+        if (!turns.length) { process.stdout.write(chalk.dim("  没有可回退的文件改动\n")); continue; }
+        process.stdout.write(chalk.bold(`  检查点 · ${turns.length} 轮可回退\n`));
+        for (const t of turns.slice(0, 8)) process.stdout.write(chalk.dim(`  ${t.label} · ${t.files.length} 个文件\n`));
+        continue;
+      }
+      process.stdout.write(chalk.green(`  ↺ 已回退 ${r.turns} 轮`) + chalk.dim(` · 恢复 ${r.restored.length} 个文件${r.deleted.length ? ` · 删除 ${r.deleted.length} 个新建文件` : ""}\n`));
+      for (const f of [...r.restored, ...r.deleted].slice(0, 10)) process.stdout.write(chalk.dim(`  ${f}\n`));
+      continue;
+    }
+    if (inp.startsWith("/")) {
+      // 自定义斜杠命令（.sky/commands/ + ~/.skyloom/commands/）
+      const { loadCustomCommands, resolveCustomCommand } = require("./commands_md");
+      const hit = resolveCustomCommand(inp, loadCustomCommands());
+      if (hit) {
+        const target = hit.command.agent ? ctx.agentMap.get(hit.command.agent) : undefined;
+        if (target) {
+          await target.init();
+          currentAgent = target;
+        }
+        process.stdout.write(chalk.dim(`  ⌘ /${hit.command.name}${hit.command.agent ? ` → ${hit.command.agent}` : ""}\n`));
+        try { await streamResponse(currentAgent, hit.prompt); } catch (e: any) { process.stdout.write(chalk.red("  ✗ " + (e.message || e) + "\n")); }
+        continue;
+      }
+    }
     if (inp.startsWith("/")) { process.stdout.write("\n" + chalk.dim(`  未知命令 ${inp.split(" ")[0]}\n`) + renderPalette(cmdL.split(" ")[0]) + "\n"); continue; }
 
+    // ── input macros: # quick memory · ! shell · @file attach ──
+    {
+      const macros = require("./input_macros");
+      if (macros.isHashMemory(inp)) {
+        try {
+          const { appendQuickMemory } = require("../core/skymd");
+          const file = appendQuickMemory(macros.hashNote(inp));
+          currentAgent.reloadProjectMemory();
+          process.stdout.write(chalk.green("  ✦ 已记入 ") + chalk.dim(file + "\n"));
+        } catch (e: any) { process.stdout.write(chalk.dim(`  记忆写入失败: ${e?.message || e}\n`)); }
+        continue;
+      }
+      if (macros.isBangCommand(inp)) {
+        const cmd = macros.bangCommand(inp);
+        process.stdout.write(chalk.dim(`  $ ${cmd}\n`));
+        const r = macros.runBang(cmd);
+        process.stdout.write("  " + r.output.split("\n").slice(0, 40).join("\n  ") + "\n");
+        currentAgent.memory.addMessage("system", `[用户执行 shell] $ ${cmd}\n${r.output.slice(0, 4000)}`);
+        continue;
+      }
+      const expanded = macros.expandFileRefs(inp);
+      if (expanded.attached.length) process.stdout.write(chalk.dim(`  已附加 ${expanded.attached.map((f: string) => "@" + f).join(" ")}\n`));
+      inp = expanded.text;
+    }
+
     // ── Chat (real streaming) ──
     try {
       await streamResponse(currentAgent, inp);
@@ -438,6 +590,79 @@ async function chat(agentName: string, modelOverride?: string): Promise<void> {
   process.exit(0);
 }
 
+/* ═══════════════════════════════════════
+   Headless mode — sky -p "..." (pipes, CI, external orchestrators)
+   ═══════════════════════════════════════ */
+async function readStdin(): Promise<string> {
+  if (process.stdin.isTTY) return "";
+  let data = "";
+  for await (const chunk of process.stdin) data += chunk;
+  return data.trim();
+}
+
+async function runHeadless(
+  prompt: string,
+  opts: { agent?: string; json?: boolean; streamJson?: boolean }
+): Promise<void> {
+  // Fresh session: a one-shot invocation must not inherit (or pollute) the
+  // interactive resume chain.
+  process.env.WA_NO_RESUME = "1";
+  const t0 = Date.now();
+  const ctx = createSystemContext();
+  const agentName = opts.agent || "fog";
+  const agent = ctx.agentMap.get(agentName);
+  if (!agent) { process.stderr.write(`Unknown agent: ${agentName}\n`); process.exit(1); }
+  await agent.init();
+
+  // No human to approve: dangerous tools are denied unless explicitly allowed.
+  try {
+    const { getSecurity } = require("../core/security");
+    getSecurity().setApprovalCallback(async () =>
+      process.env.SKYLOOM_ALLOW_DANGEROUS === "1");
+  } catch { /* optional */ }
+
+  const emit = (obj: Record<string, any>) => process.stdout.write(JSON.stringify(obj) + "\n");
+  let content = "";
+  let ok = true;
+  try {
+    for await (const ev of agent.chatStream(prompt)) {
+      if (opts.streamJson) { emit(ev); if (ev.type === "content") content += ev.text; continue; }
+      switch (ev.type) {
+        case "content":
+          content += ev.text;
+          if (!opts.json) process.stdout.write(String(ev.text));
+          break;
+        case "tool_status":
+          if (!opts.json) process.stderr.write(`[tool] ${ev.tool_name} ${ev.label || ""}\n`);
+          break;
+        case "truncated":
+          ok = false;
+          process.stderr.write(`[truncated] ${ev.reason}\n`);
+          break;
+      }
+    }
+  } catch (e: any) {
+    ok = false;
+    process.stderr.write(`Error: ${e?.message || e}\n`);
+  }
+
+  if (opts.json || opts.streamJson) {
+    emit({
+      type: "result",
+      success: ok,
+      agent: agentName,
+      model: (() => { try { return agent.contextUsage().model; } catch { return undefined; } })(),
+      content,
+      cost_usd: (() => { try { return ctx.llm.getTotalCost(); } catch { return 0; } })(),
+      duration_ms: Date.now() - t0,
+    });
+  } else if (content && !content.endsWith("\n")) {
+    process.stdout.write("\n");
+  }
+  await ctx.closeAll();
+  process.exit(ok ? 0 : 1);
+}
+
 /* ═══════════════════════════════════════
    Task
    ═══════════════════════════════════════ */
@@ -456,13 +681,34 @@ async function runTask(goal: string): Promise<void> {
    ═══════════════════════════════════════ */
 async function main() {
   const args = process.argv.slice(2);
-  if (args.length === 0) { await chat("fog"); return; }
-  if ((AGENT_NAMES as readonly string[]).includes(args[0])) {
+  const classic = args.includes("--classic");
+
+  // ── headless: sky -p "prompt" [--agent fog] [--json | --stream-json] ──
+  const pIdx = args.findIndex((a) => a === "-p" || a === "--print");
+  if (pIdx >= 0) {
+    const flags = new Set(args);
+    const agentIdx = args.findIndex((a) => a === "--agent");
+    const agentName = agentIdx >= 0 ? args[agentIdx + 1] : undefined;
+    const inline = args[pIdx + 1] && !args[pIdx + 1].startsWith("-") ? args[pIdx + 1] : "";
+    const piped = await readStdin();
+    const prompt = [inline, piped].filter(Boolean).join("\n\n");
+    if (!prompt) { process.stderr.write('Usage: sky -p "prompt" [--agent fog] [--json|--stream-json]\n'); process.exit(1); }
+    await runHeadless(prompt, {
+      agent: agentName,
+      json: flags.has("--json"),
+      streamJson: flags.has("--stream-json"),
+    });
+    return;
+  }
+
+  const rest = args.filter((a) => a !== "--classic");
+  if (rest.length === 0) { await chat("fog", undefined, classic); return; }
+  if ((AGENT_NAMES as readonly string[]).includes(rest[0])) {
     let m: string | undefined;
-    for (let i = 1; i < args.length; i++) if ((args[i] === "-m" || args[i] === "--model") && i + 1 < args.length) m = args[++i];
-    await chat(args[0], m); return;
+    for (let i = 1; i < rest.length; i++) if ((rest[i] === "-m" || rest[i] === "--model") && i + 1 < rest.length) m = rest[++i];
+    await chat(rest[0], m, classic); return;
   }
-  if (!["chat", "task", "web", "config", "init", "version", "mcp", "help"].includes(args[0]) && !args[0].startsWith("-")) { await chat("fog"); return; }
+  if (!["chat", "task", "web", "config", "init", "version", "mcp", "help"].includes(rest[0]) && !rest[0].startsWith("-")) { await chat("fog", undefined, classic); return; }
   program.parse(process.argv);
 }
 

package/src/cli/mode.ts

@@ -1,58 +1,58 @@
-/**
- * Interactive mode controller — single source of truth for plan/auto/default.
- */
-
-export enum InteractiveMode {
-  DEFAULT = 'default',
-  PLAN = 'plan',
-  AUTO = 'auto',
-}
-
-const CYCLE: InteractiveMode[] = [
-  InteractiveMode.DEFAULT,
-  InteractiveMode.PLAN,
-  InteractiveMode.AUTO,
-];
-
-const LABEL_STYLE: Record<InteractiveMode, [string, string]> = {
-  [InteractiveMode.DEFAULT]: ['DEFAULT', 'bold cyan'],
-  [InteractiveMode.PLAN]: ['PLAN', 'bold magenta'],
-  [InteractiveMode.AUTO]: ['AUTO', 'bold yellow'],
-};
-
-const DESCRIPTIONS: Record<InteractiveMode, string> = {
-  [InteractiveMode.DEFAULT]: 'smart — router picks the right depth per message',
-  [InteractiveMode.PLAN]: 'plan first, confirm before execute',
-  [InteractiveMode.AUTO]: 'autonomous reasoning & execution',
-};
-
-export class ModeController {
-  private _mode: InteractiveMode | null = null;
-
-  get current(): InteractiveMode {
-    if (this._mode === null) {
-      this._mode = InteractiveMode.DEFAULT;
-    }
-    return this._mode;
-  }
-
-  set(mode: InteractiveMode): InteractiveMode {
-    this._mode = mode;
-    return mode;
-  }
-
-  cycle(): InteractiveMode {
-    const cur = this.current;
-    const idx = CYCLE.indexOf(cur);
-    const next = CYCLE[(idx + 1) % CYCLE.length];
-    return this.set(next);
-  }
-
-  label(): [string, string] {
-    return LABEL_STYLE[this.current];
-  }
-
-  describe(): string {
-    return DESCRIPTIONS[this.current];
-  }
-}
+/**
+ * Interactive mode controller — single source of truth for plan/auto/default.
+ */
+
+export enum InteractiveMode {
+  DEFAULT = 'default',
+  PLAN = 'plan',
+  AUTO = 'auto',
+}
+
+const CYCLE: InteractiveMode[] = [
+  InteractiveMode.DEFAULT,
+  InteractiveMode.PLAN,
+  InteractiveMode.AUTO,
+];
+
+const LABEL_STYLE: Record<InteractiveMode, [string, string]> = {
+  [InteractiveMode.DEFAULT]: ['DEFAULT', 'bold cyan'],
+  [InteractiveMode.PLAN]: ['PLAN', 'bold magenta'],
+  [InteractiveMode.AUTO]: ['AUTO', 'bold yellow'],
+};
+
+const DESCRIPTIONS: Record<InteractiveMode, string> = {
+  [InteractiveMode.DEFAULT]: 'smart — router picks the right depth per message',
+  [InteractiveMode.PLAN]: 'plan first, confirm before execute',
+  [InteractiveMode.AUTO]: 'autonomous reasoning & execution',
+};
+
+export class ModeController {
+  private _mode: InteractiveMode | null = null;
+
+  get current(): InteractiveMode {
+    if (this._mode === null) {
+      this._mode = InteractiveMode.DEFAULT;
+    }
+    return this._mode;
+  }
+
+  set(mode: InteractiveMode): InteractiveMode {
+    this._mode = mode;
+    return mode;
+  }
+
+  cycle(): InteractiveMode {
+    const cur = this.current;
+    const idx = CYCLE.indexOf(cur);
+    const next = CYCLE[(idx + 1) % CYCLE.length];
+    return this.set(next);
+  }
+
+  label(): [string, string] {
+    return LABEL_STYLE[this.current];
+  }
+
+  describe(): string {
+    return DESCRIPTIONS[this.current];
+  }
+}