@myclaw163/clawclaw-cli 0.6.66 → 0.6.68

package/src/strategies/task-kill-report.ts

@@ -1,17 +1,17 @@
-import type { StrategyEntry } from './types.js';
-import { GoalRootStrategy } from './goals/goal-root-strategy.js';
-import { TaskKillReportTop } from './goals/task-kill-report-top.js';
-
-export const strategy: StrategyEntry = {
-  id: 'task-kill-report',
-  description: '需传入嫌疑目标（座位号或名字，可多人）。看到目标且冷却好，50内就出刀，否则追上去；冷却中贴身跟随。目标不在视野时，遇到尸体就报告；没尸体就做普通任务。',
-  create(args?: string[]) {
-    if (!args || args.length === 0) {
-      throw new Error('task-kill-report strategy requires suspected target seat numbers or player names as arguments.');
-    }
-    const targets = [...args];
-    return new GoalRootStrategy('task-kill-report', () => new TaskKillReportTop(targets), {
-      resetOnMeetingResume: false,
-    });
-  },
-};
+import type { StrategyEntry } from './types.js';
+import { GoalRootStrategy } from './goals/goal-root-strategy.js';
+import { TaskKillReportTop } from './goals/task-kill-report-top.js';
+
+export const strategy: StrategyEntry = {
+  id: 'task-kill-report',
+  description: '需传入嫌疑目标（座位号或名字，可多人）。看到目标且冷却好，50内就出刀，否则追上去；冷却中贴身跟随。目标不在视野时，遇到尸体就报告；没尸体就做普通任务。',
+  create(args?: string[]) {
+    if (!args || args.length === 0) {
+      throw new Error('task-kill-report strategy requires suspected target seat numbers or player names as arguments.');
+    }
+    const targets = [...args];
+    return new GoalRootStrategy('task-kill-report', () => new TaskKillReportTop(targets), {
+      resetOnMeetingResume: false,
+    });
+  },
+};

package/src/strategies/task-only.ts

@@ -1,11 +1,11 @@
-import type { StrategyEntry } from './types.js';
-import { GoalRootStrategy } from './goals/goal-root-strategy.js';
-import { TaskOnlyTop } from './goals/task-only-top.js';
-
-export const strategy: StrategyEntry = {
-  id: 'task-only',
-  description: '专心做任务。紧急任务出现时优先处理，其次按顺序完成普通任务，如果是蟹，则蟹的伪装任务也会做。没有尸体报告和战斗行为。',
-  create() {
-    return new GoalRootStrategy('task-only', () => new TaskOnlyTop(), { resetOnMeetingResume: false });
-  },
-};
+import type { StrategyEntry } from './types.js';
+import { GoalRootStrategy } from './goals/goal-root-strategy.js';
+import { TaskOnlyTop } from './goals/task-only-top.js';
+
+export const strategy: StrategyEntry = {
+  id: 'task-only',
+  description: '专心做任务。紧急任务出现时优先处理，其次按顺序完成普通任务，如果是蟹，则蟹的伪装任务也会做。没有尸体报告和战斗行为。',
+  create() {
+    return new GoalRootStrategy('task-only', () => new TaskOnlyTop(), { resetOnMeetingResume: false });
+  },
+};

package/src/strategies/task-report.ts

@@ -1,22 +1,22 @@
-import type { StrategyEntry } from './types.js';
-import { GoalRootStrategy } from './goals/goal-root-strategy.js';
-import { TaskReportTop } from './goals/task-report-top.js';
-import { parseGreetingArgs } from './greeting.js';
-
-class TaskReportStrategy extends GoalRootStrategy {
-  constructor(private readonly greetingPhrases: string[]) {
-    super('task-report', () => new TaskReportTop(greetingPhrases), { resetOnMeetingResume: false });
-  }
-
-  speechWarmupTexts(): string[] {
-    return this.greetingPhrases;
-  }
-}
-
-export const strategy: StrategyEntry = {
-  id: 'task-report',
-  description: '遇尸体最优先：达到报告距离立刻报告，没达到距离就靠近准备报告。紧急任务出现时优先处理，其次按顺序完成普通任务。传入打招呼话术时，视野内出现人就随机发送一条，之后120秒内不再发言。（普通虾默认；进阶版见 shrimp-memory）参数：可选：1~3 条打招呼话术。',
-  create(args?: string[]) {
-    return new TaskReportStrategy(parseGreetingArgs(args, 'task-report'));
-  },
-};
+import type { StrategyEntry } from './types.js';
+import { GoalRootStrategy } from './goals/goal-root-strategy.js';
+import { TaskReportTop } from './goals/task-report-top.js';
+import { parseGreetingArgs } from './greeting.js';
+
+class TaskReportStrategy extends GoalRootStrategy {
+  constructor(private readonly greetingPhrases: string[]) {
+    super('task-report', () => new TaskReportTop(greetingPhrases), { resetOnMeetingResume: false });
+  }
+
+  speechWarmupTexts(): string[] {
+    return this.greetingPhrases;
+  }
+}
+
+export const strategy: StrategyEntry = {
+  id: 'task-report',
+  description: '遇尸体最优先：达到报告距离立刻报告，没达到距离就靠近准备报告。紧急任务出现时优先处理，其次按顺序完成普通任务。传入打招呼话术时，视野内出现人就随机发送一条，之后120秒内不再发言。（普通虾默认；进阶版见 shrimp-memory）参数：可选：1~3 条打招呼话术。',
+  create(args?: string[]) {
+    return new TaskReportStrategy(parseGreetingArgs(args, 'task-report'));
+  },
+};

