@myclaw163/clawclaw-cli 0.6.57 → 0.6.58

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

@@ -1,121 +1,121 @@
-import type { GameState, PlayerInfo } from '../../sdk/types.js';
-import { hasReachedRoomTarget, isKnowledgeThreat, isTargetAlive, matchesAnyTarget, PatrolState, PROGRESS_INTERVAL_MS } from '../game-utils.js';
-import type { BehaviorDecision, RoomTarget, StrategyContext } from '../types.js';
-import { Goal } from './goal.js';
-import { KeepAwayGoal, type KeepAwayGoalOptions, type ThreatResolver } from './keep-away-goal.js';
-import { MoveRoomGoal } from './move-room-goal.js';
-
-const PATROL_PRIORITY = 0.2;
-const FLEE_PRIORITY = 0.5;
-
-export class AvoidPlayersTop extends Goal {
-  private readonly patrol = new PatrolState();
-  private moveMode: 'patrol' | 'flee' | null = null;
-  private lastAvoidNoticeKey = '';
-
-  constructor(private readonly targets: string[]) {
-    super();
-  }
-
-  tick(state: GameState, ctx: StrategyContext): BehaviorDecision[] {
-    const threats = this.threats(state, ctx);
-
-    if (threats.length > 0) {
-      this.setKeepAway();
-      if (!this.emitAvoidNotice(ctx, threats)) this.emitAvoidProgress(state, ctx, threats);
-      return [];
-    }
-
-    this.lastAvoidNoticeKey = '';
-    let room = this.patrol.nextRoom(ctx);
-    if (!room) {
-      this.emitPatrolProgress(state, ctx, null);
-      return [];
-    }
-
-    if (hasReachedRoomTarget(state, room)) {
-      this.patrol.advance(ctx);
-      room = this.patrol.nextRoom(ctx);
-      if (!room) {
-        this.emitPatrolProgress(state, ctx, null);
-        return [];
-      }
-    }
-
-    this.setMoveGoal(room, PATROL_PRIORITY, 'patrol', false);
-    this.emitPatrolProgress(state, ctx, room);
-    return [];
-  }
-
-  /** 寻路躲避：用 KeepAwayGoal 推演逃点远离回避目标（不限距离，名单上的人始终要躲）。 */
-  private setKeepAway(): void {
-    const key = this.targets.length > 0 ? this.targets.join('|') : 'avoid-knowledge';
-    const resolve: ThreatResolver = (state, ctx) => this.threats(state, ctx);
-    const options: KeepAwayGoalOptions = { threatRadius: Infinity, noun: '回避目标' };
-    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, resolve, options), FLEE_PRIORITY);
-    this.moveMode = 'flee';
-  }
-
-  /** args 回避名单（活着的）∪ 知识里标记 suspect/hostile 的玩家。 */
-  private threats(state: GameState, ctx: StrategyContext): PlayerInfo[] {
-    const validTargets = this.targets.filter(target => isTargetAlive(state, target, ctx));
-    return state.players.filter(p => matchesAnyTarget(p, validTargets, ctx) || isKnowledgeThreat(p, ctx));
-  }
-
-  private setMoveGoal(room: RoomTarget, priority: number, mode: 'patrol' | 'flee', stopOnPlayer: boolean): 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, hasReachedRoomTarget, {
-      emitProgress: false,
-      stopOnPlayer,
-    }), priority);
-    this.moveMode = mode;
-  }
-
-  private emitAvoidNotice(ctx: StrategyContext, threats: PlayerInfo[]): boolean {
-    const names = threats.map(p => p.name).join('、');
-    const key = threats.map(p => p.name).sort().join('|');
-    if (key === this.lastAvoidNoticeKey) return false;
-    this.lastAvoidNoticeKey = key;
-
-    ctx.notifications.push(`发现回避目标${names}，正在寻路躲避。`);
-    return true;
-  }
-
-  private emitPatrolProgress(state: GameState, ctx: StrategyContext, target: RoomTarget | null): void {
-    const now = Date.now();
-    if (now - ctx.lastProgressNotifyAt < PROGRESS_INTERVAL_MS) return;
-    ctx.lastProgressNotifyAt = now;
-
-    const room = state.you.room ?? '未知';
-    const targetNames = this.targets.length > 0 ? this.targets.join(', ') : '(依据知识库)';
-
-    let msg = `[进度] 当前在${room}，巡逻中，回避名单: ${targetNames}`;
-    if (target) {
-      msg += `，正在前往${target.name}`;
-    }
-    msg += '。';
-    ctx.notifications.push(msg);
-  }
-
-  private emitAvoidProgress(
-    state: GameState,
-    ctx: StrategyContext,
-    threats: PlayerInfo[],
-  ): void {
-    const now = Date.now();
-    if (now - ctx.lastProgressNotifyAt < PROGRESS_INTERVAL_MS) return;
-    ctx.lastProgressNotifyAt = now;
-
-    const here = state.you.room ?? '未知';
-    const names = threats.map(p => p.name).join('、');
-    ctx.notifications.push(`[进度] 当前在${here}，发现${names}，正在寻路躲避。`);
-  }
-}
+import type { GameState, PlayerInfo } from '../../sdk/types.js';
+import { hasReachedRoomTarget, isKnowledgeThreat, isTargetAlive, matchesAnyTarget, PatrolState, PROGRESS_INTERVAL_MS } from '../game-utils.js';
+import type { BehaviorDecision, RoomTarget, StrategyContext } from '../types.js';
+import { Goal } from './goal.js';
+import { KeepAwayGoal, type KeepAwayGoalOptions, type ThreatResolver } from './keep-away-goal.js';
+import { MoveRoomGoal } from './move-room-goal.js';
+
+const PATROL_PRIORITY = 0.2;
+const FLEE_PRIORITY = 0.5;
+
+export class AvoidPlayersTop extends Goal {
+  private readonly patrol = new PatrolState();
+  private moveMode: 'patrol' | 'flee' | null = null;
+  private lastAvoidNoticeKey = '';
+
+  constructor(private readonly targets: string[]) {
+    super();
+  }
+
+  tick(state: GameState, ctx: StrategyContext): BehaviorDecision[] {
+    const threats = this.threats(state, ctx);
+
+    if (threats.length > 0) {
+      this.setKeepAway();
+      if (!this.emitAvoidNotice(ctx, threats)) this.emitAvoidProgress(state, ctx, threats);
+      return [];
+    }
+
+    this.lastAvoidNoticeKey = '';
+    let room = this.patrol.nextRoom(ctx);
+    if (!room) {
+      this.emitPatrolProgress(state, ctx, null);
+      return [];
+    }
+
+    if (hasReachedRoomTarget(state, room)) {
+      this.patrol.advance(ctx);
+      room = this.patrol.nextRoom(ctx);
+      if (!room) {
+        this.emitPatrolProgress(state, ctx, null);
+        return [];
+      }
+    }
+
+    this.setMoveGoal(room, PATROL_PRIORITY, 'patrol', false);
+    this.emitPatrolProgress(state, ctx, room);
+    return [];
+  }
+
+  /** 寻路躲避：用 KeepAwayGoal 推演逃点远离回避目标（不限距离，名单上的人始终要躲）。 */
+  private setKeepAway(): void {
+    const key = this.targets.length > 0 ? this.targets.join('|') : 'avoid-knowledge';
+    const resolve: ThreatResolver = (state, ctx) => this.threats(state, ctx);
+    const options: KeepAwayGoalOptions = { threatRadius: Infinity, noun: '回避目标' };
+    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, resolve, options), FLEE_PRIORITY);
+    this.moveMode = 'flee';
+  }
+
+  /** args 回避名单（活着的）∪ 知识里标记 suspect/hostile 的玩家。 */
+  private threats(state: GameState, ctx: StrategyContext): PlayerInfo[] {
+    const validTargets = this.targets.filter(target => isTargetAlive(state, target, ctx));
+    return state.players.filter(p => matchesAnyTarget(p, validTargets, ctx) || isKnowledgeThreat(p, ctx));
+  }
+
+  private setMoveGoal(room: RoomTarget, priority: number, mode: 'patrol' | 'flee', stopOnPlayer: boolean): 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, hasReachedRoomTarget, {
+      emitProgress: false,
+      stopOnPlayer,
+    }), priority);
+    this.moveMode = mode;
+  }
+
+  private emitAvoidNotice(ctx: StrategyContext, threats: PlayerInfo[]): boolean {
+    const names = threats.map(p => p.name).join('、');
+    const key = threats.map(p => p.name).sort().join('|');
+    if (key === this.lastAvoidNoticeKey) return false;
+    this.lastAvoidNoticeKey = key;
+
+    ctx.notifications.push(`发现回避目标${names}，正在寻路躲避。`);
+    return true;
+  }
+
+  private emitPatrolProgress(state: GameState, ctx: StrategyContext, target: RoomTarget | null): void {
+    const now = Date.now();
+    if (now - ctx.lastProgressNotifyAt < PROGRESS_INTERVAL_MS) return;
+    ctx.lastProgressNotifyAt = now;
+
+    const room = state.you.room ?? '未知';
+    const targetNames = this.targets.length > 0 ? this.targets.join(', ') : '(依据知识库)';
+
+    let msg = `[进度] 当前在${room}，巡逻中，回避名单: ${targetNames}`;
+    if (target) {
+      msg += `，正在前往${target.name}`;
+    }
+    msg += '。';
+    ctx.notifications.push(msg);
+  }
+
+  private emitAvoidProgress(
+    state: GameState,
+    ctx: StrategyContext,
+    threats: PlayerInfo[],
+  ): void {
+    const now = Date.now();
+    if (now - ctx.lastProgressNotifyAt < PROGRESS_INTERVAL_MS) return;
+    ctx.lastProgressNotifyAt = now;
+
+    const here = state.you.room ?? '未知';
+    const names = threats.map(p => p.name).join('、');
+    ctx.notifications.push(`[进度] 当前在${here}，发现${names}，正在寻路躲避。`);
+  }
+}

