@myclaw163/clawclaw-cli 0.6.58 → 0.6.61

package/README.md

@@ -166,7 +166,7 @@ ccl tts config <apiKey> --voice female-shaonv
 ccl tts config --voice male-qn-qingse
 ccl tts list
 ccl tts request "测试一下"
-ccl do -s "我在厨房" --url <audio_url>
+ccl do -s "我在厨房" --file /path/to/audio.mp3
 ```
 
 TTS 配置保存在当前账号下。`tts request` 和 `ccl do -s "<text>"` 未显式指定音色时，会使用该账号的默认音色；没有配置默认音色时使用 CLI 内置默认。若当前账号已经配置 TTS key，`ccl do -s "<text>"` 会尝试自动合成音频并附带 URL；没有配置时仍会正常提交文字发言。

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@myclaw163/clawclaw-cli",
-  "version": "0.6.58",
+  "version": "0.6.61",
   "type": "module",
   "description": "ClawClaw social deduction game CLI",
   "bin": {

package/skills/clawclaw/SKILL.md

@@ -1,7 +1,7 @@
 ---
 name: clawclaw
 description: 默认官方 ClawClaw/龙虾杀 gameplay skill，通过 clawclaw-cli/ccl/myclaw 开始、匹配、继续或游玩一局龙虾杀。Use when the user asks to play/start/join/continue a ClawClaw match, including “玩一局”“开一局”“再来一局”“玩龙虾杀”“玩 ClawClaw”“玩 myclaw”. If another Hub/local/custom ClawClaw gameplay skill is available, prefer that skill and do not load this official fallback.
-version: 4.8.20-dev
+version: 4.8.21
 ---
 
 # 龙虾杀（ClawClaw）
@@ -19,7 +19,7 @@ version: 4.8.20-dev
 - 短同步命令（`ccl account`、`ccl load`、`ccl do -s` 等）：Claude Code 可直接 Bash 执行；OpenClaw 优先用对应 typed tool。
 - 长运行流命令（`ccl game start`）：Claude Code **必须**使用 `Monitor()`；OpenClaw 使用 `clawclaw_game_start({id:"clawclaw"})`；其他宿主使用等价 stream 工具。不可用普通 Bash、shell 后台、`run_in_background`、`Start-Process`、`nohup` 或 sleep 轮询，否则 NDJSON 事件无法唤醒 LLM。
 
-> 敏感命令如 `ccl account register`、`ccl account rename`、`ccl tts config` 涉及账号操作，操作前与用户确认。OpenClaw typed tools 会在工具层提供确认门禁，shell 直跑会绕过这层保护。
+> 敏感命令如 `ccl account register`、`ccl account rename`涉及账号操作，操作前与用户确认。OpenClaw typed tools 会在工具层提供确认门禁，shell 直跑会绕过这层保护。
 
 ---
 

package/skills/clawclaw/references/COMMANDS.md

@@ -12,9 +12,6 @@ ccl persona list
 ccl persona use <预设名>
 ccl persona path
 ccl load                                    # 加载人设 + 记忆
-ccl tts config <apiKey> --voice <voice_id>
-ccl tts list
-ccl tts request "<文本>" --voice <voice_id>
 ```
 
 ### 注册流程详情

package/src/cli.ts

@@ -84,7 +84,7 @@ program.addCommand(createPersonaCommand());
 program.addCommand(createUpgradeCommand());
 program.addCommand(createPeekCommand());
 program.addCommand(createHistoryCommand());
-program.addCommand(createTTSCommand());
+program.addCommand(createTTSCommand(), { hidden: true }); // 暂时屏蔽:不在 help 中暴露,命令仍可执行(do -s 自动 TTS 依赖其 config)
 program.addCommand(createStrategyCommand());
 program.addCommand(createSkillCommand());
 program.addCommand(createHubCommand());

package/src/commands/do.test.ts

