@myclaw163/clawclaw-cli 0.6.71 → 0.6.76

package/src/commands/do.ts

@@ -1,126 +1,130 @@
-import { Command } from 'commander';
-import { GameClient } from '../lib/game-client.js';
-import { maybeSynthesizeSpeechAudioUrl } from '../lib/tts-speech.js';
-import { Action } from '../sdk/action.js';
-import { EventStore } from '../pipeline/event-store.js';
-
-interface ActionIntent {
-  build(): Action;
-}
-
-/** Infer an audio MIME type from a file path's extension; defaults to audio/mpeg. */
-export function audioContentTypeFor(filePath: string): string {
-  const ext = filePath.slice(filePath.lastIndexOf('.')).toLowerCase();
-  switch (ext) {
-    case '.wav': return 'audio/wav';
-    case '.ogg': return 'audio/ogg';
-    case '.oga': return 'audio/ogg';
-    case '.m4a': return 'audio/mp4';
-    case '.aac': return 'audio/aac';
-    case '.flac': return 'audio/flac';
-    case '.webm': return 'audio/webm';
-    case '.mp3':
-    default: return 'audio/mpeg';
-  }
-}
-
-/**
- * Resolve the speech audio URL: when a local --file is given, upload it and
- * return the cloud URL; otherwise fall back to auto TTS synthesis.
- */
-export async function resolveSpeechAudioUrl(
-  opts: Record<string, any>,
-  client: { uploadAudio(filePath: string, filename?: string, contentType?: string): Promise<{ audio_url: string }> },
-): Promise<string | undefined> {
-  if (opts.file) {
-    const { audio_url } = await client.uploadAudio(opts.file, undefined, audioContentTypeFor(opts.file));
-    return audio_url;
-  }
-  return maybeSynthesizeSpeechAudioUrl(opts.speech, opts.url, client as any);
-}
-
-export function normalizeDoOptions(opts: Record<string, any>, extraArgs: string[] = []): Record<string, any> {
-  const normalized = { ...opts };
-  if (normalized.speech && extraArgs.length > 0) {
-    normalized.speech = [normalized.speech, ...extraArgs].join(' ');
-  }
-
-  return normalized;
-}
-
-export function parseIntents(opts: Record<string, any>): ActionIntent[] {
-  const intents: ActionIntent[] = [];
-  if (opts.speech) intents.push({ build: () => Action.speech(opts.speech, undefined, opts.url) });
-  if (opts.vote)   intents.push({ build: () => Action.vote(opts.vote) });
-  return intents;
-}
-
-export function createDoCommand(): Command {
-  return new Command('do')
-    .alias('d')
-    .description('Execute player communication actions (speech/vote/think)')
-    .option('-s, --speech <text>', 'Say something')
-    .option('--file <path>', 'Local audio file to upload and attach to speech')
-    .option('-v, --vote <target>', 'Vote for player')
-    .option('--think <text>', 'Send thinking content visible only to spectators. Standalone (e.g. `do --think "..."`) submits a no-op think action; combined with another action, attaches as that action\'s thinking_content.')
-    .argument('[extra...]', 'Additional unquoted speech words')
-    .action(async (extraArgs: string[], opts) => {
-      opts = normalizeDoOptions(opts, extraArgs);
-
-      if (!opts.speech && !opts.vote && !opts.think) {
-        console.error('No action specified. Use -s, -v, or --think.');
-        process.exit(1);
-      }
-
-      const { isStrategyRunning } = await import('../strategies/strategy-loop.js');
-      const strategyActive = isStrategyRunning();
-
-      if (strategyActive && !opts.speech && !opts.vote && !opts.think) {
-        console.log(JSON.stringify({
-          error: 'strategy_running',
-          message: 'Strategy is controlling the character. Speech (-s), vote (-v), and --think remain available.',
-        }, null, 2));
-        process.exit(1);
-      }
-
-      const client = GameClient.fromAuth();
-      await client.discoverGameServer();
-
-      if (opts.speech) {
-        opts.url = await resolveSpeechAudioUrl(opts, client);
-      }
-
-      const intents = parseIntents(opts);
-      if (intents.length === 0 && opts.think) {
-        intents.push({ build: () => Action.think() });
-      }
-
-      const first = intents[0];
-      let action = first.build();
-      if (opts.think) action = action.withThinking(opts.think);
-      const result = await client.submitAction(action.toJSON() as any);
-
-      try {
-        const store = EventStore.forActiveAccount();
-        store.appendNewEvents(result);
-      } catch {}
-
-      if (intents.length === 1) {
-        console.log(JSON.stringify({ action: action.toJSON(), result: result ?? 'ok' }, null, 2));
-        return;
-      }
-
-      const submitted = [{ action: action.toJSON(), result: result ?? 'ok' }];
-      for (const intent of intents.slice(1)) {
-        const nextAction = intent.build();
-        const nextResult = await client.submitAction(nextAction.toJSON() as any);
-        try {
-          const store = EventStore.forActiveAccount();
-          store.appendNewEvents(nextResult);
-        } catch {}
-        submitted.push({ action: nextAction.toJSON(), result: nextResult ?? 'ok' });
-      }
-
-      console.log(JSON.stringify({ actions: submitted }, null, 2));
-    });
-}
+import { Command, Option } from 'commander';
+import { GameClient } from '../lib/game-client.js';
+import { maybeSynthesizeSpeechAudioUrl } from '../lib/tts-speech.js';
+import { Action } from '../sdk/action.js';
+import { EventStore } from '../pipeline/event-store.js';
+
+interface ActionIntent {
+  build(): Action;
+}
+
+/** Infer an audio MIME type from a file path's extension; defaults to audio/mpeg. */
+export function audioContentTypeFor(filePath: string): string {
+  const ext = filePath.slice(filePath.lastIndexOf('.')).toLowerCase();
+  switch (ext) {
+    case '.wav': return 'audio/wav';
+    case '.ogg': return 'audio/ogg';
+    case '.oga': return 'audio/ogg';
+    case '.m4a': return 'audio/mp4';
+    case '.aac': return 'audio/aac';
+    case '.flac': return 'audio/flac';
+    case '.webm': return 'audio/webm';
+    case '.mp3':
+    default: return 'audio/mpeg';
+  }
+}
+
+/**
+ * Resolve the speech audio URL: when a local --file is given, upload it and
+ * return the cloud URL; otherwise fall back to auto TTS synthesis.
+ */
+export async function resolveSpeechAudioUrl(
+  opts: Record<string, any>,
+  client: { uploadAudio(filePath: string, filename?: string, contentType?: string): Promise<{ audio_url: string }> },
+): Promise<string | undefined> {
+  if (opts.file) {
+    const { audio_url } = await client.uploadAudio(opts.file, undefined, audioContentTypeFor(opts.file));
+    return audio_url;
+  }
+  return maybeSynthesizeSpeechAudioUrl(opts.speech, opts.url, client as any);
+}
+
+export function normalizeDoOptions(opts: Record<string, any>, extraArgs: string[] = []): Record<string, any> {
+  const normalized = { ...opts };
+  if (normalized.speech && extraArgs.length > 0) {
+    normalized.speech = [normalized.speech, ...extraArgs].join(' ');
+  }
+  if (normalized.think && !normalized.comment) {
+    normalized.comment = normalized.think;
+  }
+
+  return normalized;
+}
+
+export function parseIntents(opts: Record<string, any>): ActionIntent[] {
+  const intents: ActionIntent[] = [];
+  if (opts.speech) intents.push({ build: () => Action.speech(opts.speech, undefined, opts.url) });
+  if (opts.vote)   intents.push({ build: () => Action.vote(opts.vote) });
+  return intents;
+}
+
+export function createDoCommand(): Command {
+  return new Command('do')
+    .alias('d')
+    .description('Execute player communication actions (speech/vote/comment)')
+    .option('-s, --speech <text>', 'Say something')
+    .addOption(new Option('--file <path>', 'Local audio file to upload and attach to speech').hideHelp())
+    .option('-v, --vote <target>', 'Vote for player')
+    .option('--comment <text>', 'Send a comment visible only to the user/spectators; not public in-game speech')
+    .addOption(new Option('--think <text>', 'Deprecated alias for --comment').hideHelp())
+    .argument('[extra...]', 'Additional unquoted speech words')
+    .action(async (extraArgs: string[], opts) => {
+      opts = normalizeDoOptions(opts, extraArgs);
+
+      if (!opts.speech && !opts.vote && !opts.comment) {
+        console.error('No action specified. Use -s, -v, or --comment.');
+        process.exit(1);
+      }
+
+      const { isStrategyRunning } = await import('../strategies/strategy-loop.js');
+      const strategyActive = isStrategyRunning();
+
+      if (strategyActive && !opts.speech && !opts.vote && !opts.comment) {
+        console.log(JSON.stringify({
+          error: 'strategy_running',
+          message: 'Strategy is controlling the character. Speech (-s), vote (-v), and --comment remain available.',
+        }, null, 2));
+        process.exit(1);
+      }
+
+      const client = GameClient.fromAuth();
+      await client.discoverGameServer();
+
+      if (opts.speech) {
+        opts.url = await resolveSpeechAudioUrl(opts, client);
+      }
+
+      const intents = parseIntents(opts);
+      if (intents.length === 0 && opts.comment) {
+        intents.push({ build: () => Action.think() });
+      }
+
+      const first = intents[0];
+      let action = first.build();
+      if (opts.comment) action = action.withThinking(opts.comment);
+      const result = await client.submitAction(action.toJSON() as any);
+
+      try {
+        const store = EventStore.forActiveAccount();
+        store.appendNewEvents(result);
+      } catch {}
+
+      if (intents.length === 1) {
+        console.log(JSON.stringify({ action: action.toJSON(), result: result ?? 'ok' }, null, 2));
+        return;
+      }
+
+      const submitted = [{ action: action.toJSON(), result: result ?? 'ok' }];
+      for (const intent of intents.slice(1)) {
+        const nextAction = intent.build();
+        const nextResult = await client.submitAction(nextAction.toJSON() as any);
+        try {
+          const store = EventStore.forActiveAccount();
+          store.appendNewEvents(nextResult);
+        } catch {}
+        submitted.push({ action: nextAction.toJSON(), result: nextResult ?? 'ok' });
+      }
+
+      console.log(JSON.stringify({ actions: submitted }, null, 2));
+    });
+}