package/src/strategies/types.ts

@@ -1,102 +1,102 @@
-import type { GameState, TaskInfo, TaskLocation, EmergencyInfo, CorpseInfo } from '../sdk/types.js';
-import type { Action } from '../sdk/action.js';
-import type { KnowledgeView } from '../lib/knowledge-store.js';
-
-/**
- * Minimal interface for custom modules (built-in and strategy-registered).
- * Strategy authors implement this to inject custom analysis modules
- * (e.g. CoMovementTracker, VisibilityTracker, SpeechAnalyzer) via ctx.customModules.
- * The strategy-loop manages lifecycle through these hooks:
- * - processEvents: called every tick with new events, tick number, and current game state
- * - afterDecide: called after strategy.decide(), can filter/modify decisions (chained by registration order)
- * - onMeetingResume: called after each meeting (decay or full reset)
- * - onMapLoaded: called when fresh map data is available
- */
-export interface CustomModule {
-  processEvents(events: any[], tick: number, state: GameState): void;
-  afterDecide?(decisions: BehaviorDecision[], state: GameState, ctx: StrategyContext): BehaviorDecision[];
-  onMeetingResume?(): void;
-  onMapLoaded?(rawRooms: any[]): void;
-}
-
-export interface BehaviorDecision {
-  action: Action;
-}
-
-export interface CorpseTarget {
-  x: number;
-  y: number;
-  name?: string;
-  room?: string;
-}
-
-export interface Strategy {
-  readonly name: string;
-  decide(state: GameState, ctx: StrategyContext): BehaviorDecision[];
-  /** Called when wandering resumes after a meeting pause. */
-  onMeetingResume?(): void;
-  /** Called by strategy-loop after getRoleInfo() resolves, allowing late config update. */
-  updateRole?(role: string): void;
-  /** Return custom analysis modules. Called once during setup, before the main loop. */
-  customModules?(): CustomModule[];
-  /** Optional texts used by strategy-loop for async speech audio warmup. */
-  speechWarmupTexts?(): string[];
-}
-
-export interface StrategyEntry {
-  readonly id: string;
-  readonly description: string;
-  create(args?: string[]): Strategy;
-}
-
-export interface RoomTarget {
-  name: string;
-  x: number;
-  y: number;
-}
-
-export interface StrategyContext {
-  taskData: TaskInfo[];
-  /**
-   * 全局任务站点（map 的 all_task_locations），strategy-loop 加载地图后写入。与 taskData（仅自己被
-   * 分配、带 status）不同：这是地图上所有任务点的位置，开局固定。用于「同伴停在任务点附近 → 在真实
-   * 任务点假装做任务」这类定点行为。首次地图加载前可能为空/未设置。
-   */
-  taskLocations?: TaskLocation[];
-  emergency: EmergencyInfo | null;
-  taskLocalBlockedUntil: number;
-  reportCorpseTarget: CorpseTarget | null;
-  reportBlockedUntil: number;
-  notifications: string[];
-  lastProgressNotifyAt: number;
-  teammates: Set<string>;
-  alarmDone: boolean;
-  rooms: RoomTarget[];
-  playerNamesBySeat: Record<string, string>;
-  /** Set by strategy-loop when a move target is unreachable too many times. Patrol strategies should advance past the current room. */
-  forcePatrolAdvance: boolean;
-  blockedMoveTarget: { x: number; y: number } | null;
-  /** Own seat number, used by speech module for initiation arbitration. */
-  mySeat: number;
-  /** Speech-module notifications, flushed by strategy-loop as robot_speak_rule events. */
-  speechNotifications: string[];
-  /**
-   * Strategy → agent real-time briefings, flushed by strategy-loop as `strategy_alert`
-   * events (notable → surfaced live by `ccl watch`, unlike `notifications` which only
-   * land in the log as `type:'auto'`). Push **sparingly**, only on a decisive autonomous
-   * move the agent must account for when it next speaks/votes (e.g. the bot reported a
-   * corpse — possibly its own kill — to deflect). NOT for per-tick progress.
-   */
-  agentAlerts: string[];
-  /**
-   * 跨 tick 的已知尸体记忆，由 strategy-loop 每 tick 用中心 CorpseMemory 写入：尸体从出现一直存在到
-   * 开会才清空（开会时由 strategy-loop 清空）。是 `state.corpses`（仅当前视野）的严格超集，含已离开
-   * 视野、之前看见过的尸体。策略应统一读它做尸体检测/接近/任务回避/死亡确认，而非只看 `state.corpses`。
-   * 通过 hasKnownCorpse / nearestKnownCorpse / firstAvailableTask 的 avoidCorpses 参数消费。
-   */
-  knownCorpses?: CorpseInfo[];
-  knowledge?: KnowledgeView;
-  recentlyKilledTargets?: Map<string, number>;
-  /** Strategy-registered modules. strategy-loop auto-calls processEvents, afterDecide, onMeetingResume and onMapLoaded. */
-  customModules?: CustomModule[];
-}
+import type { GameState, TaskInfo, TaskLocation, EmergencyInfo, CorpseInfo } from '../sdk/types.js';
+import type { Action } from '../sdk/action.js';
+import type { KnowledgeView } from '../lib/knowledge-store.js';
+
+/**
+ * Minimal interface for custom modules (built-in and strategy-registered).
+ * Strategy authors implement this to inject custom analysis modules
+ * (e.g. CoMovementTracker, VisibilityTracker, SpeechAnalyzer) via ctx.customModules.
+ * The strategy-loop manages lifecycle through these hooks:
+ * - processEvents: called every tick with new events, tick number, and current game state
+ * - afterDecide: called after strategy.decide(), can filter/modify decisions (chained by registration order)
+ * - onMeetingResume: called after each meeting (decay or full reset)
+ * - onMapLoaded: called when fresh map data is available
+ */
+export interface CustomModule {
+  processEvents(events: any[], tick: number, state: GameState): void;
+  afterDecide?(decisions: BehaviorDecision[], state: GameState, ctx: StrategyContext): BehaviorDecision[];
+  onMeetingResume?(): void;
+  onMapLoaded?(rawRooms: any[]): void;
+}
+
+export interface BehaviorDecision {
+  action: Action;
+}
+
+export interface CorpseTarget {
+  x: number;
+  y: number;
+  name?: string;
+  room?: string;
+}
+
+export interface Strategy {
+  readonly name: string;
+  decide(state: GameState, ctx: StrategyContext): BehaviorDecision[];
+  /** Called when wandering resumes after a meeting pause. */
+  onMeetingResume?(): void;
+  /** Called by strategy-loop after getRoleInfo() resolves, allowing late config update. */
+  updateRole?(role: string): void;
+  /** Return custom analysis modules. Called once during setup, before the main loop. */
+  customModules?(): CustomModule[];
+  /** Optional texts used by strategy-loop for async speech audio warmup. */
+  speechWarmupTexts?(): string[];
+}
+
+export interface StrategyEntry {
+  readonly id: string;
+  readonly description: string;
+  create(args?: string[]): Strategy;
+}
+
+export interface RoomTarget {
+  name: string;
+  x: number;
+  y: number;
+}
+
+export interface StrategyContext {
+  taskData: TaskInfo[];
+  /**
+   * 全局任务站点（map 的 all_task_locations），strategy-loop 加载地图后写入。与 taskData（仅自己被
+   * 分配、带 status）不同：这是地图上所有任务点的位置，开局固定。用于「同伴停在任务点附近 → 在真实
+   * 任务点假装做任务」这类定点行为。首次地图加载前可能为空/未设置。
+   */
+  taskLocations?: TaskLocation[];
+  emergency: EmergencyInfo | null;
+  taskLocalBlockedUntil: number;
+  reportCorpseTarget: CorpseTarget | null;
+  reportBlockedUntil: number;
+  notifications: string[];
+  lastProgressNotifyAt: number;
+  teammates: Set<string>;
+  alarmDone: boolean;
+  rooms: RoomTarget[];
+  playerNamesBySeat: Record<string, string>;
+  /** Set by strategy-loop when a move target is unreachable too many times. Patrol strategies should advance past the current room. */
+  forcePatrolAdvance: boolean;
+  blockedMoveTarget: { x: number; y: number } | null;
+  /** Own seat number, used by speech module for initiation arbitration. */
+  mySeat: number;
+  /** Speech-module notifications, flushed by strategy-loop as robot_speak_rule events. */
+  speechNotifications: string[];
+  /**
+   * Strategy → agent real-time briefings, flushed by strategy-loop as `strategy_alert`
+   * events (notable → surfaced live by `ccl watch`, unlike `notifications` which only
+   * land in the log as `type:'auto'`). Push **sparingly**, only on a decisive autonomous
+   * move the agent must account for when it next speaks/votes (e.g. the bot reported a
+   * corpse — possibly its own kill — to deflect). NOT for per-tick progress.
+   */
+  agentAlerts: string[];
+  /**
+   * 跨 tick 的已知尸体记忆，由 strategy-loop 每 tick 用中心 CorpseMemory 写入：尸体从出现一直存在到
+   * 开会才清空（开会时由 strategy-loop 清空）。是 `state.corpses`（仅当前视野）的严格超集，含已离开
+   * 视野、之前看见过的尸体。策略应统一读它做尸体检测/接近/任务回避/死亡确认，而非只看 `state.corpses`。
+   * 通过 hasKnownCorpse / nearestKnownCorpse / firstAvailableTask 的 avoidCorpses 参数消费。
+   */
+  knownCorpses?: CorpseInfo[];
+  knowledge?: KnowledgeView;
+  recentlyKilledTargets?: Map<string, number>;
+  /** Strategy-registered modules. strategy-loop auto-calls processEvents, afterDecide, onMeetingResume and onMapLoaded. */
+  customModules?: CustomModule[];
+}

