@brawnen/agent-harness-cli 0.1.0 → 0.1.2

package/src/commands/status.js

@@ -2,6 +2,7 @@ import fs from "node:fs";
 import path from "node:path";
 
 import { evaluateTaskDeliveryReadiness, summarizeDeliveryReadiness } from "../lib/delivery-policy.js";
+import { hasConvergedHostLayout, HOST_LAYOUT_VERSION } from "../lib/host-layout.js";
 import { evaluateTaskArtifactPolicy, inspectOutputPolicyWorkspace, normalizeOutputPolicy } from "../lib/output-policy.js";
 import { loadProjectConfig } from "../lib/project-config.js";
 import {
@@ -36,6 +37,10 @@ export function runStatus(argv) {
   pushCheck(checks, harnessConfig);
   exitCode = maxExitCode(exitCode, harnessConfig.severity);
 
+  const hostLayoutCheck = inspectHostLayout(cwd);
+  pushCheck(checks, hostLayoutCheck);
+  exitCode = maxExitCode(exitCode, hostLayoutCheck.severity);
+
   const deliveryPolicyCheck = inspectDeliveryPolicy(cwd);
   pushCheck(checks, deliveryPolicyCheck);
   exitCode = maxExitCode(exitCode, deliveryPolicyCheck.severity);
@@ -72,6 +77,10 @@ export function runStatus(argv) {
   pushCheck(checks, claudeHooksCheck);
   exitCode = maxExitCode(exitCode, claudeHooksCheck.severity);
 
+  const geminiAdapterCheck = inspectGeminiAdapter(cwd, runtimeMode, hosts.includes("gemini-cli"));
+  pushCheck(checks, geminiAdapterCheck);
+  exitCode = maxExitCode(exitCode, geminiAdapterCheck.severity);
+
   const runtimeDirsCheck = inspectRuntimeDirectories(cwd, runtimeMode);
   pushCheck(checks, runtimeDirsCheck);
   exitCode = maxExitCode(exitCode, runtimeDirsCheck.severity);
@@ -140,6 +149,28 @@ function inspectDeliveryPolicy(cwd) {
   return ok("delivery_policy", `active_task=${activeTask.task_id}；${summarizeDeliveryReadiness(readiness)}`);
 }
 
+function inspectHostLayout(cwd) {
+  if (!hasConvergedHostLayout(cwd)) {
+    return warn("host_layout", "未检测到 .harness/hosts 与 .harness/rules，当前仍可能处于旧布局");
+  }
+
+  const manifestPath = path.join(cwd, ".harness", "generated", "manifest.json");
+  if (!fs.existsSync(manifestPath)) {
+    return warn("host_layout", "已检测到收敛布局源目录，但缺少 .harness/generated/manifest.json");
+  }
+
+  try {
+    const manifest = JSON.parse(fs.readFileSync(manifestPath, "utf8"));
+    const version = manifest.version ?? HOST_LAYOUT_VERSION;
+    const hosts = Array.isArray(manifest.hosts) && manifest.hosts.length > 0
+      ? manifest.hosts.join(", ")
+      : "unknown";
+    return ok("host_layout", `已启用收敛布局（version=${version}, hosts=${hosts}）`);
+  } catch {
+    return warn("host_layout", ".harness/generated/manifest.json 存在，但 JSON 解析失败");
+  }
+}
+
 function inspectOutputPolicy(cwd) {
   const config = loadProjectConfig(cwd);
   if (!config) {
@@ -307,14 +338,21 @@ function inspectCodexHooks(cwd, hasCodexHost) {
     return warn(".codex/hooks", "hooks.json 存在，但 JSON 解析失败");
   }
 
-  const checks = [
-    hasCodexHookCommand(parsedHooks, "UserPromptSubmit", "user_prompt_submit_intake.js"),
-    hasCodexHookCommand(parsedHooks, "SessionStart", "session_start_restore.js"),
-    hasCodexHookCommand(parsedHooks, "PostToolUse", "post_tool_use_record_evidence.js")
-  ];
+  const hasUserPromptSubmit = hasCodexHookCommand(parsedHooks, "UserPromptSubmit", "user_prompt_submit_intake.js");
+  const hasSessionStart = hasCodexHookCommand(parsedHooks, "SessionStart", "session_start_restore.js");
+  const hasPreToolUse = hasCodexHookCommand(parsedHooks, "PreToolUse", "pre_tool_use_gate.js");
+  const hasPostToolUse = hasCodexHookCommand(parsedHooks, "PostToolUse", "post_tool_use_record_evidence.js");
+
+  if (!hasUserPromptSubmit || !hasSessionStart) {
+    return warn(".codex/hooks", "hooks.json 存在，但缺少最小 Codex hooks：SessionStart / UserPromptSubmit");
+  }
 
-  if (checks.some((item) => item === false)) {
-    return warn(".codex/hooks", "hooks.json 存在，但 agent-harness Codex hooks 不完整");
+  if (!hasPreToolUse && !hasPostToolUse) {
+    return ok(".codex/hooks", "Codex hooks 已配置；已启用 SessionStart / UserPromptSubmit，工具级 hooks 当前关闭");
+  }
+
+  if (hasPreToolUse !== hasPostToolUse) {
+    return warn(".codex/hooks", "hooks.json 存在，但工具级 hooks 仅部分启用");
   }
 
   return ok(".codex/hooks", "Codex hooks 已配置；trusted project 默认启用，untrusted 请显式使用 codex --enable codex_hooks");
@@ -348,14 +386,130 @@ function inspectClaudeHooks(cwd, runtimeMode, hasClaudeHost) {
     .map((hook) => hook.command)
     .filter(Boolean);
 
-  const hasPreTool = commands.some((command) => command.includes("agent-harness gate before-tool"));
-  const hasPostTool = commands.some((command) => command.includes("agent-harness state update"));
+  const hasPreTool = hasCommandFragment(commands, [
+    "agent-harness gate before-tool",
+    "@brawnen/agent-harness-cli gate before-tool",
+    "packages/cli/bin/agent-harness.js\" gate before-tool",
+    "packages/cli/bin/agent-harness.js gate before-tool",
+    ".harness/hosts/claude/hooks/pre_tool_use.js"
+  ]);
+  const hasPostTool = hasCommandFragment(commands, [
+    "agent-harness state update",
+    "@brawnen/agent-harness-cli state update",
+    "packages/cli/bin/agent-harness.js\" state update",
+    "packages/cli/bin/agent-harness.js state update",
+    ".harness/hosts/claude/hooks/post_tool_use.js"
+  ]);
+  const hasSessionStart = hasCommandFragment(commands, [
+    "agent-harness hook claude session-start",
+    "@brawnen/agent-harness-cli hook claude session-start",
+    "packages/cli/bin/agent-harness.js\" hook claude session-start",
+    "packages/cli/bin/agent-harness.js hook claude session-start",
+    ".harness/hosts/claude/hooks/session_start.js"
+  ]);
+  const hasUserPromptSubmit = hasCommandFragment(commands, [
+    "agent-harness hook claude user-prompt-submit",
+    "@brawnen/agent-harness-cli hook claude user-prompt-submit",
+    "packages/cli/bin/agent-harness.js\" hook claude user-prompt-submit",
+    "packages/cli/bin/agent-harness.js hook claude user-prompt-submit",
+    ".harness/hosts/claude/hooks/user_prompt_submit.js"
+  ]);
+  const hasStop = hasCommandFragment(commands, [
+    "agent-harness hook claude stop",
+    "@brawnen/agent-harness-cli hook claude stop",
+    "packages/cli/bin/agent-harness.js\" hook claude stop",
+    "packages/cli/bin/agent-harness.js hook claude stop",
+    ".harness/hosts/claude/hooks/stop.js"
+  ]);
+
+  if (hasSessionStart && hasUserPromptSubmit && hasPreTool && hasPostTool && hasStop) {
+    return ok(".claude/settings.json", "Claude Code hooks 已配置（SessionStart / UserPromptSubmit / PreToolUse / PostToolUse / Stop）");
+  }
 
   if (hasPreTool && hasPostTool) {
-    return ok(".claude/settings.json", "Claude Code hooks 已配置");
+    return warn(".claude/settings.json", "检测到旧版 Claude Code 最小 hooks，缺少 SessionStart / UserPromptSubmit / Stop");
   }
 
-  return warn(".claude/settings.json", "hooks 存在，但 agent-harness 命令不完整");
+  return warn(".claude/settings.json", "hooks 存在，但 Claude Code adapter 命令不完整");
+}
+
+function inspectGeminiAdapter(cwd, runtimeMode, hasGeminiHost) {
+  if (!hasGeminiHost) {
+    return skip("Gemini adapter", "当前项目未检测到 Gemini CLI 宿主");
+  }
+
+  const hostPath = path.join(cwd, "GEMINI.md");
+  const settingsPath = path.join(cwd, ".gemini", "settings.json");
+  if (!fs.existsSync(hostPath)) {
+    return warn("Gemini adapter", "缺少 GEMINI.md，无法注入 Gemini CLI 宿主规则");
+  }
+
+  if (!fs.existsSync(settingsPath)) {
+    if (runtimeMode === "protocol-only") {
+      return skip("Gemini adapter", "protocol-only 模式，仅依赖 GEMINI.md 规则注入");
+    }
+
+    return warn("Gemini adapter", "未发现 .gemini/settings.json，Gemini CLI hooks 尚未配置");
+  }
+
+  let parsed;
+  try {
+    parsed = JSON.parse(fs.readFileSync(settingsPath, "utf8"));
+  } catch {
+    return warn("Gemini adapter", ".gemini/settings.json 存在，但 JSON 解析失败");
+  }
+
+  const commands = Object.values(parsed.hooks ?? {})
+    .flatMap((entries) => entries ?? [])
+    .flatMap((entry) => entry.hooks ?? [])
+    .map((hook) => hook.command)
+    .filter(Boolean);
+
+  const hasSessionStart = hasCommandFragment(commands, [
+    "agent-harness hook gemini session-start",
+    "@brawnen/agent-harness-cli hook gemini session-start",
+    "packages/cli/bin/agent-harness.js\" hook gemini session-start",
+    "packages/cli/bin/agent-harness.js hook gemini session-start",
+    ".harness/hosts/gemini/hooks/session_start.js"
+  ]);
+  const hasBeforeAgent = hasCommandFragment(commands, [
+    "agent-harness hook gemini before-agent",
+    "@brawnen/agent-harness-cli hook gemini before-agent",
+    "packages/cli/bin/agent-harness.js\" hook gemini before-agent",
+    "packages/cli/bin/agent-harness.js hook gemini before-agent",
+    ".harness/hosts/gemini/hooks/before_agent.js"
+  ]);
+  const hasBeforeTool = hasCommandFragment(commands, [
+    "agent-harness hook gemini before-tool",
+    "@brawnen/agent-harness-cli hook gemini before-tool",
+    "packages/cli/bin/agent-harness.js\" hook gemini before-tool",
+    "packages/cli/bin/agent-harness.js hook gemini before-tool",
+    ".harness/hosts/gemini/hooks/before_tool.js"
+  ]);
+  const hasAfterTool = hasCommandFragment(commands, [
+    "agent-harness hook gemini after-tool",
+    "@brawnen/agent-harness-cli hook gemini after-tool",
+    "packages/cli/bin/agent-harness.js\" hook gemini after-tool",
+    "packages/cli/bin/agent-harness.js hook gemini after-tool",
+    ".harness/hosts/gemini/hooks/after_tool.js"
+  ]);
+  const hasAfterAgent = hasCommandFragment(commands, [
+    "agent-harness hook gemini after-agent",
+    "@brawnen/agent-harness-cli hook gemini after-agent",
+    "packages/cli/bin/agent-harness.js\" hook gemini after-agent",
+    "packages/cli/bin/agent-harness.js hook gemini after-agent",
+    ".harness/hosts/gemini/hooks/after_agent.js"
+  ]);
+
+  const modeSummary = runtimeMode === "protocol-only"
+    ? "当前为 protocol-only，但 hooks 已可用"
+    : "已检测到 .harness 运行时目录，可配合 hooks 与兼容 CLI 做 state / verify / report";
+
+  if (hasSessionStart && hasBeforeAgent && hasBeforeTool && hasAfterTool && hasAfterAgent) {
+    return ok("Gemini adapter", `Gemini CLI hooks 已配置（SessionStart / BeforeAgent / BeforeTool / AfterTool / AfterAgent）；${modeSummary}`);
+  }
+
+  return warn("Gemini adapter", "Gemini CLI hooks 已部分配置，但命令集合不完整");
 }
 
 function hasCodexHookCommand(parsedHooks, eventName, commandFragment) {
@@ -369,6 +523,10 @@ function hasCodexHookCommand(parsedHooks, eventName, commandFragment) {
     .some((hook) => typeof hook?.command === "string" && hook.command.includes(commandFragment));
 }
 
+function hasCommandFragment(commands, fragments) {
+  return commands.some((command) => fragments.some((fragment) => command.includes(fragment)));
+}
+
 function inspectRuntimeDirectories(cwd, runtimeMode) {
   if (runtimeMode === "protocol-only") {
     return skip("runtime", "protocol-only 模式，无需运行时目录");

package/src/commands/sync.js

@@ -0,0 +1,88 @@
+import { applyHostLayoutWrites, collectHostLayoutWrites, HOST_LAYOUT_HOSTS } from "../lib/host-layout.js";
+
+export function runSync(argv) {
+  const parsed = parseSyncArgs(argv);
+  if (!parsed.ok) {
+    console.error(parsed.error);
+    return 1;
+  }
+
+  const cwd = process.cwd();
+  const result = collectHostLayoutWrites(cwd, {
+    check: parsed.options.check,
+    hosts: parsed.options.hosts,
+    rewrite: parsed.options.rewrite,
+    seedMissing: true
+  });
+
+  for (const warning of result.warnings) {
+    console.error(`warn: ${warning}`);
+  }
+
+  if (parsed.options.check) {
+    if (result.warnings.length === 0 && result.writes.length === 0) {
+      console.log("host layout 已同步");
+      return 0;
+    }
+
+    for (const write of result.writes) {
+      console.log(`drift: ${write.relativePath}`);
+    }
+    return 1;
+  }
+
+  applyHostLayoutWrites(result.writes);
+
+  for (const write of result.writes) {
+    console.log(`write: ${write.relativePath}`);
+  }
+
+  if (result.warnings.length > 0) {
+    return 1;
+  }
+
+  console.log("sync 完成。");
+  return 0;
+}
+
+function parseSyncArgs(argv) {
+  const options = {
+    check: false,
+    hosts: null,
+    rewrite: false
+  };
+
+  const hosts = [];
+
+  for (let index = 0; index < argv.length; index += 1) {
+    const arg = argv[index];
+
+    if (arg === "--check") {
+      options.check = true;
+      continue;
+    }
+
+    if (arg === "--rewrite") {
+      options.rewrite = true;
+      continue;
+    }
+
+    if (arg === "--host") {
+      const value = argv[index + 1];
+      if (!HOST_LAYOUT_HOSTS.includes(value)) {
+        return { ok: false, error: "无效的 --host 参数。可选值: codex, claude-code, gemini-cli" };
+      }
+      hosts.push(value);
+      index += 1;
+      continue;
+    }
+
+    return { ok: false, error: `未知参数: ${arg}` };
+  }
+
+  if (hosts.length > 0) {
+    options.hosts = hosts;
+  }
+
+  return { ok: true, options };
+}

package/src/index.js

@@ -2,14 +2,16 @@ import { runAudit } from "./commands/audit.js";
 import { runDelivery } from "./commands/delivery.js";
 import { runDocs } from "./commands/docs.js";
 import { runGate } from "./commands/gate.js";
+import { runHook } from "./commands/hook.js";
 import { runInit } from "./commands/init.js";
 import { runReport } from "./commands/report.js";
+import { runSync } from "./commands/sync.js";
 import { runState } from "./commands/state.js";
 import { runStatus } from "./commands/status.js";
 import { runTask } from "./commands/task.js";
 import { runVerify } from "./commands/verify.js";
 
-const HELP_TEXT = `agent-harness CLI
+const HELP_TEXT = `agent-harness compatibility CLI
 
 Usage:
   agent-harness --help
@@ -21,6 +23,8 @@ Usage:
   agent-harness delivery <ready|request|commit>
   agent-harness docs scaffold --type <design-note|adr>
   agent-harness gate before-tool --tool <tool>
+  agent-harness hook <claude|codex|gemini> <event>
+  agent-harness sync [--check] [--rewrite]
   agent-harness status
   agent-harness task intake "<任务描述>"
   agent-harness task confirm [--task-id <task-id>]
@@ -39,7 +43,7 @@ Options:
   --force
 
 Status:
-  task/init/status/state/verify/report/gate/audit/delivery/docs MVP are implemented.
+  CLI 主要承担 init/status/manual fallback，宿主运行时正向 repo-local hooks 收敛。
 `;
 
 export function run(argv) {
@@ -51,7 +55,7 @@ export function run(argv) {
   }
 
   if (command === "--version" || command === "-v") {
-    console.log("0.1.0");
+    console.log("0.1.2");
     return 0;
   }
 
@@ -75,10 +79,18 @@ export function run(argv) {
     return runGate(argv.slice(1));
   }
 
+  if (command === "hook") {
+    return runHook(argv.slice(1));
+  }
+
   if (command === "status") {
     return runStatus(argv.slice(1));
   }
 
+  if (command === "sync") {
+    return runSync(argv.slice(1));
+  }
+
   if (command === "task") {
     return runTask(argv.slice(1));
   }

package/src/lib/claude-hooks.js

@@ -0,0 +1,49 @@
+import {
+  handleCompletionGate,
+  handlePromptSubmit,
+  handleSessionStart
+} from "./hook-core.js";
+import { buildClaudeHookOutput, resolveClaudeCompletionMessage } from "./hook-io/claude.js";
+import { readHookPayload, resolvePayloadCwd, resolvePayloadPrompt } from "./hook-io/shared.js";
+
+const MANUAL_FALLBACK_COMMANDS = [
+  "npx @brawnen/agent-harness-cli state active",
+  "npx @brawnen/agent-harness-cli task intake \"任务描述\"",
+  "npx @brawnen/agent-harness-cli task suspend-active --reason \"切换任务\""
+];
+
+export { readHookPayload };
+
+export function runClaudeHook(event, payload) {
+  const cwd = resolvePayloadCwd(payload);
+
+  if (event === "session-start") {
+    return buildClaudeHookOutput("SessionStart", handleSessionStart({
+      cwd,
+      fallbackCommands: [
+        "npx @brawnen/agent-harness-cli state active",
+        "npx @brawnen/agent-harness-cli task intake \"任务描述\""
+      ],
+      hostDisplayName: "Claude Code",
+      source: payload?.source ?? ""
+    }));
+  }
+
+  if (event === "user-prompt-submit") {
+    return buildClaudeHookOutput("UserPromptSubmit", handlePromptSubmit({
+      cwd,
+      fallbackCommands: MANUAL_FALLBACK_COMMANDS,
+      hostDisplayName: "Claude Code",
+      prompt: resolvePayloadPrompt(payload)
+    }));
+  }
+
+  if (event === "stop") {
+    return buildClaudeHookOutput("Stop", handleCompletionGate({
+      cwd,
+      lastAssistantMessage: resolveClaudeCompletionMessage(payload)
+    }));
+  }
+
+  throw new Error(`未知 Claude hook 事件: ${event}`);
+}

package/src/lib/codex-hooks.js

@@ -0,0 +1,48 @@
+import {
+  handleCompletionGate,
+  handlePromptSubmit,
+  handleSessionStart
+} from "./hook-core.js";
+import { buildCodexHookOutput, resolveCodexCompletionMessage } from "./hook-io/codex.js";
+import { resolvePayloadCwd, resolvePayloadPrompt } from "./hook-io/shared.js";
+
+const MANUAL_FALLBACK_COMMANDS = [
+  "node packages/cli/bin/agent-harness.js state active",
+  "node packages/cli/bin/agent-harness.js task intake \"任务描述\"",
+  "node packages/cli/bin/agent-harness.js task suspend-active --reason \"切换任务\""
+];
+
+export function runCodexHook(event, payload) {
+  if (event === "session-start") {
+    const decision = handleSessionStart({
+      cwd: resolvePayloadCwd(payload),
+      fallbackCommands: [
+        "node packages/cli/bin/agent-harness.js state active",
+        "node packages/cli/bin/agent-harness.js task intake \"任务描述\""
+      ],
+      hostDisplayName: "Codex",
+      source: payload?.source ?? ""
+    });
+    return buildCodexHookOutput("SessionStart", decision);
+  }
+
+  if (event === "user-prompt-submit") {
+    const decision = handlePromptSubmit({
+      cwd: resolvePayloadCwd(payload),
+      fallbackCommands: MANUAL_FALLBACK_COMMANDS,
+      hostDisplayName: "Codex",
+      prompt: resolvePayloadPrompt(payload)
+    });
+    return buildCodexHookOutput("UserPromptSubmit", decision);
+  }
+
+  if (event === "stop") {
+    const decision = handleCompletionGate({
+      cwd: resolvePayloadCwd(payload),
+      lastAssistantMessage: resolveCodexCompletionMessage(payload)
+    });
+    return buildCodexHookOutput("Stop", decision);
+  }
+
+  throw new Error(`未知 Codex hook 事件: ${event}`);
+}

package/src/lib/gemini-hooks.js

@@ -0,0 +1,76 @@
+import {
+  handleAfterTool,
+  handleBeforeTool,
+  handleCompletionGate,
+  handlePromptSubmit,
+  handleSessionStart
+} from "./hook-core.js";
+import {
+  buildGeminiHookOutput,
+  resolveGeminiCompletionMessage,
+  resolveGeminiToolCommand,
+  resolveGeminiToolExitCode,
+  resolveGeminiToolName,
+  resolveGeminiToolOutput,
+  resolveGeminiToolPath
+} from "./hook-io/gemini.js";
+import { resolvePayloadCwd, resolvePayloadPrompt } from "./hook-io/shared.js";
+
+const MANUAL_FALLBACK_COMMANDS = [
+  "node packages/cli/bin/agent-harness.js state active",
+  "node packages/cli/bin/agent-harness.js task intake \"任务描述\"",
+  "node packages/cli/bin/agent-harness.js task suspend-active --reason \"切换任务\""
+];
+
+export function runGeminiHook(event, payload) {
+  const cwd = resolvePayloadCwd(payload);
+
+  if (event === "session-start") {
+    return buildGeminiHookOutput(handleSessionStart({
+      cwd,
+      fallbackCommands: [
+        "node packages/cli/bin/agent-harness.js state active",
+        "node packages/cli/bin/agent-harness.js task intake \"任务描述\""
+      ],
+      hostDisplayName: "Gemini CLI",
+      source: payload?.source ?? ""
+    }));
+  }
+
+  if (event === "before-agent") {
+    return buildGeminiHookOutput(handlePromptSubmit({
+      cwd,
+      fallbackCommands: MANUAL_FALLBACK_COMMANDS,
+      hostDisplayName: "Gemini CLI",
+      prompt: resolvePayloadPrompt(payload)
+    }));
+  }
+
+  if (event === "before-tool") {
+    return buildGeminiHookOutput(handleBeforeTool({
+      command: resolveGeminiToolCommand(payload),
+      cwd,
+      filePath: resolveGeminiToolPath(payload),
+      toolName: resolveGeminiToolName(payload)
+    }));
+  }
+
+  if (event === "after-tool") {
+    return buildGeminiHookOutput(handleAfterTool({
+      command: resolveGeminiToolCommand(payload),
+      cwd,
+      exitCode: resolveGeminiToolExitCode(payload),
+      output: resolveGeminiToolOutput(payload),
+      toolName: resolveGeminiToolName(payload)
+    }));
+  }
+
+  if (event === "after-agent") {
+    return buildGeminiHookOutput(handleCompletionGate({
+      cwd,
+      lastAssistantMessage: resolveGeminiCompletionMessage(payload)
+    }));
+  }
+
+  throw new Error(`未知 Gemini hook 事件: ${event}`);
+}