@myclaw163/clawclaw-cli 0.6.66 → 0.6.67

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

@@ -1,57 +1,57 @@
-import type { GameState } from '../../sdk/types.js';
-import { hasReachedRoomTarget, PatrolState, PROGRESS_INTERVAL_MS } from '../game-utils.js';
-import type { BehaviorDecision, RoomTarget, StrategyContext } from '../types.js';
-import { Goal } from './goal.js';
-import { MoveRoomGoal } from './move-room-goal.js';
-
-const PATROL_PRIORITY = 0.2;
-
-export class PatrolTop extends Goal {
-  private readonly patrol = new PatrolState();
-
-  tick(state: GameState, ctx: StrategyContext): BehaviorDecision[] {
-    let room = this.patrol.nextRoom(ctx);
-    if (!room) {
-      this.emitProgress(state, ctx, null);
-      return [];
-    }
-
-    if (hasReachedRoomTarget(state, room)) {
-      this.patrol.advance(ctx);
-      room = this.patrol.nextRoom(ctx);
-      if (!room) {
-        this.emitProgress(state, ctx, null);
-        return [];
-      }
-    }
-
-    const worker = this.subGoal;
-    if (worker instanceof MoveRoomGoal) {
-      if (worker.room !== room.name) {
-        this.removeSubGoal();
-        this.setSubGoal(new MoveRoomGoal(room.name, hasReachedRoomTarget, { emitProgress: false }), PATROL_PRIORITY);
-      }
-    } else {
-      this.setSubGoal(new MoveRoomGoal(room.name, hasReachedRoomTarget, { emitProgress: false }), PATROL_PRIORITY);
-    }
-    this.emitProgress(state, ctx, room);
-    return [];
-  }
-
-  private emitProgress(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 totalRooms = ctx.rooms.length;
-
-    let msg = `[进度] 当前在${room}`;
-    if (target) {
-      msg += `，正在巡逻前往${target.name}`;
-    }
-    msg += `。共${totalRooms}个房间。`;
-
-    ctx.notifications.push(msg);
-  }
-}
+import type { GameState } from '../../sdk/types.js';
+import { hasReachedRoomTarget, PatrolState, PROGRESS_INTERVAL_MS } from '../game-utils.js';
+import type { BehaviorDecision, RoomTarget, StrategyContext } from '../types.js';
+import { Goal } from './goal.js';
+import { MoveRoomGoal } from './move-room-goal.js';
+
+const PATROL_PRIORITY = 0.2;
+
+export class PatrolTop extends Goal {
+  private readonly patrol = new PatrolState();
+
+  tick(state: GameState, ctx: StrategyContext): BehaviorDecision[] {
+    let room = this.patrol.nextRoom(ctx);
+    if (!room) {
+      this.emitProgress(state, ctx, null);
+      return [];
+    }
+
+    if (hasReachedRoomTarget(state, room)) {
+      this.patrol.advance(ctx);
+      room = this.patrol.nextRoom(ctx);
+      if (!room) {
+        this.emitProgress(state, ctx, null);
+        return [];
+      }
+    }
+
+    const worker = this.subGoal;
+    if (worker instanceof MoveRoomGoal) {
+      if (worker.room !== room.name) {
+        this.removeSubGoal();
+        this.setSubGoal(new MoveRoomGoal(room.name, hasReachedRoomTarget, { emitProgress: false }), PATROL_PRIORITY);
+      }
+    } else {
+      this.setSubGoal(new MoveRoomGoal(room.name, hasReachedRoomTarget, { emitProgress: false }), PATROL_PRIORITY);
+    }
+    this.emitProgress(state, ctx, room);
+    return [];
+  }
+
+  private emitProgress(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 totalRooms = ctx.rooms.length;
+
+    let msg = `[进度] 当前在${room}`;
+    if (target) {
+      msg += `，正在巡逻前往${target.name}`;
+    }
+    msg += `。共${totalRooms}个房间。`;
+
+    ctx.notifications.push(msg);
+  }
+}

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

