agentflowctl 0.2.0 → 0.4.0

package/dist/proc.js

@@ -1,12 +1,9 @@
 import { spawn } from "node:child_process";
 export function exec(cmd, args, opts = {}) {
     return new Promise((resolve, reject) => {
-        const env = { ...process.env, ...opts.env };
-        for (const key of opts.unsetEnv ?? [])
-            delete env[key];
         const child = spawn(cmd, args, {
             cwd: opts.cwd,
-            env,
+            env: { ...process.env, ...opts.env },
             shell: opts.shell ?? false,
         });
         let stdout = "";

package/dist/runner.js

@@ -1,20 +1,12 @@
 import { appendFileSync, mkdirSync } from "node:fs";
 import { dirname } from "node:path";
 import { z } from "zod";
-import { ADAPTERS, DEFAULT_CYCLE } from "./agents/index.js";
-import { AgentDef } from "./schemas.js";
+import { ADAPTERS } from "./agents/index.js";
 import { projectRoot, runDir } from "./paths.js";
+import { config } from "./config.js";
+import { CMD_AGENT, footerLine, headerLine, logSeq, STDERR_MARK } from "./logs.js";
 import { exec, execShell } from "./proc.js";
 import { tail } from "./util.js";
-/** 會讓各家 CLI 改走 API 計費的環境變數；只用訂閱登入，執行 agent 時一律移除 */
-export const API_KEY_VARS = [
-    "ANTHROPIC_API_KEY",
-    "ANTHROPIC_AUTH_TOKEN",
-    "CODEX_API_KEY",
-    "OPENAI_API_KEY",
-    "GEMINI_API_KEY",
-    "GOOGLE_API_KEY",
-];
 /**
  * 判斷 agent 失敗是否因為方案額度或速率限制。
  * 各家的錯誤訊息會隨版本變動，這裡用寬鬆的樣式比對，且只在執行失敗時才檢查，避免誤判正常輸出。
@@ -56,15 +48,18 @@ function appendLog(file, text) {
     mkdirSync(dirname(file), { recursive: true });
     appendFileSync(file, text.endsWith("\n") ? text : `${text}\n`);
 }
-/** 內建的 claude、codex、gemini 定義，可在 flow.config.json 覆寫或新增其他 agent */
+/** 一行工具事件的畫面輸出：完整顯示指令或參數，多行時後續行縮排對齊 */
+export function formatToolLine(agent, tool) {
+    const head = `    🔧 [${agent}] ${tool.name}`;
+    const detail = tool.detail?.trim();
+    return detail ? `${head}: ${detail.split("\n").join("\n       ")}` : head;
+}
+/** 取出 flow.config.json 裡定義的 agent；沒有內建 agent */
 export function resolveAgent(cfg, name) {
-    const custom = cfg.agents[name];
-    if (custom)
-        return custom;
-    if (DEFAULT_CYCLE.includes(name)) {
-        return AgentDef.parse({ adapter: name });
-    }
-    throw new Error(`未定義的 agent：${name}（請在 flow.config.json 的 agents 裡設定）`);
+    const def = cfg.agents[name];
+    if (!def)
+        throw new Error(`未定義的 agent：${name}（請先用 agent add ${name} --adapter <adapter> 新增）`);
+    return def;
 }
 /** 確認某個 agent 的 CLI 是否可以執行 */
 export async function probeAgent(def) {
@@ -88,7 +83,7 @@ export async function runAgent(name, def, t, prompt) {
         projectRoot: projectRoot(),
         command: def.command,
     });
-    appendLog(t.logFile, `# agent=${name} adapter=${def.adapter} cmd=${inv.cmd}`);
+    appendLog(t.logFile, headerLine({ stage: t.stage, step: t.step, agent: name, adapter: def.adapter, startedAt: new Date().toISOString() }));
     let done;
     let lastText = "";
     let inputTokens = 0;
@@ -96,7 +91,6 @@ export async function runAgent(name, def, t, prompt) {
     const r = await exec(inv.cmd, inv.args, {
         cwd: t.cwd,
         env: inv.env,
-        unsetEnv: API_KEY_VARS,
         input: inv.input,
         onStdoutLine: (line) => {
             if (!line.trim())
@@ -105,10 +99,12 @@ export async function runAgent(name, def, t, prompt) {
             for (const ev of adapter.parse(line)) {
                 if (ev.kind === "text") {
                     lastText = ev.text;
-                    console.log(`    💬 [${name}] ${ev.text.trim().split("\n")[0]?.slice(0, 110)}`);
+                    if (config.verbose)
+                        console.log(`    💬 [${name}] ${ev.text.trim().split("\n")[0]?.slice(0, 110)}`);
                 }
                 else if (ev.kind === "tool") {
-                    console.log(`    🔧 [${name}] ${ev.name}`);
+                    if (config.verbose)
+                        console.log(formatToolLine(name, ev));
                 }
                 else if (ev.kind === "usage") {
                     inputTokens += ev.inputTokens ?? 0;
@@ -121,8 +117,11 @@ export async function runAgent(name, def, t, prompt) {
         },
     });
     if (r.stderr.trim())
-        appendLog(t.logFile, `[stderr]\n${r.stderr}`);
+        appendLog(t.logFile, `${STDERR_MARK}\n${r.stderr}`);
     const ok = r.code === 0 && (done?.ok ?? true);
+    appendLog(t.logFile, footerLine({ code: r.code, ok, endedAt: new Date().toISOString() }));
+    if (!ok)
+        console.log(`    ✗ ${name} 執行失敗（結束碼 ${r.code}），可用 agentflowctl logs ${t.runId} ${logSeq(t.logFile)} 查看`);
     const summary = done?.summary || lastText || tail(r.stdout, 2000) || tail(r.stderr, 2000);
     const quotaExhausted = !ok && isQuotaError(`${summary}\n${done?.summary ?? ""}\n${r.stderr}\n${tail(r.stdout, 4000)}`);
     const meta = parseResultMeta(summary) ?? parseResultMeta(lastText);
@@ -133,10 +132,15 @@ export async function runAgent(name, def, t, prompt) {
  * 注意：這些指令會執行 agent 寫出來的程式碼，而且不在任何沙箱內。
  */
 export async function runCommand(t, cmd) {
+    appendLog(t.logFile, headerLine({ stage: t.stage, step: t.step, agent: CMD_AGENT, startedAt: new Date().toISOString() }));
     appendLog(t.logFile, `$ ${cmd}`);
+    if (config.verbose)
+        console.log(`    $ ${cmd.trim().split("\n").join("\n      ")}`);
     const r = await execShell(cmd, { cwd: t.cwd });
     const output = `${r.stdout}\n${r.stderr}`.trim();
-    appendLog(t.logFile, output);
-    return { ok: r.code === 0, output };
+    if (output)
+        appendLog(t.logFile, output);
+    appendLog(t.logFile, footerLine({ code: r.code, ok: r.code === 0, endedAt: new Date().toISOString() }));
+    return { ok: r.code === 0, output, seq: logSeq(t.logFile) };
 }
 //# sourceMappingURL=runner.js.map

package/dist/schemas.js

@@ -49,9 +49,9 @@ export const AgentDef = z.object({
 });
 /** 目標專案可選的 flow.config.json，預設值對應 Vite + TypeScript + Vitest 專案 */
 export const RepoConfig = z.object({
-    /** 自訂或覆寫 agent；claude、codex、gemini 三個名稱內建 */
+    /** 可用的 agent；沒有內建，全部都要在這裡定義（通常用 agent add） */
     agents: z.record(z.string(), AgentDef).default({}),
-    /** 輪替順序；未設定時自動偵測已安裝的 CLI */
+    /** 輪替順序；未設定時依 agents 的順序，取已安裝的 CLI */
     cycle: z.array(z.string()).min(1).optional(),
     /** review 後的修正由誰做：ring＝輪到下一位；author＝最後寫程式的 agent */
     fixStrategy: z.enum(["ring", "author"]).default("ring"),

package/dist/setup.js

@@ -0,0 +1,70 @@
+import { addAgent, setAgent, setCycle } from "./agentConfig.js";
+/**
+ * `agentflowctl agent setup` 的互動精靈。
+ * 問答與偵測結果由外部注入，這裡只負責流程；所有修改都在記憶體裡完成，確認後才交給呼叫端寫入。
+ */
+export const SETUP_ADAPTERS = ["claude", "codex", "gemini"];
+/** 回傳要寫入的設定；使用者沒選任何 agent 或最後沒確認時回傳 null */
+export async function runSetup(initial, deps) {
+    const { detected, log } = deps;
+    const ask = async (q, def = "") => (await deps.ask(def ? `${q}（${def}）：` : `${q}：`)).trim() || def;
+    const confirm = async (q, def) => {
+        const a = (await deps.ask(`${q}（${def ? "Y/n" : "y/N"}）：`)).trim().toLowerCase();
+        return a ? a.startsWith("y") : def;
+    };
+    let cfg = initial;
+    const changes = [];
+    const chosen = [];
+    const existing = () => Object.keys((cfg.agents ?? {}));
+    for (const adapter of SETUP_ADAPTERS) {
+        log(`${detected[adapter] ? "✅" : "❌"} ${adapter}${detected[adapter] ? "" : "（沒有偵測到 CLI）"}`);
+        if (!(await confirm(`  加入 ${adapter}？`, detected[adapter])))
+            continue;
+        let name;
+        for (;;) {
+            name = await ask("  名稱", adapter);
+            if (!/^[\w-]+$/.test(name))
+                log("  名稱只能用英數字、底線與連字號");
+            else if (chosen.includes(name))
+                log(`  ${name} 這次已經用過了`);
+            else
+                break;
+        }
+        const isNew = !existing().includes(name);
+        if (!isNew && !(await confirm(`  ${name} 已存在，要覆寫嗎？`, false))) {
+            chosen.push(name);
+            continue;
+        }
+        const model = (await ask("  model（Enter 不指定）")) || undefined;
+        const edit = isNew ? addAgent(cfg, name, { adapter, model }) : setAgent(cfg, name, { adapter, model });
+        cfg = edit.cfg;
+        changes.push(...edit.changes);
+        chosen.push(name);
+    }
+    if (!chosen.length) {
+        log("沒有選擇任何 agent，設定沒有變更");
+        return null;
+    }
+    for (;;) {
+        const list = (await ask("輪替順序，用逗號分隔", chosen.join(","))).split(",").map((s) => s.trim()).filter(Boolean);
+        try {
+            cfg = setCycle(cfg, list).cfg;
+            break;
+        }
+        catch (e) {
+            log(`  ${e.message}`);
+        }
+    }
+    const agents = cfg.agents;
+    log("\n即將寫入：");
+    for (const name of chosen)
+        log(`  ${name.padEnd(14)} adapter=${agents[name].adapter}${agents[name].model ? ` model=${agents[name].model}` : ""}`);
+    log(`  輪替順序：${cfg.cycle.join(" → ")}`);
+    log("  需要自訂指令的 CLI 請改用 agent add <name> --adapter command -- <指令>");
+    if (!(await confirm("寫入 flow.config.json？", true))) {
+        log("已取消，設定沒有變更");
+        return null;
+    }
+    return { cfg, changes };
+}
+//# sourceMappingURL=setup.js.map

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "agentflowctl",
   "license": "MIT",
-  "version": "0.2.0",
+  "version": "0.4.0",
   "description": "跨廠商 AI 開發 harness：Claude Code、Codex、Gemini 輪流實作、審查、修正",
   "keywords": [
     "ai",