agentflowctl 0.2.0 → 0.3.0

package/README.md

@@ -97,6 +97,21 @@ agentflowctl clean f-xxxx          # 移除 worktree 與 run 紀錄，分支保
 
 `status` 會列出任務。進行中的任務會標出正在寫測試還是正在寫實作。
 
+### 執行中的終端機輸出
+
+agent 每次使用工具，都會印出完整的指令或主要參數，不截斷。多行指令的後續行會縮排對齊。install、測試、verify 這些專案指令也會以 `$ ` 開頭印出來：
+
+```
+    💬 [claude] 先讀現有的表單元件
+    🔧 [claude] Read: /repo/.agentflowctl/worktrees/f-xxxx/src/LoginForm.tsx
+    🔧 [claude] Bash: pnpm vitest run src/LoginForm.test.tsx
+    🔧 [codex] shell: bash -lc 'pnpm test'
+    🔧 [gemini] run_shell_command: npm run lint
+    $ pnpm install
+```
+
+工具參數依序取 command、檔案路徑、path、pattern、url、query，都沒有時印出整包 JSON。每次執行的完整輸出都在 `agentflowctl logs <id>`。
+
 ## 設定
 
 專案根目錄的 `flow.config.json`。完整範例見 `examples/flow.config.json`。未提供的欄位使用內建預設（安裝指令、測試指令、檢查清單預設對應 Vite + TypeScript + Vitest）。
@@ -126,6 +141,7 @@ agentflowctl clean f-xxxx          # 移除 worktree 與 run 紀錄，分支保
 | `maxAgentRuns` | `60` | 單一 run 最多執行幾次 agent |
 | `install` / `test` / `checks` | 見 `src/schemas.ts` | verify 階段實際執行的指令 |
 | `agents` | 內建 claude、codex、gemini | 覆寫內建 agent，或用 `command` adapter 接上其他 CLI |
+| `removedAgents` | `[]` | 移除的內建 agent，不會被自動偵測、不能放進輪替。通常用 `agent remove` 寫入 |
 
 verify 失敗（型別、lint、建置）一律交回最後作者。審查意見才依 `fixStrategy` 決定修正者。
 