@@ -1,80 +1,80 @@
-import type { GameState } from '../../sdk/types.js';
-import { Action } from '../../sdk/action.js';
-import {
-  nearestKnownCorpse,
-  nearestReportableCorpse,
-  patrolStep,
-  PatrolState,
-  PROGRESS_INTERVAL_MS,
-} from '../game-utils.js';
-import type { BehaviorDecision, StrategyContext } from '../types.js';
-import { Goal } from './goal.js';
-
-export class ReportPatrolTop extends Goal {
-  private readonly patrol = new PatrolState();
-  private lastCorpseNotified = false;
-
-  tick(state: GameState, ctx: StrategyContext): BehaviorDecision[] {
-    const reportDecision = this.tryReport(state, ctx);
-    if (reportDecision) {
-      this.emitProgress(state, ctx);
-      return [reportDecision];
-    }
-
-    const decisions = this.patrolDecision(state, ctx);
-    this.emitProgress(state, ctx);
-    return decisions;
-  }
-
-  private tryReport(state: GameState, ctx: StrategyContext): BehaviorDecision | null {
-    const reportable = nearestReportableCorpse(state);
-    if (reportable) {
-      ctx.reportCorpseTarget = null;
-      this.lastCorpseNotified = false;
-      ctx.notifications.push('发现尸体，正在报告！');
-      return { action: Action.report(reportable.name, reportable.room) };
-    }
-
-    const corpse = nearestKnownCorpse(state, ctx);
-    if (corpse) {
-      if (!this.lastCorpseNotified) {
-        this.lastCorpseNotified = true;
-        const label = corpse.name ? `${corpse.name}的尸体` : '尸体';
-        ctx.notifications.push(`视野内发现${label}，正在靠近准备报告。`);
-      }
-      ctx.reportCorpseTarget = corpse;
-      return { action: Action.move({ x: corpse.x, y: corpse.y }) };
-    }
-
-    this.lastCorpseNotified = false;
-    ctx.reportCorpseTarget = null;
-    return null;
-  }
-
-  private patrolDecision(state: GameState, ctx: StrategyContext): BehaviorDecision[] {
-    if (state.you.doing_task) return [];
-    return patrolStep(state, ctx, this.patrol, false);
-  }
-
-  private emitProgress(state: GameState, ctx: StrategyContext): void {
-    const now = Date.now();
-    if (now - ctx.lastProgressNotifyAt < PROGRESS_INTERVAL_MS) return;
-    ctx.lastProgressNotifyAt = now;
-
-    const room = state.you.room ?? '未知';
-    const target = this.patrol.nextRoom(ctx);
-
-    let msg = `[进度] 当前在${room}`;
-    if (ctx.reportCorpseTarget) {
-      const label = ctx.reportCorpseTarget.name ?? '未知';
-      msg += `，正在靠近${label}的尸体准备报告。`;
-    } else 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 {
+  nearestKnownCorpse,
+  nearestReportableCorpse,
+  patrolStep,
+  PatrolState,
+  PROGRESS_INTERVAL_MS,
+} from '../game-utils.js';
+import type { BehaviorDecision, StrategyContext } from '../types.js';
+import { Goal } from './goal.js';
+
+export class ReportPatrolTop extends Goal {
+  private readonly patrol = new PatrolState();
+  private lastCorpseNotified = false;
+
+  tick(state: GameState, ctx: StrategyContext): BehaviorDecision[] {
+    const reportDecision = this.tryReport(state, ctx);
+    if (reportDecision) {
+      this.emitProgress(state, ctx);
+      return [reportDecision];
+    }
+
+    const decisions = this.patrolDecision(state, ctx);
+    this.emitProgress(state, ctx);
+    return decisions;
+  }
+
+  private tryReport(state: GameState, ctx: StrategyContext): BehaviorDecision | null {
+    const reportable = nearestReportableCorpse(state);
+    if (reportable) {
+      ctx.reportCorpseTarget = null;
+      this.lastCorpseNotified = false;
+      ctx.notifications.push('发现尸体，正在报告！');
+      return { action: Action.report(reportable.name, reportable.room) };
+    }
+
+    const corpse = nearestKnownCorpse(state, ctx);
+    if (corpse) {
+      if (!this.lastCorpseNotified) {
+        this.lastCorpseNotified = true;
+        const label = corpse.name ? `${corpse.name}的尸体` : '尸体';
+        ctx.notifications.push(`视野内发现${label}，正在靠近准备报告。`);
+      }
+      ctx.reportCorpseTarget = corpse;
+      return { action: Action.move({ x: corpse.x, y: corpse.y }) };
+    }
+
+    this.lastCorpseNotified = false;
+    ctx.reportCorpseTarget = null;
+    return null;
+  }
+
+  private patrolDecision(state: GameState, ctx: StrategyContext): BehaviorDecision[] {
+    if (state.you.doing_task) return [];
+    return patrolStep(state, ctx, this.patrol, false);
+  }
+
+  private emitProgress(state: GameState, ctx: StrategyContext): void {
+    const now = Date.now();
+    if (now - ctx.lastProgressNotifyAt < PROGRESS_INTERVAL_MS) return;
+    ctx.lastProgressNotifyAt = now;
+
+    const room = state.you.room ?? '未知';
+    const target = this.patrol.nextRoom(ctx);
+
+    let msg = `[进度] 当前在${room}`;
+    if (ctx.reportCorpseTarget) {
+      const label = ctx.reportCorpseTarget.name ?? '未知';
+      msg += `，正在靠近${label}的尸体准备报告。`;
+    } else if (target) {
+      msg += `，巡逻中，正在前往${target.name}寻找尸体。`;
+    } else {
+      msg += '，巡逻中。';
+    }
+    msg += ` 共${ctx.rooms.length}个房间。`;
+
+    ctx.notifications.push(msg);
+  }
+}

package/src/strategies/goals/safe-task-goal.ts

@@ -1,102 +1,102 @@
-import type { GameState, Position, TaskInfo } from '../../sdk/types.js';
-import { Action } from '../../sdk/action.js';
-import { dist, nearestSafeTask, PATROL_REACHED_DISTANCE, PatrolState, taskMoveDecision } from '../game-utils.js';
-import type { BehaviorDecision, StrategyContext } from '../types.js';
-import { Goal } from './goal.js';
-
-export type ThreatPointResolver = (state: GameState, ctx: StrategyContext) => Position[];
-const NON_CRAB = (t: TaskInfo) => t.faction !== 'crab';
-
-export interface SafeTaskPlanOptions {
-  holdUnsafeCurrentForMs?: number;
-}
-
-/**
- * 进阶普通虾的劳作循环：与 TaskOrPatrolGoal 同构，但任务选择换成 nearestSafeTask——
- * 测地最近、威胁硬排除（任务点旁有威胁，或必经之路经过威胁附近都不选）、带粘性
- * （当前任务仍合法就不换，杜绝摇摆；路被把守时粘性失效自动换任务）。
- * 全部任务被排除或做完时按房间顺序巡逻。
- */
-export class SafeTaskOrPatrolGoal extends Goal {
-  private readonly patrol = new PatrolState();
-  private current: TaskInfo | null = null;
-  private holdUnsafeCurrentUntil = 0;
-
-  constructor(private readonly threatPoints: ThreatPointResolver) {
-    super();
-  }
-
-  /** 当前粘住的任务，供调用方播报进度（逃跑期间也能看到将回归的任务）。 */
-  get currentTask(): TaskInfo | null {
-    return this.current;
-  }
-
-  /** Refresh the remembered task without issuing a task move. Safe to call while fleeing. */
-  planTask(state: GameState, ctx: StrategyContext, opts: SafeTaskPlanOptions = {}): TaskInfo | null {
-    if (opts.holdUnsafeCurrentForMs != null) {
-      this.holdUnsafeCurrentUntil = Math.max(this.holdUnsafeCurrentUntil, Date.now() + opts.holdUnsafeCurrentForMs);
-    }
-    if (state.you.doing_task) return this.current;
-
-    const task = nearestSafeTask(state, ctx.taskData, NON_CRAB, ctx.emergency, ctx.blockedMoveTarget, ctx.knownCorpses, {
-      threatPoints: this.threatPoints(state, ctx),
-      stickyTaskName: this.current?.task_name ?? null,
-    });
-    this.current = task;
-    return task;
-  }
-
-  tick(state: GameState, ctx: StrategyContext): BehaviorDecision[] {
-    if (state.you.doing_task) return [];
-
-    const locked = this.current ? this.safeCurrentTask(state, ctx) : this.planTask(state, ctx);
-    if (locked) {
-      this.current = locked;
-      return [taskMoveDecision(state, ctx, locked)];
-    }
-
-    if (this.current) {
-      const remembered = this.findCurrentTask(ctx);
-      if (remembered && this.isStillAssignable(remembered, ctx) && Date.now() < this.holdUnsafeCurrentUntil) return [];
-      this.current = null;
-      const replanned = this.planTask(state, ctx);
-      if (replanned) return [taskMoveDecision(state, ctx, replanned)];
-    }
-
-    let room = this.patrol.nextRoom(ctx);
-    if (!room) return [];
-    if (dist(state.you.x, state.you.y, room.x, room.y) <= PATROL_REACHED_DISTANCE) {
-      this.patrol.advance(ctx);
-      const next = this.patrol.nextRoom(ctx);
-      if (next) room = next;
-    }
-    return [{ action: Action.move({ x: room.x, y: room.y }) }];
-  }
-
-  private safeCurrentTask(state: GameState, ctx: StrategyContext): TaskInfo | null {
-    const current = this.findCurrentTask(ctx);
-    if (!current) return null;
-
-    const safe = nearestSafeTask(state, [current], NON_CRAB, null, ctx.blockedMoveTarget, ctx.knownCorpses, {
-      threatPoints: this.threatPoints(state, ctx),
-      stickyTaskName: current.task_name,
-    });
-    return safe;
-  }
-
-  private findCurrentTask(ctx: StrategyContext): TaskInfo | null {
-    if (!this.current) return null;
-    return ctx.taskData.find(t => t.task_id === this.current?.task_id)
-      ?? ctx.taskData.find(t => t.task_name === this.current?.task_name)
-      ?? null;
-  }
-
-  private isStillAssignable(task: TaskInfo, ctx: StrategyContext): boolean {
-    return task.status !== 'completed'
-      && task.status !== 'in_progress'
-      && task.x != null
-      && task.y != null
-      && (!ctx.blockedMoveTarget || dist(task.x, task.y, ctx.blockedMoveTarget.x, ctx.blockedMoveTarget.y) > 10)
-      && NON_CRAB(task);
-  }
-}
+import type { GameState, Position, TaskInfo } from '../../sdk/types.js';
+import { Action } from '../../sdk/action.js';
+import { dist, nearestSafeTask, PATROL_REACHED_DISTANCE, PatrolState, taskMoveDecision } from '../game-utils.js';
+import type { BehaviorDecision, StrategyContext } from '../types.js';
+import { Goal } from './goal.js';
+
+export type ThreatPointResolver = (state: GameState, ctx: StrategyContext) => Position[];
+const NON_CRAB = (t: TaskInfo) => t.faction !== 'crab';
+
+export interface SafeTaskPlanOptions {
+  holdUnsafeCurrentForMs?: number;
+}
+
+/**
+ * 进阶普通虾的劳作循环：与 TaskOrPatrolGoal 同构，但任务选择换成 nearestSafeTask——
+ * 测地最近、威胁硬排除（任务点旁有威胁，或必经之路经过威胁附近都不选）、带粘性
+ * （当前任务仍合法就不换，杜绝摇摆；路被把守时粘性失效自动换任务）。
+ * 全部任务被排除或做完时按房间顺序巡逻。
+ */
+export class SafeTaskOrPatrolGoal extends Goal {
+  private readonly patrol = new PatrolState();
+  private current: TaskInfo | null = null;
+  private holdUnsafeCurrentUntil = 0;
+
+  constructor(private readonly threatPoints: ThreatPointResolver) {
+    super();
+  }
+
+  /** 当前粘住的任务，供调用方播报进度（逃跑期间也能看到将回归的任务）。 */
+  get currentTask(): TaskInfo | null {
+    return this.current;
+  }
+
+  /** Refresh the remembered task without issuing a task move. Safe to call while fleeing. */
+  planTask(state: GameState, ctx: StrategyContext, opts: SafeTaskPlanOptions = {}): TaskInfo | null {
+    if (opts.holdUnsafeCurrentForMs != null) {
+      this.holdUnsafeCurrentUntil = Math.max(this.holdUnsafeCurrentUntil, Date.now() + opts.holdUnsafeCurrentForMs);
+    }
+    if (state.you.doing_task) return this.current;
+
+    const task = nearestSafeTask(state, ctx.taskData, NON_CRAB, ctx.emergency, ctx.blockedMoveTarget, ctx.knownCorpses, {
+      threatPoints: this.threatPoints(state, ctx),
+      stickyTaskName: this.current?.task_name ?? null,
+    });
+    this.current = task;
+    return task;
+  }
+
+  tick(state: GameState, ctx: StrategyContext): BehaviorDecision[] {
+    if (state.you.doing_task) return [];
+
+    const locked = this.current ? this.safeCurrentTask(state, ctx) : this.planTask(state, ctx);
+    if (locked) {
+      this.current = locked;
+      return [taskMoveDecision(state, ctx, locked)];
+    }
+
+    if (this.current) {
+      const remembered = this.findCurrentTask(ctx);
+      if (remembered && this.isStillAssignable(remembered, ctx) && Date.now() < this.holdUnsafeCurrentUntil) return [];
+      this.current = null;
+      const replanned = this.planTask(state, ctx);
+      if (replanned) return [taskMoveDecision(state, ctx, replanned)];
+    }
+
+    let room = this.patrol.nextRoom(ctx);
+    if (!room) return [];
+    if (dist(state.you.x, state.you.y, room.x, room.y) <= PATROL_REACHED_DISTANCE) {
+      this.patrol.advance(ctx);
+      const next = this.patrol.nextRoom(ctx);
+      if (next) room = next;
+    }
+    return [{ action: Action.move({ x: room.x, y: room.y }) }];
+  }
+
+  private safeCurrentTask(state: GameState, ctx: StrategyContext): TaskInfo | null {
+    const current = this.findCurrentTask(ctx);
+    if (!current) return null;
+
+    const safe = nearestSafeTask(state, [current], NON_CRAB, null, ctx.blockedMoveTarget, ctx.knownCorpses, {
+      threatPoints: this.threatPoints(state, ctx),
+      stickyTaskName: current.task_name,
+    });
+    return safe;
+  }
+
+  private findCurrentTask(ctx: StrategyContext): TaskInfo | null {
+    if (!this.current) return null;
+    return ctx.taskData.find(t => t.task_id === this.current?.task_id)
+      ?? ctx.taskData.find(t => t.task_name === this.current?.task_name)
+      ?? null;
+  }
+
+  private isStillAssignable(task: TaskInfo, ctx: StrategyContext): boolean {
+    return task.status !== 'completed'
+      && task.status !== 'in_progress'
+      && task.x != null
+      && task.y != null
+      && (!ctx.blockedMoveTarget || dist(task.x, task.y, ctx.blockedMoveTarget.x, ctx.blockedMoveTarget.y) > 10)
+      && NON_CRAB(task);
+  }
+}