@myclaw163/clawclaw-cli 0.6.71 → 0.6.74

package/src/cli.ts

@@ -1,110 +1,110 @@
-import { Command } from 'commander';
-import { readFileSync, appendFileSync } from 'fs';
-import { fileURLToPath } from 'url';
-import { dirname, resolve } from 'path';
-import { ApiError } from './lib/http-transport.js';
-import { createGameCommand } from './commands/game.js';
-import { createDoCommand } from './commands/do.js';
-import { createEventsCommand } from './commands/events.js';
-import { createStateCommand } from './commands/state.js';
-import { createAccountCommand } from './commands/account.js';
-import { createPeekCommand } from './commands/peek.js';
-import { createUpgradeCommand } from './commands/upgrade.js';
-import { createLoadCommand } from './commands/load.js';
-import { createMemoryCommand } from './commands/memory.js';
-import { createKnowledgeCommand } from './commands/knowledge.js';
-import { createPersonaCommand } from './commands/persona.js';
-import { createTTSCommand } from './commands/tts.js';
-import { createStrategyCommand } from './commands/strategy.js';
-import { createHubCommand } from './commands/hub.js';
-import { createSkillCommand } from './commands/skill.js';
-import { createSetupCommand } from './commands/setup/index.js';
-import { createConfigCommand } from './commands/config.js';
-import { createSchemaCommand } from './commands/_schema.js';
-import { createHistoryCommand } from './commands/history.js';
-import { initHttpKeepAlive } from './lib/http-keepalive.js';
-import { applyWorkspaceArgv } from './lib/workspace-argv.js';
-
-initHttpKeepAlive();
-applyWorkspaceArgv(process.argv, process.env);
-
-// ─── Internal entry: _pipeline (forked by `do` command for multi-action sequences) ───
-if (process.argv[2] === '_pipeline') {
-  const actions = JSON.parse(process.argv[3]);
-  const initialWaitMs = process.argv[4] ? Number(process.argv[4]) : 0;
-  const { runPipeline } = await import('./pipeline/pipeline.js');
-  await runPipeline(actions, initialWaitMs);
-  process.exit(0);
-}
-
-// ─── Internal entry: _strategy (spawned by `strategy` command) ───
-if (process.argv[2] === '_strategy') {
-  const _logFile = process.env.CLAWCLAW_LOG_FILE;
-  const _earlyLog = (label: string, err: any) => {
-    const msg = `[${new Date().toISOString()}] [${label}] ${err?.stack ?? err}\n`;
-    if (_logFile) try { appendFileSync(_logFile, msg); } catch {}
-    try { process.stderr.write(msg); } catch {}
-  };
-  process.on('uncaughtException', (err) => { _earlyLog('FATAL', err); process.exit(1); });
-  process.on('unhandledRejection', (reason) => { _earlyLog('FATAL:unhandledRejection', reason); process.exit(1); });
-
-  const strategyId = process.argv[3];
-  const dashDashIdx = process.argv.indexOf('--');
-  const strategyArgs = dashDashIdx >= 0 ? process.argv.slice(dashDashIdx + 1) : [];
-  const { runStrategyLoop } = await import('./strategies/strategy-loop.js');
-  try {
-    await runStrategyLoop(strategyId, strategyArgs.length > 0 ? strategyArgs : undefined);
-  } catch (e: any) {
-    const { EventStore } = await import('./pipeline/event-store.js');
-    try { EventStore.forActiveAccount().append({ type: 'auto_fatal', error: e?.message ?? String(e), stack: e?.stack }); } catch {}
-  }
-  process.exit(0);
-}
-
-// ─── Normal CLI ───
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = dirname(__filename);
-const pkg = JSON.parse(readFileSync(resolve(__dirname, '..', 'package.json'), 'utf-8'));
-
-const program = new Command()
-  .name('clawclaw-cli')
-  .description('ClawClaw social deduction game CLI')
-  .version(pkg.version)
-  .option('--workspace-dir <dir>', 'workspace directory');
-
-program.addCommand(createDoCommand());
-program.addCommand(createStateCommand());
-program.addCommand(createEventsCommand());
-program.addCommand(createGameCommand());
-program.addCommand(createAccountCommand());
-program.addCommand(createLoadCommand());
-program.addCommand(createMemoryCommand());
-program.addCommand(createKnowledgeCommand());
-program.addCommand(createPersonaCommand());
-program.addCommand(createUpgradeCommand());
-program.addCommand(createPeekCommand());
-program.addCommand(createHistoryCommand());
-program.addCommand(createTTSCommand(), { hidden: true }); // 暂时屏蔽:不在 help 中暴露,命令仍可执行(do -s 自动 TTS 依赖其 config)
-program.addCommand(createStrategyCommand());
-program.addCommand(createSkillCommand());
-program.addCommand(createHubCommand());
-program.addCommand(createSetupCommand());
-program.addCommand(createConfigCommand());
-program.addCommand(createSchemaCommand(() => program), { hidden: true });
-
-try {
-  await program.parseAsync();
-} catch (err) {
-  if (err instanceof ApiError) {
-    if (err.status === 422) {
-      console.info(`API key is missing or malformed. Run: clawclaw-cli account register`);
-    } else if (err.status === 401) {
-      console.info(`Account not found or API key expired. Run: clawclaw-cli account register`);
-    } else {
-      console.info(`Request failed (${err.status}): ${err.body}`);
-    }
-  } else {
-    console.error(err instanceof Error ? err.message : String(err));
-  }
-  process.exit(1);
-}
+import { Command } from 'commander';
+import { readFileSync, appendFileSync } from 'fs';
+import { fileURLToPath } from 'url';
+import { dirname, resolve } from 'path';
+import { ApiError } from './lib/http-transport.js';
+import { createGameCommand } from './commands/game.js';
+import { createDoCommand } from './commands/do.js';
+import { createEventsCommand } from './commands/events.js';
+import { createStateCommand } from './commands/state.js';
+import { createAccountCommand } from './commands/account.js';
+import { createPeekCommand } from './commands/peek.js';
+import { createUpgradeCommand } from './commands/upgrade.js';
+import { createLoadCommand } from './commands/load.js';
+import { createMemoryCommand } from './commands/memory.js';
+import { createKnowledgeCommand } from './commands/knowledge.js';
+import { createPersonaCommand } from './commands/persona.js';
+import { createTTSCommand } from './commands/tts.js';
+import { createStrategyCommand } from './commands/strategy.js';
+import { createHubCommand } from './commands/hub.js';
+import { createSkillCommand } from './commands/skill.js';
+import { createSetupCommand } from './commands/setup/index.js';
+import { createConfigCommand } from './commands/config.js';
+import { createSchemaCommand } from './commands/_schema.js';
+import { createHistoryCommand } from './commands/history.js';
+import { initHttpKeepAlive } from './lib/http-keepalive.js';
+import { applyWorkspaceArgv } from './lib/workspace-argv.js';
+
+initHttpKeepAlive();
+applyWorkspaceArgv(process.argv, process.env);
+
+// ─── Internal entry: _pipeline (forked by `do` command for multi-action sequences) ───
+if (process.argv[2] === '_pipeline') {
+  const actions = JSON.parse(process.argv[3]);
+  const initialWaitMs = process.argv[4] ? Number(process.argv[4]) : 0;
+  const { runPipeline } = await import('./pipeline/pipeline.js');
+  await runPipeline(actions, initialWaitMs);
+  process.exit(0);
+}
+
+// ─── Internal entry: _strategy (spawned by `strategy` command) ───
+if (process.argv[2] === '_strategy') {
+  const _logFile = process.env.CLAWCLAW_LOG_FILE;
+  const _earlyLog = (label: string, err: any) => {
+    const msg = `[${new Date().toISOString()}] [${label}] ${err?.stack ?? err}\n`;
+    if (_logFile) try { appendFileSync(_logFile, msg); } catch {}
+    try { process.stderr.write(msg); } catch {}
+  };
+  process.on('uncaughtException', (err) => { _earlyLog('FATAL', err); process.exit(1); });
+  process.on('unhandledRejection', (reason) => { _earlyLog('FATAL:unhandledRejection', reason); process.exit(1); });
+
+  const strategyId = process.argv[3];
+  const dashDashIdx = process.argv.indexOf('--');
+  const strategyArgs = dashDashIdx >= 0 ? process.argv.slice(dashDashIdx + 1) : [];
+  const { runStrategyLoop } = await import('./strategies/strategy-loop.js');
+  try {
+    await runStrategyLoop(strategyId, strategyArgs.length > 0 ? strategyArgs : undefined);
+  } catch (e: any) {
+    const { EventStore } = await import('./pipeline/event-store.js');
+    try { EventStore.forActiveAccount().append({ type: 'auto_fatal', error: e?.message ?? String(e), stack: e?.stack }); } catch {}
+  }
+  process.exit(0);
+}
+
+// ─── Normal CLI ───
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = dirname(__filename);
+const pkg = JSON.parse(readFileSync(resolve(__dirname, '..', 'package.json'), 'utf-8'));
+
+const program = new Command()
+  .name('clawclaw-cli')
+  .description('ClawClaw social deduction game CLI')
+  .version(pkg.version)
+  .option('--workspace-dir <dir>', 'workspace directory');
+
+program.addCommand(createDoCommand());
+program.addCommand(createStateCommand(), { hidden: true });
+program.addCommand(createEventsCommand());
+program.addCommand(createGameCommand());
+program.addCommand(createAccountCommand());
+program.addCommand(createLoadCommand());
+program.addCommand(createMemoryCommand());
+program.addCommand(createKnowledgeCommand());
+program.addCommand(createPersonaCommand());
+program.addCommand(createUpgradeCommand(), { hidden: true });
+program.addCommand(createPeekCommand(), { hidden: true });
+program.addCommand(createHistoryCommand());
+program.addCommand(createTTSCommand(), { hidden: true }); // 暂时屏蔽:不在 help 中暴露,命令仍可执行(do -s 自动 TTS 依赖其 config)
+program.addCommand(createStrategyCommand());
+program.addCommand(createSkillCommand());
+program.addCommand(createHubCommand());
+program.addCommand(createSetupCommand(), { hidden: true });
+program.addCommand(createConfigCommand(), { hidden: true });
+program.addCommand(createSchemaCommand(() => program), { hidden: true });
+
+try {
+  await program.parseAsync();
+} catch (err) {
+  if (err instanceof ApiError) {
+    if (err.status === 422) {
+      console.info(`API key is missing or malformed. Run: clawclaw-cli account register`);
+    } else if (err.status === 401) {
+      console.info(`Account not found or API key expired. Run: clawclaw-cli account register`);
+    } else {
+      console.info(`Request failed (${err.status}): ${err.body}`);
+    }
+  } else {
+    console.error(err instanceof Error ? err.message : String(err));
+  }
+  process.exit(1);
+}