package/src/strategies/goals/conversation-goal.ts

@@ -1,51 +1,51 @@
-import type { GameState } from '../../sdk/types.js';
-import type { BehaviorDecision, StrategyContext } from '../types.js';
-import { Goal } from './goal.js';
-import { GoalManager } from './goal-manager.js';
-import { URGENT_GOAL_PRIORITY } from './leaf-goal.js';
-import type { SpeechModule } from '../speech-module.js';
-
-export class ConversationGoal extends Goal {
-  private readonly innerMgr = new GoalManager();
-
-  constructor(
-    private readonly makeInner: () => Goal,
-    private readonly speech: SpeechModule,
-  ) {
-    super();
-    this.innerMgr.setTop(makeInner());
-  }
-
-  tick(state: GameState, ctx: StrategyContext): BehaviorDecision[] {
-    if (this.innerMgr.getTop() === null) this.innerMgr.setTop(this.makeInner());
-    const innerDecisions = this.innerMgr.tick(state, ctx);
-
-    const interruptible = this.innerLeafPriority() < URGENT_GOAL_PRIORITY;
-    const primaryIsMove = innerDecisions[0]?.action.type === 'move';
-    const result = this.speech.evaluate(state, ctx, {
-      allowAutoGreet: interruptible && primaryIsMove,
-    });
-    for (const msg of result.notifications) ctx.speechNotifications.push(msg);
-
-    return innerDecisions;
-  }
-
-  onMeetingResume(): void {
-    this.speech.resetMeetingState();
-    this.innerMgr.getTop()?.onMeetingResume();
-  }
-
-  updateConfig(role: string): void {
-    this.speech.updateConfig(role);
-  }
-
-  private innerLeafPriority(): number {
-    let node: Goal | null = this.innerMgr.getTop();
-    let priority = 0;
-    while (node) {
-      priority = node.priority;
-      node = node.subGoal;
-    }
-    return priority;
-  }
-}
+import type { GameState } from '../../sdk/types.js';
+import type { BehaviorDecision, StrategyContext } from '../types.js';
+import { Goal } from './goal.js';
+import { GoalManager } from './goal-manager.js';
+import { URGENT_GOAL_PRIORITY } from './leaf-goal.js';
+import type { SpeechModule } from '../speech-module.js';
+
+export class ConversationGoal extends Goal {
+  private readonly innerMgr = new GoalManager();
+
+  constructor(
+    private readonly makeInner: () => Goal,
+    private readonly speech: SpeechModule,
+  ) {
+    super();
+    this.innerMgr.setTop(makeInner());
+  }
+
+  tick(state: GameState, ctx: StrategyContext): BehaviorDecision[] {
+    if (this.innerMgr.getTop() === null) this.innerMgr.setTop(this.makeInner());
+    const innerDecisions = this.innerMgr.tick(state, ctx);
+
+    const interruptible = this.innerLeafPriority() < URGENT_GOAL_PRIORITY;
+    const primaryIsMove = innerDecisions[0]?.action.type === 'move';
+    const result = this.speech.evaluate(state, ctx, {
+      allowAutoGreet: interruptible && primaryIsMove,
+    });
+    for (const msg of result.notifications) ctx.speechNotifications.push(msg);
+
+    return innerDecisions;
+  }
+
+  onMeetingResume(): void {
+    this.speech.resetMeetingState();
+    this.innerMgr.getTop()?.onMeetingResume();
+  }
+
+  updateConfig(role: string): void {
+    this.speech.updateConfig(role);
+  }
+
+  private innerLeafPriority(): number {
+    let node: Goal | null = this.innerMgr.getTop();
+    let priority = 0;
+    while (node) {
+      priority = node.priority;
+      node = node.subGoal;
+    }
+    return priority;
+  }
+}

