@myclaw163/clawclaw-cli 0.6.66 → 0.6.68

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

@@ -1,160 +1,160 @@
-import type { GameState, PlayerInfo } from '../../sdk/types.js';
-import {
-  hasKillUseRemaining,
-  hasReachedRoomTarget,
-  isKnowledgeHostile,
-  isKnowledgeTrusted,
-  killCooldownSecs,
-  LONE_IGNORE_MS,
-  matchesAnyTarget,
-  nearestPlayerByDistance,
-  nonTeammatesVisible,
-  PatrolState,
-  PROGRESS_INTERVAL_MS,
-} from '../game-utils.js';
-import type { BehaviorDecision, StrategyContext } from '../types.js';
-import { Goal } from './goal.js';
-import { KillVisibleTargetGoal } from './kill-target-goal.js';
-import { MoveRoomGoal } from './move-room-goal.js';
-
-const PATROL_PRIORITY = 0.2;
-const HUNT_PRIORITY = 0.5;
-
-export class KillLoneTop extends Goal {
-  private readonly patrol = new PatrolState();
-  private loneIgnoreUntil = 0;
-  private patrolStopOnPlayer: boolean | null = null;
-  private lastFlaggedTarget = '';
-
-  constructor(private readonly protectedTargets: string[] = []) {
-    super();
-  }
-
-  tick(state: GameState, ctx: StrategyContext): BehaviorDecision[] {
-    const now = Date.now();
-    const nonTeammates = nonTeammatesVisible(state, ctx);
-
-    if (!hasKillUseRemaining(state)) {
-      this.setPatrolGoal(state, ctx, false);
-      this.emitProgress(state, ctx);
-      return [];
-    }
-
-    const flagged = nearestPlayerByDistance(
-      state,
-      nonTeammates.filter(p => isKnowledgeHostile(p, ctx) && !this.isProtected(p, ctx)),
-    );
-    if (flagged) {
-      if (flagged.name !== this.lastFlaggedTarget) {
-        ctx.notifications.push(`根据情报，${flagged.name}被标记为目标，主动出击！`);
-        this.lastFlaggedTarget = flagged.name;
-      }
-      this.setHuntGoal(flagged.name, true);
-      return [];
-    } else {
-      this.lastFlaggedTarget = '';
-    }
-
-    if (nonTeammates.length === 0 && state.players.length > 0) {
-      this.loneIgnoreUntil = now + LONE_IGNORE_MS;
-    }
-
-    if (now < this.loneIgnoreUntil || nonTeammates.length === 0) {
-      this.setPatrolGoal(state, ctx, now >= this.loneIgnoreUntil);
-      this.emitProgress(state, ctx);
-      return [];
-    }
-
-    if (nonTeammates.length > 1) {
-      this.loneIgnoreUntil = now + LONE_IGNORE_MS;
-      this.setPatrolGoal(state, ctx, false);
-      this.emitProgress(state, ctx);
-      return [];
-    }
-
-    const target = nonTeammates[0];
-    if (this.isProtected(target, ctx)) {
-      this.loneIgnoreUntil = now + LONE_IGNORE_MS;
-      this.setPatrolGoal(state, ctx, false);
-      this.emitProgress(state, ctx);
-      return [];
-    }
-
-    this.setHuntGoal(target.name);
-    this.emitProgress(state, ctx);
-    return [];
-  }
-
-  /** args 保护名单 ∪ 知识里 trusted 的玩家，永不击杀。 */
-  private isProtected(p: PlayerInfo, ctx: StrategyContext): boolean {
-    return matchesAnyTarget(p, this.protectedTargets, ctx) || isKnowledgeTrusted(p, ctx);
-  }
-
-  private setHuntGoal(targetName: string, ignoreCrowd = false): void {
-    const worker = this.subGoal;
-    if (worker instanceof KillVisibleTargetGoal && worker.targetName === targetName && worker.ignoreCrowd === ignoreCrowd) return;
-    if (this.subGoal) this.removeSubGoal();
-    this.setSubGoal(new KillVisibleTargetGoal(targetName, this.protectedTargets, ignoreCrowd), HUNT_PRIORITY);
-    this.patrolStopOnPlayer = null;
-  }
-
-  private setPatrolGoal(state: GameState, ctx: StrategyContext, stopOnPlayer: boolean): 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;
-      }
-    }
-
-    const worker = this.subGoal;
-    if (worker instanceof MoveRoomGoal && worker.room === room.name && this.patrolStopOnPlayer === stopOnPlayer) return;
-    if (this.subGoal) this.removeSubGoal();
-    this.setSubGoal(new MoveRoomGoal(room.name, hasReachedRoomTarget, {
-      emitProgress: false,
-      stopOnPlayer,
-    }), PATROL_PRIORITY);
-    this.patrolStopOnPlayer = stopOnPlayer;
-  }
-
-  private clearGoal(): void {
-    if (this.subGoal) this.removeSubGoal();
-    this.patrolStopOnPlayer = null;
-  }
-
-  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 cd = killCooldownSecs(state);
-    const killsRemaining = state.you.kills_remaining;
-    const nonTeammates = nonTeammatesVisible(state, ctx);
-
-    let msg = `[进度] 当前在${room}`;
-    if (nonTeammates.length === 0) {
-      msg += '，视野内没有目标，继续巡逻寻找落单猎物。';
-    } else if (nonTeammates.length === 1) {
-      const target = nonTeammates[0];
-      if (this.isProtected(target, ctx)) {
-        msg += `，视野内发现保护目标${target.name}，不动手。`;
-      } else {
-        msg += `，视野内发现落单目标${target.name}。`;
-      }
-      if (cd > 0) msg += `攻击冷却中(${cd}s)。`;
-      if (killsRemaining === 0) msg += '出刀次数已用完。';
-    } else {
-      msg += `，视野内有${nonTeammates.length}人，不适合动手，暂时回避。`;
-    }
-
-    ctx.notifications.push(msg);
-  }
-}
+import type { GameState, PlayerInfo } from '../../sdk/types.js';
+import {
+  hasKillUseRemaining,
+  hasReachedRoomTarget,
+  isKnowledgeHostile,
+  isKnowledgeTrusted,
+  killCooldownSecs,
+  LONE_IGNORE_MS,
+  matchesAnyTarget,
+  nearestPlayerByDistance,
+  nonTeammatesVisible,
+  PatrolState,
+  PROGRESS_INTERVAL_MS,
+} from '../game-utils.js';
+import type { BehaviorDecision, StrategyContext } from '../types.js';
+import { Goal } from './goal.js';
+import { KillVisibleTargetGoal } from './kill-target-goal.js';
+import { MoveRoomGoal } from './move-room-goal.js';
+
+const PATROL_PRIORITY = 0.2;
+const HUNT_PRIORITY = 0.5;
+
+export class KillLoneTop extends Goal {
+  private readonly patrol = new PatrolState();
+  private loneIgnoreUntil = 0;
+  private patrolStopOnPlayer: boolean | null = null;
+  private lastFlaggedTarget = '';
+
+  constructor(private readonly protectedTargets: string[] = []) {
+    super();
+  }
+
+  tick(state: GameState, ctx: StrategyContext): BehaviorDecision[] {
+    const now = Date.now();
+    const nonTeammates = nonTeammatesVisible(state, ctx);
+
+    if (!hasKillUseRemaining(state)) {
+      this.setPatrolGoal(state, ctx, false);
+      this.emitProgress(state, ctx);
+      return [];
+    }
+
+    const flagged = nearestPlayerByDistance(
+      state,
+      nonTeammates.filter(p => isKnowledgeHostile(p, ctx) && !this.isProtected(p, ctx)),
+    );
+    if (flagged) {
+      if (flagged.name !== this.lastFlaggedTarget) {
+        ctx.notifications.push(`根据情报，${flagged.name}被标记为目标，主动出击！`);
+        this.lastFlaggedTarget = flagged.name;
+      }
+      this.setHuntGoal(flagged.name, true);
+      return [];
+    } else {
+      this.lastFlaggedTarget = '';
+    }
+
+    if (nonTeammates.length === 0 && state.players.length > 0) {
+      this.loneIgnoreUntil = now + LONE_IGNORE_MS;
+    }
+
+    if (now < this.loneIgnoreUntil || nonTeammates.length === 0) {
+      this.setPatrolGoal(state, ctx, now >= this.loneIgnoreUntil);
+      this.emitProgress(state, ctx);
+      return [];
+    }
+
+    if (nonTeammates.length > 1) {
+      this.loneIgnoreUntil = now + LONE_IGNORE_MS;
+      this.setPatrolGoal(state, ctx, false);
+      this.emitProgress(state, ctx);
+      return [];
+    }
+
+    const target = nonTeammates[0];
+    if (this.isProtected(target, ctx)) {
+      this.loneIgnoreUntil = now + LONE_IGNORE_MS;
+      this.setPatrolGoal(state, ctx, false);
+      this.emitProgress(state, ctx);
+      return [];
+    }
+
+    this.setHuntGoal(target.name);
+    this.emitProgress(state, ctx);
+    return [];
+  }
+
+  /** args 保护名单 ∪ 知识里 trusted 的玩家，永不击杀。 */
+  private isProtected(p: PlayerInfo, ctx: StrategyContext): boolean {
+    return matchesAnyTarget(p, this.protectedTargets, ctx) || isKnowledgeTrusted(p, ctx);
+  }
+
+  private setHuntGoal(targetName: string, ignoreCrowd = false): void {
+    const worker = this.subGoal;
+    if (worker instanceof KillVisibleTargetGoal && worker.targetName === targetName && worker.ignoreCrowd === ignoreCrowd) return;
+    if (this.subGoal) this.removeSubGoal();
+    this.setSubGoal(new KillVisibleTargetGoal(targetName, this.protectedTargets, ignoreCrowd), HUNT_PRIORITY);
+    this.patrolStopOnPlayer = null;
+  }
+
+  private setPatrolGoal(state: GameState, ctx: StrategyContext, stopOnPlayer: boolean): 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;
+      }
+    }
+
+    const worker = this.subGoal;
+    if (worker instanceof MoveRoomGoal && worker.room === room.name && this.patrolStopOnPlayer === stopOnPlayer) return;
+    if (this.subGoal) this.removeSubGoal();
+    this.setSubGoal(new MoveRoomGoal(room.name, hasReachedRoomTarget, {
+      emitProgress: false,
+      stopOnPlayer,
+    }), PATROL_PRIORITY);
+    this.patrolStopOnPlayer = stopOnPlayer;
+  }
+
+  private clearGoal(): void {
+    if (this.subGoal) this.removeSubGoal();
+    this.patrolStopOnPlayer = null;
+  }
+
+  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 cd = killCooldownSecs(state);
+    const killsRemaining = state.you.kills_remaining;
+    const nonTeammates = nonTeammatesVisible(state, ctx);
+
+    let msg = `[进度] 当前在${room}`;
+    if (nonTeammates.length === 0) {
+      msg += '，视野内没有目标，继续巡逻寻找落单猎物。';
+    } else if (nonTeammates.length === 1) {
+      const target = nonTeammates[0];
+      if (this.isProtected(target, ctx)) {
+        msg += `，视野内发现保护目标${target.name}，不动手。`;
+      } else {
+        msg += `，视野内发现落单目标${target.name}。`;
+      }
+      if (cd > 0) msg += `攻击冷却中(${cd}s)。`;
+      if (killsRemaining === 0) msg += '出刀次数已用完。';
+    } else {
+      msg += `，视野内有${nonTeammates.length}人，不适合动手，暂时回避。`;
+    }
+
+    ctx.notifications.push(msg);
+  }
+}

