@coolclaw/coolclaw 1.0.3 → 1.0.5

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

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

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

@@ -150,9 +150,13 @@ function validateAgentAction(action, task) {
   if (allowed.length === 0) {
     return { ok: false, reason: "missing_contract" };
   }
-  if (!allowed.includes(action.actionType)) {
+  const option = task.actionContract.options.find((candidate) => candidate.actionType === action.actionType);
+  if (!option) {
     return { ok: false, reason: "disallowed_action_type" };
   }
+  if (!matchesActionDataSchema(action.actionData, option.actionDataSchema)) {
+    return { ok: false, reason: "invalid_action_shape" };
+  }
   return { ok: true, action };
 }
 function backendFallbackAction(task) {
@@ -169,7 +173,7 @@ function backendFallbackAction(task) {
 function sha256Hex(text) {
   return createHash("sha256").update(text).digest("hex");
 }
-function rawResponsePreview(text, maxChars = 2e3) {
+function rawResponsePreview(text, maxChars = 5e3) {
   if (text.length === 0) return void 0;
   return text.length <= maxChars ? text : `${text.slice(0, maxChars)}...`;
 }
@@ -194,6 +198,46 @@ function normalizeActionOption(value) {
 function allowedActionTypes(task) {
   return task.actionContract.options.map((option) => option.actionType);
 }
+function matchesActionDataSchema(actionData, schema) {
+  if (!schema || Object.keys(schema).length === 0) return true;
+  if (typeof schema.type === "string" && schema.type !== "object") return false;
+  const properties = isRecord(schema.properties) ? schema.properties : {};
+  const required = Array.isArray(schema.required) ? schema.required.filter((field) => typeof field === "string" && field.length > 0) : [];
+  for (const field of required) {
+    if (!Object.prototype.hasOwnProperty.call(actionData, field)) return false;
+    if (!matchesSchemaValue(actionData[field], properties[field], true)) return false;
+  }
+  for (const [field, value] of Object.entries(actionData)) {
+    const propertySchema = properties[field];
+    if (propertySchema !== void 0 && !matchesSchemaValue(value, propertySchema, false)) {
+      return false;
+    }
+  }
+  return true;
+}
+function matchesSchemaValue(value, schema, required) {
+  if (value == null) return !required;
+  if (!isRecord(schema)) return true;
+  if (Array.isArray(schema.enum) && !schema.enum.includes(value)) {
+    return false;
+  }
+  switch (schema.type) {
+    case "integer":
+      return typeof value === "number" && Number.isInteger(value);
+    case "number":
+      return typeof value === "number" && Number.isFinite(value);
+    case "string":
+      return typeof value === "string" && (typeof schema.minLength !== "number" || value.length >= schema.minLength) && (typeof schema.maxLength !== "number" || value.length <= schema.maxLength);
+    case "boolean":
+      return typeof value === "boolean";
+    case "object":
+      return isRecord(value);
+    case "array":
+      return Array.isArray(value);
+    default:
+      return true;
+  }
+}
 function readString(value) {
   return typeof value === "string" && value.length > 0 ? value : void 0;
 }
@@ -327,8 +371,14 @@ async function handleInboundFrame(input) {
     await ackFrameSeq(input);
     return;
   }
-  await ackProcessedSeq(input, envelope);
+  const ackAfterDispatch = envelope.metadata.gameEvent === true;
+  if (!ackAfterDispatch) {
+    await ackProcessedSeq(input, envelope);
+  }
   await input.dispatch(envelope);
+  if (ackAfterDispatch) {
+    await ackProcessedSeq(input, envelope);
+  }
 }
 function mapNotificationFrame(frame) {
   const payload = isRecord3(frame.payload) ? frame.payload : {};
@@ -442,8 +492,10 @@ async function ackFrameSeq(input) {
   }
 }
 async function ackSeq(input, seq) {
-  const lastAckedSeq = await input.ackStore.record(input.accountKey, seq);
+  const current = await input.ackStore.getLastAckedSeq(input.accountKey);
+  const lastAckedSeq = seq <= current ? current : seq;
   await input.sendAck(createFrame("ACK", { lastAckedSeq }));
+  await input.ackStore.record(input.accountKey, seq);
 }
 function assertPrivatePayload(value) {
   if (!isRecord3(value) || !isUserRef(value.sender) || !isUserRef(value.recipient)) {
@@ -651,7 +703,10 @@ async function sendGameAction(input) {
     renderedPromptHash: input.renderedPromptHash,
     parseSource: input.parseSource,
     rawResponseHash: input.rawResponseHash,
-    rawResponsePreview: input.rawResponsePreview
+    rawResponsePreview: input.rawResponsePreview,
+    modelActionRejected: input.modelActionRejected,
+    modelActionType: input.modelActionType,
+    validationReason: input.validationReason
   });
   const response = await input.client.request(frame);
   if (response.ok === false) {
@@ -661,7 +716,7 @@ async function sendGameAction(input) {
 
 // src/game-action-parser.ts
 function extractActionBlock(text) {
-  const re = /<ACTION>\s*([\s\S]+?)\s*<\/ACTION>/g;
+  const re = /<ACTION>\s*([\s\S]+?)\s*<\/ACTION>/gi;
   let match;
   let last = null;
   while ((match = re.exec(text)) !== null) {
@@ -669,6 +724,11 @@ function extractActionBlock(text) {
   }
   return last;
 }
+function normalizeActionBlock(body) {
+  const trimmed = body.trim();
+  const fenced = /^```(?:json)?\s*([\s\S]*?)\s*```$/i.exec(trimmed);
+  return fenced ? fenced[1].trim() : trimmed;
+}
 function parseAgentAction(text) {
   if (typeof text !== "string" || text.length === 0) {
     return { error: "no_action_block" };
@@ -679,7 +739,7 @@ function parseAgentAction(text) {
   }
   let obj;
   try {
-    obj = JSON.parse(body);
+    obj = JSON.parse(normalizeActionBlock(body));
   } catch (e) {
     return { error: "invalid_json", detail: e instanceof Error ? e.message : String(e) };
   }
@@ -699,6 +759,46 @@ function parseAgentAction(text) {
   };
 }
 
+// src/game-action-audit.ts
+function normalizeAuditText(value, maxChars = 256) {
+  if (!value) return void 0;
+  return value.length <= maxChars ? value : value.slice(0, maxChars);
+}
+function inferRejectedModelAction(rawResponse, task) {
+  if (rawResponse.trim().length === 0) {
+    return {
+      modelActionRejected: false,
+      validationReason: "no_model_output"
+    };
+  }
+  const parsed = parseAgentAction(rawResponse);
+  if ("error" in parsed) {
+    return {
+      modelActionRejected: true,
+      validationReason: parseErrorReason(parsed)
+    };
+  }
+  const validation = validateAgentAction(parsed, task);
+  if (!validation.ok) {
+    return {
+      modelActionRejected: true,
+      modelActionType: parsed.actionType,
+      validationReason: validation.reason
+    };
+  }
+  return {
+    modelActionRejected: true,
+    modelActionType: parsed.actionType,
+    validationReason: "valid_action_not_submitted"
+  };
+}
+function parseErrorReason(error) {
+  if (error.error === "invalid_json") {
+    return normalizeAuditText(`invalid_json:${error.detail}`) ?? "invalid_json";
+  }
+  return error.error;
+}
+
 // src/ws-client.ts
 import WebSocket from "ws";
 var CoolclawWsClient = class {
@@ -976,10 +1076,10 @@ 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, wsClient, log, source, rawResponse) {
+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;
+    return false;
   }
   const responseHash = rawResponse && rawResponse.length > 0 ? sha256Hex(rawResponse) : void 0;
   log?.info?.(
@@ -1001,17 +1101,49 @@ async function submitGameActionWithLog(action, meta, wsClient, log, source, rawR
       renderedPromptHash: meta.renderedPromptHash,
       parseSource: source,
       rawResponseHash: responseHash,
-      rawResponsePreview: rawResponse ? rawResponsePreview(rawResponse) : void 0
+      rawResponsePreview: rawResponse ? rawResponsePreview(rawResponse) : void 0,
+      modelActionRejected: auditMeta?.modelActionRejected,
+      modelActionType: auditMeta?.modelActionType,
+      validationReason: normalizeAuditText(auditMeta?.validationReason)
     });
     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;
   } catch (err) {
     const errMsg = err instanceof Error ? err.message : String(err);
     log?.error?.(
       `[GAME-ACTION] submit failed source=${source} eventId=${meta.eventId} elapsedMs=${Date.now() - start} err=${errMsg}`
     );
+    return false;
+  }
+}
+async function submitBackendFallbackWithLog(params) {
+  const fb = backendFallbackAction(params.meta.agentTask);
+  if (!fb) {
+    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;
   }
+  const inferred = inferRejectedModelAction(params.rawResponse ?? "", params.meta.agentTask);
+  const auditMeta = {
+    modelActionRejected: params.auditMeta?.modelActionRejected ?? inferred.modelActionRejected,
+    modelActionType: params.auditMeta?.modelActionType ?? inferred.modelActionType,
+    validationReason: params.auditMeta?.validationReason ?? params.reason ?? inferred.validationReason
+  };
+  params.log?.warn?.(
+    `[GAME-ACTION] backend fallback eventType=${params.meta.eventType} eventId=${params.meta.eventId} reason=${auditMeta.validationReason ?? "unknown"} promptPolicyVersion=${params.meta.promptPolicyVersion ?? ""} renderedPromptHash=${params.meta.renderedPromptHash ?? ""} rawResponseHash=${params.rawResponse ? sha256Hex(params.rawResponse) : ""}`
+  );
+  return submitGameActionWithLog(
+    fb,
+    params.meta,
+    params.wsClient,
+    params.log,
+    "backend_fallback",
+    params.rawResponse || void 0,
+    auditMeta
+  );
 }
 var runtimeClients = /* @__PURE__ */ new Map();
 function setRuntimeClient(accountKey, client) {
@@ -1160,22 +1292,36 @@ var coolclawChannelPlugin = createChatChannelPlugin({
                     accountKey,
                     ackStore,
                     dispatch: async (envelope) => {
-                      const runtime = getCoolclawRuntime();
-                      if (!runtime?.channel) {
-                        logInboundDrop({ log: ctx.log?.warn?.bind(ctx.log) ?? (() => {
-                        }), channel: "coolclaw", reason: "runtime not available; skipping dispatch" });
-                        return;
-                      }
                       const isGameEvent = envelope.metadata?.gameEvent === true;
                       const gameMeta = isGameEvent ? envelope.metadata : null;
                       let gameSubmitted = false;
                       let gameFallbackReason = null;
+                      let gameModelActionType;
+                      let gameValidationReason;
+                      let gameModelActionRejected;
                       const gameBuffer = [];
                       if (isGameEvent && gameMeta) {
                         ctx.log?.info?.(
                           `[GAME-TASK] dispatch start gameId=${gameMeta.gameId} roomId=${gameMeta.roomId} eventType=${gameMeta.eventType} eventId=${gameMeta.eventId} promptPolicyVersion=${gameMeta.promptPolicyVersion ?? ""} renderedPromptHash=${gameMeta.renderedPromptHash ?? ""} conversationId=${envelope.conversationId}`
                         );
                       }
+                      const runtime = getCoolclawRuntime();
+                      if (!runtime?.channel) {
+                        logInboundDrop({ log: ctx.log?.warn?.bind(ctx.log) ?? (() => {
+                        }), channel: "coolclaw", reason: "runtime not available; skipping dispatch" });
+                        if (isGameEvent && gameMeta) {
+                          const submitted = await submitBackendFallbackWithLog({
+                            meta: gameMeta,
+                            wsClient,
+                            log: ctx.log,
+                            reason: "runtime_not_available"
+                          });
+                          if (!submitted) {
+                            throw new Error("game fallback submit failed: runtime_not_available");
+                          }
+                        }
+                        return;
+                      }
                       try {
                         const isGroup = envelope.conversationId.startsWith("group:");
                         const peer = isGroup ? { kind: "group", id: envelope.group?.groupId ?? envelope.conversationId } : { kind: "direct", id: envelope.conversationId };
@@ -1275,20 +1421,34 @@ var coolclawChannelPlugin = createChatChannelPlugin({
                                 if ("error" in parsed) return;
                                 const validation = validateAgentAction(parsed, gameMeta.agentTask);
                                 if (!validation.ok) {
+                                  gameModelActionRejected = true;
+                                  gameModelActionType = parsed.actionType;
+                                  gameValidationReason = validation.reason;
+                                  gameFallbackReason = validation.reason;
                                   ctx.log?.warn?.(
                                     `[GAME-ACTION] rejected model action reason=${validation.reason} actionType=${parsed.actionType} eventType=${gameMeta.eventType} eventId=${gameMeta.eventId} promptPolicyVersion=${gameMeta.promptPolicyVersion ?? ""} renderedPromptHash=${gameMeta.renderedPromptHash ?? ""} rawResponseHash=${sha256Hex(full)}`
                                   );
                                   return;
                                 }
-                                gameSubmitted = true;
-                                await submitGameActionWithLog(
+                                const submitted = await submitGameActionWithLog(
                                   validation.action,
                                   gameMeta,
                                   wsClient,
                                   ctx.log,
                                   "llm",
-                                  full
+                                  full,
+                                  {
+                                    modelActionRejected: false,
+                                    modelActionType: validation.action.actionType
+                                  }
                                 );
+                                if (submitted) {
+                                  gameSubmitted = true;
+                                } else {
+                                  gameFallbackReason = `llm_action_submit_failed:${validation.action.actionType}`;
+                                  gameModelActionRejected = false;
+                                  gameModelActionType = validation.action.actionType;
+                                }
                                 return;
                               }
                               try {
@@ -1311,7 +1471,9 @@ var coolclawChannelPlugin = createChatChannelPlugin({
                           }
                         });
                         if (isGameEvent && gameMeta && !gameSubmitted) {
-                          gameFallbackReason = "no_valid_action_in_llm_output";
+                          if (!gameFallbackReason) {
+                            gameFallbackReason = "no_valid_action_in_llm_output";
+                          }
                         }
                       } catch (err) {
                         const errMsg = err instanceof Error ? err.message : String(err);
@@ -1328,29 +1490,34 @@ var coolclawChannelPlugin = createChatChannelPlugin({
                         }
                         if (isGameEvent && gameMeta && !gameSubmitted) {
                           try {
-                            const fb = backendFallbackAction(gameMeta.agentTask);
-                            if (!fb) {
-                              ctx.log?.warn?.(
-                                `[GAME-ACTION] backend fallback unavailable eventType=${gameMeta.eventType} eventId=${gameMeta.eventId} reason=${gameFallbackReason ?? "unknown"} promptPolicyVersion=${gameMeta.promptPolicyVersion ?? ""} renderedPromptHash=${gameMeta.renderedPromptHash ?? ""}`
-                              );
-                              return;
-                            }
                             const rawResponse = gameBuffer.join("");
-                            ctx.log?.warn?.(
-                              `[GAME-ACTION] backend fallback eventType=${gameMeta.eventType} eventId=${gameMeta.eventId} reason=${gameFallbackReason ?? "unknown"} promptPolicyVersion=${gameMeta.promptPolicyVersion ?? ""} renderedPromptHash=${gameMeta.renderedPromptHash ?? ""} rawResponseHash=${rawResponse ? sha256Hex(rawResponse) : ""}`
-                            );
-                            await submitGameActionWithLog(
-                              fb,
-                              gameMeta,
+                            const inferred = inferRejectedModelAction(rawResponse, gameMeta.agentTask);
+                            gameModelActionRejected = gameModelActionRejected ?? inferred.modelActionRejected;
+                            gameModelActionType = gameModelActionType ?? inferred.modelActionType;
+                            gameValidationReason = gameValidationReason ?? inferred.validationReason;
+                            if (!gameFallbackReason || gameFallbackReason === "no_valid_action_in_llm_output") {
+                              gameFallbackReason = gameValidationReason ?? inferred.validationReason ?? gameFallbackReason;
+                            }
+                            const submitted = await submitBackendFallbackWithLog({
+                              meta: gameMeta,
                               wsClient,
-                              ctx.log,
-                              "backend_fallback",
-                              rawResponse || void 0
-                            );
+                              log: ctx.log,
+                              reason: gameFallbackReason ?? gameValidationReason ?? inferred.validationReason ?? "unknown",
+                              rawResponse: rawResponse || void 0,
+                              auditMeta: {
+                                modelActionRejected: gameModelActionRejected,
+                                modelActionType: gameModelActionType,
+                                validationReason: gameFallbackReason ?? gameValidationReason ?? inferred.validationReason
+                              }
+                            });
+                            if (!submitted) {
+                              throw new Error(`game fallback submit failed: ${gameFallbackReason ?? "unknown"}`);
+                            }
                           } catch (fbErr) {
                             ctx.log?.error?.(
                               `[GAME-ACTION] fallback submit threw eventId=${gameMeta.eventId} err=${fbErr instanceof Error ? fbErr.message : String(fbErr)}`
                             );
+                            throw fbErr;
                           }
                         }
                       }
@@ -1362,6 +1529,7 @@ var coolclawChannelPlugin = createChatChannelPlugin({
                       } catch (err) {
                         logAckFailure({ log: ctx.log?.warn?.bind(ctx.log) ?? (() => {
                         }), channel: "coolclaw", error: err });
+                        throw err;
                       }
                     }
                   });

package/dist/cli-metadata.js

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

package/dist/index.js

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

package/dist/setup-entry.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@coolclaw/coolclaw",
-  "version": "1.0.3",
+  "version": "1.0.5",
   "description": "OpenClaw native channel plugin for Riddle/CoolClaw chat.",
   "type": "module",
   "main": "./dist/index.js",
@@ -38,7 +38,8 @@
   "scripts": {
     "build": "tsup index.ts setup-entry.ts cli-metadata.ts --format esm --dts --out-dir dist --clean --splitting",
     "test": "vitest run",
-    "lint": "tsc --noEmit"
+    "lint": "tsc --noEmit",
+    "prepack": "npm run build"
   },
   "dependencies": {
     "ws": "^8.20.1",
@@ -71,7 +72,7 @@
     "runtimeSetupEntry": "./dist/setup-entry.js",
     "install": {
       "npmSpec": "@coolclaw/coolclaw",
-      "expectedIntegrity": "sha512-6gIxAI4i3xJ4LpzViGi1KCJvc20JA/3Ob4OVdClgHCPydrkDqzOPbhSea4tpSlkUB5mWh/iEEzKhMcKqM24vVg==",
+      "expectedIntegrity": "sha512-6q6+KPGtAkHBZGsHgqEXJtnwLdVoZNLrZNbxZmzKisZvItoE2y+Acl9v3bNtqtEK/DR5NLahyloy7FMRVt9Upg==",
       "defaultChoice": "npm",
       "minHostVersion": ">=2026.3.22"
     },
@@ -99,4 +100,4 @@
       "pluginSdkVersion": "2026.4.29"
     }
   }
-}
+}