@myclaw163/clawclaw-cli 0.6.74 → 0.6.77

package/src/strategies/spawn.ts

@@ -1,82 +1,82 @@
-import { spawn } from 'child_process';
-import { existsSync, mkdirSync, openSync, writeFileSync } from 'fs';
-import { dirname, join, resolve } from 'path';
-import { fileURLToPath } from 'url';
-import { getProfileLogsDir, getProfileStateDir } from '../lib/init-command.js';
-import { AuthStore } from '../lib/auth.js';
-
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = dirname(__filename);
-
-const fwd = (p: string) => p.replace(/\\/g, '/');
-const BIN_MJS = fwd(resolve(__dirname, '..', '..', 'bin', 'clawclaw-cli.mjs'));
-
-function isTrue(value: string | undefined): boolean {
-  return typeof value === 'string' && value.trim().toLowerCase() === 'true';
-}
-
-function isDeveloperDiagnosticsEnabled(env: NodeJS.ProcessEnv = process.env): boolean {
-  return isTrue(env.CCL_DEBUG_RUNTIME) || isTrue(env.CCL_TEST) || isTrue(env['ccl-test']);
-}
-
-export function spawnStrategyLoop(
-  strategyId: string,
-  strategyArgs?: string[],
-  opts?: { source?: string; gameId?: string; role?: string; detached?: boolean; writeRuntimeFiles?: boolean },
-): ReturnType<typeof spawn> {
-  if (!existsSync(BIN_MJS)) throw new Error('clawclaw-cli bin entry not found');
-  const isWin = process.platform === 'win32';
-  const writeRuntimeFiles = opts?.writeRuntimeFiles ?? false;
-
-  let logFile: string | undefined;
-  if (isWin && isDeveloperDiagnosticsEnabled()) {
-    try {
-      const store = new AuthStore();
-      const active = store.getActive();
-      if (active) {
-        const logsDir = getProfileLogsDir(active);
-        mkdirSync(logsDir, { recursive: true });
-        const timestamp = new Date().toISOString().replace(/[:.]/g, '-');
-        logFile = resolve(logsDir, `strategy-${timestamp}.log`);
-        openSync(logFile, 'a');
-      }
-    } catch {}
-  }
-
-  const args = ['_strategy', strategyId];
-  if (strategyArgs && strategyArgs.length > 0) args.push('--', ...strategyArgs);
-
-  const detached = opts?.detached ?? false;
-  const child = spawn(process.execPath, [BIN_MJS, ...args], {
-    detached,
-    stdio: ['ignore', 'ignore', 'ignore'],
-    env: {
-      ...process.env,
-      ...(isWin && logFile ? { CLAWCLAW_LOG_FILE: logFile } : {}),
-      ...(writeRuntimeFiles ? { CLAWCLAW_STRATEGY_RUNTIME_FILES: '1' } : {}),
-    },
-    windowsHide: true,
-  });
-
-  if (child.pid && writeRuntimeFiles) {
-    try {
-      const store = new AuthStore();
-      const active = store.getActive();
-      if (active) {
-        const stateDir = getProfileStateDir(active);
-        mkdirSync(stateDir, { recursive: true });
-        writeFileSync(join(stateDir, 'auto.pid'), String(child.pid));
-        writeFileSync(join(stateDir, 'auto.json'), JSON.stringify({
-          strategy: strategyId,
-          pid: child.pid,
-          source: opts?.source ?? 'manual',
-          ...(opts?.gameId ? { game_id: opts.gameId } : {}),
-          ...(opts?.role ? { role: opts.role } : {}),
-        }));
-      }
-    } catch {}
-  }
-
-  if (detached) child.unref();
-  return child;
-}
+import { spawn } from 'child_process';
+import { existsSync, mkdirSync, openSync, writeFileSync } from 'fs';
+import { dirname, join, resolve } from 'path';
+import { fileURLToPath } from 'url';
+import { getProfileLogsDir, getProfileStateDir } from '../lib/init-command.js';
+import { AuthStore } from '../lib/auth.js';
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = dirname(__filename);
+
+const fwd = (p: string) => p.replace(/\\/g, '/');
+const BIN_MJS = fwd(resolve(__dirname, '..', '..', 'bin', 'clawclaw-cli.mjs'));
+
+function isTrue(value: string | undefined): boolean {
+  return typeof value === 'string' && value.trim().toLowerCase() === 'true';
+}
+
+function isDeveloperDiagnosticsEnabled(env: NodeJS.ProcessEnv = process.env): boolean {
+  return isTrue(env.CCL_DEBUG_RUNTIME) || isTrue(env.CCL_TEST) || isTrue(env['ccl-test']);
+}
+
+export function spawnStrategyLoop(
+  strategyId: string,
+  strategyArgs?: string[],
+  opts?: { source?: string; gameId?: string; role?: string; detached?: boolean; writeRuntimeFiles?: boolean },
+): ReturnType<typeof spawn> {
+  if (!existsSync(BIN_MJS)) throw new Error('clawclaw-cli bin entry not found');
+  const isWin = process.platform === 'win32';
+  const writeRuntimeFiles = opts?.writeRuntimeFiles ?? false;
+
+  let logFile: string | undefined;
+  if (isWin && isDeveloperDiagnosticsEnabled()) {
+    try {
+      const store = new AuthStore();
+      const active = store.getActive();
+      if (active) {
+        const logsDir = getProfileLogsDir(active);
+        mkdirSync(logsDir, { recursive: true });
+        const timestamp = new Date().toISOString().replace(/[:.]/g, '-');
+        logFile = resolve(logsDir, `strategy-${timestamp}.log`);
+        openSync(logFile, 'a');
+      }
+    } catch {}
+  }
+
+  const args = ['_strategy', strategyId];
+  if (strategyArgs && strategyArgs.length > 0) args.push('--', ...strategyArgs);
+
+  const detached = opts?.detached ?? false;
+  const child = spawn(process.execPath, [BIN_MJS, ...args], {
+    detached,
+    stdio: ['ignore', 'ignore', 'ignore'],
+    env: {
+      ...process.env,
+      ...(isWin && logFile ? { CLAWCLAW_LOG_FILE: logFile } : {}),
+      ...(writeRuntimeFiles ? { CLAWCLAW_STRATEGY_RUNTIME_FILES: '1' } : {}),
+    },
+    windowsHide: true,
+  });
+
+  if (child.pid && writeRuntimeFiles) {
+    try {
+      const store = new AuthStore();
+      const active = store.getActive();
+      if (active) {
+        const stateDir = getProfileStateDir(active);
+        mkdirSync(stateDir, { recursive: true });
+        writeFileSync(join(stateDir, 'auto.pid'), String(child.pid));
+        writeFileSync(join(stateDir, 'auto.json'), JSON.stringify({
+          strategy: strategyId,
+          pid: child.pid,
+          source: opts?.source ?? 'manual',
+          ...(opts?.gameId ? { game_id: opts.gameId } : {}),
+          ...(opts?.role ? { role: opts.role } : {}),
+        }));
+      }
+    } catch {}
+  }
+
+  if (detached) child.unref();
+  return child;
+}

