@coolclaw/coolclaw 0.4.0 → 0.4.1

package/dist/{chunk-NY6UBBGB.js → chunk-QZL3FKVL.js}

@@ -1,7 +1,7 @@
 import {
   coolclawChannelPlugin,
   setCoolclawRuntime
-} from "./chunk-IPHJPPD4.js";
+} from "./chunk-XVB6UKBR.js";
 import {
   runCoolclawSetup
 } from "./chunk-A54AF634.js";

package/dist/{chunk-IPHJPPD4.js → chunk-XVB6UKBR.js}

@@ -167,19 +167,25 @@ function asRecordArray(v) {
 function asStringArray(v) {
   return Array.isArray(v) ? v.filter((x) => typeof x === "string") : [];
 }
-function renderPlayerInfo(list) {
+function renderPlayerInfo(list, selfSeat) {
   if (list.length === 0) return "\uFF08\u65E0\u5EA7\u4F4D\u4FE1\u606F\uFF09";
   return list.map((p) => {
     const seat = asNumberOrNull(p.seat);
-    const name = asString(p.name, "\u672A\u77E5");
-    const voice = asString(p.voiceDesc, "");
     const alive = p.alive === true ? "\u5B58\u6D3B" : "\u5DF2\u6B7B\u4EA1";
-    return `\u5EA7\u4F4D${seat ?? "?"} ${name}\uFF08${voice || "\u672A\u6807\u6CE8"}\uFF0C${alive}\uFF09`;
+    if (seat != null && selfSeat != null && seat === selfSeat) {
+      const name = asString(p.name, "\u672A\u77E5");
+      const voice = asString(p.voiceDesc, "");
+      return `\u5EA7\u4F4D${seat}\uFF08\u4F60\u81EA\u5DF1\uFF0C${name}${voice ? `\uFF0C${voice}` : ""}\uFF0C${alive}\uFF09`;
+    }
+    return `\u5EA7\u4F4D${seat ?? "?"}\uFF08${alive}\uFF09`;
   }).join("\uFF1B");
 }
+function stripAudioSuffix(line) {
+  return line.replace(/\s*:audio=https?:\/\/\S+/g, "").replace(/\s*:cb=[^\s|]+/g, "");
+}
 function renderHistory(history) {
   if (history.length === 0) return "\uFF08\u6682\u65E0\u5386\u53F2\u8BB0\u5F55\uFF09";
-  return history.map((h, i) => `${i + 1}. ${h}`).join("\n");
+  return history.map((h, i) => `${i + 1}. ${stripAudioSuffix(h)}`).join("\n");
 }
 function renderAliveSeats(seats) {
   return seats.length === 0 ? "\uFF08\u65E0\uFF09" : `[${seats.join(", ")}]`;
@@ -191,7 +197,7 @@ function renderHeader(eventType, outer, payload) {
   const selfName = asString(payload.selfAgentName, "");
   const phase = eventType.startsWith("DAY_") || eventType === "LAST_WORD_TURN" || eventType === "HUNTER_SKILL_TURN" ? "\u767D\u5929" : "\u591C\u665A";
   const aliveSeats = asNumberArray(payload.aliveSeats);
-  const playerInfo = renderPlayerInfo(asRecordArray(payload.playerInfoList));
+  const playerInfo = renderPlayerInfo(asRecordArray(payload.playerInfoList), selfSeat);
   const history = renderHistory(asStringArray(payload.scopedHistory));
   return [
     `[\u6E38\u620F] \u72FC\u4EBA\u6740 \xB7 \u7B2C ${round} \u8F6E \xB7 ${phase} \xB7 ${describeEventType(eventType)}`,
@@ -250,15 +256,26 @@ function renderWolfTurn(payload) {
   const round = asNumberOrNull(payload.wolfAttemptRound) ?? 1;
   const isFirst = payload.isFirstSpeakerInRound === true;
   const teammateSeat = asNumberOrNull(payload.teammateSeat);
-  const teammateName = asString(payload.teammateName, "");
   const tp = asRecord(payload.teammateProposal);
-  const teammateProposalStr = tp.targetSeat != null ? `\u540C\u4F34\uFF08\u5EA7\u4F4D ${tp.seat}\uFF09\u672C\u8F6E\u5DF2\u63D0\u8BAE\u51FB\u6740\u5EA7\u4F4D ${tp.targetSeat}${tp.reason ? `\uFF0C\u7406\u7531\uFF1A${tp.reason}` : ""}${tp.speech ? `\uFF0C\u53D1\u8A00\uFF1A"${tp.speech}"` : ""}\u3002` : isFirst ? "\u4F60\u662F\u672C\u8F6E\u9996\u4F4D\u53D1\u8A00\u7684\u72FC\u4EBA\u3002" : "\u540C\u4F34\u5C1A\u672A\u53D1\u8A00\u3002";
+  const tpSeat = asNumberOrNull(tp.seat);
+  const tpTarget = asNumberOrNull(tp.targetSeat);
+  const tpSpeech = asString(tp.speech, "").trim();
+  let teammateBlock;
+  if (tpTarget != null) {
+    const speechLine = tpSpeech ? `
+===== \u72FC\u961F\u53CB\u53D1\u8A00\u5F00\u59CB =====
+${tpSpeech}
+===== \u72FC\u961F\u53CB\u53D1\u8A00\u7ED3\u675F =====` : "";
+    teammateBlock = `\u540C\u4F34\uFF08\u5EA7\u4F4D ${tpSeat ?? "?"}\uFF09\u672C\u8F6E\u5DF2\u63D0\u8BAE\u51FB\u6740\u5EA7\u4F4D ${tpTarget}\u3002${speechLine}`;
+  } else {
+    teammateBlock = isFirst ? "\u4F60\u662F\u672C\u8F6E\u9996\u4F4D\u53D1\u8A00\u7684\u72FC\u4EBA\u3002" : "\u540C\u4F34\u5C1A\u672A\u53D1\u8A00\u3002";
+  }
   const lastRound = asRecordArray(payload.lastRoundChoices);
   const lastRoundStr = lastRound.length > 0 ? `\u4E0A\u4E00\u8F6E\u6295\u7968\u8BB0\u5F55\uFF1A${lastRound.map((c) => `\u5EA7\u4F4D${c.seat}\u2192\u5EA7\u4F4D${c.targetSeat}`).join("\uFF1B")}\u3002` : "";
   return [
     `\u3010\u4EFB\u52A1\u3011\u72FC\u4EBA\u6740\u4EBA\u534F\u5546\uFF08\u7B2C ${round} \u8F6E\uFF09`,
-    teammateSeat != null ? `\u4F60\u7684\u72FC\u540C\u4F34\uFF1A\u5EA7\u4F4D ${teammateSeat} ${teammateName}\u3002` : "\u4F60\u662F\u72EC\u72FC\u3002",
-    teammateProposalStr,
+    teammateSeat != null ? `\u4F60\u7684\u72FC\u540C\u4F34\uFF1A\u5EA7\u4F4D ${teammateSeat}\u3002` : "\u4F60\u662F\u72EC\u72FC\u3002",
+    teammateBlock,
     lastRoundStr,
     `\u5408\u6CD5\u76EE\u6807\uFF1A${renderAliveSeats(aliveSeats)} \u4E2D\u7684\u4EFB\u610F\u4E00\u4E2A\u3002`,
     ``,
@@ -717,6 +734,22 @@ async function sendMedia(input) {
   }
   return response.messageId;
 }
+async function sendGameAction(input) {
+  const frame = createFrame("GAME_ACTION", {
+    gameId: input.gameId,
+    actionType: input.actionType,
+    actionData: input.actionData,
+    // AgentActionRequest.timestamp 契约为 String
+    timestamp: String(Date.now()),
+    turnSeq: input.turnSeq,
+    eventId: input.eventId,
+    traceId: input.traceId
+  });
+  const response = await input.client.request(frame);
+  if (response.ok === false) {
+    throw new Error(response.error?.message ?? "CoolClaw game action failed");
+  }
+}
 
 // src/game-action-parser.ts
 function extractActionBlock(text) {
@@ -821,89 +854,6 @@ function fallbackActionFor(eventType, eventData) {
   }
 }
 
-// src/game-action-client.ts
-function buildUrl(gatewayUrl) {
-  const base = gatewayUrl.replace(/\/+$/, "");
-  const tail = base.endsWith("/riddle") ? "/api/chat/agent/action" : "/riddle/api/chat/agent/action";
-  return `${base}${tail}`;
-}
-function buildBody(input) {
-  return JSON.stringify({
-    gameId: input.gameId,
-    actionType: input.actionType,
-    actionData: input.actionData,
-    // AgentActionRequest.timestamp 契约为 String
-    timestamp: String(Date.now()),
-    turnSeq: input.turnSeq,
-    eventId: input.eventId,
-    traceId: input.traceId
-  });
-}
-function sleep(ms) {
-  return new Promise((resolve) => setTimeout(resolve, ms));
-}
-async function submitGameAction(input) {
-  const url = buildUrl(input.gatewayUrl);
-  const body = buildBody(input);
-  const timeoutMs = input.timeoutMs ?? 5e3;
-  const maxRetries = input.maxRetries ?? 1;
-  const fetchImpl = input.fetchImpl ?? fetch;
-  const start = Date.now();
-  let attempts = 0;
-  let lastError;
-  let lastStatus;
-  for (let attempt = 0; attempt <= maxRetries; attempt++) {
-    attempts++;
-    const ac = new AbortController();
-    const timer = setTimeout(() => ac.abort(), timeoutMs);
-    try {
-      const resp = await fetchImpl(url, {
-        method: "POST",
-        headers: {
-          "Content-Type": "application/json",
-          Authorization: `Bearer ${input.token}`,
-          "X-User-Id": input.agentId,
-          "X-User-Type": "AGENT"
-        },
-        body,
-        signal: ac.signal
-      });
-      lastStatus = resp.status;
-      if (resp.ok) {
-        const elapsedMs2 = Date.now() - start;
-        input.log?.info?.(
-          `[GAME-ACTION] post ok gameId=${input.gameId} eventId=${input.eventId} actionType=${input.actionType} status=${resp.status} elapsedMs=${elapsedMs2} attempts=${attempts}`
-        );
-        return { success: true, status: resp.status, elapsedMs: elapsedMs2, attempts };
-      }
-      let text = "";
-      try {
-        text = (await resp.text()).slice(0, 500);
-      } catch {
-      }
-      lastError = `http_${resp.status}: ${text}`;
-      input.log?.warn?.(
-        `[GAME-ACTION] post non-2xx gameId=${input.gameId} eventId=${input.eventId} status=${resp.status} attempt=${attempt} body=${text}`
-      );
-    } catch (err) {
-      lastError = err instanceof Error ? err.message : String(err);
-      input.log?.warn?.(
-        `[GAME-ACTION] post network error gameId=${input.gameId} eventId=${input.eventId} attempt=${attempt} err=${lastError}`
-      );
-    } finally {
-      clearTimeout(timer);
-    }
-    if (attempt < maxRetries) {
-      await sleep(500 * Math.pow(2, attempt));
-    }
-  }
-  const elapsedMs = Date.now() - start;
-  input.log?.error?.(
-    `[GAME-ACTION] post failed gameId=${input.gameId} eventId=${input.eventId} actionType=${input.actionType} status=${lastStatus ?? "n/a"} attempts=${attempts} elapsedMs=${elapsedMs} err=${lastError ?? "unknown"}`
-  );
-  return { success: false, status: lastStatus, error: lastError, elapsedMs, attempts };
-}
-
 // src/ws-client.ts
 import WebSocket from "ws";
 var CoolclawWsClient = class {
@@ -1181,29 +1131,32 @@ function logAckFailure(params) {
   const target = params.target ? ` target=${params.target}` : "";
   params.log(`${params.channel} ack cleanup failed${target}: ${String(params.error)}`);
 }
-async function submitGameActionWithLog(action, meta, account, token, log, source) {
-  if (!account.gatewayUrl || !account.agentId) {
-    log?.error?.(`[GAME-ACTION] submit skipped: missing gatewayUrl/agentId eventId=${meta.eventId}`);
+async function submitGameActionWithLog(action, meta, wsClient, log, source) {
+  if (!wsClient.isConnected()) {
+    log?.error?.(`[GAME-ACTION] submit skipped: ws not connected eventId=${meta.eventId}`);
     return;
   }
   log?.info?.(
     `[GAME-ACTION] submit start source=${source} eventType=${meta.eventType} actionType=${action.actionType} gameId=${meta.gameId} turnSeq=${meta.turnSeq} eventId=${meta.eventId}`
   );
-  const result = await submitGameAction({
-    gatewayUrl: account.gatewayUrl,
-    token,
-    agentId: String(account.agentId),
-    gameId: meta.gameId,
-    actionType: action.actionType,
-    actionData: action.actionData,
-    turnSeq: meta.turnSeq,
-    eventId: meta.eventId,
-    traceId: meta.traceId,
-    log
-  });
-  if (!result.success) {
+  const start = Date.now();
+  try {
+    await sendGameAction({
+      client: wsClient,
+      gameId: meta.gameId,
+      actionType: action.actionType,
+      actionData: action.actionData,
+      turnSeq: meta.turnSeq,
+      eventId: meta.eventId,
+      traceId: meta.traceId
+    });
+    log?.info?.(
+      `[GAME-ACTION] submit ok source=${source} gameId=${meta.gameId} eventId=${meta.eventId} elapsedMs=${Date.now() - start}`
+    );
+  } catch (err) {
+    const errMsg = err instanceof Error ? err.message : String(err);
     log?.error?.(
-      `[GAME-ACTION] submit failed source=${source} eventId=${meta.eventId} attempts=${result.attempts} status=${result.status ?? "n/a"} err=${result.error ?? "unknown"}`
+      `[GAME-ACTION] submit failed source=${source} eventId=${meta.eventId} elapsedMs=${Date.now() - start} err=${errMsg}`
     );
   }
 }
@@ -1460,8 +1413,7 @@ var coolclawChannelPlugin = createChatChannelPlugin({
                                 await submitGameActionWithLog(
                                   parsed,
                                   gameMeta,
-                                  account,
-                                  token,
+                                  wsClient,
                                   ctx.log,
                                   "llm"
                                 );
@@ -1505,8 +1457,7 @@ var coolclawChannelPlugin = createChatChannelPlugin({
                             await submitGameActionWithLog(
                               fb,
                               gameMeta,
-                              account,
-                              token,
+                              wsClient,
                               ctx.log,
                               "fallback"
                             );

package/dist/cli-metadata.js

@@ -1,7 +1,7 @@
 import {
   index_default
-} from "./chunk-NY6UBBGB.js";
-import "./chunk-IPHJPPD4.js";
+} from "./chunk-QZL3FKVL.js";
+import "./chunk-XVB6UKBR.js";
 import "./chunk-A54AF634.js";
 import "./chunk-Q3NF4NWE.js";
 

package/dist/index.js

@@ -1,7 +1,7 @@
 import {
   index_default
-} from "./chunk-NY6UBBGB.js";
-import "./chunk-IPHJPPD4.js";
+} from "./chunk-QZL3FKVL.js";
+import "./chunk-XVB6UKBR.js";
 import "./chunk-A54AF634.js";
 import "./chunk-Q3NF4NWE.js";
 export {

package/dist/setup-entry.js

@@ -1,6 +1,6 @@
 import {
   coolclawChannelPlugin
-} from "./chunk-IPHJPPD4.js";
+} from "./chunk-XVB6UKBR.js";
 import "./chunk-Q3NF4NWE.js";
 
 // setup-entry.ts

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@coolclaw/coolclaw",
-  "version": "0.4.0",
+  "version": "0.4.1",
   "description": "OpenClaw native channel plugin for Riddle/CoolClaw chat.",
   "type": "module",
   "files": [
@@ -59,7 +59,7 @@
     "runtimeSetupEntry": "./dist/setup-entry.js",
     "install": {
       "npmSpec": "@coolclaw/coolclaw",
-      "expectedIntegrity": "sha512-jZn9gMqpzKzbqQBz7GMFkTUdqUBtV1SZRYnYKP9eV/75xbx1RkoCADvhLF5LviH3JWsYd3jzZEV/6fy1H5FNTw==",
+      "expectedIntegrity": "sha512-flpAooDuQuAIeKDQ0oPAS7bzy+yN8ql1tKxE7HfvMgSgJiIiwrFXWQ3+Uqnc6q0Ls0MAncnCSwFC5TzxNX+CVw==",
       "defaultChoice": "npm",
       "minHostVersion": ">=2026.3.22"
     },