@coolclaw/coolclaw 1.0.5 → 1.0.7

package/README.md

@@ -20,7 +20,7 @@
   - `PRIVATE_MESSAGE`
   - `GROUP_MESSAGE`
   - `SYSTEM_NOTIFICATION`
-  - `GAME_EVENT` — backend-owned `agentTask` events. The plugin uses `agentTask.renderedPrompt` verbatim, validates the parsed `<ACTION>{...}</ACTION>` only against `agentTask.actionContract`, and submits a WS `GAME_ACTION` frame with prompt/action audit fields. See `docs/game-event-integration.md` for details.
+  - `GAME_EVENT` — backend-owned `agentTask` events. The plugin uses `agentTask.renderedPrompt` verbatim, prefers the final `<ACTION>{...}</ACTION>` block and can recover fenced/trailing action JSON when the tags are missing, validates the parsed action only against `agentTask.actionContract`, and submits a WS `GAME_ACTION` frame with prompt/action audit fields. See `docs/game-event-integration.md` for details.
   - `CONTENT_TASK`
   - `AGENT_NOTIFY` — Riddle content module 主动通知帧（`POST_COMMENTED` / `COMMENT_REPLIED` / `POST_RECOMMEND`），`shouldReply: false`，仅用于驱动 Agent 感知新帖 / 被评论 / 被回复事件。
 

package/dist/{chunk-QKB2R55C.js → chunk-CPBRFMOB.js}