package/src/commands/_schema.ts

@@ -1,109 +1,124 @@
-/**
- * `_schema` — internal hidden command exposing the entire commander tree as JSON.
- *
- * Adapter consumers (e.g. `openclaw-clawclaw`) call this to auto-generate one tool
- * per leaf subcommand without having to hand-translate each `ccl` command.
- *
- * Hidden by convention: name starts with `_` so the walker excludes it from output,
- * and `--help` listings of regular tooling generally skip underscore-prefixed entries.
- */
-
-import { Command, Option, Argument } from 'commander';
-import { getMeta, type CommandMeta } from '../lib/command-meta.js';
-
-interface OptionSchema {
-  flags: string;
-  long?: string | null;
-  short?: string | null;
-  attributeName: string;
-  description?: string;
-  defaultValue?: unknown;
-  /** option marked with `<value>` — value required */
-  required: boolean;
-  /** option marked with `[value]` — value optional */
-  optional: boolean;
-  /** option marked with `.makeOptionMandatory()` — option itself required */
-  mandatory: boolean;
-  negate: boolean;
-  takesValue: boolean;
-}
-
-interface ArgumentSchema {
-  name: string;
-  description?: string;
-  required: boolean;
-  variadic: boolean;
-  defaultValue?: unknown;
-}
-
-interface CommandSchema {
-  name: string;
-  description?: string;
-  aliases: string[];
-  options: OptionSchema[];
-  arguments: ArgumentSchema[];
-  subcommands: CommandSchema[];
-  /** path from root, joined by space, e.g. "account leaderboard" */
-  path: string;
-  /** true when the command has no subcommands and is therefore directly invocable */
-  leaf: boolean;
-  /** Adapter-facing metadata (omitted if no metadata is set on this command). */
-  meta?: CommandMeta;
-}
-
-function dumpOption(o: Option): OptionSchema {
-  const flags = o.flags;
-  const takesValue = flags.includes('<') || flags.includes('[');
-  return {
-    flags,
-    long: o.long ?? null,
-    short: o.short ?? null,
-    attributeName: o.attributeName(),
-    description: o.description || undefined,
-    defaultValue: o.defaultValue,
-    required: o.required,
-    optional: o.optional,
-    mandatory: o.mandatory,
-    negate: o.negate,
-    takesValue,
-  };
-}
-
-function dumpArgument(a: Argument): ArgumentSchema {
-  return {
-    name: a.name(),
-    description: a.description || undefined,
-    required: a.required,
-    variadic: a.variadic,
-    defaultValue: a.defaultValue,
-  };
-}
-
-function walkCommand(cmd: Command, parentPath: string[] = []): CommandSchema {
-  const path = [...parentPath, cmd.name()];
-  const visibleSubs = (cmd.commands || []).filter((c) => !c.name().startsWith('_'));
-  const meta = getMeta(cmd);
-  return {
-    name: cmd.name(),
-    description: cmd.description() || undefined,
-    aliases: cmd.aliases() ?? [],
-    options: (cmd.options || []).map(dumpOption),
-    arguments: (cmd.registeredArguments || []).map(dumpArgument),
-    subcommands: visibleSubs.map((c) => walkCommand(c, path)),
-    path: path.slice(1).join(' '), // exclude root program name from path
-    leaf: visibleSubs.length === 0,
-    ...(meta && Object.keys(meta).length > 0 ? { meta } : {}),
-  };
-}
-
-export function createSchemaCommand(getProgram: () => Command): Command {
-  return new Command('_schema')
-    .description('[internal] dump full command tree as JSON for adapter auto-generation')
-    .option('--pretty', 'Indent JSON output')
-    .action((opts: { pretty?: boolean }) => {
-      const tree = walkCommand(getProgram());
-      console.log(JSON.stringify(tree, null, opts.pretty ? 2 : 0));
-    });
-  // Note: to hide from `ccl --help`, the parent passes { hidden: true } to addCommand().
-  // See cli.ts registration site.
-}
+/**
+ * `_schema` — internal hidden command exposing the entire commander tree as JSON.
+ *
+ * Adapter consumers (e.g. `openclaw-clawclaw`) call this to auto-generate one tool
+ * per leaf subcommand without having to hand-translate each `ccl` command.
+ *
+ * Hidden by convention: name starts with `_` so the walker excludes it from output,
+ * and `--help` listings of regular tooling generally skip underscore-prefixed entries.
+ */
+
+import { Command, Option, Argument } from 'commander';
+import { getMeta, type CommandMeta } from '../lib/command-meta.js';
+
+interface OptionSchema {
+  flags: string;
+  long?: string | null;
+  short?: string | null;
+  attributeName: string;
+  description?: string;
+  defaultValue?: unknown;
+  /** option marked with `<value>` — value required */
+  required: boolean;
+  /** option marked with `[value]` — value optional */
+  optional: boolean;
+  /** option marked with `.makeOptionMandatory()` — option itself required */
+  mandatory: boolean;
+  negate: boolean;
+  takesValue: boolean;
+}
+
+interface ArgumentSchema {
+  name: string;
+  description?: string;
+  required: boolean;
+  variadic: boolean;
+  defaultValue?: unknown;
+}
+
+interface CommandSchema {
+  name: string;
+  description?: string;
+  aliases: string[];
+  options: OptionSchema[];
+  arguments: ArgumentSchema[];
+  subcommands: CommandSchema[];
+  /** path from root, joined by space, e.g. "account leaderboard" */
+  path: string;
+  /** true when the command has no subcommands and is therefore directly invocable */
+  leaf: boolean;
+  /** Adapter-facing metadata (omitted if no metadata is set on this command). */
+  meta?: CommandMeta;
+}
+
+interface WalkOptions {
+  includeHidden: boolean;
+}
+
+function dumpOption(o: Option): OptionSchema {
+  const flags = o.flags;
+  const takesValue = flags.includes('<') || flags.includes('[');
+  return {
+    flags,
+    long: o.long ?? null,
+    short: o.short ?? null,
+    attributeName: o.attributeName(),
+    description: o.description || undefined,
+    defaultValue: o.defaultValue,
+    required: o.required,
+    optional: o.optional,
+    mandatory: o.mandatory,
+    negate: o.negate,
+    takesValue,
+  };
+}
+
+function dumpArgument(a: Argument): ArgumentSchema {
+  return {
+    name: a.name(),
+    description: a.description || undefined,
+    required: a.required,
+    variadic: a.variadic,
+    defaultValue: a.defaultValue,
+  };
+}
+
+function isHiddenCommand(cmd: Command): boolean {
+  return (cmd as any)._hidden === true;
+}
+
+function isHiddenOption(option: Option): boolean {
+  return (option as any).hidden === true;
+}
+
+function walkCommand(cmd: Command, parentPath: string[] = [], opts: WalkOptions): CommandSchema {
+  const path = [...parentPath, cmd.name()];
+  const visibleSubs = (cmd.commands || []).filter((c) => (
+    opts.includeHidden || (!c.name().startsWith('_') && !isHiddenCommand(c))
+  ));
+  const meta = getMeta(cmd);
+  return {
+    name: cmd.name(),
+    description: cmd.description() || undefined,
+    aliases: cmd.aliases() ?? [],
+    options: (cmd.options || []).filter((o) => opts.includeHidden || !isHiddenOption(o)).map(dumpOption),
+    arguments: (cmd.registeredArguments || []).map(dumpArgument),
+    subcommands: visibleSubs.map((c) => walkCommand(c, path, opts)),
+    path: path.slice(1).join(' '), // exclude root program name from path
+    leaf: visibleSubs.length === 0,
+    ...(meta && Object.keys(meta).length > 0 ? { meta } : {}),
+  };
+}
+
+export function createSchemaCommand(getProgram: () => Command): Command {
+  return new Command('_schema')
+    .description('[internal] dump full command tree as JSON for adapter auto-generation')
+    .option('--all', 'Include hidden/deprecated/debug commands and options')
+    .option('--pretty', 'Indent JSON output')
+    .action((opts: { all?: boolean; pretty?: boolean }) => {
+      const tree = walkCommand(getProgram(), [], { includeHidden: opts.all === true });
+      console.log(JSON.stringify(tree, null, opts.pretty ? 2 : 0));
+    });
+  // Note: to hide from `ccl --help`, the parent passes { hidden: true } to addCommand().
+  // See cli.ts registration site.
+}