package/src/strategies/warrior-memory.knowledge.md

@@ -1,22 +1,21 @@
-# warrior-memory 知识契约
-
-`warrior-memory` 只读取统一的玩家三档标记：
-
-| 标记 | 行为 |
-|------|------|
-| `suspect` | 可疑：只回避观察，刀可用也绝不出刀（被贴身追击也只逃不反击） |
-| `hostile` | 敌对：刀可用时主动追杀；刀冷却或枪虾无次数时回避 |
-| `trusted` | 可信：绝不攻击，也不会因其在场而对陌生人后撤 |
-
-**suspect 只回避、不自卫**：对仅标记 suspect 的玩家，武士虾永远只观察、回避、拉开距离，绝不会因为怀疑或被持续贴身追击而先手出刀（被追到死角也只逃）。确认其敌对后请升级标为 hostile，再由刀好时主动追杀。
-
-无标记玩家按陌生人处理：平时不主动猎杀；无 trusted 同伴且单个陌生人贴近 270px 内时先拉开距离。尸体场景仍有更高优先级：刀可用时会攻击尸体旁最近的非 trusted 非队友，因此确认好人后应及时标为 trusted。
-
-```bash
-ccl knowledge mark 5 suspect --confidence 0.7 --note "电力房尾随"
-ccl knowledge mark 5 hostile --confidence 0.9 --note "确认敌对"
-ccl knowledge mark 3 trusted --note "不在场证明成立"
-ccl knowledge del player 5
-```
-
-启动参数 `ccl strategy warrior-memory -- 3 7` 仍表示本次策略运行的明确猎杀目标。`role` 是纯身份事实，不直接控制策略。
+# warrior-memory 知识契约
+
+`warrior-memory` 只读取两档玩家标记，**未标记的一律默认「被怀疑」**：
+
+| 标记 | 行为 |
+|------|------|
+| `hostile`（坏人） | 敌对：刀可用时主动追杀；刀冷却或枪虾无次数时硬回避 |
+| `trusted`（好人） | 可信：绝不攻击，也不会因其在场而对被怀疑者后撤 |
+| 未标记（被怀疑） | 默认回避观察，刀可用也不主动猎杀；仅「绝境自卫」例外（见下） |
+
+**绝境自卫例外（对所有被怀疑者适用）**：当被同一个被怀疑者连续贴身追击、且逃跑推演判定甩不掉时，武士虾会主动横向变一次向试探。只有它跟着变向重新咬住（确认是在追我、不是顺路赶路）、已进 160px 射程、且我到它视线无墙，才会出于自卫先手击杀，并向 agent 推一条「被动自卫」简报（供后续发言/投票口径对齐，别承认无故先手）。直奔身后任务点、顺路掠过的虾不会跟着变向，会被自然甩开、绝不误杀。**不要求先把对方标成坏人**——实战里真凶往往还没被标记就开始追杀，所以对任何被怀疑者都适用。这是最后手段——多数情况下变向只是把追兵甩开，并不出刀。
+
+被怀疑者（未标记）平时按陌生人处理：不主动猎杀；无 trusted 同伴且单个被怀疑者贴近 270px 内时先拉开距离，多个互为目击者时照常做任务；坏人刀冷时硬躲所有非好人。尸体场景对【未报警的身份不明者】只报警不灭口：站在尸体旁即便身边有被怀疑者，也绝不先手击杀，一律靠近报警；但若尸体旁是 hostile 或启动猎杀目标、刀可用，仍会现场先手击杀（凶手就在身边照杀）。
+
+```bash
+ccl knowledge mark 5 hostile --note "确认敌对"
+ccl knowledge mark 3 trusted --note "不在场证明成立"
+ccl knowledge del player 5            # 取消标记 → 回到默认「被怀疑」
+```
+
+启动参数 `ccl strategy warrior-memory -- 3 7` 仍表示本次策略运行的明确猎杀目标（等同坏人）。`role` 是纯身份事实，不直接控制策略。

