@myclaw163/clawclaw-cli 0.6.66 → 0.6.67

package/src/commands/skill.ts

@@ -1,128 +1,128 @@
-// src/commands/skill.ts
-import { Command } from 'commander';
-import { spawnSync } from 'child_process';
-import { existsSync, readFileSync } from 'fs';
-import { join, resolve, dirname } from 'path';
-import { fileURLToPath } from 'url';
-import { createRequire } from 'module';
-
-const require = createRequire(import.meta.url);
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = dirname(__filename);
-
-function getSkillsCli(): string {
-  try {
-    return require.resolve('skills/bin/cli.mjs');
-  } catch {
-    return '';
-  }
-}
-
-/** Resolve the built-in clawclaw skill shipped with this CLI package. */
-function resolveBuiltinSkill(): string {
-  // Priority: same repo layout (src/commands/skill.ts → ../../skills/clawclaw)
-  // Fallback: installed package layout (node_modules/@myclaw163/clawclaw-cli/skills/clawclaw)
-  // Also try legacy bare package name for backward compat during upgrade transition.
-  const devPath = join(__dirname, '..', '..', 'skills', 'clawclaw');
-  if (existsSync(join(devPath, 'SKILL.md'))) return devPath;
-  try {
-    const pkgRoot = dirname(require.resolve('@myclaw163/clawclaw-cli/package.json'));
-    return join(pkgRoot, 'skills', 'clawclaw');
-  } catch {
-    try {
-      const pkgRoot = dirname(require.resolve('clawclaw-cli/package.json'));
-      return join(pkgRoot, 'skills', 'clawclaw');
-    } catch {
-      return devPath;
-    }
-  }
-}
-
-/** Read the skill name from a directory's SKILL.md frontmatter. Returns null if not found. */
-export function readSkillName(dir: string): string | null {
-  const md = join(dir, 'SKILL.md');
-  if (!existsSync(md)) return null;
-  const content = readFileSync(md, 'utf8');
-  const m = content.match(/^---\r?\n([\s\S]*?)\r?\n---/);
-  if (!m) return null;
-  for (const line of m[1].split(/\r?\n/)) {
-    const kv = line.match(/^\s*name\s*:\s*(.+)\s*$/i);
-    if (kv) return kv[1].trim().replace(/^["']|["']$/g, '');
-  }
-  return null;
-}
-
-function runSkillsCli(args: string[]): { ok: boolean; err?: string } {
-  const cliBin = getSkillsCli();
-  if (!cliBin) return { ok: false, err: 'skills CLI not found. Ensure the "skills" package is installed.' };
-
-  const result = spawnSync(process.execPath, [cliBin, ...args], {
-    stdio: 'inherit',
-    timeout: 30_000,
-  });
-
-  if (result.error) return { ok: false, err: result.error.message };
-  if (result.status !== 0) return { ok: false, err: `skills CLI exited with code ${result.status}` };
-  return { ok: true };
-}
-
-export function createSkillCommand(): Command {
-  const cmd = new Command('skill')
-    .description('Install and manage agent skills');
-
-  // ─── install ───
-  cmd.command('install [path]')
-    .description('Register a skill directory with the agent. Use --builtin for the default clawclaw skill.')
-    .option('--builtin', 'install the built-in clawclaw skill shipped with this CLI')
-    .option('-g, --global', 'install globally', true)
-    .option('-y, --yes', 'skip confirmation prompts', true)
-    .action(async (rawPath: string | undefined, opts: { builtin?: boolean; global?: boolean; yes?: boolean }) => {
-      let absPath: string;
-      if (opts.builtin) {
-        absPath = resolveBuiltinSkill();
-      } else if (rawPath) {
-        absPath = resolve(rawPath);
-      } else {
-        console.error(JSON.stringify({ error: 'missing_path', message: 'Specify a path or use --builtin for the default clawclaw skill.' }, null, 2));
-        process.exit(1);
-      }
-
-      if (!existsSync(absPath)) {
-        console.error(JSON.stringify({ error: 'skill_not_found', message: `Skill directory not found: ${absPath}` }, null, 2));
-        process.exit(1);
-      }
-
-      const args = ['add', absPath];
-      if (opts.global) args.push('-g');
-      if (opts.yes) args.push('-y');
-      const r = runSkillsCli(args);
-      if (!r.ok) {
-        console.error(JSON.stringify({ error: 'skill_install_failed', message: r.err }, null, 2));
-        process.exit(1);
-      }
-    });
-
-  // ─── uninstall ───
-  cmd.command('uninstall <path>')
-    .description('Unregister a skill from the agent (wraps skills remove)')
-    .option('-g, --global', 'remove from global scope', true)
-    .option('-y, --yes', 'skip confirmation prompts', true)
-    .action(async (rawPath: string, opts: { global?: boolean; yes?: boolean }) => {
-      const absPath = resolve(rawPath);
-      const name = readSkillName(absPath);
-      if (!name) {
-        console.error(JSON.stringify({ error: 'skill_name_missing', message: `No valid SKILL.md with a name found in ${absPath}` }, null, 2));
-        process.exit(1);
-      }
-      const args = ['remove', name];
-      if (opts.global) args.push('-g');
-      if (opts.yes) args.push('-y');
-      const r = runSkillsCli(args);
-      if (!r.ok) {
-        console.error(JSON.stringify({ error: 'skill_uninstall_failed', message: r.err }, null, 2));
-        process.exit(1);
-      }
-    });
-
-  return cmd;
-}
+// src/commands/skill.ts
+import { Command } from 'commander';
+import { spawnSync } from 'child_process';
+import { existsSync, readFileSync } from 'fs';
+import { join, resolve, dirname } from 'path';
+import { fileURLToPath } from 'url';
+import { createRequire } from 'module';
+
+const require = createRequire(import.meta.url);
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = dirname(__filename);
+
+function getSkillsCli(): string {
+  try {
+    return require.resolve('skills/bin/cli.mjs');
+  } catch {
+    return '';
+  }
+}
+
+/** Resolve the built-in clawclaw skill shipped with this CLI package. */
+function resolveBuiltinSkill(): string {
+  // Priority: same repo layout (src/commands/skill.ts → ../../skills/clawclaw)
+  // Fallback: installed package layout (node_modules/@myclaw163/clawclaw-cli/skills/clawclaw)
+  // Also try legacy bare package name for backward compat during upgrade transition.
+  const devPath = join(__dirname, '..', '..', 'skills', 'clawclaw');
+  if (existsSync(join(devPath, 'SKILL.md'))) return devPath;
+  try {
+    const pkgRoot = dirname(require.resolve('@myclaw163/clawclaw-cli/package.json'));
+    return join(pkgRoot, 'skills', 'clawclaw');
+  } catch {
+    try {
+      const pkgRoot = dirname(require.resolve('clawclaw-cli/package.json'));
+      return join(pkgRoot, 'skills', 'clawclaw');
+    } catch {
+      return devPath;
+    }
+  }
+}
+
+/** Read the skill name from a directory's SKILL.md frontmatter. Returns null if not found. */
+export function readSkillName(dir: string): string | null {
+  const md = join(dir, 'SKILL.md');
+  if (!existsSync(md)) return null;
+  const content = readFileSync(md, 'utf8');
+  const m = content.match(/^---\r?\n([\s\S]*?)\r?\n---/);
+  if (!m) return null;
+  for (const line of m[1].split(/\r?\n/)) {
+    const kv = line.match(/^\s*name\s*:\s*(.+)\s*$/i);
+    if (kv) return kv[1].trim().replace(/^["']|["']$/g, '');
+  }
+  return null;
+}
+
+function runSkillsCli(args: string[]): { ok: boolean; err?: string } {
+  const cliBin = getSkillsCli();
+  if (!cliBin) return { ok: false, err: 'skills CLI not found. Ensure the "skills" package is installed.' };
+
+  const result = spawnSync(process.execPath, [cliBin, ...args], {
+    stdio: 'inherit',
+    timeout: 30_000,
+  });
+
+  if (result.error) return { ok: false, err: result.error.message };
+  if (result.status !== 0) return { ok: false, err: `skills CLI exited with code ${result.status}` };
+  return { ok: true };
+}
+
+export function createSkillCommand(): Command {
+  const cmd = new Command('skill')
+    .description('Install and manage agent skills');
+
+  // ─── install ───
+  cmd.command('install [path]')
+    .description('Register a skill directory with the agent. Use --builtin for the default clawclaw skill.')
+    .option('--builtin', 'install the built-in clawclaw skill shipped with this CLI')
+    .option('-g, --global', 'install globally', true)
+    .option('-y, --yes', 'skip confirmation prompts', true)
+    .action(async (rawPath: string | undefined, opts: { builtin?: boolean; global?: boolean; yes?: boolean }) => {
+      let absPath: string;
+      if (opts.builtin) {
+        absPath = resolveBuiltinSkill();
+      } else if (rawPath) {
+        absPath = resolve(rawPath);
+      } else {
+        console.error(JSON.stringify({ error: 'missing_path', message: 'Specify a path or use --builtin for the default clawclaw skill.' }, null, 2));
+        process.exit(1);
+      }
+
+      if (!existsSync(absPath)) {
+        console.error(JSON.stringify({ error: 'skill_not_found', message: `Skill directory not found: ${absPath}` }, null, 2));
+        process.exit(1);
+      }
+
+      const args = ['add', absPath];
+      if (opts.global) args.push('-g');
+      if (opts.yes) args.push('-y');
+      const r = runSkillsCli(args);
+      if (!r.ok) {
+        console.error(JSON.stringify({ error: 'skill_install_failed', message: r.err }, null, 2));
+        process.exit(1);
+      }
+    });
+
+  // ─── uninstall ───
+  cmd.command('uninstall <path>')
+    .description('Unregister a skill from the agent (wraps skills remove)')
+    .option('-g, --global', 'remove from global scope', true)
+    .option('-y, --yes', 'skip confirmation prompts', true)
+    .action(async (rawPath: string, opts: { global?: boolean; yes?: boolean }) => {
+      const absPath = resolve(rawPath);
+      const name = readSkillName(absPath);
+      if (!name) {
+        console.error(JSON.stringify({ error: 'skill_name_missing', message: `No valid SKILL.md with a name found in ${absPath}` }, null, 2));
+        process.exit(1);
+      }
+      const args = ['remove', name];
+      if (opts.global) args.push('-g');
+      if (opts.yes) args.push('-y');
+      const r = runSkillsCli(args);
+      if (!r.ok) {
+        console.error(JSON.stringify({ error: 'skill_uninstall_failed', message: r.err }, null, 2));
+        process.exit(1);
+      }
+    });
+
+  return cmd;
+}

package/src/commands/state.ts

@@ -1,46 +1,46 @@
-import { Command } from 'commander';
-import { GameClient } from '../lib/game-client.js';
-import { EventStore } from '../pipeline/event-store.js';
-
-function briefState(state: any): any {
-  const out: any = {
-    phase: state.phase,
-    you: state.you,
-    alive_count: state.alive_count,
-    task_progress: state.task_progress,
-  };
-  if (state.new_events?.length) out.new_events = state.new_events;
-  if (state.corpses?.length) out.corpses = state.corpses;
-  if (state.meeting) {
-    out.meeting = {
-      caller: state.meeting.caller,
-      sub_phase: state.meeting.sub_phase,
-      current_speaker: state.meeting.current_speaker,
-      speeches: state.meeting.speeches_so_far ?? state.meeting.speeches ?? {},
-      speech_skipped: state.meeting.speech_skipped,
-      votes_submitted: state.meeting.votes_submitted,
-      alive_players: state.meeting.alive_players,
-    };
-  }
-  return out;
-}
-
-export function createStateCommand(): Command {
-  return new Command('state')
-    .alias('s')
-    .description('Get current game state')
-    .option('-f, --full', 'Show full state (default: brief)')
-    .action(async (opts) => {
-      const client = GameClient.fromAuth();
-      await client.discoverGameServer();
-      const state = await client.getGameState();
-      if (!state) {
-        console.log(JSON.stringify({ status: 'no_active_game' }));
-        return;
-      }
-      const store = EventStore.forActiveAccount();
-      store.appendNewEvents((state as any).new_events);
-      const output = opts.full ? state : briefState(state);
-      console.log(JSON.stringify(output, null, 2));
-    });
-}
+import { Command } from 'commander';
+import { GameClient } from '../lib/game-client.js';
+import { EventStore } from '../pipeline/event-store.js';
+
+function briefState(state: any): any {
+  const out: any = {
+    phase: state.phase,
+    you: state.you,
+    alive_count: state.alive_count,
+    task_progress: state.task_progress,
+  };
+  if (state.new_events?.length) out.new_events = state.new_events;
+  if (state.corpses?.length) out.corpses = state.corpses;
+  if (state.meeting) {
+    out.meeting = {
+      caller: state.meeting.caller,
+      sub_phase: state.meeting.sub_phase,
+      current_speaker: state.meeting.current_speaker,
+      speeches: state.meeting.speeches_so_far ?? state.meeting.speeches ?? {},
+      speech_skipped: state.meeting.speech_skipped,
+      votes_submitted: state.meeting.votes_submitted,
+      alive_players: state.meeting.alive_players,
+    };
+  }
+  return out;
+}
+
+export function createStateCommand(): Command {
+  return new Command('state')
+    .alias('s')
+    .description('Get current game state')
+    .option('-f, --full', 'Show full state (default: brief)')
+    .action(async (opts) => {
+      const client = GameClient.fromAuth();
+      await client.discoverGameServer();
+      const state = await client.getGameState();
+      if (!state) {
+        console.log(JSON.stringify({ status: 'no_active_game' }));
+        return;
+      }
+      const store = EventStore.forActiveAccount();
+      store.appendNewEvents((state as any).new_events);
+      const output = opts.full ? state : briefState(state);
+      console.log(JSON.stringify(output, null, 2));
+    });
+}

package/src/commands/strategy.test.ts

@@ -1,135 +1,135 @@
-// src/commands/strategy.test.ts
-import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
-import { mkdtempSync, rmSync, mkdirSync, writeFileSync, readFileSync, existsSync } from 'fs';
-import { tmpdir } from 'os';
-import { join } from 'path';
-import { createStrategyCommand } from './strategy.js';
-
-let ws: string;
-let logs: string[];
-let errs: string[];
-
-beforeEach(() => {
-  ws = mkdtempSync(join(tmpdir(), 'ccl-strategy-cmd-'));
-  process.env.CLAWCLAW_WORKSPACE_DIR = ws;
-  logs = []; errs = [];
-  vi.spyOn(console, 'log').mockImplementation((...a) => { logs.push(a.join(' ')); });
-  vi.spyOn(console, 'error').mockImplementation((...a) => { errs.push(a.join(' ')); });
-  vi.spyOn(process, 'exit').mockImplementation((() => { throw new Error('process.exit'); }) as any);
-});
-
-afterEach(() => {
-  delete process.env.CLAWCLAW_WORKSPACE_DIR;
-  vi.restoreAllMocks();
-  rmSync(ws, { recursive: true, force: true });
-});
-
-async function run(argv: string[]) {
-  const cmd = createStrategyCommand();
-  await cmd.parseAsync(['node', 'ccl', ...argv]);
-}
-
-describe('strategy command', () => {
-  describe('--export', () => {
-    it('should export a valid strategy', async () => {
-      await run(['--export', 'task-only']);
-
-      const strategyFile = join(ws, 'strategies', 'task-only.ts');
-      expect(logs[0]).toContain('task-only');
-      expect(logs[0]).toContain('exported');
-
-      const content = readFileSync(strategyFile, 'utf8');
-      expect(content).toContain('// Exported from task-only@');
-      expect(content).toContain("from '@myclaw163/clawclaw-cli'");
-    });
-
-    it('should export with --force to overwrite', async () => {
-      // First export
-      await run(['--export', 'task-only']);
-
-      // Modify the file
-      const strategyFile = join(ws, 'strategies', 'task-only.ts');
-      writeFileSync(strategyFile, '// customized', 'utf8');
-
-      // Re-export with --force
-      await run(['--export', 'task-only', '--force']);
-
-      const content = readFileSync(strategyFile, 'utf8');
-      expect(content).toContain('// Exported from task-only@');
-    });
-
-    it('should export a formerly goal-based strategy with its knowledge sidecar', async () => {
-      await run(['--export', 'kill-lone']);
-
-      expect(existsSync(join(ws, 'strategies', 'kill-lone.ts'))).toBe(true);
-      expect(existsSync(join(ws, 'strategies', 'kill-lone.knowledge.md'))).toBe(true);
-    });
-
-    it('should reject non-existent strategies', async () => {
-      await expect(run(['--export', 'non-existent'])).rejects.toThrow('process.exit');
-
-      expect(errs[0]).toContain('export_failed');
-      expect(errs[0]).toContain('not found');
-    });
-
-    it('should warn about other stale strategies after export', async () => {
-      // Export two strategies
-      await run(['--export', 'task-only']);
-      await run(['--export', 'kill-lone']);
-      logs = []; errs = [];
-
-      // Tamper kill-lone's hash to make it stale
-      const manifestFile = join(ws, 'strategies', '.official', 'manifest.json');
-      const manifest = JSON.parse(readFileSync(manifestFile, 'utf8'));
-      manifest['kill-lone'].sourceHash = 'stale';
-      writeFileSync(manifestFile, JSON.stringify(manifest), 'utf8');
-
-      // Re-export task-only — should warn about kill-lone being stale
-      await run(['--export', 'task-only', '--force']);
-
-      expect(errs.join(' ')).toContain('kill-lone');
-      expect(errs.join(' ')).toContain('提示');
-    });
-  });
-
-  describe('--info', () => {
-    it('should show strategy info', async () => {
-      await run(['--info', 'task-only']);
-
-      expect(logs[0]).toContain('"id": "task-only"');
-      expect(logs[0]).toContain('"description"');
-    });
-
-    it('should show knowledge contract if available', async () => {
-      await run(['--info', 'task-report']);
-
-      const output = JSON.parse(logs[0]);
-      expect(output.id).toBe('task-report');
-      expect(output.description).toBeDefined();
-      // knowledge might be null if no .knowledge.md file exists
-    });
-
-    it('should reject non-existent strategies', async () => {
-      await expect(run(['--info', 'non-existent'])).rejects.toThrow('process.exit');
-
-      expect(errs[0]).toContain('unknown_strategy');
-      expect(errs[0]).toContain('non-existent');
-    });
-  });
-
-  describe('--list', () => {
-    it('should list all available strategies', async () => {
-      await run(['--list']);
-
-      const output = JSON.parse(logs[0]);
-      expect(output.strategies).toBeDefined();
-      expect(Array.isArray(output.strategies)).toBe(true);
-      expect(output.strategies.length).toBeGreaterThan(0);
-
-      // Check that task-only is in the list
-      const taskOnly = output.strategies.find((s: any) => s.id === 'task-only');
-      expect(taskOnly).toBeDefined();
-      expect(taskOnly.description).toBeDefined();
-    });
-  });
-});
+// src/commands/strategy.test.ts
+import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
+import { mkdtempSync, rmSync, mkdirSync, writeFileSync, readFileSync, existsSync } from 'fs';
+import { tmpdir } from 'os';
+import { join } from 'path';
+import { createStrategyCommand } from './strategy.js';
+
+let ws: string;
+let logs: string[];
+let errs: string[];
+
+beforeEach(() => {
+  ws = mkdtempSync(join(tmpdir(), 'ccl-strategy-cmd-'));
+  process.env.CLAWCLAW_WORKSPACE_DIR = ws;
+  logs = []; errs = [];
+  vi.spyOn(console, 'log').mockImplementation((...a) => { logs.push(a.join(' ')); });
+  vi.spyOn(console, 'error').mockImplementation((...a) => { errs.push(a.join(' ')); });
+  vi.spyOn(process, 'exit').mockImplementation((() => { throw new Error('process.exit'); }) as any);
+});
+
+afterEach(() => {
+  delete process.env.CLAWCLAW_WORKSPACE_DIR;
+  vi.restoreAllMocks();
+  rmSync(ws, { recursive: true, force: true });
+});
+
+async function run(argv: string[]) {
+  const cmd = createStrategyCommand();
+  await cmd.parseAsync(['node', 'ccl', ...argv]);
+}
+
+describe('strategy command', () => {
+  describe('--export', () => {
+    it('should export a valid strategy', async () => {
+      await run(['--export', 'task-only']);
+
+      const strategyFile = join(ws, 'strategies', 'task-only.ts');
+      expect(logs[0]).toContain('task-only');
+      expect(logs[0]).toContain('exported');
+
+      const content = readFileSync(strategyFile, 'utf8');
+      expect(content).toContain('// Exported from task-only@');
+      expect(content).toContain("from '@myclaw163/clawclaw-cli'");
+    });
+
+    it('should export with --force to overwrite', async () => {
+      // First export
+      await run(['--export', 'task-only']);
+
+      // Modify the file
+      const strategyFile = join(ws, 'strategies', 'task-only.ts');
+      writeFileSync(strategyFile, '// customized', 'utf8');
+
+      // Re-export with --force
+      await run(['--export', 'task-only', '--force']);
+
+      const content = readFileSync(strategyFile, 'utf8');
+      expect(content).toContain('// Exported from task-only@');
+    });
+
+    it('should export a formerly goal-based strategy with its knowledge sidecar', async () => {
+      await run(['--export', 'kill-lone']);
+
+      expect(existsSync(join(ws, 'strategies', 'kill-lone.ts'))).toBe(true);
+      expect(existsSync(join(ws, 'strategies', 'kill-lone.knowledge.md'))).toBe(true);
+    });
+
+    it('should reject non-existent strategies', async () => {
+      await expect(run(['--export', 'non-existent'])).rejects.toThrow('process.exit');
+
+      expect(errs[0]).toContain('export_failed');
+      expect(errs[0]).toContain('not found');
+    });
+
+    it('should warn about other stale strategies after export', async () => {
+      // Export two strategies
+      await run(['--export', 'task-only']);
+      await run(['--export', 'kill-lone']);
+      logs = []; errs = [];
+
+      // Tamper kill-lone's hash to make it stale
+      const manifestFile = join(ws, 'strategies', '.official', 'manifest.json');
+      const manifest = JSON.parse(readFileSync(manifestFile, 'utf8'));
+      manifest['kill-lone'].sourceHash = 'stale';
+      writeFileSync(manifestFile, JSON.stringify(manifest), 'utf8');
+
+      // Re-export task-only — should warn about kill-lone being stale
+      await run(['--export', 'task-only', '--force']);
+
+      expect(errs.join(' ')).toContain('kill-lone');
+      expect(errs.join(' ')).toContain('提示');
+    });
+  });
+
+  describe('--info', () => {
+    it('should show strategy info', async () => {
+      await run(['--info', 'task-only']);
+
+      expect(logs[0]).toContain('"id": "task-only"');
+      expect(logs[0]).toContain('"description"');
+    });
+
+    it('should show knowledge contract if available', async () => {
+      await run(['--info', 'task-report']);
+
+      const output = JSON.parse(logs[0]);
+      expect(output.id).toBe('task-report');
+      expect(output.description).toBeDefined();
+      // knowledge might be null if no .knowledge.md file exists
+    });
+
+    it('should reject non-existent strategies', async () => {
+      await expect(run(['--info', 'non-existent'])).rejects.toThrow('process.exit');
+
+      expect(errs[0]).toContain('unknown_strategy');
+      expect(errs[0]).toContain('non-existent');
+    });
+  });
+
+  describe('--list', () => {
+    it('should list all available strategies', async () => {
+      await run(['--list']);
+
+      const output = JSON.parse(logs[0]);
+      expect(output.strategies).toBeDefined();
+      expect(Array.isArray(output.strategies)).toBe(true);
+      expect(output.strategies.length).toBeGreaterThan(0);
+
+      // Check that task-only is in the list
+      const taskOnly = output.strategies.find((s: any) => s.id === 'task-only');
+      expect(taskOnly).toBeDefined();
+      expect(taskOnly.description).toBeDefined();
+    });
+  });
+});