package/src/strategies/goals/kill-target-goal.ts

@@ -1,59 +1,59 @@
-import type { GameState, PlayerInfo } from '../../sdk/types.js';
-import { Action } from '../../sdk/action.js';
-import {
-  canUseKill,
-  dist,
-  hasKillUseRemaining,
-  isKnowledgeTrusted,
-  killCommitRange,
-  LONE_FOLLOW_DISTANCE,
-  matchesAnyTarget,
-  nonTeammatesVisible,
-} from '../game-utils.js';
-import type { BehaviorDecision, StrategyContext } from '../types.js';
-import { Goal } from './goal.js';
-
-export class KillVisibleTargetGoal extends Goal {
-  constructor(
-    public readonly targetName: string,
-    private readonly protectedTargets: string[],
-    public readonly ignoreCrowd = false,
-  ) {
-    super();
-  }
-
-  tick(state: GameState, ctx: StrategyContext): BehaviorDecision[] {
-    const target = this.target(state, ctx);
-    if (!target) return [];
-    if (!hasKillUseRemaining(state)) return [];
-
-    const d = target.distance ?? dist(state.you.x, state.you.y, target.x, target.y);
-
-    if (d <= killCommitRange(state.you.role)) {
-      if (canUseKill(state)) {
-        ctx.notifications.push(`发现追杀目标${target.name}，出刀！`);
-        return [{ action: Action.kill(target.name) }];
-      }
-      return d > LONE_FOLLOW_DISTANCE
-        ? [{ action: Action.move({ x: target.x, y: target.y }) }]
-        : [];
-    }
-
-    ctx.notifications.push(`发现追杀目标${target.name}，正在靠近！`);
-    return [{ action: Action.move({ x: target.x, y: target.y }) }];
-  }
-
-  isFinish(state: GameState, ctx: StrategyContext): boolean {
-    return this.target(state, ctx) == null;
-  }
-
-  private target(state: GameState, ctx: StrategyContext): PlayerInfo | null {
-    const visible = nonTeammatesVisible(state, ctx);
-    if (!this.ignoreCrowd && visible.length !== 1) return null;
-    const target = visible.find(p => p.name === this.targetName) ?? null;
-    if (!target) return null;
-    if (matchesAnyTarget(target, this.protectedTargets, ctx)) return null;
-    if (isKnowledgeTrusted(target, ctx)) return null;
-    return target;
-  }
-}
+import type { GameState, PlayerInfo } from '../../sdk/types.js';
+import { Action } from '../../sdk/action.js';
+import {
+  canUseKill,
+  dist,
+  hasKillUseRemaining,
+  isKnowledgeTrusted,
+  killCommitRange,
+  LONE_FOLLOW_DISTANCE,
+  matchesAnyTarget,
+  nonTeammatesVisible,
+} from '../game-utils.js';
+import type { BehaviorDecision, StrategyContext } from '../types.js';
+import { Goal } from './goal.js';
+
+export class KillVisibleTargetGoal extends Goal {
+  constructor(
+    public readonly targetName: string,
+    private readonly protectedTargets: string[],
+    public readonly ignoreCrowd = false,
+  ) {
+    super();
+  }
+
+  tick(state: GameState, ctx: StrategyContext): BehaviorDecision[] {
+    const target = this.target(state, ctx);
+    if (!target) return [];
+    if (!hasKillUseRemaining(state)) return [];
+
+    const d = target.distance ?? dist(state.you.x, state.you.y, target.x, target.y);
+
+    if (d <= killCommitRange(state.you.role)) {
+      if (canUseKill(state)) {
+        ctx.notifications.push(`发现追杀目标${target.name}，出刀！`);
+        return [{ action: Action.kill(target.name) }];
+      }
+      return d > LONE_FOLLOW_DISTANCE
+        ? [{ action: Action.move({ x: target.x, y: target.y }) }]
+        : [];
+    }
+
+    ctx.notifications.push(`发现追杀目标${target.name}，正在靠近！`);
+    return [{ action: Action.move({ x: target.x, y: target.y }) }];
+  }
+
+  isFinish(state: GameState, ctx: StrategyContext): boolean {
+    return this.target(state, ctx) == null;
+  }
+
+  private target(state: GameState, ctx: StrategyContext): PlayerInfo | null {
+    const visible = nonTeammatesVisible(state, ctx);
+    if (!this.ignoreCrowd && visible.length !== 1) return null;
+    const target = visible.find(p => p.name === this.targetName) ?? null;
+    if (!target) return null;
+    if (matchesAnyTarget(target, this.protectedTargets, ctx)) return null;
+    if (isKnowledgeTrusted(target, ctx)) return null;
+    return target;
+  }
+}

