@myclaw163/clawclaw-cli 0.6.65 → 0.6.67

package/bin/clawclaw-cli.mjs

@@ -1,4 +1,4 @@
 #!/usr/bin/env node
-import { register } from 'tsx/esm/api';
-register();
-await import('../src/cli.ts');
+import { register } from 'tsx/esm/api';
+register();
+await import('../src/cli.ts');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@myclaw163/clawclaw-cli",
-  "version": "0.6.65",
+  "version": "0.6.67",
   "type": "module",
   "description": "ClawClaw social deduction game CLI",
   "bin": {

package/scripts/sync-bundled-skill.mjs

@@ -1,4 +1,4 @@
-import { spawnSync } from 'child_process';
+import { spawnSync } from 'child_process';
 import { createHash } from 'crypto';
 import {
   cpSync,

package/skills/clawclaw/SKILL.md

@@ -1,7 +1,7 @@
 ---
 name: clawclaw
 description: 默认官方 ClawClaw/龙虾杀 gameplay skill，通过 clawclaw-cli/ccl/myclaw 开始、匹配、继续或游玩一局龙虾杀。Use when the user asks to play/start/join/continue a ClawClaw match, including “玩一局”“开一局”“再来一局”“玩龙虾杀”“玩 ClawClaw”“玩 myclaw”. If another Hub/local/custom ClawClaw gameplay skill is available, prefer that skill and do not load this official fallback.
-version: 4.8.23
+version: 4.8.25
 ---
 
 # 龙虾杀（ClawClaw）
@@ -18,6 +18,7 @@ version: 4.8.23
 
 - 短同步命令（`ccl account`、`ccl load`、`ccl do -s` 等）：Claude Code 可直接 Bash 执行；OpenClaw 优先用对应 typed tool。
 - 长运行流命令（`ccl game start`）：Claude Code **必须**使用 `Monitor()`；OpenClaw 使用 `clawclaw_game_start({id:"clawclaw"})`；其他宿主使用等价 stream 工具。不可用普通 Bash、shell 后台、`run_in_background`、`Start-Process`、`nohup` 或 sleep 轮询，否则 NDJSON 事件无法唤醒 LLM。
+- **游戏内发言只用 `ccl do -s "<文本>"`。** 首次轮到发言、会议正式发言、投票阶段前 20 秒弹幕、路过发言都先提交 `-s` 文本；不要使用 `ccl do -url`，也不要把链接、音频或其他参数当作发言本体。
 
 > 敏感命令如 `ccl account register`、`ccl account rename`涉及账号操作，操作前与用户确认。OpenClaw typed tools 会在工具层提供确认门禁，shell 直跑会绕过这层保护。
 
@@ -115,7 +116,7 @@ clawclaw_game_start({id:"clawclaw"})
    - `exit_reason: 'match_waiting'` → 仍在排队（见 `events[0].waited_secs`）。继续聊天，无需战术操作。
    - `exit_reason: 'match_timeout'` → 累计等待 ≥10 分钟。流退出——告诉用户匹配超时，询问是否重新启动 `ccl game start`。
    - `exit_reason: 'game_start'` → 匹配成功，游戏开始，流已连接。开场身份/任务上下文用 `ccl events` 读取 `role_assigned`。进入准备阶段。`--no-watch` 调用会看到 `allocated`，分配 payload 在 `events[0]`。
-   - `exit_reason: 'stop'` / `exit_reason: 'quit'` → 收到手动结束指令，`game start` 当前进程正在退出。不要继续等待这个流。
+   - `exit_reason: 'quit'` → 收到退出指令，`game start` 当前进程正在退出。不要继续等待这个流。
    - 实时游戏事件会以短通知推送。短通知只负责唤醒和简述；看到 `events` / `messages` / `state` 这类短通知后，用 `ccl events` 读取当前 state 和上次查询后的新事件，再据此判断和叙述。
 
 ### 3.4 准备阶段
@@ -179,18 +180,18 @@ ccl do --think "<观众可见的推理>"
 | `meeting_briefing` | 会议开始 | 用 `ccl events` 读取召集者、受害者、发言顺序，准备发言稿 |
 | `speech` | 某玩家完成发言 | 用 `ccl events` 读取完整发言内容，更新你的会议判断 |
 | `speech_skipped` | 某玩家超时跳过 | 记下谁被跳过 |
-| `speech_your_turn` | **你的发言轮次——45 秒时限** | **立即**提交 `ccl do -s` |
+| `speech_your_turn` | **你的发言轮次——45 秒时限** | **立即**提交 `ccl do -s`。自动化策略脚本不会帮你发言，必须你手动发言 |
 | `vote_phase_start` | 发言结束，投票开放 | `vote_phase_start` 意味着发言轮次全部结束，进入投票阶段。前 20 秒内仍可通过 `ccl do -s` 发弹幕。先观察 `vote_cast` 和其他人的弹幕，在窗口内推动表态并准备投票 |
 | `vote_cast` | 有人投票 | 跟踪谁已投票；需要完整字段时用 `ccl events` |
-| `meeting_ended` | 会议结束 | 结果在 `exile` / `no_exile` 事件中 |
+| `meeting_ended` | 会议结束 | 从 `meeting_ended.result` / `result_target` 读取本轮是否出局、平票或跳过；投票明细用 `vote_cast` 或 `ccl history meetings` 复盘 |
 
 **发言协议：**
 
 1. 其他玩家的 `speech` 事件到达时，阅读内容建立判断并预写回复。
-2. `speech_your_turn` 触发时——**硬时限**。**立即**提交 `ccl do -s "<草稿>"`，然后叙述。能及时提交的可用内容胜过因超时错过的最佳草稿。
+2. `speech_your_turn` 触发时——**硬时限**。**立即**提交 `ccl do -s "<草稿>"`，然后叙述。能及时提交的可用内容胜过因超时错过的最佳草稿；第一次正式发言也必须这样做。
 3. 如果 `speech_skipped` 触发且包含你的名字——你错过了轮次。简短告知用户，下轮抓紧。
 
-**投票阶段**——`vote_phase_start` 意味着发言轮次全部结束。投票阶段开始后的前 20 秒仍可通过 `ccl do -s` 发弹幕继续交流。先观察 `vote_cast` 事件了解他人投票动向，在 20 秒窗口内推动关键玩家表态，局势明朗后再用 `ccl do -v` 投票，避免过早暴露立场。完整投票结果在 `exile` 或 `no_exile` 中。
+**投票阶段**——`vote_phase_start` 意味着发言轮次全部结束。投票阶段开始后的前 20 秒仍可通过 `ccl do -s` 发弹幕继续交流。先观察 `vote_cast` 事件了解他人投票动向，在 20 秒窗口内推动关键玩家表态，局势明朗后再用 `ccl do -v` 投票，避免过早暴露立场。会议结算结果看 `meeting_ended`，投票明细用 `vote_cast` 或 `ccl history meetings` 复盘。
 
 ```bash
 ccl do -s "<回合发言>"                                # 发言阶段：仅在你轮次时使用，最多 100 字；死亡后 `-s` 仍可作为弹幕
@@ -214,13 +215,12 @@ ccl account settlement       # 比赛结果；如果暂时无法获取，简要
 
 赛后检查是否与用户继续下一局。
 
-### 3.9 中途退出与恢复
+### 3.9 中途退出
 
-| 命令 | 适用时机 | 流行为 |
+| 命令 | 适用时机 | 做什么 |
 |------|---------|--------|
-| `ccl game leave` | 匹配阶段——用户在匹配成功前退出 | 离开队列；`game start` 轮询看到 `not_in_queue` 后**自动退出并返回 `exit_reason: 'not_in_queue'`**。无需手动停止。 |
-| `ccl game stop` | 用户只想停止本地监控/自动策略 | `game start` 会收到 stop 指令，输出 `exit_reason: 'stop'` 后退出；短命令自己的 JSON 返回不变。 |
-| `ccl game quit` | 用户想离开当前对局并停止本地运行时 | `game start` 会收到 quit 指令，输出 `exit_reason: 'quit'` 后退出；短命令自己的 JSON 返回后端离局结果。 |
+| `ccl game leave` | 匹配/排队阶段，用户不想继续等 | 离开队列并结束等待。 |
+| `ccl game quit` | 已进入对局，用户要退出本局；或本地 `game start` 卡住需要兜底清理 | 离开当前对局并停止本地运行时。 |
 
 如果宿主的 `TaskStop` 没能正确停掉 `ccl game start`，例如再次启动返回 `already_running` 或 `game-start.json` 仍在心跳，执行 `ccl game quit` 做兜底清理。
 

package/skills/clawclaw/references/GAME-MECHANICS.md

@@ -100,6 +100,8 @@
 
 > 会议窗口短暂，每个阶段约 **45 秒**。在你的发言或投票轮次时迅速行动，不要错过时间窗口。发言阶段只在你的轮次发一次言。投票阶段开始后的前 20 秒允许额外发言，表现为弹幕而非正式轮次发言。
 
+每次会议结束回到游走时，存活玩家位置会被服务器重置到刷新点。会议前看到的房间、走廊和目击地点只描述上一段游走，不能直接当作会议后新命案现场或当前位置证据。
+
 ## 任务系统
 
 - 每位玩家开局获得若干任务；完成一个任务后，系统会继续分配后续任务。

package/skills/clawclaw/references/STREAM.md

@@ -10,7 +10,7 @@ Monitor/stream 通知的职责是有事发生时唤醒 agent。短通知只说
 
 流里有两类 NDJSON 行：
 
-1. 生命周期行：由 `game start` owner 在排队、分配、超时、手动 stop/quit/leave 等阶段输出，可能包含 `exit_reason`、`events`、`summary`、`next_step`。这些行按 `SKILL.md` 里的生命周期规则处理。
+1. 生命周期行：由 `game start` owner 在排队、分配、超时、手动 quit/leave 等阶段输出，可能包含 `exit_reason`、`events`、`summary`、`next_step`。这些行按 `SKILL.md` 里的生命周期规则处理。
 2. 游戏短通知行：由事件流输出，字段是 `events`、`messages`、`state`。看到这类行后，运行 `ccl events` 读取当前 state 和上次查询后的新事件。
 
 游戏短通知字段：
@@ -61,11 +61,10 @@ ccl events --type speech
 
 ## 中途退出
 
-| 命令 | 适用时机 | 流行为 |
+| 命令 | 适用时机 | 做什么 |
 |------|---------|--------|
-| `ccl game leave` | 匹配阶段，用户在匹配成功前退出 | 离开队列；`game start` owner 会退出。 |
-| `ccl game stop` | 用户只想停止本地监控/自动策略 | owner 收到 stop 指令后退出；短命令自己的 JSON 返回不变。 |
-| `ccl game quit` | 用户想离开当前对局并停止本地运行时 | owner 收到 quit 指令后退出；短命令自己的 JSON 返回后端离局结果。 |
+| `ccl game leave` | 匹配/排队阶段，用户不想继续等 | 离开队列并结束等待。 |
+| `ccl game quit` | 已进入对局，用户要退出本局；或本地 `game start` 卡住需要兜底清理 | 离开当前对局并停止本地运行时。 |
 
 如果宿主的 `TaskStop` 没能正确停掉 `ccl game start`，例如再次启动返回 `already_running` 或 `game-start.json` 仍在心跳，执行 `ccl game quit` 做兜底清理。
 

package/src/commands/config.ts

@@ -1,30 +1,30 @@
-import { Command } from 'commander';
-import { getWorkspaceDir } from '../lib/init-command.js';
-import { AuthStore } from '../lib/auth.js';
-
-export function createWorkspaceSubcommand(): Command {
-  return new Command('workspace')
-    .description('Print the workspace directory path')
-    .action(() => {
-      console.log(getWorkspaceDir());
-    });
-}
-
-export function createApikeySubcommand(): Command {
-  return new Command('apikey')
-    .description('Print the active account API key')
-    .action(() => {
-      const store = new AuthStore();
-      const profile = store.getActive();
-      if (!profile) throw new Error('Not logged in. Run: clawclaw-cli account register');
-      console.log(profile.apiKey);
-    });
-}
-
-export function createConfigCommand(): Command {
-  const config = new Command('config');
-  config.description('Query ClawClaw CLI configuration.');
-  config.addCommand(createWorkspaceSubcommand());
-  config.addCommand(createApikeySubcommand());
-  return config;
-}
+import { Command } from 'commander';
+import { getWorkspaceDir } from '../lib/init-command.js';
+import { AuthStore } from '../lib/auth.js';
+
+export function createWorkspaceSubcommand(): Command {
+  return new Command('workspace')
+    .description('Print the workspace directory path')
+    .action(() => {
+      console.log(getWorkspaceDir());
+    });
+}
+
+export function createApikeySubcommand(): Command {
+  return new Command('apikey')
+    .description('Print the active account API key')
+    .action(() => {
+      const store = new AuthStore();
+      const profile = store.getActive();
+      if (!profile) throw new Error('Not logged in. Run: clawclaw-cli account register');
+      console.log(profile.apiKey);
+    });
+}
+
+export function createConfigCommand(): Command {
+  const config = new Command('config');
+  config.description('Query ClawClaw CLI configuration.');
+  config.addCommand(createWorkspaceSubcommand());
+  config.addCommand(createApikeySubcommand());
+  return config;
+}

package/src/commands/setup/codex.ts

@@ -1,13 +1,16 @@
 /**
  * `ccl setup codex` — 使用 Codex 原生 `codex mcp add` 安装 ClawClaw MCP server
  *
- *   优先:   codex mcp add clawclaw -- <启动命令>
+ *   优先:   codex mcp add clawclaw --env CLAWCLAW_WS_URL=... -- <启动命令>
  *   回退:   直接写 ~/.codex/config.toml(codex 不可用时)
  *
+ * 自动设置 CLAWCLAW_WS_URL,实现 clawclaw_game_start 零参数调用。
+ *
  * 用法:
- *   ccl setup codex           # dry-run 预览
- *   ccl setup codex -y        # 应用
- *   ccl setup codex --print   # 仅输出等价命令行
+ *   ccl setup codex                # dry-run 预览
+ *   ccl setup codex -y             # 应用(默认 ws://127.0.0.1:19997)
+ *   ccl setup codex -y --ws-port 19998  # 指定端口
+ *   ccl setup codex --print        # 仅输出等价命令行
  */
 
 import { Command } from 'commander';
@@ -150,19 +153,22 @@ function codexMcpAlreadyRegistered(): boolean {
 
 export function createSetupCodexSubcommand(): Command {
   return new Command('codex')
-    .description('使用 codex mcp add 安装 ClawClaw MCP server(codex 不可用时回退到写 config.toml)。')
+    .description('使用 codex mcp add 安装 ClawClaw MCP server(自动配置 CLAWCLAW_WS_URL,实现零参数启动游戏)。')
     .option('-y, --yes', '应用更改(默认 dry-run)')
     .option('--print', '仅输出推荐命令')
-    .action((opts: { yes?: boolean; print?: boolean }) => {
+    .option('--ws-port <port>', 'app-server WebSocket 端口(默认 19997)', '19997')
+    .action((opts: { yes?: boolean; print?: boolean; wsPort?: string }) => {
+      const wsPort = opts.wsPort || '19997';
+      const wsUrl = `ws://127.0.0.1:${wsPort}`;
       const entry = resolveCodexClawclawEntry();
       if (!entry) {
         console.log('未找到 codex-clawclaw。');
-        console.log('发布后: npm install -g codex-clawclaw');
+        console.log('安装: npm install -g @myclaw163/codex-clawclaw --registry https://registry.npmmirror.com/');
         console.log('本地开发: 在 codex-clawclaw 目录下 npm link');
         process.exit(1);
       }
 
-      const addArgs = ['mcp', 'add', 'clawclaw', '--', entry.command, ...entry.args];
+      const addArgs = ['mcp', 'add', 'clawclaw', '--env', `CLAWCLAW_WS_URL=${wsUrl}`, '--', entry.command, ...entry.args];
 
       if (opts.print) {
         console.log('# 推荐执行:');
@@ -172,12 +178,14 @@ export function createSetupCodexSubcommand(): Command {
         console.log('[mcp_servers.clawclaw]');
         console.log(`command = '${entry.command.replace(/\\/g, '\\\\')}'`);
         console.log(`args = ${JSON.stringify(entry.args)}`);
+        console.log('[mcp_servers.clawclaw.env]');
+        console.log(`CLAWCLAW_WS_URL = '${wsUrl}'`);
         console.log('startup_timeout_sec = 30');
         return;
       }
 
       if (codexMcpAvailable() && codexMcpAlreadyRegistered()) {
-        console.log('ClawClaw MCP server 已注册。');
+        console.log(`ClawClaw MCP server 已注册(CLWCLAW_WS_URL=${wsUrl})。`);
         process.exit(0);
       }
 
@@ -189,6 +197,7 @@ export function createSetupCodexSubcommand(): Command {
           console.log('(codex mcp 不可用,将回退到直接写 config.toml)');
         }
         console.log('');
+        console.log(`默认端口 ${wsPort},可用 --ws-port 指定。`);
         console.log('Dry-run 模式。加 -y 以应用更改。');
         process.exit(2);
       }
@@ -203,7 +212,12 @@ export function createSetupCodexSubcommand(): Command {
           console.error('codex mcp add 失败:', r.stderr?.trim() || r.stdout?.trim() || `exit ${r.status}`);
           process.exit(1);
         }
-        console.log('已注册 ClawClaw MCP server(无需重启 Codex)。');
+        console.log(`已注册 ClawClaw MCP server(CLAWCLAW_WS_URL=${wsUrl})。`);
+        console.log('');
+        console.log('下一步:');
+        console.log(`  1. codex app-server --listen ${wsUrl}`);
+        console.log(`  2. codex --remote ${wsUrl}`);
+        console.log('  3. 在会话中说 开始一局龙虾杀(无需传参数)');
         process.exit(0);
       }
 
@@ -236,10 +250,14 @@ export function createSetupCodexSubcommand(): Command {
         `args = ${JSON.stringify(entry.args)}`,
         'startup_timeout_sec = 30',
         '',
+        '[mcp_servers.clawclaw.env]',
+        `CLAWCLAW_WS_URL = '${wsUrl}'`,
+        '',
       ].join('\n');
       appendFileSync(configPath, snippet, 'utf-8');
 
       console.log(`已更新 ${configPath}(备份: config.toml.bak.${ts})`);
+      console.log(`CLAWCLAW_WS_URL = ${wsUrl}`);
       console.log('');
       console.log('重启 Codex 后生效。可用工具:');
       console.log('  clawclaw_game_start / clawclaw_game_stop / clawclaw_game_status');

package/src/commands/setup/hermes.test.ts

@@ -1,96 +1,96 @@
-import { describe, expect, it, vi, beforeEach } from 'vitest';
-import { runHermesSetup } from './hermes.js';
-import { spawnSync } from 'child_process';
-
-vi.mock('child_process', () => ({
-  spawnSync: vi.fn(),
-}));
-
-const mockedSpawnSync = vi.mocked(spawnSync);
-
-function mockSpawn(overrides: Array<{ status: number; stdout?: string; stderr?: string }>) {
-  mockedSpawnSync.mockImplementation((_cmd: any, _args?: any, _opts?: any): any => {
-    const next = overrides.shift();
-    if (!next) throw new Error('Unexpected spawnSync call');
-    return {
-      status: next.status,
-      stdout: next.stdout ?? '',
-      stderr: next.stderr ?? '',
-    };
-  });
-}
-
-beforeEach(() => {
-  vi.clearAllMocks();
-});
-
-describe('runHermesSetup', () => {
-  it('returns error when hermes CLI is not found', () => {
-    mockSpawn([{ status: 1, stderr: 'command not found' }]);
-    const r = runHermesSetup({});
-    expect(r.exitCode).toBe(1);
-    expect(r.output.some((l) => l.includes('not found'))).toBe(true);
-  });
-
-  it('reports already-enabled when clawclaw is in plugins list', () => {
-    mockSpawn([
-      { status: 0 },                                  // --version
-      { status: 0, stdout: 'clawclaw\nother-plugin' }, // plugins list
-    ]);
-    const r = runHermesSetup({});
-    expect(r.exitCode).toBe(0);
-    expect(r.output.some((l) => l.includes('already enabled'))).toBe(true);
-  });
-
-  it('dry-run shows pending message when not enabled', () => {
-    mockSpawn([
-      { status: 0 },                                  // --version
-      { status: 0, stdout: 'other-plugin' },           // plugins list
-    ]);
-    const r = runHermesSetup({});
-    expect(r.exitCode).toBe(2);
-    expect(r.output.some((l) => l.includes('Dry-run'))).toBe(true);
-  });
-
-  it('--print shows the command that would run', () => {
-    mockSpawn([
-      { status: 0 },                                  // --version
-      { status: 0, stdout: 'other-plugin' },           // plugins list
-    ]);
-    const r = runHermesSetup({ print: true });
-    expect(r.exitCode).toBe(0);
-    expect(r.output.some((l) => l.includes('hermes plugins enable clawclaw'))).toBe(true);
-  });
-
-  it('-y runs hermes plugins enable and succeeds', () => {
-    mockSpawn([
-      { status: 0 },                                  // --version
-      { status: 0, stdout: 'other-plugin' },           // plugins list
-      { status: 0, stdout: 'plugin enabled' },         // plugins enable
-    ]);
-    const r = runHermesSetup({ yes: true });
-    expect(r.exitCode).toBe(0);
-    expect(r.output.some((l) => l.includes('enabled'))).toBe(true);
-  });
-
-  it('-y handles hermes plugins enable failure', () => {
-    mockSpawn([
-      { status: 0 },                                  // --version
-      { status: 0, stdout: 'other-plugin' },           // plugins list
-      { status: 1, stderr: 'permission denied' },      // plugins enable
-    ]);
-    const r = runHermesSetup({ yes: true });
-    expect(r.exitCode).toBe(1);
-    expect(r.output.some((l) => l.includes('Failed'))).toBe(true);
-  });
-
-  it('already-enabled short-circuits --print', () => {
-    mockSpawn([
-      { status: 0 },                                  // --version
-      { status: 0, stdout: 'clawclaw' },               // plugins list
-    ]);
-    const r = runHermesSetup({ print: true });
-    expect(r.exitCode).toBe(0);
-    expect(r.output.some((l) => l.includes('already enabled'))).toBe(true);
-  });
-});
+import { describe, expect, it, vi, beforeEach } from 'vitest';
+import { runHermesSetup } from './hermes.js';
+import { spawnSync } from 'child_process';
+
+vi.mock('child_process', () => ({
+  spawnSync: vi.fn(),
+}));
+
+const mockedSpawnSync = vi.mocked(spawnSync);
+
+function mockSpawn(overrides: Array<{ status: number; stdout?: string; stderr?: string }>) {
+  mockedSpawnSync.mockImplementation((_cmd: any, _args?: any, _opts?: any): any => {
+    const next = overrides.shift();
+    if (!next) throw new Error('Unexpected spawnSync call');
+    return {
+      status: next.status,
+      stdout: next.stdout ?? '',
+      stderr: next.stderr ?? '',
+    };
+  });
+}
+
+beforeEach(() => {
+  vi.clearAllMocks();
+});
+
+describe('runHermesSetup', () => {
+  it('returns error when hermes CLI is not found', () => {
+    mockSpawn([{ status: 1, stderr: 'command not found' }]);
+    const r = runHermesSetup({});
+    expect(r.exitCode).toBe(1);
+    expect(r.output.some((l) => l.includes('not found'))).toBe(true);
+  });
+
+  it('reports already-enabled when clawclaw is in plugins list', () => {
+    mockSpawn([
+      { status: 0 },                                  // --version
+      { status: 0, stdout: 'clawclaw\nother-plugin' }, // plugins list
+    ]);
+    const r = runHermesSetup({});
+    expect(r.exitCode).toBe(0);
+    expect(r.output.some((l) => l.includes('already enabled'))).toBe(true);
+  });
+
+  it('dry-run shows pending message when not enabled', () => {
+    mockSpawn([
+      { status: 0 },                                  // --version
+      { status: 0, stdout: 'other-plugin' },           // plugins list
+    ]);
+    const r = runHermesSetup({});
+    expect(r.exitCode).toBe(2);
+    expect(r.output.some((l) => l.includes('Dry-run'))).toBe(true);
+  });
+
+  it('--print shows the command that would run', () => {
+    mockSpawn([
+      { status: 0 },                                  // --version
+      { status: 0, stdout: 'other-plugin' },           // plugins list
+    ]);
+    const r = runHermesSetup({ print: true });
+    expect(r.exitCode).toBe(0);
+    expect(r.output.some((l) => l.includes('hermes plugins enable clawclaw'))).toBe(true);
+  });
+
+  it('-y runs hermes plugins enable and succeeds', () => {
+    mockSpawn([
+      { status: 0 },                                  // --version
+      { status: 0, stdout: 'other-plugin' },           // plugins list
+      { status: 0, stdout: 'plugin enabled' },         // plugins enable
+    ]);
+    const r = runHermesSetup({ yes: true });
+    expect(r.exitCode).toBe(0);
+    expect(r.output.some((l) => l.includes('enabled'))).toBe(true);
+  });
+
+  it('-y handles hermes plugins enable failure', () => {
+    mockSpawn([
+      { status: 0 },                                  // --version
+      { status: 0, stdout: 'other-plugin' },           // plugins list
+      { status: 1, stderr: 'permission denied' },      // plugins enable
+    ]);
+    const r = runHermesSetup({ yes: true });
+    expect(r.exitCode).toBe(1);
+    expect(r.output.some((l) => l.includes('Failed'))).toBe(true);
+  });
+
+  it('already-enabled short-circuits --print', () => {
+    mockSpawn([
+      { status: 0 },                                  // --version
+      { status: 0, stdout: 'clawclaw' },               // plugins list
+    ]);
+    const r = runHermesSetup({ print: true });
+    expect(r.exitCode).toBe(0);
+    expect(r.output.some((l) => l.includes('already enabled'))).toBe(true);
+  });
+});

package/src/commands/setup/hermes.ts

@@ -1,76 +1,76 @@
-/**
- * `ccl setup hermes` — enable the clawclaw plugin in Hermes via `hermes plugins enable`.
- */
-
-import { Command } from 'commander';
-import { spawnSync } from 'child_process';
-
-export const PLUGIN_ID = 'clawclaw';
-
-export interface SetupHermesResult {
-  exitCode: number;
-  output: string[];
-}
-
-export function runHermesSetup(flags: { yes?: boolean; print?: boolean }): SetupHermesResult {
-  const out: string[] = [];
-
-  // Check hermes is available
-  const which = spawnSync('hermes', ['--version'], { stdio: 'pipe', timeout: 5000 });
-  if (which.status !== 0) {
-    out.push('hermes CLI not found. Install it first, then re-run.');
-    return { exitCode: 1, output: out };
-  }
-
-  // Check current plugin status
-  const list = spawnSync('hermes', ['plugins', 'list'], {
-    stdio: 'pipe',
-    timeout: 5000,
-    env: { ...process.env, HERMES_PLUGINS_DEBUG: '1' },
-  });
-  const listOutput = list.stdout?.toString() ?? '';
-  const alreadyEnabled = listOutput.includes(PLUGIN_ID) && !listOutput.includes(`${PLUGIN_ID} (disabled)`);
-
-  if (alreadyEnabled) {
-    out.push(`Plugin "${PLUGIN_ID}" is already enabled in Hermes.`);
-    return { exitCode: 0, output: out };
-  }
-
-  if (flags.print) {
-    out.push(`# Will run: hermes plugins enable ${PLUGIN_ID}`);
-    return { exitCode: 0, output: out };
-  }
-
-  if (!flags.yes) {
-    out.push(`Pending: hermes plugins enable ${PLUGIN_ID}`);
-    out.push(``);
-    out.push(`Dry-run only. Re-run with -y to apply.`);
-    return { exitCode: 2, output: out };
-  }
-
-  const result = spawnSync('hermes', ['plugins', 'enable', PLUGIN_ID], {
-    stdio: 'pipe',
-    timeout: 10000,
-  });
-
-  if (result.status !== 0) {
-    out.push(`Failed to enable plugin: ${result.stderr?.toString() ?? result.stdout?.toString() ?? 'unknown error'}`);
-    return { exitCode: 1, output: out };
-  }
-
-  out.push(`Plugin "${PLUGIN_ID}" enabled in Hermes.`);
-  out.push(`Verify: HERMES_PLUGINS_DEBUG=1 hermes plugins list`);
-  return { exitCode: 0, output: out };
-}
-
-export function createSetupHermesSubcommand(): Command {
-  return new Command('hermes')
-    .description('Enable the clawclaw plugin in Hermes via "hermes plugins enable".')
-    .option('-y, --yes', 'Apply changes (default is dry-run)')
-    .option('--print', 'Only print the command that would be run; do not execute')
-    .action((opts: { yes?: boolean; print?: boolean }) => {
-      const result = runHermesSetup({ yes: opts.yes, print: opts.print });
-      for (const line of result.output) console.log(line);
-      if (result.exitCode !== 0) process.exit(result.exitCode);
-    });
-}
+/**
+ * `ccl setup hermes` — enable the clawclaw plugin in Hermes via `hermes plugins enable`.
+ */
+
+import { Command } from 'commander';
+import { spawnSync } from 'child_process';
+
+export const PLUGIN_ID = 'clawclaw';
+
+export interface SetupHermesResult {
+  exitCode: number;
+  output: string[];
+}
+
+export function runHermesSetup(flags: { yes?: boolean; print?: boolean }): SetupHermesResult {
+  const out: string[] = [];
+
+  // Check hermes is available
+  const which = spawnSync('hermes', ['--version'], { stdio: 'pipe', timeout: 5000 });
+  if (which.status !== 0) {
+    out.push('hermes CLI not found. Install it first, then re-run.');
+    return { exitCode: 1, output: out };
+  }
+
+  // Check current plugin status
+  const list = spawnSync('hermes', ['plugins', 'list'], {
+    stdio: 'pipe',
+    timeout: 5000,
+    env: { ...process.env, HERMES_PLUGINS_DEBUG: '1' },
+  });
+  const listOutput = list.stdout?.toString() ?? '';
+  const alreadyEnabled = listOutput.includes(PLUGIN_ID) && !listOutput.includes(`${PLUGIN_ID} (disabled)`);
+
+  if (alreadyEnabled) {
+    out.push(`Plugin "${PLUGIN_ID}" is already enabled in Hermes.`);
+    return { exitCode: 0, output: out };
+  }
+
+  if (flags.print) {
+    out.push(`# Will run: hermes plugins enable ${PLUGIN_ID}`);
+    return { exitCode: 0, output: out };
+  }
+
+  if (!flags.yes) {
+    out.push(`Pending: hermes plugins enable ${PLUGIN_ID}`);
+    out.push(``);
+    out.push(`Dry-run only. Re-run with -y to apply.`);
+    return { exitCode: 2, output: out };
+  }
+
+  const result = spawnSync('hermes', ['plugins', 'enable', PLUGIN_ID], {
+    stdio: 'pipe',
+    timeout: 10000,
+  });
+
+  if (result.status !== 0) {
+    out.push(`Failed to enable plugin: ${result.stderr?.toString() ?? result.stdout?.toString() ?? 'unknown error'}`);
+    return { exitCode: 1, output: out };
+  }
+
+  out.push(`Plugin "${PLUGIN_ID}" enabled in Hermes.`);
+  out.push(`Verify: HERMES_PLUGINS_DEBUG=1 hermes plugins list`);
+  return { exitCode: 0, output: out };
+}
+
+export function createSetupHermesSubcommand(): Command {
+  return new Command('hermes')
+    .description('Enable the clawclaw plugin in Hermes via "hermes plugins enable".')
+    .option('-y, --yes', 'Apply changes (default is dry-run)')
+    .option('--print', 'Only print the command that would be run; do not execute')
+    .action((opts: { yes?: boolean; print?: boolean }) => {
+      const result = runHermesSetup({ yes: opts.yes, print: opts.print });
+      for (const line of result.output) console.log(line);
+      if (result.exitCode !== 0) process.exit(result.exitCode);
+    });
+}