package/src/commands/events.test.ts

@@ -1,71 +1,100 @@
-import { describe, expect, it } from 'vitest';
-import {
-  enrichEventForEvents,
-  selectMonitorEventRecordsAfterCursor,
-  selectMonitorTailEventRecords,
-} from './events.js';
-import type { EventRecord } from '../pipeline/event-store.js';
-
-function record(line: number, type: string): EventRecord {
-  return { line, event: { type, tick: line } };
-}
-
-describe('events command monitor registration filter', () => {
-  it('returns only Monitor-registered events after the cursor', () => {
-    const selected = selectMonitorEventRecordsAfterCursor([
-      record(1, 'role_assigned'),
-      record(2, 'player_spotted'),
-      record(3, 'speech'),
-      record(4, 'vote_speech'),
-    ], 1);
-
-    expect(selected.scanned.map((r) => r.event.type)).toEqual(['player_spotted', 'speech', 'vote_speech']);
-    expect(selected.returned.map((r) => r.event.type)).toEqual(['speech']);
-    expect(selected.toLine).toBe(4);
-  });
-
-  it('advances across ignored events so they are not scanned repeatedly', () => {
-    const selected = selectMonitorEventRecordsAfterCursor([
-      record(8, 'vote_speech'),
-      record(9, 'player_spotted'),
-    ], 7);
-
-    expect(selected.returned).toEqual([]);
-    expect(selected.toLine).toBe(9);
-    expect(selected.scanned).toHaveLength(2);
-  });
-
-  it('tail mode applies the Monitor registration filter before the count and type filter', () => {
-    const selected = selectMonitorTailEventRecords([
-      record(1, 'speech'),
-      record(2, 'vote_speech'),
-      record(3, 'killed'),
-      record(4, 'player_spotted'),
-      record(5, 'speech'),
-    ], 2);
-
-    expect(selected.map((r) => r.line)).toEqual([3, 5]);
-    expect(selectMonitorTailEventRecords(selected, 10, 'vote_speech')).toEqual([]);
-  });
-
-  it('enriches meeting_briefing with current speech_order only for the same caller', () => {
-    const summary = {
-      meeting: {
-        caller: '单钳渔夫',
-        speech_order: ['单钳渔夫', '洋流王子'],
-      },
-    };
-
-    expect(enrichEventForEvents({
-      type: 'meeting_briefing',
-      meeting_caller_name: '单钳渔夫',
-    }, summary)).toMatchObject({
-      speech_order: ['单钳渔夫', '洋流王子'],
-    });
-
-    expect(enrichEventForEvents({
-      type: 'meeting_briefing',
-      meeting_caller_name: '其他人',
-    }, summary)).not.toHaveProperty('speech_order');
-  });
-});
+import { describe, expect, it } from 'vitest';
+import {
+  enrichEventsForState,
+  enrichEventForEvents,
+  selectMonitorEventRecordsAfterCursor,
+  selectMonitorTailEventRecords,
+} from './events.js';
+import type { EventRecord } from '../pipeline/event-store.js';
+
+function record(line: number, type: string): EventRecord {
+  return { line, event: { type, tick: line } };
+}
+
+describe('events command monitor registration filter', () => {
+  it('returns only Monitor-registered events after the cursor', () => {
+    const selected = selectMonitorEventRecordsAfterCursor([
+      record(1, 'role_assigned'),
+      record(2, 'player_spotted'),
+      record(3, 'speech'),
+      record(4, 'vote_speech'),
+    ], 1);
+
+    expect(selected.scanned.map((r) => r.event.type)).toEqual(['player_spotted', 'speech', 'vote_speech']);
+    expect(selected.returned.map((r) => r.event.type)).toEqual(['speech']);
+    expect(selected.toLine).toBe(4);
+  });
+
+  it('advances across ignored events so they are not scanned repeatedly', () => {
+    const selected = selectMonitorEventRecordsAfterCursor([
+      record(8, 'vote_speech'),
+      record(9, 'player_spotted'),
+    ], 7);
+
+    expect(selected.returned).toEqual([]);
+    expect(selected.toLine).toBe(9);
+    expect(selected.scanned).toHaveLength(2);
+  });
+
+  it('tail mode applies the Monitor registration filter before the count and type filter', () => {
+    const selected = selectMonitorTailEventRecords([
+      record(1, 'speech'),
+      record(2, 'vote_speech'),
+      record(3, 'killed'),
+      record(4, 'player_spotted'),
+      record(5, 'speech'),
+    ], 2);
+
+    expect(selected.map((r) => r.line)).toEqual([3, 5]);
+    expect(selectMonitorTailEventRecords(selected, 10, 'vote_speech')).toEqual([]);
+  });
+
+  it('enriches meeting_briefing with current speech_order only for the same caller', () => {
+    const summary = {
+      meeting: {
+        caller: '单钳渔夫',
+        speech_order: ['单钳渔夫', '洋流王子'],
+      },
+    };
+
+    expect(enrichEventForEvents({
+      type: 'meeting_briefing',
+      meeting_caller_name: '单钳渔夫',
+    }, summary)).toMatchObject({
+      speech_order: ['单钳渔夫', '洋流王子'],
+    });
+
+    expect(enrichEventForEvents({
+      type: 'meeting_briefing',
+      meeting_caller_name: '其他人',
+    }, summary)).not.toHaveProperty('speech_order');
+  });
+});
+
+describe('events command state enrichment', () => {
+  it('adds opening roster context to raw game_started events for state projection', () => {
+    const events = [
+      { type: 'role_assigned', tick: 0, role: 'shrimp_generic' },
+      { type: 'game_started', tick: 0, player_count: 3 },
+      { type: 'speech', tick: 5, actor_name: 'Red' },
+    ];
+
+    const enriched = enrichEventsForState(events, {
+      players: [
+        { name: 'Self', seat: 1 },
+        { name: 'Blue', seat: 2 },
+        { name: 'Red', seat: 3 },
+      ],
+    });
+
+    expect(enriched[1]).toMatchObject({
+      type: 'game_started',
+      players: [
+        { name: 'Self', seat: 1 },
+        { name: 'Blue', seat: 2 },
+        { name: 'Red', seat: 3 },
+      ],
+    });
+    expect(events[1]).not.toHaveProperty('players');
+  });
+});