package/src/strategies/speech-module.ts

@@ -1,123 +1,123 @@
-import type { GameState, PlayerInfo } from '../sdk/types.js';
-import type { StrategyContext } from './types.js';
-
-export interface SpeechModuleConfig {
-  globalCooldownMs: number;
-  perPersonCooldownMs: number;
-  autoGreetEnabled: boolean;
-}
-
-export interface SpeechEvalResult {
-  notifications: string[];
-}
-
-export class SpeechModule {
-  private config: SpeechModuleConfig;
-  private lastInitiateTime = 0;
-  private perPersonCooldowns = new Map<string, number>();
-
-  constructor(config: SpeechModuleConfig) {
-    this.config = config;
-  }
-
-  evaluate(
-    state: GameState,
-    ctx: StrategyContext,
-    signals: { allowAutoGreet: boolean },
-  ): SpeechEvalResult {
-    const result: SpeechEvalResult = { notifications: [] };
-    const now = Date.now();
-
-    const speechEvents = (state.new_events ?? []).filter(
-      evt => evt.type === 'wandering_speech' && evt.actor_name && evt.actor_name !== state.you.name,
-    );
-
-    for (const evt of speechEvents) {
-      const speaker = evt.actor_name as string;
-      const text = (evt.text ?? evt.content ?? '') as string;
-      const seatInfo = this.findSeatForPlayer(speaker, state, ctx);
-      result.notifications.push(`[被搭话] ${speaker}${seatInfo}对你说：「${text}」`);
-    }
-
-    if (signals.allowAutoGreet && this.canInitiate(state, ctx, now)) {
-      const candidate = this.pickCandidate(state, ctx, now);
-      if (candidate) {
-        const seatInfo = this.findSeatForPlayer(candidate.name, state, ctx);
-        this.lastInitiateTime = now;
-        this.perPersonCooldowns.set(candidate.name, now + this.config.perPersonCooldownMs);
-        result.notifications.push(`[发言] 视野内出现${candidate.name}${seatInfo}，可以主动打招呼。`);
-      }
-    }
-
-    return result;
-  }
-
-  private canInitiate(state: GameState, ctx: StrategyContext, now: number): boolean {
-    if (!this.config.autoGreetEnabled) return false;
-    if (now - this.lastInitiateTime < this.config.globalCooldownMs) return false;
-    if (state.you.doing_task) return false;
-    if (ctx.reportCorpseTarget) return false;
-    if (ctx.emergency && ctx.emergency.status !== 'completed') return false;
-
-    return true;
-  }
-
-  private pickCandidate(state: GameState, ctx: StrategyContext, now: number): PlayerInfo | null {
-    const mySeat = ctx.mySeat ?? 0;
-    const speechActors = new Set(
-      (state.new_events ?? [])
-        .filter(evt => evt.type === 'wandering_speech' && evt.actor_name)
-        .map(evt => evt.actor_name as string),
-    );
-
-    for (const player of state.players) {
-      const cooldownUntil = this.perPersonCooldowns.get(player.name) ?? 0;
-      if (now < cooldownUntil) continue;
-
-      const theirSeat = player.seat ?? Infinity;
-      if (mySeat >= theirSeat) continue;
-
-      if (speechActors.has(player.name)) continue;
-
-      return player;
-    }
-    return null;
-  }
-
-  /** 会议边界不再暂停移动，也无需清理等待对话状态。 */
-  resetMeetingState(): void {
-  }
-
-  /** 角色变化时刷新发言配置，保留 ConversationGoal 持有的模块实例。 */
-  updateConfig(role: string): void {
-    this.config = getSpeechConfigForRole(role);
-  }
-
-  private findSeatForPlayer(name: string, state: GameState, ctx: StrategyContext): string {
-    const player = state.players.find(p => p.name === name);
-    if (player?.seat != null) return `（${player.seat}号）`;
-    for (const [seat, pName] of Object.entries(ctx.playerNamesBySeat)) {
-      if (pName === name) return `（${seat}号）`;
-    }
-    return '';
-  }
-}
-
-const ROLE_CONFIGS: Record<string, SpeechModuleConfig> = {
-  shrimp_generic: { globalCooldownMs: 30_000, perPersonCooldownMs: 90_000, autoGreetEnabled: true },
-  shrimp_warrior: { globalCooldownMs: 30_000, perPersonCooldownMs: 90_000, autoGreetEnabled: true },
-  shrimp_pistol: { globalCooldownMs: 30_000, perPersonCooldownMs: 90_000, autoGreetEnabled: true },
-  crab_generic: { globalCooldownMs: 30_000, perPersonCooldownMs: 90_000, autoGreetEnabled: false },
-  neutral_paradise_fish: { globalCooldownMs: 20_000, perPersonCooldownMs: 90_000, autoGreetEnabled: true },
-  neutral_octopus: { globalCooldownMs: 30_000, perPersonCooldownMs: 90_000, autoGreetEnabled: false },
-};
-
-const DEFAULT_CONFIG: SpeechModuleConfig = {
-  globalCooldownMs: 30_000,
-  perPersonCooldownMs: 90_000,
-  autoGreetEnabled: true,
-};
-
-export function getSpeechConfigForRole(role: string): SpeechModuleConfig {
-  return ROLE_CONFIGS[role] ?? DEFAULT_CONFIG;
-}
+import type { GameState, PlayerInfo } from '../sdk/types.js';
+import type { StrategyContext } from './types.js';
+
+export interface SpeechModuleConfig {
+  globalCooldownMs: number;
+  perPersonCooldownMs: number;
+  autoGreetEnabled: boolean;
+}
+
+export interface SpeechEvalResult {
+  notifications: string[];
+}
+
+export class SpeechModule {
+  private config: SpeechModuleConfig;
+  private lastInitiateTime = 0;
+  private perPersonCooldowns = new Map<string, number>();
+
+  constructor(config: SpeechModuleConfig) {
+    this.config = config;
+  }
+
+  evaluate(
+    state: GameState,
+    ctx: StrategyContext,
+    signals: { allowAutoGreet: boolean },
+  ): SpeechEvalResult {
+    const result: SpeechEvalResult = { notifications: [] };
+    const now = Date.now();
+
+    const speechEvents = (state.new_events ?? []).filter(
+      evt => evt.type === 'wandering_speech' && evt.actor_name && evt.actor_name !== state.you.name,
+    );
+
+    for (const evt of speechEvents) {
+      const speaker = evt.actor_name as string;
+      const text = (evt.text ?? evt.content ?? '') as string;
+      const seatInfo = this.findSeatForPlayer(speaker, state, ctx);
+      result.notifications.push(`[被搭话] ${speaker}${seatInfo}对你说：「${text}」`);
+    }
+
+    if (signals.allowAutoGreet && this.canInitiate(state, ctx, now)) {
+      const candidate = this.pickCandidate(state, ctx, now);
+      if (candidate) {
+        const seatInfo = this.findSeatForPlayer(candidate.name, state, ctx);
+        this.lastInitiateTime = now;
+        this.perPersonCooldowns.set(candidate.name, now + this.config.perPersonCooldownMs);
+        result.notifications.push(`[发言] 视野内出现${candidate.name}${seatInfo}，可以主动打招呼。`);
+      }
+    }
+
+    return result;
+  }
+
+  private canInitiate(state: GameState, ctx: StrategyContext, now: number): boolean {
+    if (!this.config.autoGreetEnabled) return false;
+    if (now - this.lastInitiateTime < this.config.globalCooldownMs) return false;
+    if (state.you.doing_task) return false;
+    if (ctx.reportCorpseTarget) return false;
+    if (ctx.emergency && ctx.emergency.status !== 'completed') return false;
+
+    return true;
+  }
+
+  private pickCandidate(state: GameState, ctx: StrategyContext, now: number): PlayerInfo | null {
+    const mySeat = ctx.mySeat ?? 0;
+    const speechActors = new Set(
+      (state.new_events ?? [])
+        .filter(evt => evt.type === 'wandering_speech' && evt.actor_name)
+        .map(evt => evt.actor_name as string),
+    );
+
+    for (const player of state.players) {
+      const cooldownUntil = this.perPersonCooldowns.get(player.name) ?? 0;
+      if (now < cooldownUntil) continue;
+
+      const theirSeat = player.seat ?? Infinity;
+      if (mySeat >= theirSeat) continue;
+
+      if (speechActors.has(player.name)) continue;
+
+      return player;
+    }
+    return null;
+  }
+
+  /** 会议边界不再暂停移动，也无需清理等待对话状态。 */
+  resetMeetingState(): void {
+  }
+
+  /** 角色变化时刷新发言配置，保留 ConversationGoal 持有的模块实例。 */
+  updateConfig(role: string): void {
+    this.config = getSpeechConfigForRole(role);
+  }
+
+  private findSeatForPlayer(name: string, state: GameState, ctx: StrategyContext): string {
+    const player = state.players.find(p => p.name === name);
+    if (player?.seat != null) return `（${player.seat}号）`;
+    for (const [seat, pName] of Object.entries(ctx.playerNamesBySeat)) {
+      if (pName === name) return `（${seat}号）`;
+    }
+    return '';
+  }
+}
+
+const ROLE_CONFIGS: Record<string, SpeechModuleConfig> = {
+  shrimp_generic: { globalCooldownMs: 30_000, perPersonCooldownMs: 90_000, autoGreetEnabled: true },
+  shrimp_warrior: { globalCooldownMs: 30_000, perPersonCooldownMs: 90_000, autoGreetEnabled: true },
+  shrimp_pistol: { globalCooldownMs: 30_000, perPersonCooldownMs: 90_000, autoGreetEnabled: true },
+  crab_generic: { globalCooldownMs: 30_000, perPersonCooldownMs: 90_000, autoGreetEnabled: false },
+  neutral_paradise_fish: { globalCooldownMs: 20_000, perPersonCooldownMs: 90_000, autoGreetEnabled: true },
+  neutral_octopus: { globalCooldownMs: 30_000, perPersonCooldownMs: 90_000, autoGreetEnabled: false },
+};
+
+const DEFAULT_CONFIG: SpeechModuleConfig = {
+  globalCooldownMs: 30_000,
+  perPersonCooldownMs: 90_000,
+  autoGreetEnabled: true,
+};
+
+export function getSpeechConfigForRole(role: string): SpeechModuleConfig {
+  return ROLE_CONFIGS[role] ?? DEFAULT_CONFIG;
+}