@@ -1,5 +1,10 @@
-import { describe, expect, it } from 'vitest';
-import { normalizeDoOptions, parseIntents } from './do.js';
+import { describe, expect, it, vi } from 'vitest';
+import { audioContentTypeFor, normalizeDoOptions, parseIntents, resolveSpeechAudioUrl } from './do.js';
+
+vi.mock('../lib/tts-speech.js', () => ({
+  // Stub auto-TTS so the no-file path never touches AuthStore or the network.
+  maybeSynthesizeSpeechAudioUrl: vi.fn().mockResolvedValue(undefined),
+}));
 
 describe('normalizeDoOptions', () => {
   it('joins unquoted speech words passed as extra arguments', () => {
@@ -35,3 +40,34 @@ describe('parseIntents', () => {
     expect(parseIntents({ move: '2424,237', task: true, kill: 'p1', report: true, alarm: true })).toEqual([]);
   });
 });
+
+describe('audioContentTypeFor', () => {
+  it('maps known audio extensions', () => {
+    expect(audioContentTypeFor('/tmp/a.mp3')).toBe('audio/mpeg');
+    expect(audioContentTypeFor('/tmp/a.wav')).toBe('audio/wav');
+    expect(audioContentTypeFor('/tmp/a.m4a')).toBe('audio/mp4');
+    expect(audioContentTypeFor('/tmp/A.OGG')).toBe('audio/ogg');
+  });
+
+  it('defaults to audio/mpeg for unknown or extension-less paths', () => {
+    expect(audioContentTypeFor('/tmp/clip')).toBe('audio/mpeg');
+    expect(audioContentTypeFor('/tmp/clip.xyz')).toBe('audio/mpeg');
+  });
+});
+
+describe('resolveSpeechAudioUrl', () => {
+  it('uploads the local file and returns the cloud audio_url', async () => {
+    const uploadAudio = vi.fn().mockResolvedValue({ audio_url: 'https://cdn.example.com/uploaded.mp3' });
+    const url = await resolveSpeechAudioUrl({ speech: 'hi', file: '/tmp/clip.wav' }, { uploadAudio } as any);
+    expect(url).toBe('https://cdn.example.com/uploaded.mp3');
+    expect(uploadAudio).toHaveBeenCalledWith('/tmp/clip.wav', undefined, 'audio/wav');
+  });
+
+  it('falls back to auto TTS (no upload) when no file is given', async () => {
+    const uploadAudio = vi.fn();
+    const url = await resolveSpeechAudioUrl({ speech: 'hi' }, { uploadAudio } as any);
+    expect(uploadAudio).not.toHaveBeenCalled();
+    // No TTS key configured in test env → auto synthesis returns undefined.
+    expect(url).toBeUndefined();
+  });
+});

package/src/commands/do.ts

@@ -8,6 +8,37 @@ interface ActionIntent {
   build(): Action;
 }
 
+/** Infer an audio MIME type from a file path's extension; defaults to audio/mpeg. */
+export function audioContentTypeFor(filePath: string): string {
+  const ext = filePath.slice(filePath.lastIndexOf('.')).toLowerCase();
+  switch (ext) {
+    case '.wav': return 'audio/wav';
+    case '.ogg': return 'audio/ogg';
+    case '.oga': return 'audio/ogg';
+    case '.m4a': return 'audio/mp4';
+    case '.aac': return 'audio/aac';
+    case '.flac': return 'audio/flac';
+    case '.webm': return 'audio/webm';
+    case '.mp3':
+    default: return 'audio/mpeg';
+  }
+}
+
+/**
+ * Resolve the speech audio URL: when a local --file is given, upload it and
+ * return the cloud URL; otherwise fall back to auto TTS synthesis.
+ */
+export async function resolveSpeechAudioUrl(
+  opts: Record<string, any>,
+  client: { uploadAudio(filePath: string, filename?: string, contentType?: string): Promise<{ audio_url: string }> },
+): Promise<string | undefined> {
+  if (opts.file) {
+    const { audio_url } = await client.uploadAudio(opts.file, undefined, audioContentTypeFor(opts.file));
+    return audio_url;
+  }
+  return maybeSynthesizeSpeechAudioUrl(opts.speech, opts.url, client as any);
+}
+
 export function normalizeDoOptions(opts: Record<string, any>, extraArgs: string[] = []): Record<string, any> {
   const normalized = { ...opts };
   if (normalized.speech && extraArgs.length > 0) {
@@ -29,7 +60,7 @@ export function createDoCommand(): Command {
     .alias('d')
     .description('Execute player communication actions (speech/vote/think)')
     .option('-s, --speech <text>', 'Say something')
-    .option('--url <url>', 'Optional audio URL for speech')
+    .option('--file <path>', 'Local audio file to upload and attach to speech')
     .option('-v, --vote <target>', 'Vote for player')
     .option('--think <text>', 'Send thinking content visible only to spectators. Standalone (e.g. `do --think "..."`) submits a no-op think action; combined with another action, attaches as that action\'s thinking_content.')
     .argument('[extra...]', 'Additional unquoted speech words')
@@ -55,8 +86,8 @@ export function createDoCommand(): Command {
       const client = GameClient.fromAuth();
       await client.discoverGameServer();
 
-      if (opts.speech && !opts.url) {
-        opts.url = await maybeSynthesizeSpeechAudioUrl(opts.speech, opts.url, client);
+      if (opts.speech) {
+        opts.url = await resolveSpeechAudioUrl(opts, client);
       }
 
       const intents = parseIntents(opts);

package/src/strategies/game-utils.ts

@@ -18,12 +18,16 @@ export const PATROL_REACHED_DISTANCE = 150;
 export const PROGRESS_INTERVAL_MS = 30_000;
 export const LONE_IGNORE_MS = 10_000;
 export const LONE_FOLLOW_DISTANCE = 10;
-/** 任务点离任一可见尸体多近就算「在尸体旁」，会做任务伪装的坏人据此跳过该任务、避免站在命案现场做任务。 */
-export const CORPSE_TASK_AVOID_RANGE = 100;
-/** 判「同一具尸体」的极近半径：尸体不会移动，跨 tick 只有坐标取整抖动，远小于两具不同尸体的间距。 */
-export const CORPSE_SAME_BODY_RADIUS = 20;
 /** corpse_spotted 事件坐标离自己多近才算「人就在命案现场」——超出视为别处尸体的迟到/补发事件，不触发现场反射。 */
 export const CORPSE_SCENE_RANGE = REPORT_RANGE;
+/**
+ * 任务避尸的**距离兜底**：任务点离任一已知尸体 ≤ 此距离就算「在尸体旁」而被跳过。与命案现场半径
+ * 对齐（CORPSE_SCENE_RANGE=150），覆盖尸体贴门跨房、或尸体/任务缺房间标签的情形。主判据是「与尸体
+ * 同房间」（见 taskNearKnownCorpse）——房间级回避自动随房间尺寸缩放，避免坏人杀完回到陈尸的房间里做任务。
+ */
+export const CORPSE_TASK_AVOID_RANGE = CORPSE_SCENE_RANGE;
+/** 判「同一具尸体」的极近半径：尸体不会移动，跨 tick 只有坐标取整抖动，远小于两具不同尸体的间距。 */
+export const CORPSE_SAME_BODY_RADIUS = 20;
 
 export function killCooldownSecs(state: GameState): number {
   return state.you.kill_cooldown_secs ?? 0;
@@ -54,6 +58,32 @@ export function dist(x1: number, y1: number, x2: number, y2: number): number {
   return Math.sqrt((x1 - x2) ** 2 + (y1 - y2) ** 2);
 }
 
+/** 房间名归一：去空白；公共走廊 hallway 与空串都视作「无房间」，不参与同房间判断（只走距离兜底）。 */
+function normalizeRoom(room?: string): string {
+  const r = (room ?? '').trim();
+  return r === 'hallway' ? '' : r;
+}
+
+/**
+ * 任务点是否落在「尸体回避区」，供做任务伪装的角色跳过命案房间的任务。命中其一即算：
+ * 1. **同房间**：任务与任一已知尸体在同一个（非走廊）房间——房间级回避，自动随房间尺寸缩放，
+ *    这样坏人杀完不会回到陈尸的那个房间里做任务，哪怕任务点离尸体有大半个房间远。
+ * 2. **距离兜底**：欧氏距离 ≤ CORPSE_TASK_AVOID_RANGE——覆盖尸体贴门跨到隔壁房间、或尸体/任务
+ *    缺房间标签（走廊命案、坐标未回填）的情形。
+ */
+export function taskNearKnownCorpse(
+  task: { x?: number; y?: number; room?: string },
+  avoidCorpses?: CorpseInfo[] | null,
+): boolean {
+  if (!avoidCorpses || avoidCorpses.length === 0) return false;
+  const taskRoom = normalizeRoom(task.room);
+  return avoidCorpses.some(c => {
+    if (taskRoom && normalizeRoom(c.room) === taskRoom) return true;
+    return c.x != null && c.y != null && task.x != null && task.y != null
+      && dist(task.x, task.y, c.x, c.y) <= CORPSE_TASK_AVOID_RANGE;
+  });
+}
+
 export function firstAvailableTask(
   tasks: TaskInfo[],
   predicate: (task: TaskInfo) => boolean,
@@ -61,9 +91,6 @@ export function firstAvailableTask(
   blockedTarget?: { x: number; y: number } | null,
   avoidCorpses?: CorpseInfo[] | null,
 ): TaskInfo | null {
-  const nearCorpse = (x: number, y: number): boolean =>
-    !!avoidCorpses && avoidCorpses.some(c => c.x != null && c.y != null && dist(x, y, c.x, c.y) <= CORPSE_TASK_AVOID_RANGE);
-
   // 紧急任务（维修点）始终自动优先，不做尸体回避：大家都会涌向维修点，在那儿做任务并不可疑，
   // 且紧急维修有倒计时、时间敏感。尸体回避只针对下面的常规伪装任务。
   if (emergency && emergency.status !== 'completed' && emergency.x != null && emergency.y != null && predicate(emergency)) {
@@ -75,7 +102,7 @@ export function firstAvailableTask(
     if (t.status === 'completed' || t.status === 'in_progress') return false;
     if (t.x == null || t.y == null) return false;
     if (blockedTarget && dist(t.x, t.y, blockedTarget.x, blockedTarget.y) <= 10) return false;
-    if (nearCorpse(t.x, t.y)) return false;
+    if (taskNearKnownCorpse(t, avoidCorpses)) return false;
     return predicate(t);
   }) ?? null;
 }
@@ -130,14 +157,12 @@ export function nearestSafeTask(
 
   const threatPoints = opts.threatPoints ?? [];
   const threatRadius = opts.threatExcludeRadius ?? TASK_THREAT_EXCLUDE_RANGE;
-  const nearCorpse = (x: number, y: number): boolean =>
-    !!avoidCorpses && avoidCorpses.some(c => c.x != null && c.y != null && dist(x, y, c.x, c.y) <= CORPSE_TASK_AVOID_RANGE);
 
   const candidates = tasks.filter(t => {
     if (t.status === 'completed' || t.status === 'in_progress') return false;
     if (t.x == null || t.y == null) return false;
     if (blockedTarget && dist(t.x, t.y, blockedTarget.x, blockedTarget.y) <= 10) return false;
-    if (nearCorpse(t.x, t.y)) return false;
+    if (taskNearKnownCorpse(t, avoidCorpses)) return false;
     if (threatPoints.some(p => dist(t.x!, t.y!, p.x, p.y) <= threatRadius)) return false;
     return predicate(t);
   });
@@ -469,7 +494,7 @@ export class CorpseMemory {
   }
 
   private remember(corpse: { x?: number; y?: number; name?: string; room?: string; seat?: number }): void {
-    // 身份去重，不能用任务回避半径(100px)——那会把相距 90px 的两具不同尸体并成一具，
+    // 身份去重，不能用任务回避半径(CORPSE_TASK_AVOID_RANGE)——那会把相距上百 px 的两具不同尸体并成一具，
     // 漏掉第二具另一侧的任务回避。优先按尸体名判同，无名时退化为极近坐标(CORPSE_SAME_BODY_RADIUS)。
     const name = corpse.name ?? '';
     const existing = this.seen.find(c => this.isSameBody(c, corpse, name));
@@ -500,6 +525,19 @@ export function reportCorpseDecision(
 
   const reportable = nearestReportableCorpse(state);
   if (reportable && !reportBlocked) {
+    // 服务端在距离判断之前先按 doing_task 拒绝 report（只有 move/kill 才会打断当前任务）。正在做任务时
+    // 直接报尸必失败、还会触发 5 秒退避而错过目击窗口；改为先发一个移动打断任务并朝尸体靠拢，下一 tick
+    // 任务已断再正常报尸。尸体无坐标可导航时（极少见）退回直接报尸——失败不再长退避，任务做完即可补报。
+    if (state.you.doing_task) {
+      const nav = reportable.x != null && reportable.y != null
+        ? { x: reportable.x, y: reportable.y }
+        : nearestKnownCorpse(state, ctx);
+      if (nav) {
+        ctx.reportCorpseTarget = null;
+        ctx.notifications.push(`正在做任务，先移动打断任务再报尸。`);
+        return { action: Action.move({ x: nav.x, y: nav.y }) };
+      }
+    }
     ctx.reportCorpseTarget = null;
     ctx.notifications.push(`发现尸体，正在报告！`);
     return { action: Action.report(reportable.name, reportable.room) };

package/src/strategies/strategy-loop.ts

@@ -480,7 +480,11 @@ export async function runStrategyLoop(strategyId: string, args?: string[]): Prom
           activeMoveTarget = null;
         }
         if (actionType === 'report') {
-          ctx.reportBlockedUntil = Date.now() + 5000;
+          // doing_task 型失败不是真报不了：服务端只是因正在做任务而拒绝，下一 tick 任务被 move 打断后即可补报。
+          // 这种情况不设 5 秒退避，否则会错过「目击者刚靠近尸体」的报尸自证窗口；其余原因（距离不够等）仍退避避免空报刷屏。
+          if (!failureText.includes('doing_task')) {
+            ctx.reportBlockedUntil = Date.now() + 5000;
+          }
           activeMoveTarget = null;
         }
         if (actionType === 'move') {