@myclaw163/clawclaw-cli 0.6.60 → 0.6.61

package/src/strategies/goals/avoid-lone-top.ts

@@ -1,168 +1,168 @@
-import type { GameState, PlayerInfo } from '../../sdk/types.js';
-import { dist, hasReachedRoomTarget, PatrolState, PROGRESS_INTERVAL_MS, pursueVisibleTarget } from '../game-utils.js';
-import type { BehaviorDecision, RoomTarget, StrategyContext } from '../types.js';
-import { Goal } from './goal.js';
-import { KeepAwayGoal, type ThreatResolver } from './keep-away-goal.js';
-import { MoveRoomGoal, type RoomArrival } from './move-room-goal.js';
-
-const PATROL_PRIORITY = 0.2;
-const MOVE_PRIORITY = 0.5;
-const EMPTY_GRACE_MS = 8_000;
-// 次近玩家落在这个范围内就原地待着；超出才迈步靠近。须 < 视野半径，留边缘余量。
-const GATHER_FOLLOW_DISTANCE = 200;
-
-type MoveMode = 'patrol' | 'flee' | 'gather';
-
-export class AvoidLoneTop extends Goal {
-  private readonly patrol = new PatrolState();
-  private emptySince: number | null = null;
-  private moveMode: MoveMode | null = null;
-  private lastNoticeKey = '';
-
-  tick(state: GameState, ctx: StrategyContext): BehaviorDecision[] {
-    const now = Date.now();
-    const visible = state.players;
-
-    if (visible.length === 0) {
-      if (this.emptySince == null) this.emptySince = now;
-      // 有「上一条移动」要守护时就尊重 8 秒空视野宽限：flee 靠子目标续命（KeepAwayGoal），
-      // gather 是内联返回的跟随 move（无子目标），靠 moveMode==='gather' 标记守护——
-      // 否则人短暂出视野会被立刻改判巡逻、覆盖掉刚发出的跟随移动。
-      const hasMoveToHold = this.subGoal != null || this.moveMode === 'gather';
-      if (!hasMoveToHold || now - this.emptySince >= EMPTY_GRACE_MS) {
-        this.setPatrolGoal(state, ctx);
-        this.emitProgress(state, ctx, 'patrol', null, visible);
-      } else {
-        this.emitProgress(state, ctx, this.moveMode, null, visible); // 宽限期内维持原目标
-      }
-      return [];
-    }
-
-    this.emptySince = null;
-
-    if (visible.length === 1) {
-      const lone = visible[0].name;
-      this.setKeepAway(`single:${lone}`,
-        currentState => currentState.players.filter(player => player.name === lone));
-      if (!this.emitNotice(ctx, `flee:${lone}`,
-        `视野内只有${lone}，正在寻路避免落单。`))
-        this.emitProgress(state, ctx, 'flee', null, visible);
-      return [];
-    }
-
-    // 2+ 人：跟住「次近」的人。最近的人本就贴着、最不会掉出视野；真正卡在
-    // 「≥2 人 / 跌回 1 人独处」临界点上的是第二近的人，盯住他、保持在视野舒适范围内即可维持人数。
-    this.clearGoal();
-    this.moveMode = 'gather';
-    const anchor = [...visible].sort((a, b) => this.distOf(state, a) - this.distOf(state, b))[1]; // length>=2 必存在
-    const decision = pursueVisibleTarget(state, anchor, { kill: false, followDistance: GATHER_FOLLOW_DISTANCE });
-    if (decision) {
-      if (!this.emitNotice(ctx, `gather:follow:${anchor.name}`,
-        `视野内${visible.length}人，正在靠近${anchor.name}维持人数。`))
-        this.emitProgress(state, ctx, 'gather', null, visible);
-      return [{
-        action: decision.action.withThinking(
-          `跟住次近的${anchor.name}，维持视野内至少两人，避免落单。`,
-        ),
-      }];
-    }
-    if (!this.emitNotice(ctx, `gather:hold:${visible.length}`,
-      `视野内${visible.length}人，已和大家在一起保持安全。`))
-      this.emitProgress(state, ctx, 'gather', null, visible);
-    return [];
-  }
-
-  private distOf(state: GameState, p: PlayerInfo): number {
-    return p.distance ?? dist(state.you.x, state.you.y, p.x, p.y);
-  }
-
-  private setPatrolGoal(state: GameState, ctx: StrategyContext): void {
-    let room = this.patrol.nextRoom(ctx);
-    if (!room) {
-      this.clearGoal();
-      return;
-    }
-
-    if (hasReachedRoomTarget(state, room)) {
-      this.patrol.advance(ctx);
-      room = this.patrol.nextRoom(ctx);
-      if (!room) {
-        this.clearGoal();
-        return;
-      }
-    }
-
-    this.setMoveGoal(room, 'patrol', true, PATROL_PRIORITY);
-    this.lastNoticeKey = '';
-  }
-
-  /**
-   * 寻路躲避：用 KeepAwayGoal 推演逃点远离这个唯一可见的人（不限距离，避免落单）。
-   * finishWhenClear:false——人短暂丢失视野时子目标不自我结束，交由父层 8 秒空视野宽限
-   * 决定何时转巡逻，否则一丢视野就同轮被清、下一 tick 立刻 patrol，宽限只剩一帧会来回摇摆。
-   */
-  private setKeepAway(key: string, resolveThreats: ThreatResolver): void {
-    const worker = this.subGoal;
-    if (worker instanceof KeepAwayGoal && worker.key === key) {
-      this.moveMode = 'flee';
-      return;
-    }
-    if (this.subGoal) this.removeSubGoal();
-    this.setSubGoal(new KeepAwayGoal(key, resolveThreats, {
-      threatRadius: Infinity,
-      finishWhenClear: false,
-      noun: '',
-    }), MOVE_PRIORITY);
-    this.moveMode = 'flee';
-  }
-
-  private setMoveGoal(
-    room: RoomTarget,
-    mode: MoveMode,
-    stopOnPlayer: boolean,
-    priority = MOVE_PRIORITY,
-    hasArrived: RoomArrival = hasReachedRoomTarget,
-  ): void {
-    const worker = this.subGoal;
-    if (worker instanceof MoveRoomGoal && worker.room === room.name && this.moveMode === mode) return;
-    if (this.subGoal) this.removeSubGoal();
-    this.setSubGoal(new MoveRoomGoal(room.name, hasArrived, {
-      emitProgress: false,
-      stopOnPlayer,
-    }), priority);
-    this.moveMode = mode;
-  }
-
-  private clearGoal(): void {
-    if (this.subGoal) this.removeSubGoal();
-    this.moveMode = null;
-  }
-
-  private emitNotice(ctx: StrategyContext, key: string, message: string): boolean {
-    if (key === this.lastNoticeKey) return false;
-    this.lastNoticeKey = key;
-    ctx.notifications.push(message);
-    return true;
-  }
-
-  private emitProgress(
-    state: GameState,
-    ctx: StrategyContext,
-    mode: MoveMode | null,
-    target: RoomTarget | null,
-    visible: PlayerInfo[],
-  ): void {
-    const now = Date.now();
-    if (now - ctx.lastProgressNotifyAt < PROGRESS_INTERVAL_MS) return;
-    ctx.lastProgressNotifyAt = now;
-
-    const room = state.you.room ?? '未知';
-    let msg = `[进度] 当前在${room}，视野内${visible.length}人`;
-    if (mode === 'gather') msg += '，正在跟随人群';
-    else if (mode === 'flee') msg += '，正在避免落单风险';
-    else msg += '，正在巡逻寻找人群';
-    if (target) msg += `，前往${target.name}`;
-    msg += '。';
-    ctx.notifications.push(msg);
-  }
-}
+import type { GameState, PlayerInfo } from '../../sdk/types.js';
+import { dist, hasReachedRoomTarget, PatrolState, PROGRESS_INTERVAL_MS, pursueVisibleTarget } from '../game-utils.js';
+import type { BehaviorDecision, RoomTarget, StrategyContext } from '../types.js';
+import { Goal } from './goal.js';
+import { KeepAwayGoal, type ThreatResolver } from './keep-away-goal.js';
+import { MoveRoomGoal, type RoomArrival } from './move-room-goal.js';
+
+const PATROL_PRIORITY = 0.2;
+const MOVE_PRIORITY = 0.5;
+const EMPTY_GRACE_MS = 8_000;
+// 次近玩家落在这个范围内就原地待着；超出才迈步靠近。须 < 视野半径，留边缘余量。
+const GATHER_FOLLOW_DISTANCE = 200;
+
+type MoveMode = 'patrol' | 'flee' | 'gather';
+
+export class AvoidLoneTop extends Goal {
+  private readonly patrol = new PatrolState();
+  private emptySince: number | null = null;
+  private moveMode: MoveMode | null = null;
+  private lastNoticeKey = '';
+
+  tick(state: GameState, ctx: StrategyContext): BehaviorDecision[] {
+    const now = Date.now();
+    const visible = state.players;
+
+    if (visible.length === 0) {
+      if (this.emptySince == null) this.emptySince = now;
+      // 有「上一条移动」要守护时就尊重 8 秒空视野宽限：flee 靠子目标续命（KeepAwayGoal），
+      // gather 是内联返回的跟随 move（无子目标），靠 moveMode==='gather' 标记守护——
+      // 否则人短暂出视野会被立刻改判巡逻、覆盖掉刚发出的跟随移动。
+      const hasMoveToHold = this.subGoal != null || this.moveMode === 'gather';
+      if (!hasMoveToHold || now - this.emptySince >= EMPTY_GRACE_MS) {
+        this.setPatrolGoal(state, ctx);
+        this.emitProgress(state, ctx, 'patrol', null, visible);
+      } else {
+        this.emitProgress(state, ctx, this.moveMode, null, visible); // 宽限期内维持原目标
+      }
+      return [];
+    }
+
+    this.emptySince = null;
+
+    if (visible.length === 1) {
+      const lone = visible[0].name;
+      this.setKeepAway(`single:${lone}`,
+        currentState => currentState.players.filter(player => player.name === lone));
+      if (!this.emitNotice(ctx, `flee:${lone}`,
+        `视野内只有${lone}，正在寻路避免落单。`))
+        this.emitProgress(state, ctx, 'flee', null, visible);
+      return [];
+    }
+
+    // 2+ 人：跟住「次近」的人。最近的人本就贴着、最不会掉出视野；真正卡在
+    // 「≥2 人 / 跌回 1 人独处」临界点上的是第二近的人，盯住他、保持在视野舒适范围内即可维持人数。
+    this.clearGoal();
+    this.moveMode = 'gather';
+    const anchor = [...visible].sort((a, b) => this.distOf(state, a) - this.distOf(state, b))[1]; // length>=2 必存在
+    const decision = pursueVisibleTarget(state, anchor, { kill: false, followDistance: GATHER_FOLLOW_DISTANCE });
+    if (decision) {
+      if (!this.emitNotice(ctx, `gather:follow:${anchor.name}`,
+        `视野内${visible.length}人，正在靠近${anchor.name}维持人数。`))
+        this.emitProgress(state, ctx, 'gather', null, visible);
+      return [{
+        action: decision.action.withThinking(
+          `跟住次近的${anchor.name}，维持视野内至少两人，避免落单。`,
+        ),
+      }];
+    }
+    if (!this.emitNotice(ctx, `gather:hold:${visible.length}`,
+      `视野内${visible.length}人，已和大家在一起保持安全。`))
+      this.emitProgress(state, ctx, 'gather', null, visible);
+    return [];
+  }
+
+  private distOf(state: GameState, p: PlayerInfo): number {
+    return p.distance ?? dist(state.you.x, state.you.y, p.x, p.y);
+  }
+
+  private setPatrolGoal(state: GameState, ctx: StrategyContext): void {
+    let room = this.patrol.nextRoom(ctx);
+    if (!room) {
+      this.clearGoal();
+      return;
+    }
+
+    if (hasReachedRoomTarget(state, room)) {
+      this.patrol.advance(ctx);
+      room = this.patrol.nextRoom(ctx);
+      if (!room) {
+        this.clearGoal();
+        return;
+      }
+    }
+
+    this.setMoveGoal(room, 'patrol', true, PATROL_PRIORITY);
+    this.lastNoticeKey = '';
+  }
+
+  /**
+   * 寻路躲避：用 KeepAwayGoal 推演逃点远离这个唯一可见的人（不限距离，避免落单）。
+   * finishWhenClear:false——人短暂丢失视野时子目标不自我结束，交由父层 8 秒空视野宽限
+   * 决定何时转巡逻，否则一丢视野就同轮被清、下一 tick 立刻 patrol，宽限只剩一帧会来回摇摆。
+   */
+  private setKeepAway(key: string, resolveThreats: ThreatResolver): void {
+    const worker = this.subGoal;
+    if (worker instanceof KeepAwayGoal && worker.key === key) {
+      this.moveMode = 'flee';
+      return;
+    }
+    if (this.subGoal) this.removeSubGoal();
+    this.setSubGoal(new KeepAwayGoal(key, resolveThreats, {
+      threatRadius: Infinity,
+      finishWhenClear: false,
+      noun: '',
+    }), MOVE_PRIORITY);
+    this.moveMode = 'flee';
+  }
+
+  private setMoveGoal(
+    room: RoomTarget,
+    mode: MoveMode,
+    stopOnPlayer: boolean,
+    priority = MOVE_PRIORITY,
+    hasArrived: RoomArrival = hasReachedRoomTarget,
+  ): void {
+    const worker = this.subGoal;
+    if (worker instanceof MoveRoomGoal && worker.room === room.name && this.moveMode === mode) return;
+    if (this.subGoal) this.removeSubGoal();
+    this.setSubGoal(new MoveRoomGoal(room.name, hasArrived, {
+      emitProgress: false,
+      stopOnPlayer,
+    }), priority);
+    this.moveMode = mode;
+  }
+
+  private clearGoal(): void {
+    if (this.subGoal) this.removeSubGoal();
+    this.moveMode = null;
+  }
+
+  private emitNotice(ctx: StrategyContext, key: string, message: string): boolean {
+    if (key === this.lastNoticeKey) return false;
+    this.lastNoticeKey = key;
+    ctx.notifications.push(message);
+    return true;
+  }
+
+  private emitProgress(
+    state: GameState,
+    ctx: StrategyContext,
+    mode: MoveMode | null,
+    target: RoomTarget | null,
+    visible: PlayerInfo[],
+  ): void {
+    const now = Date.now();
+    if (now - ctx.lastProgressNotifyAt < PROGRESS_INTERVAL_MS) return;
+    ctx.lastProgressNotifyAt = now;
+
+    const room = state.you.room ?? '未知';
+    let msg = `[进度] 当前在${room}，视野内${visible.length}人`;
+    if (mode === 'gather') msg += '，正在跟随人群';
+    else if (mode === 'flee') msg += '，正在避免落单风险';
+    else msg += '，正在巡逻寻找人群';
+    if (target) msg += `，前往${target.name}`;
+    msg += '。';
+    ctx.notifications.push(msg);
+  }
+}

