@coolclaw/coolclaw 1.0.17 → 1.0.19

package/dist/{chunk-3YKMAM6K.js → chunk-MKVNFXLL.js}

@@ -219,23 +219,26 @@ function validateAgentAction(action, task) {
   if (!option) {
     return { ok: false, reason: "disallowed_action_type" };
   }
-  const repaired = repairActionDataForSchema(action.actionData, option.actionDataSchema);
+  const sanitizedActionData = sanitizeActionData(action.actionData);
+  const repaired = repairActionDataForSchema(sanitizedActionData, option.actionDataSchema);
   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.reason === "string") normalizedAction.reason = action.reason;
+  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) {
@@ -296,9 +299,17 @@ function matchesRootOutputSchema(action, schema) {
     actionData: action.actionData
   };
   if (typeof action.speech === "string") root.speech = action.speech;
-  if (typeof action.reason === "string") root.reason = action.reason;
+  if (typeof action.voteReason === "string") root.voteReason = action.voteReason;
   return matchesSchemaValue(root, schema, true);
 }
+function sanitizeActionData(actionData) {
+  if (!Object.prototype.hasOwnProperty.call(actionData, "reason")) {
+    return actionData;
+  }
+  const sanitized = { ...actionData };
+  delete sanitized.reason;
+  return sanitized;
+}
 function repairActionDataForSchema(actionData, schema) {
   if (!schema || Object.keys(schema).length === 0) {
     return { actionData };
@@ -321,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) {
@@ -332,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) {
@@ -1111,7 +1170,7 @@ async function sendGameAction(input) {
     retryRawResponseHash: input.retryRawResponseHash,
     retryValidationReason: input.retryValidationReason,
     speech: input.speech,
-    reason: input.reason
+    voteReason: input.voteReason
   });
   const response = await input.client.request(frame);
   if (response.ok === false) {
@@ -1121,15 +1180,6 @@ async function sendGameAction(input) {
 }
 
 // src/game-action-parser.ts
-function extractActionBlock(text) {
-  const re = /<ACTION>\s*([\s\S]+?)\s*<\/ACTION>/gi;
-  let match;
-  let last = null;
-  while ((match = re.exec(text)) !== null) {
-    last = match[1];
-  }
-  return last;
-}
 function extractFencedJsonBlocks(text) {
   const re = /```(?:json)?\s*([\s\S]*?)\s*```/gi;
   const blocks = [];
@@ -1149,15 +1199,12 @@ function extractTrailingJsonCandidates(text) {
     if (candidate.includes('"actionType"') && candidate.includes('"actionData"')) {
       candidates.push(candidate);
     }
+    if (idx === 0) break;
     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();
@@ -1270,7 +1317,7 @@ function parseActionJson(body) {
     actionType: rec.actionType,
     actionData: rec.actionData,
     ...typeof rec.speech === "string" ? { speech: rec.speech } : {},
-    ...typeof rec.reason === "string" ? { reason: rec.reason } : {}
+    ...typeof rec.voteReason === "string" ? { voteReason: rec.voteReason } : {}
   };
 }
 function parseActionJsonStrict(body) {
@@ -1285,7 +1332,7 @@ function parseActionJsonStrict(body) {
   }
   const rec = obj;
   for (const field of Object.keys(rec)) {
-    if (!["speech", "reason", "actionType", "actionData"].includes(field)) {
+    if (!["speech", "voteReason", "reason", "actionType", "actionData"].includes(field)) {
       return { error: "invalid_json", detail: `unknown_top_level_field:${field}` };
     }
   }
@@ -1299,7 +1346,7 @@ function parseActionJsonStrict(body) {
     actionType: rec.actionType,
     actionData: rec.actionData,
     ...typeof rec.speech === "string" ? { speech: rec.speech } : {},
-    ...typeof rec.reason === "string" ? { reason: rec.reason } : {}
+    ...typeof rec.voteReason === "string" ? { voteReason: rec.voteReason } : {}
   };
 }
 function removeTrailingCommas(body) {
@@ -1993,7 +2040,7 @@ function buildStructuredActionRetryPrompt(renderedPrompt, reason) {
   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\u3001\u4EE3\u7801\u5757\u6216\u65E7\u52A8\u4F5C\u6807\u7B7E\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`;
 }
 function hasStructuredRetryBudget(deadlineEpochMs, nowEpochMs = Date.now(), safetyMarginMs = 1e3) {
   if (!deadlineEpochMs || deadlineEpochMs <= 0) {
@@ -2075,7 +2122,7 @@ async function submitGameActionWithLog(action, meta, wsClient, log, source, rawR
       retryRawResponseHash: auditMeta?.retryRawResponseHash,
       retryValidationReason: normalizeAuditText(auditMeta?.retryValidationReason),
       speech: action.speech,
-      reason: action.reason
+      voteReason: action.voteReason
     });
     if (response.uncertain === true) {
       log?.warn?.(

package/dist/{chunk-RPT3G66A.js → chunk-R3WD2GBM.js}

@@ -4,7 +4,7 @@ import {
   coolclawChannelPlugin,
   defaultBindingFile,
   setCoolclawRuntime
-} from "./chunk-3YKMAM6K.js";
+} from "./chunk-MKVNFXLL.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-RPT3G66A.js";
-import "./chunk-3YKMAM6K.js";
+} from "./chunk-R3WD2GBM.js";
+import "./chunk-MKVNFXLL.js";
 
 // cli-metadata.ts
 var cli_metadata_default = index_default;

package/dist/index.js

@@ -1,7 +1,7 @@
 import {
   index_default
-} from "./chunk-RPT3G66A.js";
-import "./chunk-3YKMAM6K.js";
+} from "./chunk-R3WD2GBM.js";
+import "./chunk-MKVNFXLL.js";
 export {
   index_default as default
 };

package/dist/setup-entry.js

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

package/package.json

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