package/src/strategies/strategy-loop.test.ts

@@ -1,15 +1,15 @@
-import { describe, expect, it } from 'vitest';
-import { eventsForStrategyStateLog } from './strategy-loop.js';
-
-describe('eventsForStrategyStateLog', () => {
-  it('drops setup events repeatedly backfilled by getGameState', () => {
-    expect(eventsForStrategyStateLog([
-      { type: 'role_assigned', tick: 0 },
-      { type: 'game_started', tick: 0 },
-      { type: 'crab_teammates', tick: 0 },
-      { type: 'corpse_spotted', tick: 42 },
-    ])).toEqual([
-      { type: 'corpse_spotted', tick: 42 },
-    ]);
-  });
-});
+import { describe, expect, it } from 'vitest';
+import { eventsForStrategyStateLog } from './strategy-loop.js';
+
+describe('eventsForStrategyStateLog', () => {
+  it('drops setup events repeatedly backfilled by getGameState', () => {
+    expect(eventsForStrategyStateLog([
+      { type: 'role_assigned', tick: 0 },
+      { type: 'game_started', tick: 0 },
+      { type: 'crab_teammates', tick: 0 },
+      { type: 'corpse_spotted', tick: 42 },
+    ])).toEqual([
+      { type: 'corpse_spotted', tick: 42 },
+    ]);
+  });
+});