package/src/strategies/goals/corpse-patrol-top.ts

@@ -1,91 +1,91 @@
-import type { GameState } from '../../sdk/types.js';
-import { Action } from '../../sdk/action.js';
-import {
-  corpseAtScene,
-  nearestKnownCorpseNav,
-  patrolStep,
-  PatrolState,
-  PROGRESS_INTERVAL_MS,
-} from '../game-utils.js';
-import type { BehaviorDecision, CorpseTarget, StrategyContext } from '../types.js';
-import { Goal } from './goal.js';
-import { LingerCorpseGoal } from './linger-corpse-goal.js';
-
-const GREETING_COOLDOWN_MS = 120_000;
-
-export class CorpsePatrolTop extends Goal {
-  private readonly patrol = new PatrolState();
-  private readonly linger = new LingerCorpseGoal();
-  private lastCorpseNotified = false;
-  private lastGreetingAt: number | null = null;
-
-  constructor(private readonly greetingPhrases: string[]) {
-    super();
-  }
-
-  tick(state: GameState, ctx: StrategyContext): BehaviorDecision[] {
-    const decisions: BehaviorDecision[] = [];
-
-    const greetingDecision = this.tryGreeting(state);
-    if (greetingDecision) decisions.push(greetingDecision);
-
-    const corpse = nearestKnownCorpseNav(state, ctx);
-    const canMove = !state.you.doing_task;
-
-    if (corpse) {
-      if (!this.lastCorpseNotified) {
-        this.lastCorpseNotified = true;
-        const label = corpse.name ? `${corpse.name}的尸体` : '尸体';
-        // corpseAtScene=已站在尸体旁(≤150px)；仅凭记忆/房间锚点导航过去时人还没到，别谎报「在附近徘徊」。
-        ctx.notifications.push(
-          corpseAtScene(state) ? `发现${label}！在附近徘徊观察。` : `发现${label}！正前往查看。`,
-        );
-      }
-      if (canMove) decisions.push(...this.linger.tick(state, ctx));
-    } else {
-      this.lastCorpseNotified = false;
-      if (canMove) decisions.push(...patrolStep(state, ctx, this.patrol, false));
-    }
-
-    this.emitProgress(state, ctx, corpse);
-    return decisions;
-  }
-
-  private tryGreeting(state: GameState): BehaviorDecision | null {
-    if (this.greetingPhrases.length === 0) return null;
-    if (state.players.length === 0) return null;
-
-    const now = Date.now();
-    if (this.lastGreetingAt !== null && now - this.lastGreetingAt < GREETING_COOLDOWN_MS) return null;
-
-    const text = this.greetingPhrases[Math.floor(Math.random() * this.greetingPhrases.length)];
-    this.lastGreetingAt = now;
-    return { action: Action.speech(text) };
-  }
-
-  private emitProgress(state: GameState, ctx: StrategyContext, corpse: CorpseTarget | null): void {
-    const now = Date.now();
-    if (now - ctx.lastProgressNotifyAt < PROGRESS_INTERVAL_MS) return;
-    ctx.lastProgressNotifyAt = now;
-
-    const room = state.you.room ?? '未知';
-
-    let msg = `[进度] 当前在${room}`;
-    if (corpse) {
-      const label = corpse.name ?? '未知';
-      msg += corpseAtScene(state)
-        ? `，在${label}的尸体附近徘徊。`
-        : `，正前往${label}的尸体所在位置。`;
-    } else {
-      const target = this.patrol.nextRoom(ctx);
-      if (target) {
-        msg += `，巡逻中，正在前往${target.name}。`;
-      } else {
-        msg += `，巡逻中。`;
-      }
-    }
-    msg += ` 共${ctx.rooms.length}个房间。`;
-
-    ctx.notifications.push(msg);
-  }
-}
+import type { GameState } from '../../sdk/types.js';
+import { Action } from '../../sdk/action.js';
+import {
+  corpseAtScene,
+  nearestKnownCorpseNav,
+  patrolStep,
+  PatrolState,
+  PROGRESS_INTERVAL_MS,
+} from '../game-utils.js';
+import type { BehaviorDecision, CorpseTarget, StrategyContext } from '../types.js';
+import { Goal } from './goal.js';
+import { LingerCorpseGoal } from './linger-corpse-goal.js';
+
+const GREETING_COOLDOWN_MS = 120_000;
+
+export class CorpsePatrolTop extends Goal {
+  private readonly patrol = new PatrolState();
+  private readonly linger = new LingerCorpseGoal();
+  private lastCorpseNotified = false;
+  private lastGreetingAt: number | null = null;
+
+  constructor(private readonly greetingPhrases: string[]) {
+    super();
+  }
+
+  tick(state: GameState, ctx: StrategyContext): BehaviorDecision[] {
+    const decisions: BehaviorDecision[] = [];
+
+    const greetingDecision = this.tryGreeting(state);
+    if (greetingDecision) decisions.push(greetingDecision);
+
+    const corpse = nearestKnownCorpseNav(state, ctx);
+    const canMove = !state.you.doing_task;
+
+    if (corpse) {
+      if (!this.lastCorpseNotified) {
+        this.lastCorpseNotified = true;
+        const label = corpse.name ? `${corpse.name}的尸体` : '尸体';
+        // corpseAtScene=已站在尸体旁(≤150px)；仅凭记忆/房间锚点导航过去时人还没到，别谎报「在附近徘徊」。
+        ctx.notifications.push(
+          corpseAtScene(state) ? `发现${label}！在附近徘徊观察。` : `发现${label}！正前往查看。`,
+        );
+      }
+      if (canMove) decisions.push(...this.linger.tick(state, ctx));
+    } else {
+      this.lastCorpseNotified = false;
+      if (canMove) decisions.push(...patrolStep(state, ctx, this.patrol, false));
+    }
+
+    this.emitProgress(state, ctx, corpse);
+    return decisions;
+  }
+
+  private tryGreeting(state: GameState): BehaviorDecision | null {
+    if (this.greetingPhrases.length === 0) return null;
+    if (state.players.length === 0) return null;
+
+    const now = Date.now();
+    if (this.lastGreetingAt !== null && now - this.lastGreetingAt < GREETING_COOLDOWN_MS) return null;
+
+    const text = this.greetingPhrases[Math.floor(Math.random() * this.greetingPhrases.length)];
+    this.lastGreetingAt = now;
+    return { action: Action.speech(text) };
+  }
+
+  private emitProgress(state: GameState, ctx: StrategyContext, corpse: CorpseTarget | null): void {
+    const now = Date.now();
+    if (now - ctx.lastProgressNotifyAt < PROGRESS_INTERVAL_MS) return;
+    ctx.lastProgressNotifyAt = now;
+
+    const room = state.you.room ?? '未知';
+
+    let msg = `[进度] 当前在${room}`;
+    if (corpse) {
+      const label = corpse.name ?? '未知';
+      msg += corpseAtScene(state)
+        ? `，在${label}的尸体附近徘徊。`
+        : `，正前往${label}的尸体所在位置。`;
+    } else {
+      const target = this.patrol.nextRoom(ctx);
+      if (target) {
+        msg += `，巡逻中，正在前往${target.name}。`;
+      } else {
+        msg += `，巡逻中。`;
+      }
+    }
+    msg += ` 共${ctx.rooms.length}个房间。`;
+
+    ctx.notifications.push(msg);
+  }
+}