package/src/strategies/goals/avoid-players-top.test.ts

@@ -1,83 +1,83 @@
-import { describe, expect, it } from 'vitest';
-import type { GameState } from '../../sdk/types.js';
-import type { StrategyContext } from '../types.js';
-import { AvoidPlayersTop } from './avoid-players-top.js';
-
-function state(overrides: Partial<GameState> = {}): GameState {
-  return {
-    phase: 'wandering',
-    tick: 1,
-    you: {
-      name: 'self',
-      x: 0,
-      y: 0,
-      room: 'start',
-      role: 'neutral_octopus',
-      faction: 'neutral',
-      is_alive: true,
-    },
-    your_tasks: [],
-    players: [],
-    corpses: [],
-    stale: false,
-    ...overrides,
-  };
-}
-
-function context(overrides: Partial<StrategyContext> = {}): StrategyContext {
-  return {
-    taskData: [],
-    emergency: null,
-    taskLocalBlockedUntil: 0,
-    reportCorpseTarget: null,
-    reportBlockedUntil: 0,
-    notifications: [],
-    lastProgressNotifyAt: Date.now(),
-    teammates: new Set(),
-    alarmDone: false,
-    rooms: [{ name: 'patrol', x: 500, y: 0 }],
-    playerNamesBySeat: {},
-    forcePatrolAdvance: false,
-    blockedMoveTarget: null,
-    mySeat: 1,
-    speechNotifications: [],
-    agentAlerts: [],
-    ...overrides,
-  };
-}
-
-describe('AvoidPlayersTop', () => {
-  it('patrols without stop_on_player when the avoid list has no active threat', () => {
-    const top = new AvoidPlayersTop([]);
-    const ctx = context();
-    const current = state({
-      players: [{ name: 'roadie', x: 200, y: 0, room: 'start' }],
-    });
-
-    top.tick(current, ctx);
-    const decisions = top.subGoal?.tick(current, ctx) ?? [];
-
-    expect(decisions).toHaveLength(1);
-    expect(decisions[0].action.type).toBe('move');
-    expect(decisions[0].action.payload).toMatchObject({ target_x: 500, target_y: 0 });
-    expect(decisions[0].action.payload).not.toHaveProperty('stop_on_player');
-  });
-
-  it('patrols without stop_on_player when the configured avoid target is dead', () => {
-    const top = new AvoidPlayersTop(['dead-target']);
-    const ctx = context();
-    const current = state({
-      players: [{ name: 'roadie', x: 200, y: 0, room: 'start' }],
-      all_players: [
-        { name: 'dead-target', role: 'lobster', is_alive: false, seat: 2 },
-        { name: 'roadie', role: 'lobster', is_alive: true, seat: 3 },
-      ],
-    });
-
-    top.tick(current, ctx);
-    const decisions = top.subGoal?.tick(current, ctx) ?? [];
-
-    expect(decisions).toHaveLength(1);
-    expect(decisions[0].action.payload).not.toHaveProperty('stop_on_player');
-  });
-});
+import { describe, expect, it } from 'vitest';
+import type { GameState } from '../../sdk/types.js';
+import type { StrategyContext } from '../types.js';
+import { AvoidPlayersTop } from './avoid-players-top.js';
+
+function state(overrides: Partial<GameState> = {}): GameState {
+  return {
+    phase: 'wandering',
+    tick: 1,
+    you: {
+      name: 'self',
+      x: 0,
+      y: 0,
+      room: 'start',
+      role: 'neutral_octopus',
+      faction: 'neutral',
+      is_alive: true,
+    },
+    your_tasks: [],
+    players: [],
+    corpses: [],
+    stale: false,
+    ...overrides,
+  };
+}
+
+function context(overrides: Partial<StrategyContext> = {}): StrategyContext {
+  return {
+    taskData: [],
+    emergency: null,
+    taskLocalBlockedUntil: 0,
+    reportCorpseTarget: null,
+    reportBlockedUntil: 0,
+    notifications: [],
+    lastProgressNotifyAt: Date.now(),
+    teammates: new Set(),
+    alarmDone: false,
+    rooms: [{ name: 'patrol', x: 500, y: 0 }],
+    playerNamesBySeat: {},
+    forcePatrolAdvance: false,
+    blockedMoveTarget: null,
+    mySeat: 1,
+    speechNotifications: [],
+    agentAlerts: [],
+    ...overrides,
+  };
+}
+
+describe('AvoidPlayersTop', () => {
+  it('patrols without stop_on_player when the avoid list has no active threat', () => {
+    const top = new AvoidPlayersTop([]);
+    const ctx = context();
+    const current = state({
+      players: [{ name: 'roadie', x: 200, y: 0, room: 'start' }],
+    });
+
+    top.tick(current, ctx);
+    const decisions = top.subGoal?.tick(current, ctx) ?? [];
+
+    expect(decisions).toHaveLength(1);
+    expect(decisions[0].action.type).toBe('move');
+    expect(decisions[0].action.payload).toMatchObject({ target_x: 500, target_y: 0 });
+    expect(decisions[0].action.payload).not.toHaveProperty('stop_on_player');
+  });
+
+  it('patrols without stop_on_player when the configured avoid target is dead', () => {
+    const top = new AvoidPlayersTop(['dead-target']);
+    const ctx = context();
+    const current = state({
+      players: [{ name: 'roadie', x: 200, y: 0, room: 'start' }],
+      all_players: [
+        { name: 'dead-target', role: 'lobster', is_alive: false, seat: 2 },
+        { name: 'roadie', role: 'lobster', is_alive: true, seat: 3 },
+      ],
+    });
+
+    top.tick(current, ctx);
+    const decisions = top.subGoal?.tick(current, ctx) ?? [];
+
+    expect(decisions).toHaveLength(1);
+    expect(decisions[0].action.payload).not.toHaveProperty('stop_on_player');
+  });
+});