@@ -140,13 +156,15 @@ agentflowctl agent add aider --adapter command -- aider --yes-always --message {
 agentflowctl agent set codex --model 你要用的模型 --extra-arg=--search
 agentflowctl agent set aider --adapter gemini             # 換 adapter
 agentflowctl agent remove aider
+agentflowctl agent remove gemini                          # 內建的也能移除
 agentflowctl agent cycle claude-strong,codex,gemini       # 不帶參數時顯示目前的順序
 ```
 
 修改會連帶更新相關設定，並在終端機列出：
 
 - `set --adapter` 換 adapter 時，會清掉舊 adapter 的 `model`、`extraArgs`、`command`，這次有重新指定的除外。
-- `remove` 刪除自訂 agent 時，會一併從 `cycle` 移除。`cycle` 變空就刪除這個欄位，改回自動偵測。對內建 agent 用 `remove`，只會刪掉覆寫設定。
+- `remove` 會一併從 `cycle` 移除。`cycle` 變空就刪除這個欄位，改回自動偵測。
+- 內建的 claude、codex、gemini 也能 `remove`：覆寫設定會一起刪掉，名稱記在 `removedAgents`，之後自動偵測會跳過它，也不能放進 `cycle`。要加回來用 `agent add gemini --adapter gemini`。
 - `--extra-arg` 可以重複指定，會整個取代原本的 `extraArgs`。參數以 `-` 開頭時，寫成 `--extra-arg=--sandbox`。
 
 已建立的 run 會沿用建立時的輪替順序，不受這些修改影響。

package/dist/agentConfig.js

@@ -1,12 +1,20 @@
 import { existsSync, readFileSync, writeFileSync } from "node:fs";
 import { z } from "zod";
-import { DEFAULT_CYCLE } from "./agents/index.js";
+import { builtinAgents, DEFAULT_CYCLE } from "./agents/index.js";
 import { AgentDef, RepoConfig } from "./schemas.js";
 /** 這些欄位的意義取決於 adapter，換 adapter 時要清掉 */
 const ADAPTER_FIELDS = ["model", "extraArgs", "command"];
 const isBuiltin = (name) => DEFAULT_CYCLE.includes(name);
 const agentsOf = (cfg) => ({ ...(cfg.agents ?? {}) });
-const isDefined = (cfg, name) => isBuiltin(name) || name in agentsOf(cfg);
+const removedOf = (cfg) => (cfg.removedAgents ?? []);
+const isDefined = (cfg, name) => builtinAgents(removedOf(cfg)).includes(name) || name in agentsOf(cfg);
+/** 寫回 removedAgents；清單變空就刪掉欄位 */
+function withRemoved(cfg, removed) {
+    const next = { ...cfg, removedAgents: removed };
+    if (!removed.length)
+        delete next.removedAgents;
+    return next;
+}
 /** 只留下有值的欄位，驗證後回傳 */
 function buildAgent(base, patch) {
     const next = { ...base };
@@ -29,7 +37,10 @@ export function addAgent(cfg, name, def) {
     if (isDefined(cfg, name))
         throw new Error(`agent ${name} 已存在，要修改請用 agent set`);
     const { adapter, ...patch } = def;
-    return { cfg: { ...cfg, agents: { ...agentsOf(cfg), [name]: buildAgent({ adapter }, patch) } }, changes: [] };
+    const next = { ...cfg, agents: { ...agentsOf(cfg), [name]: buildAgent({ adapter }, patch) } };
+    // 加回先前移除的內建 agent
+    const removed = removedOf(cfg);
+    return { cfg: removed.includes(name) ? withRemoved(next, removed.filter((n) => n !== name)) : next, changes: [] };
 }
 export function setAgent(cfg, name, patch) {
     if (!isDefined(cfg, name))
@@ -51,16 +62,17 @@ export function setAgent(cfg, name, patch) {
     return { cfg: { ...cfg, agents: { ...agents, [name]: buildAgent(base, patch) } }, changes };
 }
 export function removeAgent(cfg, name) {
+    if (!isDefined(cfg, name))
+        throw new Error(`未定義的 agent：${name}`);
     const agents = agentsOf(cfg);
-    if (!(name in agents)) {
-        throw new Error(isBuiltin(name) ? `${name} 是內建 agent，沒有覆寫設定可以刪除` : `未定義的 agent：${name}`);
-    }
     delete agents[name];
-    const next = { ...cfg, agents };
+    // 內建 agent 沒有設定也存在，要記在 removedAgents 才算移除；覆寫設定一併刪掉
+    let next = { ...cfg, agents };
+    if (isBuiltin(name))
+        next = withRemoved(next, [...removedOf(cfg), name]);
     const changes = [];
     const cycle = cfg.cycle;
-    // 自訂 agent 刪掉後就不存在了，一併從輪替順序移除；內建 agent 只是恢復預設，仍可留在輪替裡
-    if (cycle?.includes(name) && !isBuiltin(name)) {
+    if (cycle?.includes(name)) {
         const rest = cycle.filter((n) => n !== name);
         if (rest.length) {
             next.cycle = rest;

package/dist/agents/claude.js

@@ -1,6 +1,6 @@
 import { mkdirSync, writeFileSync } from "node:fs";
 import { join } from "node:path";
-import { num, str, tryJson } from "./types.js";
+import { num, str, toolDetail, tryJson } from "./types.js";
 /**
  * Claude Code 的權限設定：acceptEdits 只自動允許工作目錄內的修改，
  * 版本控制交給 agentflowctl，並啟用內建沙箱限制 shell 指令。
@@ -46,7 +46,7 @@ export const claude = {
                 if (b.type === "text" && str(b.text)?.trim())
                     out.push({ kind: "text", text: str(b.text) });
                 if (b.type === "tool_use")
-                    out.push({ kind: "tool", name: str(b.name) ?? "tool" });
+                    out.push({ kind: "tool", name: str(b.name) ?? "tool", detail: toolDetail(b.input) });
             }
         }
         else if (ev.type === "result") {

package/dist/agents/codex.js

@@ -21,9 +21,12 @@ export const codex = {
             if (item.type === "agent_message" && str(item.text)?.trim())
                 out.push({ kind: "text", text: str(item.text) });
             else if (item.type === "command_execution")
-                out.push({ kind: "tool", name: `shell: ${str(item.command) ?? ""}`.slice(0, 80) });
-            else if (item.type === "file_change")
-                out.push({ kind: "tool", name: "edit" });
+                out.push({ kind: "tool", name: "shell", detail: str(item.command) });
+            else if (item.type === "file_change") {
+                const changes = Array.isArray(item.changes) ? item.changes : [];
+                const paths = changes.map((c) => str(c.path)).filter(Boolean);
+                out.push({ kind: "tool", name: "edit", detail: paths.length ? paths.join(", ") : undefined });
+            }
         }
         else if (ev.type === "turn.completed") {
             const usage = (ev.usage ?? {});

package/dist/agents/gemini.js

@@ -1,4 +1,4 @@
-import { num, str, tryJson } from "./types.js";
+import { num, str, toolDetail, tryJson } from "./types.js";
 /**
  * Google Gemini CLI：`gemini -p ... --output-format stream-json`。
  * Gemini CLI 沒有「只允許工作目錄內的 shell 指令」這種細緻權限，
@@ -21,7 +21,7 @@ export const gemini = {
             out.push({ kind: "text", text: str(ev.content) });
         }
         else if (ev.type === "tool_use") {
-            out.push({ kind: "tool", name: str(ev.tool_name) ?? "tool" });
+            out.push({ kind: "tool", name: str(ev.tool_name) ?? "tool", detail: toolDetail(ev.parameters) });
         }
         else if (ev.type === "result") {
             const stats = (ev.stats ?? {});

package/dist/agents/index.js

@@ -5,4 +5,6 @@ import { gemini } from "./gemini.js";
 export const ADAPTERS = { claude, codex, gemini, command };
 /** 沒有設定時，依序偵測這些已安裝的 CLI 組成輪替順序 */
 export const DEFAULT_CYCLE = ["claude", "codex", "gemini"];
+/** 扣掉設定裡 removedAgents 之後，仍可使用的內建 agent */
+export const builtinAgents = (removed = []) => DEFAULT_CYCLE.filter((n) => !removed.includes(n));
 //# sourceMappingURL=index.js.map

package/dist/agents/types.js

@@ -9,4 +9,18 @@ export function tryJson(line) {
 }
 export const num = (v) => (typeof v === "number" ? v : undefined);
 export const str = (v) => (typeof v === "string" ? v : undefined);
+/** 從工具參數挑出最能代表「正在做什麼」的欄位；都沒有時以 JSON 顯示全部參數 */
+export function toolDetail(input) {
+    if (!input || typeof input !== "object")
+        return undefined;
+    const o = input;
+    for (const key of ["command", "cmd", "file_path", "absolute_path", "path", "pattern", "url", "query"]) {
+        const v = o[key];
+        if (typeof v === "string" && v.trim())
+            return v;
+        if (Array.isArray(v) && v.length)
+            return v.join(" ");
+    }
+    return Object.keys(o).length ? JSON.stringify(o) : undefined;
+}
 //# sourceMappingURL=types.js.map

package/dist/cli.js

@@ -2,7 +2,7 @@
 import { Command } from "commander";
 import { existsSync, readFileSync, readdirSync, rmSync } from "node:fs";
 import { join } from "node:path";
-import { DEFAULT_CYCLE } from "./agents/index.js";
+import { builtinAgents } from "./agents/index.js";
 import { advance, loadRepoConfig } from "./engine.js";
 import { API_KEY_VARS, probeAgent, resolveAgent, runCommand } from "./runner.js";
 import { addWorktree, git, removeWorktree } from "./git.js";
@@ -62,11 +62,11 @@ async function resolveCycle(flag) {
         return wanted;
     }
     const found = [];
-    for (const name of DEFAULT_CYCLE)
+    for (const name of builtinAgents(cfg.removedAgents))
         if (await probeAgent(resolveAgent(cfg, name)))
             found.push(name);
     if (!found.length)
-        throw new Error("沒有偵測到任何 agent CLI（claude、codex、gemini），可用 agentflowctl doctor 檢查");
+        throw new Error(`沒有偵測到任何 agent CLI（${builtinAgents(cfg.removedAgents).join("、") || "內建 agent 都已移除"}），可用 agentflowctl doctor 檢查`);
     return found;
 }
 const program = new Command()
@@ -211,12 +211,12 @@ agent
     .action(async () => {
     const cfg = loadRepoConfig();
     const cycle = await resolveCycle().catch(() => cfg.cycle ?? []);
-    const names = [...new Set([...DEFAULT_CYCLE, ...Object.keys(cfg.agents)])];
+    const names = [...new Set([...builtinAgents(cfg.removedAgents), ...Object.keys(cfg.agents)])];
     for (const name of names) {
         const def = resolveAgent(cfg, name);
         const ok = await probeAgent(def);
         const pos = cycle.indexOf(name);
-        const kind = DEFAULT_CYCLE.includes(name) ? (name in cfg.agents ? "內建（已覆寫）" : "內建") : "自訂";
+        const kind = builtinAgents(cfg.removedAgents).includes(name) ? (name in cfg.agents ? "內建（已覆寫）" : "內建") : "自訂";
         const detail = [
             `adapter=${def.adapter}`,
             def.model && `model=${def.model}`,
@@ -225,6 +225,8 @@ agent
         ].filter(Boolean);
         console.log(`${ok ? "✅" : "❌"} ${name.padEnd(14)} ${kind.padEnd(8)} ${pos >= 0 ? `輪替 #${pos + 1}` : "不在輪替"}  ${detail.join(" ")}`);
     }
+    if (cfg.removedAgents.length)
+        console.log(`\n已移除的內建 agent：${cfg.removedAgents.join("、")}（可用 agent add <name> --adapter <name> 加回）`);
     console.log(`
 輪替順序：${cycle.length ? cycle.join(" → ") : "（沒有可用的 agent）"}${cfg.cycle ? "" : "（自動偵測）"}`);
 });
@@ -248,8 +250,8 @@ agent
 });
 agent
     .command("remove <name>")
-    .description("刪除自訂 agent（一併從輪替移除），或刪除內建 agent 的覆寫設定")
-    .action((name) => applyEdit((cfg) => removeAgent(cfg, name), `已刪除 ${name} 的設定`));
+    .description("刪除 agent（含內建的 claude、codex、gemini），一併從輪替移除；內建的可用 agent add 加回")
+    .action((name) => applyEdit((cfg) => removeAgent(cfg, name), `已移除 ${name}`));
 agent
     .command("cycle [names]")
     .description("顯示輪替順序，或用逗號分隔設定新的順序")
@@ -272,7 +274,7 @@ program
     .description("檢查可用的 agent CLI 與目前的輪替設定")
     .action(async () => {
     const cfg = loadRepoConfig();
-    const names = [...new Set([...DEFAULT_CYCLE, ...Object.keys(cfg.agents)])];
+    const names = [...new Set([...builtinAgents(cfg.removedAgents), ...Object.keys(cfg.agents)])];
     for (const name of names) {
         const def = resolveAgent(cfg, name);
         const ok = await probeAgent(def);

package/dist/runner.js

@@ -1,7 +1,7 @@
 import { appendFileSync, mkdirSync } from "node:fs";
 import { dirname } from "node:path";
 import { z } from "zod";
-import { ADAPTERS, DEFAULT_CYCLE } from "./agents/index.js";
+import { ADAPTERS, builtinAgents } from "./agents/index.js";
 import { AgentDef } from "./schemas.js";
 import { projectRoot, runDir } from "./paths.js";
 import { exec, execShell } from "./proc.js";
@@ -56,14 +56,22 @@ function appendLog(file, text) {
     mkdirSync(dirname(file), { recursive: true });
     appendFileSync(file, text.endsWith("\n") ? text : `${text}\n`);
 }
+/** 一行工具事件的畫面輸出：完整顯示指令或參數，多行時後續行縮排對齊 */
+export function formatToolLine(agent, tool) {
+    const head = `    🔧 [${agent}] ${tool.name}`;
+    const detail = tool.detail?.trim();
+    return detail ? `${head}: ${detail.split("\n").join("\n       ")}` : head;
+}
 /** 內建的 claude、codex、gemini 定義，可在 flow.config.json 覆寫或新增其他 agent */
 export function resolveAgent(cfg, name) {
     const custom = cfg.agents[name];
     if (custom)
         return custom;
-    if (DEFAULT_CYCLE.includes(name)) {
+    if (builtinAgents(cfg.removedAgents).includes(name)) {
         return AgentDef.parse({ adapter: name });
     }
+    if (cfg.removedAgents.includes(name))
+        throw new Error(`${name} 已從設定移除（removedAgents），要使用請先 agent add ${name} --adapter ${name}`);
     throw new Error(`未定義的 agent：${name}（請在 flow.config.json 的 agents 裡設定）`);
 }
 /** 確認某個 agent 的 CLI 是否可以執行 */
@@ -108,7 +116,7 @@ export async function runAgent(name, def, t, prompt) {
                     console.log(`    💬 [${name}] ${ev.text.trim().split("\n")[0]?.slice(0, 110)}`);
                 }
                 else if (ev.kind === "tool") {
-                    console.log(`    🔧 [${name}] ${ev.name}`);
+                    console.log(formatToolLine(name, ev));
                 }
                 else if (ev.kind === "usage") {
                     inputTokens += ev.inputTokens ?? 0;
@@ -134,6 +142,7 @@ export async function runAgent(name, def, t, prompt) {
  */
 export async function runCommand(t, cmd) {
     appendLog(t.logFile, `$ ${cmd}`);
+    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);

package/dist/schemas.js

@@ -51,6 +51,8 @@ export const AgentDef = z.object({
 export const RepoConfig = z.object({
     /** 自訂或覆寫 agent；claude、codex、gemini 三個名稱內建 */
     agents: z.record(z.string(), AgentDef).default({}),
+    /** 移除的內建 agent：不再自動偵測，也不能放進輪替；用 agent add 加回 */
+    removedAgents: z.array(z.string()).default([]),
     /** 輪替順序；未設定時自動偵測已安裝的 CLI */
     cycle: z.array(z.string()).min(1).optional(),
     /** review 後的修正由誰做：ring＝輪到下一位；author＝最後寫程式的 agent */

package/package.json

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