@myclaw163/clawclaw-cli 0.6.74 → 0.6.77

package/src/strategies/custom-module.test.ts

@@ -1,270 +1,270 @@
-import { describe, it, expect } from 'vitest';
-import type { BehaviorDecision, CustomModule, Strategy, StrategyContext, StrategyEntry } from './types.js';
-import type { GameState } from '../sdk/types.js';
-import { Action } from '../sdk/action.js';
-import { emptyKnowledgeView } from '../lib/knowledge-store.js';
-
-function makeMoveDecision(): BehaviorDecision {
-  return { action: Action.move({ x: 100, y: 100 }) };
-}
-
-function makeKillDecision(): BehaviorDecision {
-  return { action: Action.kill('target') };
-}
-
-class TestCustomModule implements CustomModule {
-  processEventsCalled = 0;
-  afterDecideCalled = 0;
-  onMeetingResumeCalled = 0;
-  onMapLoadedCalled = 0;
-  lastTick = -1;
-  lastEventCount = 0;
-  lastRooms: any[] = [];
-  lastState: GameState | null = null;
-  lastDecisions: BehaviorDecision[] = [];
-
-  processEvents(events: any[], tick: number, state: GameState): void {
-    this.processEventsCalled++;
-    this.lastTick = tick;
-    this.lastEventCount = events.length;
-    this.lastState = state;
-  }
-
-  afterDecide(decisions: BehaviorDecision[], _state: GameState, _ctx: StrategyContext): BehaviorDecision[] {
-    this.afterDecideCalled++;
-    this.lastDecisions = decisions;
-    return decisions;
-  }
-
-  onMeetingResume(): void {
-    this.onMeetingResumeCalled++;
-  }
-
-  onMapLoaded(rawRooms: any[]): void {
-    this.onMapLoadedCalled++;
-    this.lastRooms = rawRooms;
-  }
-}
-
-/** Module that filters out move decisions (simulates SpeechModule suppress behavior). */
-class SuppressMoveModule implements CustomModule {
-  processEvents(_events: any[], _tick: number, _state: GameState): void {}
-  afterDecide(decisions: BehaviorDecision[], _state: GameState, _ctx: StrategyContext): BehaviorDecision[] {
-    return decisions.filter(d => d.action.type !== 'move');
-  }
-}
-
-class TestCustomModuleStrategy implements Strategy {
-  readonly name = 'test-custom-module';
-  private module: TestCustomModule;
-
-  constructor() {
-    this.module = new TestCustomModule();
-  }
-
-  customModules(): CustomModule[] {
-    return [this.module];
-  }
-
-  decide() {
-    return [];
-  }
-}
-
-const testEntry: StrategyEntry = {
-  id: 'test-custom-module',
-  name: 'test-custom-module',
-  description: 'Internal test strategy for CustomModule verification.',
-  create() {
-    return new TestCustomModuleStrategy();
-  },
-};
-
-const FAKE_STATE = { phase: 'wandering', tick: 1 } as GameState;
-
-function makeCtx(overrides: Partial<StrategyContext> = {}): StrategyContext {
-  return {
-    taskData: [],
-    emergency: null,
-    taskLocalBlockedUntil: 0,
-    reportCorpseTarget: null,
-    reportBlockedUntil: 0,
-    notifications: [],
-    lastProgressNotifyAt: 0,
-    teammates: new Set(),
-    alarmDone: false,
-    rooms: [],
-    playerNamesBySeat: {},
-    forcePatrolAdvance: false,
-    blockedMoveTarget: null,
-    mySeat: 1,
-    speechNotifications: [],
-    agentAlerts: [],
-    knowledge: emptyKnowledgeView(),
-    ...overrides,
-  };
-}
-
-describe('CustomModule interface', () => {
-  describe('TestCustomModule lifecycle', () => {
-    it('processEvents receives events, tick, and state', () => {
-      const mod = new TestCustomModule();
-      const events = [{ type: 'player_moved', actor: 'p1' }, { type: 'kill', actor: 'p2' }];
-
-      mod.processEvents(events, 42, FAKE_STATE);
-
-      expect(mod.processEventsCalled).toBe(1);
-      expect(mod.lastTick).toBe(42);
-      expect(mod.lastEventCount).toBe(2);
-      expect(mod.lastState).toBe(FAKE_STATE);
-    });
-
-    it('afterDecide receives and can modify decisions', () => {
-      const mod = new TestCustomModule();
-      const decisions = [makeMoveDecision(), makeKillDecision()];
-
-      const result = mod.afterDecide(decisions, FAKE_STATE, makeCtx());
-
-      expect(mod.afterDecideCalled).toBe(1);
-      expect(result).toEqual(decisions);
-    });
-
-    it('onMeetingResume is callable', () => {
-      const mod = new TestCustomModule();
-      mod.onMeetingResume();
-      mod.onMeetingResume();
-      expect(mod.onMeetingResumeCalled).toBe(2);
-    });
-
-    it('onMapLoaded receives raw rooms', () => {
-      const mod = new TestCustomModule();
-      const rooms = [{ name: 'room1', polygon: [[0, 0], [10, 0], [10, 10], [0, 10]] }];
-
-      mod.onMapLoaded(rooms);
-
-      expect(mod.onMapLoadedCalled).toBe(1);
-      expect(mod.lastRooms).toEqual(rooms);
-    });
-  });
-
-  describe('Strategy.customModules()', () => {
-    it('test strategy returns modules via customModules()', () => {
-      const strat = testEntry.create();
-      expect(strat.customModules).toBeDefined();
-
-      const modules = strat.customModules!();
-      expect(modules).toHaveLength(1);
-      expect(modules[0]).toBeInstanceOf(TestCustomModule);
-    });
-
-    it('customModules() returns the same instance on repeated calls', () => {
-      const strat = testEntry.create();
-      const a = strat.customModules!();
-      const b = strat.customModules!();
-      expect(a[0]).toBe(b[0]);
-    });
-  });
-
-  describe('Strategy-loop lifecycle simulation', () => {
-    it('simulates processEvents → afterDecide → onMeetingResume → onMapLoaded sequence', () => {
-      const strat = testEntry.create();
-      const modules = strat.customModules!();
-      const mod = modules[0] as TestCustomModule;
-      const ctx = makeCtx();
-
-      // Simulate 3 ticks: processEvents then afterDecide
-      for (let tick = 1; tick <= 3; tick++) {
-        mod.processEvents([{ type: 'player_moved' }], tick, FAKE_STATE);
-        mod.afterDecide([makeMoveDecision()], FAKE_STATE, ctx);
-      }
-      expect(mod.processEventsCalled).toBe(3);
-      expect(mod.afterDecideCalled).toBe(3);
-      expect(mod.lastTick).toBe(3);
-
-      // Simulate map load
-      mod.onMapLoaded?.([{ name: 'kitchen' }, { name: 'medbay' }]);
-      expect(mod.onMapLoadedCalled).toBe(1);
-
-      // Simulate meeting end
-      mod.onMeetingResume?.();
-      expect(mod.onMeetingResumeCalled).toBe(1);
-
-      // Post-meeting tick
-      mod.processEvents([{ type: 'session_started' }], 4, FAKE_STATE);
-      mod.afterDecide([], FAKE_STATE, ctx);
-      expect(mod.processEventsCalled).toBe(4);
-      expect(mod.afterDecideCalled).toBe(4);
-    });
-  });
-
-  describe('afterDecide pipeline', () => {
-    it('module can filter decisions (chained)', () => {
-      const mod = new SuppressMoveModule();
-      const decisions = [makeKillDecision(), makeMoveDecision()];
-
-      const result = mod.afterDecide(decisions, FAKE_STATE, makeCtx());
-
-      expect(result).toHaveLength(1);
-      expect(result[0].action.type).toBe('kill');
-    });
-
-    it('multiple modules chain by registration order', () => {
-      const mod1 = new TestCustomModule();
-      const mod2 = new SuppressMoveModule();
-      const modules: CustomModule[] = [mod1, mod2];
-      const ctx = makeCtx();
-
-      let decisions: BehaviorDecision[] = [makeKillDecision(), makeMoveDecision()];
-      for (const mod of modules) {
-        if (mod.afterDecide) {
-          decisions = mod.afterDecide(decisions, FAKE_STATE, ctx);
-        }
-      }
-
-      // mod1 saw both decisions, mod2 filtered out move
-      expect(mod1.lastDecisions).toHaveLength(2);
-      expect(decisions).toHaveLength(1);
-      expect(decisions[0].action.type).toBe('kill');
-    });
-
-    it('module without afterDecide is skipped', () => {
-      const minimal: CustomModule = {
-        processEvents(_events, _tick) {},
-      };
-      const decisions = [makeMoveDecision()];
-      const ctx = makeCtx();
-
-      // afterDecide is optional — strategy-loop skips if undefined
-      const result = minimal.afterDecide
-        ? minimal.afterDecide(decisions, FAKE_STATE, ctx)
-        : decisions;
-
-      expect(result).toBe(decisions);
-    });
-  });
-
-  describe('CustomModule type conformance', () => {
-    it('module with only processEvents satisfies CustomModule', () => {
-      const minimal: CustomModule = {
-        processEvents(_events, _tick) {},
-      };
-      expect(minimal.processEvents).toBeDefined();
-      expect(minimal.afterDecide).toBeUndefined();
-      expect(minimal.onMeetingResume).toBeUndefined();
-      expect(minimal.onMapLoaded).toBeUndefined();
-    });
-
-    it('module with all hooks satisfies CustomModule', () => {
-      const full: CustomModule = {
-        processEvents(_events, _tick) {},
-        afterDecide(d, _state, _ctx) { return d; },
-        onMeetingResume() {},
-        onMapLoaded(_rooms) {},
-      };
-      expect(full.processEvents).toBeDefined();
-      expect(full.afterDecide).toBeDefined();
-      expect(full.onMeetingResume).toBeDefined();
-      expect(full.onMapLoaded).toBeDefined();
-    });
-  });
-});
+import { describe, it, expect } from 'vitest';
+import type { BehaviorDecision, CustomModule, Strategy, StrategyContext, StrategyEntry } from './types.js';
+import type { GameState } from '../sdk/types.js';
+import { Action } from '../sdk/action.js';
+import { emptyKnowledgeView } from '../lib/knowledge-store.js';
+
+function makeMoveDecision(): BehaviorDecision {
+  return { action: Action.move({ x: 100, y: 100 }) };
+}
+
+function makeKillDecision(): BehaviorDecision {
+  return { action: Action.kill('target') };
+}
+
+class TestCustomModule implements CustomModule {
+  processEventsCalled = 0;
+  afterDecideCalled = 0;
+  onMeetingResumeCalled = 0;
+  onMapLoadedCalled = 0;
+  lastTick = -1;
+  lastEventCount = 0;
+  lastRooms: any[] = [];
+  lastState: GameState | null = null;
+  lastDecisions: BehaviorDecision[] = [];
+
+  processEvents(events: any[], tick: number, state: GameState): void {
+    this.processEventsCalled++;
+    this.lastTick = tick;
+    this.lastEventCount = events.length;
+    this.lastState = state;
+  }
+
+  afterDecide(decisions: BehaviorDecision[], _state: GameState, _ctx: StrategyContext): BehaviorDecision[] {
+    this.afterDecideCalled++;
+    this.lastDecisions = decisions;
+    return decisions;
+  }
+
+  onMeetingResume(): void {
+    this.onMeetingResumeCalled++;
+  }
+
+  onMapLoaded(rawRooms: any[]): void {
+    this.onMapLoadedCalled++;
+    this.lastRooms = rawRooms;
+  }
+}
+
+/** Module that filters out move decisions (simulates SpeechModule suppress behavior). */
+class SuppressMoveModule implements CustomModule {
+  processEvents(_events: any[], _tick: number, _state: GameState): void {}
+  afterDecide(decisions: BehaviorDecision[], _state: GameState, _ctx: StrategyContext): BehaviorDecision[] {
+    return decisions.filter(d => d.action.type !== 'move');
+  }
+}
+
+class TestCustomModuleStrategy implements Strategy {
+  readonly name = 'test-custom-module';
+  private module: TestCustomModule;
+
+  constructor() {
+    this.module = new TestCustomModule();
+  }
+
+  customModules(): CustomModule[] {
+    return [this.module];
+  }
+
+  decide() {
+    return [];
+  }
+}
+
+const testEntry: StrategyEntry = {
+  id: 'test-custom-module',
+  name: 'test-custom-module',
+  description: 'Internal test strategy for CustomModule verification.',
+  create() {
+    return new TestCustomModuleStrategy();
+  },
+};
+
+const FAKE_STATE = { phase: 'wandering', tick: 1 } as GameState;
+
+function makeCtx(overrides: Partial<StrategyContext> = {}): StrategyContext {
+  return {
+    taskData: [],
+    emergency: null,
+    taskLocalBlockedUntil: 0,
+    reportCorpseTarget: null,
+    reportBlockedUntil: 0,
+    notifications: [],
+    lastProgressNotifyAt: 0,
+    teammates: new Set(),
+    alarmDone: false,
+    rooms: [],
+    playerNamesBySeat: {},
+    forcePatrolAdvance: false,
+    blockedMoveTarget: null,
+    mySeat: 1,
+    speechNotifications: [],
+    agentAlerts: [],
+    knowledge: emptyKnowledgeView(),
+    ...overrides,
+  };
+}
+
+describe('CustomModule interface', () => {
+  describe('TestCustomModule lifecycle', () => {
+    it('processEvents receives events, tick, and state', () => {
+      const mod = new TestCustomModule();
+      const events = [{ type: 'player_moved', actor: 'p1' }, { type: 'kill', actor: 'p2' }];
+
+      mod.processEvents(events, 42, FAKE_STATE);
+
+      expect(mod.processEventsCalled).toBe(1);
+      expect(mod.lastTick).toBe(42);
+      expect(mod.lastEventCount).toBe(2);
+      expect(mod.lastState).toBe(FAKE_STATE);
+    });
+
+    it('afterDecide receives and can modify decisions', () => {
+      const mod = new TestCustomModule();
+      const decisions = [makeMoveDecision(), makeKillDecision()];
+
+      const result = mod.afterDecide(decisions, FAKE_STATE, makeCtx());
+
+      expect(mod.afterDecideCalled).toBe(1);
+      expect(result).toEqual(decisions);
+    });
+
+    it('onMeetingResume is callable', () => {
+      const mod = new TestCustomModule();
+      mod.onMeetingResume();
+      mod.onMeetingResume();
+      expect(mod.onMeetingResumeCalled).toBe(2);
+    });
+
+    it('onMapLoaded receives raw rooms', () => {
+      const mod = new TestCustomModule();
+      const rooms = [{ name: 'room1', polygon: [[0, 0], [10, 0], [10, 10], [0, 10]] }];
+
+      mod.onMapLoaded(rooms);
+
+      expect(mod.onMapLoadedCalled).toBe(1);
+      expect(mod.lastRooms).toEqual(rooms);
+    });
+  });
+
+  describe('Strategy.customModules()', () => {
+    it('test strategy returns modules via customModules()', () => {
+      const strat = testEntry.create();
+      expect(strat.customModules).toBeDefined();
+
+      const modules = strat.customModules!();
+      expect(modules).toHaveLength(1);
+      expect(modules[0]).toBeInstanceOf(TestCustomModule);
+    });
+
+    it('customModules() returns the same instance on repeated calls', () => {
+      const strat = testEntry.create();
+      const a = strat.customModules!();
+      const b = strat.customModules!();
+      expect(a[0]).toBe(b[0]);
+    });
+  });
+
+  describe('Strategy-loop lifecycle simulation', () => {
+    it('simulates processEvents → afterDecide → onMeetingResume → onMapLoaded sequence', () => {
+      const strat = testEntry.create();
+      const modules = strat.customModules!();
+      const mod = modules[0] as TestCustomModule;
+      const ctx = makeCtx();
+
+      // Simulate 3 ticks: processEvents then afterDecide
+      for (let tick = 1; tick <= 3; tick++) {
+        mod.processEvents([{ type: 'player_moved' }], tick, FAKE_STATE);
+        mod.afterDecide([makeMoveDecision()], FAKE_STATE, ctx);
+      }
+      expect(mod.processEventsCalled).toBe(3);
+      expect(mod.afterDecideCalled).toBe(3);
+      expect(mod.lastTick).toBe(3);
+
+      // Simulate map load
+      mod.onMapLoaded?.([{ name: 'kitchen' }, { name: 'medbay' }]);
+      expect(mod.onMapLoadedCalled).toBe(1);
+
+      // Simulate meeting end
+      mod.onMeetingResume?.();
+      expect(mod.onMeetingResumeCalled).toBe(1);
+
+      // Post-meeting tick
+      mod.processEvents([{ type: 'session_started' }], 4, FAKE_STATE);
+      mod.afterDecide([], FAKE_STATE, ctx);
+      expect(mod.processEventsCalled).toBe(4);
+      expect(mod.afterDecideCalled).toBe(4);
+    });
+  });
+
+  describe('afterDecide pipeline', () => {
+    it('module can filter decisions (chained)', () => {
+      const mod = new SuppressMoveModule();
+      const decisions = [makeKillDecision(), makeMoveDecision()];
+
+      const result = mod.afterDecide(decisions, FAKE_STATE, makeCtx());
+
+      expect(result).toHaveLength(1);
+      expect(result[0].action.type).toBe('kill');
+    });
+
+    it('multiple modules chain by registration order', () => {
+      const mod1 = new TestCustomModule();
+      const mod2 = new SuppressMoveModule();
+      const modules: CustomModule[] = [mod1, mod2];
+      const ctx = makeCtx();
+
+      let decisions: BehaviorDecision[] = [makeKillDecision(), makeMoveDecision()];
+      for (const mod of modules) {
+        if (mod.afterDecide) {
+          decisions = mod.afterDecide(decisions, FAKE_STATE, ctx);
+        }
+      }
+
+      // mod1 saw both decisions, mod2 filtered out move
+      expect(mod1.lastDecisions).toHaveLength(2);
+      expect(decisions).toHaveLength(1);
+      expect(decisions[0].action.type).toBe('kill');
+    });
+
+    it('module without afterDecide is skipped', () => {
+      const minimal: CustomModule = {
+        processEvents(_events, _tick) {},
+      };
+      const decisions = [makeMoveDecision()];
+      const ctx = makeCtx();
+
+      // afterDecide is optional — strategy-loop skips if undefined
+      const result = minimal.afterDecide
+        ? minimal.afterDecide(decisions, FAKE_STATE, ctx)
+        : decisions;
+
+      expect(result).toBe(decisions);
+    });
+  });
+
+  describe('CustomModule type conformance', () => {
+    it('module with only processEvents satisfies CustomModule', () => {
+      const minimal: CustomModule = {
+        processEvents(_events, _tick) {},
+      };
+      expect(minimal.processEvents).toBeDefined();
+      expect(minimal.afterDecide).toBeUndefined();
+      expect(minimal.onMeetingResume).toBeUndefined();
+      expect(minimal.onMapLoaded).toBeUndefined();
+    });
+
+    it('module with all hooks satisfies CustomModule', () => {
+      const full: CustomModule = {
+        processEvents(_events, _tick) {},
+        afterDecide(d, _state, _ctx) { return d; },
+        onMeetingResume() {},
+        onMapLoaded(_rooms) {},
+      };
+      expect(full.processEvents).toBeDefined();
+      expect(full.afterDecide).toBeDefined();
+      expect(full.onMeetingResume).toBeDefined();
+      expect(full.onMapLoaded).toBeDefined();
+    });
+  });
+});

