@myclaw163/clawclaw-cli 0.6.66 → 0.6.68

package/src/commands/setup/openclaw.ts

@@ -1,147 +1,147 @@
-/**
- * `ccl setup openclaw` — install recommended OpenClaw config snippet.
- *
- * Pure function `computeOpenclawPatch` is exported for tests.
- * IO / diff / atomic write / backup is delegated to lib/host-config-patcher.ts.
- */
-
-import { Command } from 'commander';
-import { homedir } from 'os';
-import { join } from 'path';
-import {
-  runHostConfigSetup,
-  unionArrayField,
-  type HostPatchResult,
-} from '../../lib/host-config-patcher.js';
-
-export const PLUGIN_ID = 'clawclaw';
-
-export interface ComputeOpenclawPatchOpts {
-  skipPluginsAllow?: boolean;
-  skipToolsAllow?: boolean;
-}
-
-export function resolveOpenclawConfigPath(env: NodeJS.ProcessEnv = process.env): string {
-  const home = env.OPENCLAW_HOME?.trim();
-  if (home) return join(home, 'openclaw.json');
-  return join(homedir(), '.openclaw', 'openclaw.json');
-}
-
-/** Pure: compute the minimal additive patch to make `clawclaw` work under `coding` profile. */
-export function computeOpenclawPatch(current: unknown, opts: ComputeOpenclawPatchOpts): HostPatchResult {
-  const changes: string[] = [];
-  const warnings: string[] = [];
-  const cfg: Record<string, unknown> =
-    current !== null && typeof current === 'object' && !Array.isArray(current)
-      ? { ...(current as Record<string, unknown>) }
-      : {};
-
-  // ── plugins.allow + plugins.entries.clawclaw.enabled ──────────────────
-  if (!opts.skipPluginsAllow) {
-    const plugins: Record<string, unknown> =
-      cfg.plugins !== null && typeof cfg.plugins === 'object' && !Array.isArray(cfg.plugins)
-        ? { ...(cfg.plugins as Record<string, unknown>) }
-        : {};
-
-    const allowResult = unionArrayField(plugins.allow, PLUGIN_ID);
-    if ('warning' in allowResult) {
-      warnings.push(`plugins.allow ${allowResult.warning}`);
-    } else {
-      if (allowResult.added) {
-        if (plugins.allow === undefined) {
-          changes.push(`create plugins.allow with ["${PLUGIN_ID}"]`);
-        } else {
-          changes.push(`add "${PLUGIN_ID}" to plugins.allow`);
-        }
-      }
-      plugins.allow = allowResult.next;
-    }
-
-    const entries: Record<string, unknown> =
-      plugins.entries !== null && typeof plugins.entries === 'object' && !Array.isArray(plugins.entries)
-        ? { ...(plugins.entries as Record<string, unknown>) }
-        : {};
-    const existingEntry =
-      entries[PLUGIN_ID] !== null && typeof entries[PLUGIN_ID] === 'object' && !Array.isArray(entries[PLUGIN_ID])
-        ? { ...(entries[PLUGIN_ID] as Record<string, unknown>) }
-        : {};
-
-    if (existingEntry.enabled === false) {
-      warnings.push(
-        `plugins.entries.${PLUGIN_ID}.enabled is explicitly false; not flipping it on. Remove the line manually if you want it enabled.`,
-      );
-    } else if (existingEntry.enabled !== true) {
-      existingEntry.enabled = true;
-      entries[PLUGIN_ID] = existingEntry;
-      plugins.entries = entries;
-      changes.push(`set plugins.entries.${PLUGIN_ID}.enabled = true (equivalent to: openclaw plugins enable ${PLUGIN_ID})`);
-    }
-
-    cfg.plugins = plugins;
-  }
-
-  // ── tools.alsoAllow ────────────────────────────────────────────────────
-  if (!opts.skipToolsAllow) {
-    const tools: Record<string, unknown> =
-      cfg.tools !== null && typeof cfg.tools === 'object' && !Array.isArray(cfg.tools)
-        ? { ...(cfg.tools as Record<string, unknown>) }
-        : {};
-
-    const alsoAllowResult = unionArrayField(tools.alsoAllow, PLUGIN_ID);
-    if ('warning' in alsoAllowResult) {
-      warnings.push(`tools.alsoAllow ${alsoAllowResult.warning}`);
-    } else {
-      if (alsoAllowResult.added) {
-        if (tools.alsoAllow === undefined) {
-          changes.push(`create tools.alsoAllow with ["${PLUGIN_ID}"]`);
-        } else {
-          changes.push(`add "${PLUGIN_ID}" to tools.alsoAllow`);
-        }
-      }
-      tools.alsoAllow = alsoAllowResult.next;
-    }
-
-    cfg.tools = tools;
-  }
-
-  return { next: cfg, changes, warnings };
-}
-
-export function createSetupOpenclawSubcommand(): Command {
-  return new Command('openclaw')
-    .description('Install recommended OpenClaw config (plugins.allow + tools.alsoAllow) for the clawclaw plugin.')
-    .option('-y, --yes', 'Apply changes (default is dry-run with diff preview)')
-    .option('--print', 'Only print the recommended JSON patch; do not read or write files')
-    .option('--config <path>', 'Override openclaw.json path (default: $OPENCLAW_HOME/openclaw.json or ~/.openclaw/openclaw.json)')
-    .option('--skip-plugins-allow', "Do not touch plugins.allow / plugins.entries.clawclaw")
-    .option('--skip-tools-allow', "Do not touch tools.alsoAllow")
-    .option('--no-backup', 'Do not write a timestamped .bak.* before applying')
-    .action((opts: {
-      yes?: boolean;
-      print?: boolean;
-      config?: string;
-      skipPluginsAllow?: boolean;
-      skipToolsAllow?: boolean;
-      backup?: boolean;
-    }) => {
-      const result = runHostConfigSetup(
-        {
-          hostName: 'OpenClaw',
-          resolveConfigPath: () => resolveOpenclawConfigPath(),
-          computePatch: (current, hostOpts) => computeOpenclawPatch(current, hostOpts),
-        },
-        {
-          skipPluginsAllow: opts.skipPluginsAllow,
-          skipToolsAllow: opts.skipToolsAllow,
-        },
-        {
-          yes: opts.yes,
-          print: opts.print,
-          configPath: opts.config,
-          backup: opts.backup,
-        },
-      );
-      for (const line of result.output) console.log(line);
-      if (result.exitCode !== 0) process.exit(result.exitCode);
-    });
-}
+/**
+ * `ccl setup openclaw` — install recommended OpenClaw config snippet.
+ *
+ * Pure function `computeOpenclawPatch` is exported for tests.
+ * IO / diff / atomic write / backup is delegated to lib/host-config-patcher.ts.
+ */
+
+import { Command } from 'commander';
+import { homedir } from 'os';
+import { join } from 'path';
+import {
+  runHostConfigSetup,
+  unionArrayField,
+  type HostPatchResult,
+} from '../../lib/host-config-patcher.js';
+
+export const PLUGIN_ID = 'clawclaw';
+
+export interface ComputeOpenclawPatchOpts {
+  skipPluginsAllow?: boolean;
+  skipToolsAllow?: boolean;
+}
+
+export function resolveOpenclawConfigPath(env: NodeJS.ProcessEnv = process.env): string {
+  const home = env.OPENCLAW_HOME?.trim();
+  if (home) return join(home, 'openclaw.json');
+  return join(homedir(), '.openclaw', 'openclaw.json');
+}
+
+/** Pure: compute the minimal additive patch to make `clawclaw` work under `coding` profile. */
+export function computeOpenclawPatch(current: unknown, opts: ComputeOpenclawPatchOpts): HostPatchResult {
+  const changes: string[] = [];
+  const warnings: string[] = [];
+  const cfg: Record<string, unknown> =
+    current !== null && typeof current === 'object' && !Array.isArray(current)
+      ? { ...(current as Record<string, unknown>) }
+      : {};
+
+  // ── plugins.allow + plugins.entries.clawclaw.enabled ──────────────────
+  if (!opts.skipPluginsAllow) {
+    const plugins: Record<string, unknown> =
+      cfg.plugins !== null && typeof cfg.plugins === 'object' && !Array.isArray(cfg.plugins)
+        ? { ...(cfg.plugins as Record<string, unknown>) }
+        : {};
+
+    const allowResult = unionArrayField(plugins.allow, PLUGIN_ID);
+    if ('warning' in allowResult) {
+      warnings.push(`plugins.allow ${allowResult.warning}`);
+    } else {
+      if (allowResult.added) {
+        if (plugins.allow === undefined) {
+          changes.push(`create plugins.allow with ["${PLUGIN_ID}"]`);
+        } else {
+          changes.push(`add "${PLUGIN_ID}" to plugins.allow`);
+        }
+      }
+      plugins.allow = allowResult.next;
+    }
+
+    const entries: Record<string, unknown> =
+      plugins.entries !== null && typeof plugins.entries === 'object' && !Array.isArray(plugins.entries)
+        ? { ...(plugins.entries as Record<string, unknown>) }
+        : {};
+    const existingEntry =
+      entries[PLUGIN_ID] !== null && typeof entries[PLUGIN_ID] === 'object' && !Array.isArray(entries[PLUGIN_ID])
+        ? { ...(entries[PLUGIN_ID] as Record<string, unknown>) }
+        : {};
+
+    if (existingEntry.enabled === false) {
+      warnings.push(
+        `plugins.entries.${PLUGIN_ID}.enabled is explicitly false; not flipping it on. Remove the line manually if you want it enabled.`,
+      );
+    } else if (existingEntry.enabled !== true) {
+      existingEntry.enabled = true;
+      entries[PLUGIN_ID] = existingEntry;
+      plugins.entries = entries;
+      changes.push(`set plugins.entries.${PLUGIN_ID}.enabled = true (equivalent to: openclaw plugins enable ${PLUGIN_ID})`);
+    }
+
+    cfg.plugins = plugins;
+  }
+
+  // ── tools.alsoAllow ────────────────────────────────────────────────────
+  if (!opts.skipToolsAllow) {
+    const tools: Record<string, unknown> =
+      cfg.tools !== null && typeof cfg.tools === 'object' && !Array.isArray(cfg.tools)
+        ? { ...(cfg.tools as Record<string, unknown>) }
+        : {};
+
+    const alsoAllowResult = unionArrayField(tools.alsoAllow, PLUGIN_ID);
+    if ('warning' in alsoAllowResult) {
+      warnings.push(`tools.alsoAllow ${alsoAllowResult.warning}`);
+    } else {
+      if (alsoAllowResult.added) {
+        if (tools.alsoAllow === undefined) {
+          changes.push(`create tools.alsoAllow with ["${PLUGIN_ID}"]`);
+        } else {
+          changes.push(`add "${PLUGIN_ID}" to tools.alsoAllow`);
+        }
+      }
+      tools.alsoAllow = alsoAllowResult.next;
+    }
+
+    cfg.tools = tools;
+  }
+
+  return { next: cfg, changes, warnings };
+}
+
+export function createSetupOpenclawSubcommand(): Command {
+  return new Command('openclaw')
+    .description('Install recommended OpenClaw config (plugins.allow + tools.alsoAllow) for the clawclaw plugin.')
+    .option('-y, --yes', 'Apply changes (default is dry-run with diff preview)')
+    .option('--print', 'Only print the recommended JSON patch; do not read or write files')
+    .option('--config <path>', 'Override openclaw.json path (default: $OPENCLAW_HOME/openclaw.json or ~/.openclaw/openclaw.json)')
+    .option('--skip-plugins-allow', "Do not touch plugins.allow / plugins.entries.clawclaw")
+    .option('--skip-tools-allow', "Do not touch tools.alsoAllow")
+    .option('--no-backup', 'Do not write a timestamped .bak.* before applying')
+    .action((opts: {
+      yes?: boolean;
+      print?: boolean;
+      config?: string;
+      skipPluginsAllow?: boolean;
+      skipToolsAllow?: boolean;
+      backup?: boolean;
+    }) => {
+      const result = runHostConfigSetup(
+        {
+          hostName: 'OpenClaw',
+          resolveConfigPath: () => resolveOpenclawConfigPath(),
+          computePatch: (current, hostOpts) => computeOpenclawPatch(current, hostOpts),
+        },
+        {
+          skipPluginsAllow: opts.skipPluginsAllow,
+          skipToolsAllow: opts.skipToolsAllow,
+        },
+        {
+          yes: opts.yes,
+          print: opts.print,
+          configPath: opts.config,
+          backup: opts.backup,
+        },
+      );
+      for (const line of result.output) console.log(line);
+      if (result.exitCode !== 0) process.exit(result.exitCode);
+    });
+}

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));
+    });
+}