@coolclaw/coolclaw 1.0.18 → 1.0.20

package/dist/{chunk-G2JZSRZF.js → chunk-7HQ3P7XX.js}

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

package/dist/{chunk-N2OJAALL.js → chunk-NZP7CI26.js}

@@ -224,19 +224,21 @@ function validateAgentAction(action, task) {
   if (!matchesActionDataSchema(repaired.actionData, option.actionDataSchema)) {
     return { ok: false, reason: "invalid_action_shape" };
   }
-  if (isStructuredJsonTask(task) && !matchesRootOutputSchema(action, task.outputSchema)) {
-    return { ok: false, reason: "invalid_action_shape" };
-  }
   const normalizedAction = {
     actionType: action.actionType,
     actionData: repaired.actionData
   };
   if (typeof action.speech === "string") normalizedAction.speech = action.speech;
   if (typeof action.voteReason === "string") normalizedAction.voteReason = action.voteReason;
+  const shouldValidateRoot = isStructuredJsonTask(task);
+  const repairedRoot = shouldValidateRoot ? repairRootOutputForSchema(normalizedAction, task.outputSchema) : { action: normalizedAction };
+  if (!repairedRoot || shouldValidateRoot && !matchesRootOutputSchema(repairedRoot.action, task.outputSchema)) {
+    return { ok: false, reason: "invalid_action_shape" };
+  }
   return {
     ok: true,
-    action: normalizedAction,
-    repairReason: repaired.repairReason
+    action: repairedRoot.action,
+    repairReason: combineRepairReasons(repaired.repairReason, repairedRoot.repairReason)
   };
 }
 function backendFallbackAction(task) {
@@ -330,7 +332,7 @@ function repairActionDataForSchema(actionData, schema) {
     if (!repaired) {
       repaired = { ...actionData };
     }
-    repaired[field] = value.slice(0, maxLength);
+    repaired[field] = truncateWithEllipsis(value, maxLength);
     truncatedFields.push(field);
   }
   if (truncatedFields.length === 0) {
@@ -341,6 +343,54 @@ function repairActionDataForSchema(actionData, schema) {
     repairReason: truncatedFields.map((field) => `${field}_too_long`).join(",")
   };
 }
+function repairRootOutputForSchema(action, schema) {
+  if (!schema || Object.keys(schema).length === 0) {
+    return { action };
+  }
+  const properties = isRecord(schema.properties) ? schema.properties : {};
+  let repaired = null;
+  const truncatedFields = [];
+  for (const field of ["speech", "voteReason"]) {
+    const propertySchema = properties[field];
+    const value = action[field];
+    if (typeof value !== "string" || !isRecord(propertySchema)) {
+      continue;
+    }
+    if (!schemaAllowsType(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 = { ...action };
+    }
+    repaired[field] = truncateWithEllipsis(value, maxLength);
+    truncatedFields.push(field);
+  }
+  if (truncatedFields.length === 0) {
+    return { action };
+  }
+  return {
+    action: repaired ?? action,
+    repairReason: truncatedFields.map((field) => `${field}_too_long`).join(",")
+  };
+}
+function combineRepairReasons(first, second) {
+  if (!first) return second;
+  if (!second) return first;
+  return `${first},${second}`;
+}
+function truncateWithEllipsis(value, maxLength) {
+  if (value.length <= maxLength) {
+    return value;
+  }
+  if (maxLength <= 3) {
+    return value.slice(0, Math.max(0, maxLength));
+  }
+  return `${value.slice(0, maxLength - 3)}...`;
+}
 function matchesSchemaValue(value, schema, required) {
   if (!isRecord(schema)) return true;
   if (value == null) {
@@ -1985,12 +2035,50 @@ function logAckFailure(params) {
   const target = params.target ? ` target=${params.target}` : "";
   params.log(`${params.channel} ack cleanup failed${target}: ${String(params.error)}`);
 }
-function buildStructuredActionRetryPrompt(renderedPrompt, reason) {
+function buildStructuredActionRetryPrompt(renderedPrompt, reason, agentTask) {
   const reasonText = reason && reason.trim().length > 0 ? reason.trim() : "invalid_output";
+  const translatedReason = translateStructuredRetryReason(reasonText);
+  const allowedActionTypes2 = agentTask?.actionContract?.options?.map((option) => option.actionType).filter((actionType) => typeof actionType === "string" && actionType.length > 0) ?? [];
+  const allowedLine = allowedActionTypes2.length > 0 ? `
+\u5F53\u524D\u53EA\u5141\u8BB8 actionType\uFF1A${allowedActionTypes2.join("\u3001")}\u3002` : "";
+  const forbiddenNames = [...forbiddenLegacyActionNames(allowedActionTypes2), "SUBMIT_ACTION", "reason", "content"];
+  const forbiddenLine = allowedActionTypes2.length > 0 ? `
+\u4E0D\u8981\u4F7F\u7528 ${joinChineseOr(forbiddenNames)}\u3002` : "";
   return `${renderedPrompt}
 
-\u4E0A\u4E00\u6B21\u8F93\u51FA\u672A\u88AB\u72FC\u4EBA\u6740\u7ED3\u6784\u5316\u52A8\u4F5C\u534F\u8BAE\u63A5\u53D7\uFF0C\u5931\u8D25\u539F\u56E0\uFF1A${reasonText}\u3002
-\u8BF7\u91CD\u65B0\u4F5C\u7B54\uFF1A\u53EA\u8F93\u51FA\u4E00\u4E2A\u5B8C\u6574 JSON \u5BF9\u8C61\uFF0C\u4E0D\u8981\u8F93\u51FA Markdown\u3001\u89E3\u91CA\u6587\u5B57\u6216\u4EE3\u7801\u5757\u3002`;
+${translatedReason}${allowedLine}${forbiddenLine}
+\u8BF7\u6309\u4E0A\u65B9\u3010\u8F93\u51FA\u683C\u5F0F\u3011\u91CD\u65B0\u8F93\u51FA\u5B8C\u6574 JSON\uFF1B\u53EA\u8F93\u51FA\u4E00\u4E2A\u5B8C\u6574 JSON \u5BF9\u8C61\uFF0C\u4E0D\u8981\u8F93\u51FA Markdown\u3001\u89E3\u91CA\u6587\u5B57\u6216\u4EE3\u7801\u5757\u3002`;
+}
+function translateStructuredRetryReason(reasonText) {
+  if (reasonText === "disallowed_action_type") {
+    return "\u4E0A\u4E00\u6B21\u8F93\u51FA\u672A\u88AB\u63A5\u53D7\uFF1AactionType \u4E0D\u5728\u5F53\u524D\u5141\u8BB8\u5217\u8868\u3002";
+  }
+  if (reasonText === "invalid_action_shape") {
+    return "\u4E0A\u4E00\u6B21\u8F93\u51FA\u672A\u88AB\u63A5\u53D7\uFF1AJSON \u5B57\u6BB5\u7ED3\u6784\u4E0D\u7B26\u5408\u5F53\u524D\u3010\u8F93\u51FA\u683C\u5F0F\u3011\u3002";
+  }
+  if (reasonText === "missing_contract") {
+    return "\u4E0A\u4E00\u6B21\u8F93\u51FA\u672A\u88AB\u63A5\u53D7\uFF1A\u5F53\u524D\u4EFB\u52A1\u7F3A\u5C11\u53EF\u63D0\u4EA4\u7684\u52A8\u4F5C\u5951\u7EA6\u3002";
+  }
+  return `\u4E0A\u4E00\u6B21\u8F93\u51FA\u672A\u88AB\u63A5\u53D7\uFF0C\u5931\u8D25\u539F\u56E0\uFF1A${reasonText}\u3002`;
+}
+function forbiddenLegacyActionNames(allowedActionTypes2) {
+  const legacyNames = allowedActionTypes2.map((actionType) => {
+    if (actionType === "WOLF_KILL") return "WOLF_TURN";
+    if (actionType === "WITCH_SAVE" || actionType === "WITCH_POISON" || actionType === "WITCH_PASS") return "WITCH_TURN";
+    if (actionType === "SEER_CHECK") return "SEER_TURN";
+    if (actionType === "DAY_SPEAK") return "DAY_SPEAK_TURN";
+    if (actionType === "DAY_VOTE") return "DAY_VOTE_TURN";
+    if (actionType === "LAST_WORD") return "LAST_WORD_TURN";
+    if (actionType === "HUNTER_SHOOT" || actionType === "HUNTER_PASS") return "HUNTER_SKILL_TURN";
+    return void 0;
+  }).filter((name) => Boolean(name));
+  return [...new Set(legacyNames)];
+}
+function joinChineseOr(values) {
+  if (values.length <= 1) {
+    return values.join("");
+  }
+  return `${values.slice(0, -1).join("\u3001")} \u6216 ${values[values.length - 1]}`;
 }
 function hasStructuredRetryBudget(deadlineEpochMs, nowEpochMs = Date.now(), safetyMarginMs = 1e3) {
   if (!deadlineEpochMs || deadlineEpochMs <= 0) {
@@ -2835,7 +2923,7 @@ var coolclawChannelPlugin = createChatChannelPlugin({
                               gameModelActionRejected = void 0;
                               gameModelActionType = void 0;
                               gameValidationReason = void 0;
-                              const retryPrompt = buildStructuredActionRetryPrompt(envelope.text, retryReason);
+                              const retryPrompt = buildStructuredActionRetryPrompt(envelope.text, retryReason, gameMeta.agentTask);
                               await dispatchGameReply({
                                 ...gameBaseReplyContext,
                                 Body: retryPrompt,

package/dist/cli-metadata.js

@@ -1,7 +1,7 @@
 import {
   index_default
-} from "./chunk-G2JZSRZF.js";
-import "./chunk-N2OJAALL.js";
+} from "./chunk-7HQ3P7XX.js";
+import "./chunk-NZP7CI26.js";
 
 // cli-metadata.ts
 var cli_metadata_default = index_default;

package/dist/index.js

@@ -1,7 +1,7 @@
 import {
   index_default
-} from "./chunk-G2JZSRZF.js";
-import "./chunk-N2OJAALL.js";
+} from "./chunk-7HQ3P7XX.js";
+import "./chunk-NZP7CI26.js";
 export {
   index_default as default
 };

package/dist/setup-entry.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@coolclaw/coolclaw",
-  "version": "1.0.18",
+  "version": "1.0.20",
   "description": "OpenClaw native channel plugin for CoolClaw chat.",
   "type": "module",
   "main": "./dist/index.js",