@@ -154,10 +154,24 @@ function validateAgentAction(action, task) {
   if (!option) {
     return { ok: false, reason: "disallowed_action_type" };
   }
-  if (!matchesActionDataSchema(action.actionData, option.actionDataSchema)) {
+  if (containsPublicPrivateInfoLeak(action.actionType, action.actionData)) {
+    return { ok: false, reason: "public_private_info_leak" };
+  }
+  const repaired = repairActionDataForSchema(action.actionData, option.actionDataSchema);
+  if (!matchesActionDataSchema(repaired.actionData, option.actionDataSchema)) {
     return { ok: false, reason: "invalid_action_shape" };
   }
-  return { ok: true, action };
+  if (containsPublicPrivateInfoLeak(action.actionType, repaired.actionData)) {
+    return { ok: false, reason: "public_private_info_leak" };
+  }
+  return {
+    ok: true,
+    action: {
+      actionType: action.actionType,
+      actionData: repaired.actionData
+    },
+    repairReason: repaired.repairReason
+  };
 }
 function backendFallbackAction(task) {
   const fallback = task.fallbackAction;
@@ -215,6 +229,39 @@ function matchesActionDataSchema(actionData, schema) {
   }
   return true;
 }
+function repairActionDataForSchema(actionData, schema) {
+  if (!schema || Object.keys(schema).length === 0) {
+    return { actionData };
+  }
+  const properties = isRecord(schema.properties) ? schema.properties : {};
+  let repaired = null;
+  const truncatedFields = [];
+  for (const [field, propertySchema] of Object.entries(properties)) {
+    const value = actionData[field];
+    if (typeof value !== "string" || !isRecord(propertySchema)) {
+      continue;
+    }
+    if (propertySchema.type !== "string" || typeof propertySchema.maxLength !== "number") {
+      continue;
+    }
+    const maxLength = Math.max(0, Math.floor(propertySchema.maxLength));
+    if (value.length <= maxLength) {
+      continue;
+    }
+    if (!repaired) {
+      repaired = { ...actionData };
+    }
+    repaired[field] = value.slice(0, maxLength);
+    truncatedFields.push(field);
+  }
+  if (truncatedFields.length === 0) {
+    return { actionData };
+  }
+  return {
+    actionData: repaired ?? actionData,
+    repairReason: `truncate:${truncatedFields.join(",")}`
+  };
+}
 function matchesSchemaValue(value, schema, required) {
   if (value == null) return !required;
   if (!isRecord(schema)) return true;
@@ -238,6 +285,28 @@ function matchesSchemaValue(value, schema, required) {
       return true;
   }
 }
+var PUBLIC_ACTION_TYPES = /* @__PURE__ */ new Set(["DAY_SPEAK", "DAY_VOTE", "LAST_WORD", "HUNTER_SHOOT", "HUNTER_PASS"]);
+var PUBLIC_TEXT_FIELDS = ["content", "reason"];
+var PRIVATE_LEAK_PATTERNS = [
+  /我是\s*狼/u,
+  /我是\s*狼人/u,
+  /作为\s*狼/u,
+  /我们\s*狼队/u,
+  /我方\s*狼队/u,
+  /我(?:的)?狼队友/u,
+  /我(?:的)?队友/u,
+  /(?:我|我们|我方).{0,8}夜聊/u,
+  /夜聊.{0,16}(?:我说|我建议|我们|我方|决定|刀|击杀)/u,
+  /(?:我们|我方)\s*狼队.*(?:刀|击杀|目标)/u,
+  /今晚\s*(?:先)?刀/u
+];
+function containsPublicPrivateInfoLeak(actionType, actionData) {
+  if (!PUBLIC_ACTION_TYPES.has(actionType)) return false;
+  return PUBLIC_TEXT_FIELDS.some((field) => {
+    const value = actionData[field];
+    return typeof value === "string" && PRIVATE_LEAK_PATTERNS.some((pattern) => pattern.test(value));
+  });
+}
 function readString(value) {
   return typeof value === "string" && value.length > 0 ? value : void 0;
 }
@@ -698,6 +767,7 @@ async function sendGameAction(input) {
     timestamp: String(Date.now()),
     turnSeq: input.turnSeq,
     eventId: input.eventId,
+    deadlineEpochMs: input.deadlineEpochMs,
     traceId: input.traceId,
     promptPolicyVersion: input.promptPolicyVersion,
     renderedPromptHash: input.renderedPromptHash,
@@ -712,6 +782,7 @@ async function sendGameAction(input) {
   if (response.ok === false) {
     throw new Error(response.error?.message ?? "CoolClaw game action failed");
   }
+  return response;
 }
 
 // src/game-action-parser.ts
@@ -724,6 +795,40 @@ function extractActionBlock(text) {
   }
   return last;
 }
+function extractFencedJsonBlocks(text) {
+  const re = /```(?:json)?\s*([\s\S]*?)\s*```/gi;
+  const blocks = [];
+  let match;
+  while ((match = re.exec(text)) !== null) {
+    blocks.push(match[1]);
+  }
+  return blocks;
+}
+function extractTrailingJsonCandidates(text) {
+  const trimmed = text.trim();
+  if (!trimmed.endsWith("}")) return [];
+  const candidates = [];
+  let idx = trimmed.lastIndexOf("{");
+  while (idx >= 0) {
+    const candidate = trimmed.slice(idx).trim();
+    if (candidate.includes('"actionType"') && candidate.includes('"actionData"')) {
+      candidates.push(candidate);
+    }
+    idx = trimmed.lastIndexOf("{", idx - 1);
+  }
+  return candidates;
+}
+function extractActionCandidates(text) {
+  const actionBlock = extractActionBlock(text);
+  if (actionBlock !== null) {
+    return [actionBlock];
+  }
+  const fenced = extractFencedJsonBlocks(text);
+  if (fenced.length > 0) {
+    return fenced.reverse();
+  }
+  return extractTrailingJsonCandidates(text);
+}
 function normalizeActionBlock(body) {
   const trimmed = body.trim();
   const fenced = /^```(?:json)?\s*([\s\S]*?)\s*```$/i.exec(trimmed);
@@ -733,15 +838,35 @@ function parseAgentAction(text) {
   if (typeof text !== "string" || text.length === 0) {
     return { error: "no_action_block" };
   }
-  const body = extractActionBlock(text);
-  if (body === null) {
+  const candidates = extractActionCandidates(text);
+  if (candidates.length === 0) {
     return { error: "no_action_block" };
   }
+  let lastError = null;
+  for (const body of candidates) {
+    const parsed = parseActionJson(normalizeActionBlock(body));
+    if (!("error" in parsed)) {
+      return parsed;
+    }
+    lastError = parsed;
+  }
+  return lastError ?? { error: "no_action_block" };
+}
+function parseActionJson(body) {
   let obj;
   try {
-    obj = JSON.parse(normalizeActionBlock(body));
+    obj = JSON.parse(body);
   } catch (e) {
-    return { error: "invalid_json", detail: e instanceof Error ? e.message : String(e) };
+    const repaired = removeTrailingCommas(body);
+    if (repaired !== body) {
+      try {
+        obj = JSON.parse(repaired);
+      } catch {
+        return { error: "invalid_json", detail: e instanceof Error ? e.message : String(e) };
+      }
+    } else {
+      return { error: "invalid_json", detail: e instanceof Error ? e.message : String(e) };
+    }
   }
   if (typeof obj !== "object" || obj === null) {
     return { error: "invalid_json", detail: "not an object" };
@@ -758,6 +883,41 @@ function parseAgentAction(text) {
     actionData: rec.actionData
   };
 }
+function removeTrailingCommas(body) {
+  let out = "";
+  let inString = false;
+  let escaped = false;
+  for (let i = 0; i < body.length; i += 1) {
+    const ch = body[i];
+    if (inString) {
+      out += ch;
+      if (escaped) {
+        escaped = false;
+      } else if (ch === "\\") {
+        escaped = true;
+      } else if (ch === '"') {
+        inString = false;
+      }
+      continue;
+    }
+    if (ch === '"') {
+      inString = true;
+      out += ch;
+      continue;
+    }
+    if (ch === ",") {
+      let j = i + 1;
+      while (j < body.length && /\s/.test(body[j])) {
+        j += 1;
+      }
+      if (body[j] === "}" || body[j] === "]") {
+        continue;
+      }
+    }
+    out += ch;
+  }
+  return out;
+}
 
 // src/game-action-audit.ts
 function normalizeAuditText(value, maxChars = 256) {
@@ -1079,7 +1239,7 @@ function logAckFailure(params) {
 async function submitGameActionWithLog(action, meta, wsClient, log, source, rawResponse, auditMeta) {
   if (!wsClient.isConnected()) {
     log?.error?.(`[GAME-ACTION] submit skipped: ws not connected eventId=${meta.eventId}`);
-    return false;
+    return "failed";
   }
   const responseHash = rawResponse && rawResponse.length > 0 ? sha256Hex(rawResponse) : void 0;
   log?.info?.(
@@ -1087,7 +1247,7 @@ async function submitGameActionWithLog(action, meta, wsClient, log, source, rawR
   );
   const start = Date.now();
   try {
-    await sendGameAction({
+    const response = await sendGameAction({
       client: wsClient,
       gameId: meta.gameId,
       roomId: meta.roomId,
@@ -1096,6 +1256,7 @@ async function submitGameActionWithLog(action, meta, wsClient, log, source, rawR
       actionData: action.actionData,
       turnSeq: meta.turnSeq,
       eventId: meta.eventId,
+      deadlineEpochMs: meta.deadlineEpochMs,
       traceId: meta.traceId,
       promptPolicyVersion: meta.promptPolicyVersion,
       renderedPromptHash: meta.renderedPromptHash,
@@ -1106,16 +1267,28 @@ async function submitGameActionWithLog(action, meta, wsClient, log, source, rawR
       modelActionType: auditMeta?.modelActionType,
       validationReason: normalizeAuditText(auditMeta?.validationReason)
     });
+    if (response.uncertain === true) {
+      log?.warn?.(
+        `[GAME-ACTION] submit uncertain source=${source} eventId=${meta.eventId} elapsedMs=${Date.now() - start} msg=${response.message ?? ""}`
+      );
+      return "uncertain";
+    }
     log?.info?.(
       `[GAME-ACTION] submit ok source=${source} gameId=${meta.gameId} eventId=${meta.eventId} promptPolicyVersion=${meta.promptPolicyVersion ?? ""} renderedPromptHash=${meta.renderedPromptHash ?? ""} rawResponseHash=${responseHash ?? ""} elapsedMs=${Date.now() - start}`
     );
-    return true;
+    return "submitted";
   } catch (err) {
     const errMsg = err instanceof Error ? err.message : String(err);
+    if (isGameActionSubmitUncertainError(errMsg)) {
+      log?.warn?.(
+        `[GAME-ACTION] submit uncertain source=${source} eventId=${meta.eventId} elapsedMs=${Date.now() - start} err=${errMsg}`
+      );
+      return "uncertain";
+    }
     log?.error?.(
       `[GAME-ACTION] submit failed source=${source} eventId=${meta.eventId} elapsedMs=${Date.now() - start} err=${errMsg}`
     );
-    return false;
+    return "failed";
   }
 }
 async function submitBackendFallbackWithLog(params) {
@@ -1124,7 +1297,7 @@ async function submitBackendFallbackWithLog(params) {
     params.log?.warn?.(
       `[GAME-ACTION] backend fallback unavailable eventType=${params.meta.eventType} eventId=${params.meta.eventId} reason=${params.reason} promptPolicyVersion=${params.meta.promptPolicyVersion ?? ""} renderedPromptHash=${params.meta.renderedPromptHash ?? ""}`
     );
-    return false;
+    return "failed";
   }
   const inferred = inferRejectedModelAction(params.rawResponse ?? "", params.meta.agentTask);
   const auditMeta = {
@@ -1145,6 +1318,9 @@ async function submitBackendFallbackWithLog(params) {
     auditMeta
   );
 }
+function isGameActionSubmitUncertainError(message) {
+  return /request timed out|wss client stopped|websocket.*clos|socket hang up|econnreset|write epipe/i.test(message);
+}
 var runtimeClients = /* @__PURE__ */ new Map();
 function setRuntimeClient(accountKey, client) {
   runtimeClients.set(accountKey, client);
@@ -1316,7 +1492,7 @@ var coolclawChannelPlugin = createChatChannelPlugin({
                             log: ctx.log,
                             reason: "runtime_not_available"
                           });
-                          if (!submitted) {
+                          if (submitted === "failed") {
                             throw new Error("game fallback submit failed: runtime_not_available");
                           }
                         }
@@ -1439,10 +1615,11 @@ var coolclawChannelPlugin = createChatChannelPlugin({
                                   full,
                                   {
                                     modelActionRejected: false,
-                                    modelActionType: validation.action.actionType
+                                    modelActionType: validation.action.actionType,
+                                    validationReason: validation.repairReason
                                   }
                                 );
-                                if (submitted) {
+                                if (submitted === "submitted" || submitted === "uncertain") {
                                   gameSubmitted = true;
                                 } else {
                                   gameFallbackReason = `llm_action_submit_failed:${validation.action.actionType}`;
@@ -1510,7 +1687,7 @@ var coolclawChannelPlugin = createChatChannelPlugin({
                                 validationReason: gameFallbackReason ?? gameValidationReason ?? inferred.validationReason
                               }
                             });
-                            if (!submitted) {
+                            if (submitted === "failed") {
                               throw new Error(`game fallback submit failed: ${gameFallbackReason ?? "unknown"}`);
                             }
                           } catch (fbErr) {

package/dist/{chunk-EE5BK65S.js → chunk-QAJK4WOL.js}

@@ -3,7 +3,7 @@ import {
   coolclawChannelPlugin,
   defaultBindingFile,
   setCoolclawRuntime
-} from "./chunk-QKB2R55C.js";
+} from "./chunk-CPBRFMOB.js";
 
 // index.ts
 import { defineChannelPluginEntry, buildChannelConfigSchema } from "openclaw/plugin-sdk/core";

package/dist/cli-metadata.js

@@ -1,7 +1,7 @@
 import {
   index_default
-} from "./chunk-EE5BK65S.js";
-import "./chunk-QKB2R55C.js";
+} from "./chunk-QAJK4WOL.js";
+import "./chunk-CPBRFMOB.js";
 
 // cli-metadata.ts
 var cli_metadata_default = index_default;

package/dist/index.js

@@ -1,7 +1,7 @@
 import {
   index_default
-} from "./chunk-EE5BK65S.js";
-import "./chunk-QKB2R55C.js";
+} from "./chunk-QAJK4WOL.js";
+import "./chunk-CPBRFMOB.js";
 export {
   index_default as default
 };

package/dist/setup-entry.js

@@ -1,6 +1,6 @@
 import {
   coolclawChannelPlugin
-} from "./chunk-QKB2R55C.js";
+} from "./chunk-CPBRFMOB.js";
 
 // setup-entry.ts
 import { defineSetupPluginEntry } from "openclaw/plugin-sdk/core";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@coolclaw/coolclaw",
-  "version": "1.0.5",
+  "version": "1.0.7",
   "description": "OpenClaw native channel plugin for Riddle/CoolClaw chat.",
   "type": "module",
   "main": "./dist/index.js",
@@ -72,7 +72,7 @@
     "runtimeSetupEntry": "./dist/setup-entry.js",
     "install": {
       "npmSpec": "@coolclaw/coolclaw",
-      "expectedIntegrity": "sha512-6q6+KPGtAkHBZGsHgqEXJtnwLdVoZNLrZNbxZmzKisZvItoE2y+Acl9v3bNtqtEK/DR5NLahyloy7FMRVt9Upg==",
+      "expectedIntegrity": "sha512-nLVphLOrmsFhxyJU8neAdx4bE+EcJjLnmzGZmt9E9ndUqiPAjbJCb8pOv7HXYfHeQeVFnf42HkmVrUeqro3ClQ==",
       "defaultChoice": "npm",
       "minHostVersion": ">=2026.3.22"
     },
@@ -100,4 +100,4 @@
       "pluginSdkVersion": "2026.4.29"
     }
   }
-}
+}