package/src/strategies/goals/kill-target-top.ts

@@ -1,109 +1,109 @@
-import type { GameState } from '../../sdk/types.js';
-import {
-  dist,
-  killCooldownSecs,
-  isTargetAlive,
-  isRecentlyKilledTarget,
-  killCommitRange,
-  LONE_FOLLOW_DISTANCE,
-  LONE_IGNORE_MS,
-  matchesTarget,
-  nearestVisibleTarget,
-  patrolStep,
-  PatrolState,
-  PROGRESS_INTERVAL_MS,
-  pursueVisibleTarget,
-} from '../game-utils.js';
-import type { BehaviorDecision, StrategyContext } from '../types.js';
-import { Goal } from './goal.js';
-
-export class KillTargetTop extends Goal {
-  private readonly patrol = new PatrolState();
-  private skipStopUntil = 0;
-  private completedAfterKill = false;
-  private completedNotified = false;
-
-  constructor(private readonly targets: string[]) {
-    super();
-  }
-
-  onMeetingResume(): void {
-    this.skipStopUntil = Date.now() + LONE_IGNORE_MS;
-  }
-
-  tick(state: GameState, ctx: StrategyContext): BehaviorDecision[] {
-    if (this.completedAfterKill) return this.completedPatrol(state, ctx);
-
-    const recentlyKilledAnyTarget = this.targets.some(t => isRecentlyKilledTarget(t, ctx));
-    const allTargetsDead = this.allTargetsDeadInState(state, ctx);
-    const validTargets = this.targets.filter(t => this.isValidTarget(t, state, ctx));
-    if (validTargets.length === 0) {
-      if (recentlyKilledAnyTarget || allTargetsDead || this.completedAfterKill) {
-        this.completedAfterKill = true;
-        return this.completedPatrol(state, ctx);
-      }
-      ctx.notifications.push('所有目标都已死亡或为队友');
-      this.emitProgress(state, ctx);
-      return [];
-    }
-
-    const target = nearestVisibleTarget(state, ctx, validTargets);
-    if (target) {
-      const decision = pursueVisibleTarget(state, target, { kill: true, followDistance: LONE_FOLLOW_DISTANCE });
-      if (decision?.action.type === 'kill') {
-        ctx.notifications.push(`发现目标${target.name}在攻击范围内，出刀！`);
-      } else {
-        const d = target.distance ?? dist(state.you.x, state.you.y, target.x, target.y);
-        if (d > killCommitRange(state.you.role)) ctx.notifications.push(`发现目标${target.name}，正在靠近！`);
-      }
-      this.emitProgress(state, ctx);
-      return decision ? [decision] : [];
-    }
-
-    if (state.players.length > 0 || ctx.emergency) {
-      this.skipStopUntil = Date.now() + LONE_IGNORE_MS;
-    }
-    this.emitProgress(state, ctx);
-    return patrolStep(state, ctx, this.patrol, Date.now() >= this.skipStopUntil);
-  }
-
-  private completedPatrol(state: GameState, ctx: StrategyContext): BehaviorDecision[] {
-    if (!this.completedNotified) {
-      ctx.notifications.push('击杀目标已完成，切换巡逻离开现场。');
-      ctx.forcePatrolAdvance = true;
-      this.completedNotified = true;
-    }
-    return patrolStep(state, ctx, this.patrol, false);
-  }
-
-  private isValidTarget(t: string, state: GameState, ctx: StrategyContext): boolean {
-    if (!isTargetAlive(state, t, ctx)) return false;
-    const nameFromSeat = /^\d+$/.test(t.trim()) ? ctx.playerNamesBySeat[t.trim()] : null;
-    const resolvedName = nameFromSeat ?? t.trim();
-    return !ctx.teammates.has(resolvedName);
-  }
-
-  private allTargetsDeadInState(state: GameState, ctx: StrategyContext): boolean {
-    return this.targets.length > 0 && this.targets.every(target => this.targetDeadInState(target, state, ctx));
-  }
-
-  private targetDeadInState(target: string, state: GameState, ctx: StrategyContext): boolean {
-    const player = state.all_players?.find(p => matchesTarget(target, p, ctx));
-    if (player) return player.is_alive === false;
-    return (ctx.knownCorpses ?? []).some(corpse => matchesTarget(target, corpse, ctx));
-  }
-
-  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 cd = killCooldownSecs(state);
-    const killsRemaining = state.you.kills_remaining;
-    let msg = `[进度] 当前在${room}，正在寻找目标: ${this.targets.join(', ')}。`;
-    if (cd > 0) msg += `攻击冷却中(${cd}s)。`;
-    if (killsRemaining === 0) msg += '出刀次数已用完。';
-    ctx.notifications.push(msg);
-  }
-}
+import type { GameState } from '../../sdk/types.js';
+import {
+  dist,
+  killCooldownSecs,
+  isTargetAlive,
+  isRecentlyKilledTarget,
+  killCommitRange,
+  LONE_FOLLOW_DISTANCE,
+  LONE_IGNORE_MS,
+  matchesTarget,
+  nearestVisibleTarget,
+  patrolStep,
+  PatrolState,
+  PROGRESS_INTERVAL_MS,
+  pursueVisibleTarget,
+} from '../game-utils.js';
+import type { BehaviorDecision, StrategyContext } from '../types.js';
+import { Goal } from './goal.js';
+
+export class KillTargetTop extends Goal {
+  private readonly patrol = new PatrolState();
+  private skipStopUntil = 0;
+  private completedAfterKill = false;
+  private completedNotified = false;
+
+  constructor(private readonly targets: string[]) {
+    super();
+  }
+
+  onMeetingResume(): void {
+    this.skipStopUntil = Date.now() + LONE_IGNORE_MS;
+  }
+
+  tick(state: GameState, ctx: StrategyContext): BehaviorDecision[] {
+    if (this.completedAfterKill) return this.completedPatrol(state, ctx);
+
+    const recentlyKilledAnyTarget = this.targets.some(t => isRecentlyKilledTarget(t, ctx));
+    const allTargetsDead = this.allTargetsDeadInState(state, ctx);
+    const validTargets = this.targets.filter(t => this.isValidTarget(t, state, ctx));
+    if (validTargets.length === 0) {
+      if (recentlyKilledAnyTarget || allTargetsDead || this.completedAfterKill) {
+        this.completedAfterKill = true;
+        return this.completedPatrol(state, ctx);
+      }
+      ctx.notifications.push('所有目标都已死亡或为队友');
+      this.emitProgress(state, ctx);
+      return [];
+    }
+
+    const target = nearestVisibleTarget(state, ctx, validTargets);
+    if (target) {
+      const decision = pursueVisibleTarget(state, target, { kill: true, followDistance: LONE_FOLLOW_DISTANCE });
+      if (decision?.action.type === 'kill') {
+        ctx.notifications.push(`发现目标${target.name}在攻击范围内，出刀！`);
+      } else {
+        const d = target.distance ?? dist(state.you.x, state.you.y, target.x, target.y);
+        if (d > killCommitRange(state.you.role)) ctx.notifications.push(`发现目标${target.name}，正在靠近！`);
+      }
+      this.emitProgress(state, ctx);
+      return decision ? [decision] : [];
+    }
+
+    if (state.players.length > 0 || ctx.emergency) {
+      this.skipStopUntil = Date.now() + LONE_IGNORE_MS;
+    }
+    this.emitProgress(state, ctx);
+    return patrolStep(state, ctx, this.patrol, Date.now() >= this.skipStopUntil);
+  }
+
+  private completedPatrol(state: GameState, ctx: StrategyContext): BehaviorDecision[] {
+    if (!this.completedNotified) {
+      ctx.notifications.push('击杀目标已完成，切换巡逻离开现场。');
+      ctx.forcePatrolAdvance = true;
+      this.completedNotified = true;
+    }
+    return patrolStep(state, ctx, this.patrol, false);
+  }
+
+  private isValidTarget(t: string, state: GameState, ctx: StrategyContext): boolean {
+    if (!isTargetAlive(state, t, ctx)) return false;
+    const nameFromSeat = /^\d+$/.test(t.trim()) ? ctx.playerNamesBySeat[t.trim()] : null;
+    const resolvedName = nameFromSeat ?? t.trim();
+    return !ctx.teammates.has(resolvedName);
+  }
+
+  private allTargetsDeadInState(state: GameState, ctx: StrategyContext): boolean {
+    return this.targets.length > 0 && this.targets.every(target => this.targetDeadInState(target, state, ctx));
+  }
+
+  private targetDeadInState(target: string, state: GameState, ctx: StrategyContext): boolean {
+    const player = state.all_players?.find(p => matchesTarget(target, p, ctx));
+    if (player) return player.is_alive === false;
+    return (ctx.knownCorpses ?? []).some(corpse => matchesTarget(target, corpse, ctx));
+  }
+
+  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 cd = killCooldownSecs(state);
+    const killsRemaining = state.you.kills_remaining;
+    let msg = `[进度] 当前在${room}，正在寻找目标: ${this.targets.join(', ')}。`;
+    if (cd > 0) msg += `攻击冷却中(${cd}s)。`;
+    if (killsRemaining === 0) msg += '出刀次数已用完。';
+    ctx.notifications.push(msg);
+  }
+}