package/src/strategies/warrior-memory.ts

@@ -1,16 +1,16 @@
-import type { StrategyEntry } from './types.js';
-import { GoalRootStrategy } from './goals/goal-root-strategy.js';
-import { WarriorShrimpTop } from './goals/warrior-shrimp-top.js';
-import { parseTargetArgs } from './player-targets.js';
-
-export const strategy: StrategyEntry = {
-  id: 'warrior-memory',
-  description:
-    '带刀虾·记忆进阶版（武士虾/枪虾通用，好人带刀；kill-lone 的带记忆升级）。统一读取 ccl knowledge 三档标记：suspect 只回避观察、刀可用也绝不出刀（被贴身追击也只逃不反击，确认敌对请升级为 hostile），hostile 在刀好时主动追杀、刀不好时回避，trusted 视为可信同伴且绝不攻击。发现尸体且旁边有非 trusted 对象、刀可用就先出刀，否则靠近报警；无可信同伴且单个陌生人贴近270内时先拉开到300再做任务；无危险时优先紧急任务，否则做任务/巡逻。枪虾会尊重剩余出刀次数。',
-  create(args?: string[]) {
-    const huntTargets = args ? parseTargetArgs(args) : [];
-    return new GoalRootStrategy('warrior-memory', () => new WarriorShrimpTop(huntTargets), {
-      resetOnMeetingResume: false,
-    });
-  },
-};
+import type { StrategyEntry } from './types.js';
+import { GoalRootStrategy } from './goals/goal-root-strategy.js';
+import { WarriorShrimpTop } from './goals/warrior-shrimp-top.js';
+import { parseTargetArgs } from './player-targets.js';
+
+export const strategy: StrategyEntry = {
+  id: 'warrior-memory',
+  description:
+    '带刀虾·记忆进阶版（武士虾/枪虾通用，好人带刀；kill-lone 的带记忆升级）。读取 ccl knowledge 两档标记（hostile=坏人 / trusted=好人），未标记的一律默认被怀疑：hostile 刀好时主动追杀、刀不好时硬回避，trusted 视为可信同伴且绝不攻击，被怀疑者默认只回避观察——仅当被同一个被怀疑者持续贴身追击、避让判定甩不掉时主动横向变向试探，只有它跟着变向仍咬住、进了射程且视线无墙才自卫先手击杀（被动自卫，会推 agent 简报；直奔任务点顺路掠过的虾不跟变向、自然甩开不误杀；不要求先标记，实战里真凶常没来得及标就追杀）。发现尸体优先报警；尸体旁若是 hostile/启动猎杀目标且刀可用会现场先手击杀，但绝不会因尸体旁有未报警的身份不明者就灭口（已根治该误杀）；无可信同伴且单个被怀疑者贴近270内时先拉开到300再做任务；无危险时优先紧急任务，否则做任务/巡逻。枪虾会尊重剩余出刀次数。',
+  create(args?: string[]) {
+    const huntTargets = args ? parseTargetArgs(args) : [];
+    return new GoalRootStrategy('warrior-memory', () => new WarriorShrimpTop(huntTargets), {
+      resetOnMeetingResume: false,
+    });
+  },
+};