package/src/strategies/find-player.ts

@@ -1,17 +1,17 @@
-import type { StrategyEntry } from './types.js';
-import { GoalRootStrategy } from './goals/goal-root-strategy.js';
-import { FindPlayerTop } from './goals/find-player-top.js';
-import { parseTargetArgs } from './player-targets.js';
-
-export const strategy: StrategyEntry = {
-  id: 'find-player',
-  name: '盯人',
-  description: '全力寻找并贴身跟踪一个指定目标（座位号或名字，单个）。看到就贴上去近距离尾随（约40距离）；跟丢就先奔向最后出现的位置，再按房间顺序不停巡逻直到目标重新出现，绝不放弃。只跟踪、不出刀、不做任务、不报告；目标死亡即停。',
-  create(args?: string[]) {
-    const targets = args ? parseTargetArgs(args) : [];
-    if (targets.length === 0) {
-      throw new Error('find-player strategy requires a target seat number or player name as argument.');
-    }
-    return new GoalRootStrategy('find-player', () => new FindPlayerTop(targets[0]), { resetOnMeetingResume: false });
-  },
-};
+import type { StrategyEntry } from './types.js';
+import { GoalRootStrategy } from './goals/goal-root-strategy.js';
+import { FindPlayerTop } from './goals/find-player-top.js';
+import { parseTargetArgs } from './player-targets.js';
+
+export const strategy: StrategyEntry = {
+  id: 'find-player',
+  name: '盯人',
+  description: '全力寻找并贴身跟踪一个指定目标（座位号或名字，单个）。看到就贴上去近距离尾随（约40距离）；跟丢就先奔向最后出现的位置，再按房间顺序不停巡逻直到目标重新出现，绝不放弃。只跟踪、不出刀、不做任务、不报告；目标死亡即停。',
+  create(args?: string[]) {
+    const targets = args ? parseTargetArgs(args) : [];
+    if (targets.length === 0) {
+      throw new Error('find-player strategy requires a target seat number or player name as argument.');
+    }
+    return new GoalRootStrategy('find-player', () => new FindPlayerTop(targets[0]), { resetOnMeetingResume: false });
+  },
+};