@troykelly/openclaw-projects 0.0.48 → 0.0.50

package/dist/register-openclaw.d.ts

@@ -7,6 +7,7 @@
  * - Hooks registered via `api.on()` (modern) or `api.registerHook()` (legacy fallback)
  * - CLI registered via `api.registerCli()`
  */
+import { z } from 'zod';
 import { type ApiClient } from './api-client.js';
 import { type PluginConfig } from './config.js';
 import { type Logger } from './logger.js';
@@ -36,6 +37,35 @@ interface PluginState {
     /** Track whether session data was already captured to avoid double-capture (#2052) */
     sessionCapturedKeys: Set<string>;
 }
+/**
+ * Zod schema enforcing the gateway contract: every content block
+ * must have type "text" and a non-empty text string (#2230).
+ */
+export declare const AgentToolResultSchema: z.ZodObject<{
+    content: z.ZodArray<z.ZodObject<{
+        type: z.ZodLiteral<"text">;
+        text: z.ZodString;
+    }, "strip", z.ZodTypeAny, {
+        type: "text";
+        text: string;
+    }, {
+        type: "text";
+        text: string;
+    }>, "many">;
+    isError: z.ZodOptional<z.ZodBoolean>;
+}, "strip", z.ZodTypeAny, {
+    content: {
+        type: "text";
+        text: string;
+    }[];
+    isError?: boolean | undefined;
+}, {
+    content: {
+        type: "text";
+        text: string;
+    }[];
+    isError?: boolean | undefined;
+}>;
 /**
  * Convert internal ToolResult format to AgentToolResult format expected by OpenClaw Gateway.
  *

package/dist/register-openclaw.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"register-openclaw.d.ts","sourceRoot":"","sources":["../src/register-openclaw.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAGH,OAAO,EAAE,KAAK,SAAS,EAAmB,MAAM,iBAAiB,CAAC;AAClE,OAAO,EAAE,KAAK,YAAY,EAA2G,MAAM,aAAa,CAAC;AAQzJ,OAAO,EAAgB,KAAK,MAAM,EAAE,MAAM,aAAa,CAAC;AAwExD,OAAO,KAAK,EACV,eAAe,EAEf,UAAU,EAcV,iBAAiB,EAGjB,UAAU,EACX,MAAM,yBAAyB,CAAC;AAajC,8CAA8C;AAC9C,UAAU,WAAW;IACnB,MAAM,EAAE,YAAY,CAAC;IACrB,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,SAAS,CAAC;IACrB,oEAAoE;IACpE,OAAO,EAAE,MAAM,CAAC;IAChB,uGAAuG;IACvG,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,4GAA4G;IAC5G,iBAAiB,EAAE;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,EAAE,CAAA;KAAE,CAAC;IACzD,oEAAoE;IACpE,eAAe,EAAE,OAAO,CAAC;IACzB,mEAAmE;IACnE,sBAAsB,EAAE,MAAM,CAAC;IAC/B,2DAA2D;IAC3D,eAAe,EAAE,OAAO,CAAC;IACzB,gEAAgE;IAChE,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,sFAAsF;IACtF,mBAAmB,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;CAClC;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,UAAU,GAAG,eAAe,CAyBrE;AAoiDD;;;;GAIG;AACH,wBAAsB,sBAAsB,CAAC,KAAK,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC,CA6C9E;AAwxED;;;;;GAKG;AACH,eAAO,MAAM,gBAAgB,EAAE,iBAwqD9B,CAAC;AAEF,yDAAyD;AACzD,eAAe,gBAAgB,CAAC;AAEhC,2CAA2C;AAC3C,eAAO,MAAM,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAwCnB,CAAC"}
+{"version":3,"file":"register-openclaw.d.ts","sourceRoot":"","sources":["../src/register-openclaw.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,EAAE,CAAC,EAAY,MAAM,KAAK,CAAC;AAClC,OAAO,EAAE,KAAK,SAAS,EAAmB,MAAM,iBAAiB,CAAC;AAClE,OAAO,EAAE,KAAK,YAAY,EAA2G,MAAM,aAAa,CAAC;AAQzJ,OAAO,EAAgB,KAAK,MAAM,EAAE,MAAM,aAAa,CAAC;AAwExD,OAAO,KAAK,EACV,eAAe,EAEf,UAAU,EAcV,iBAAiB,EAGjB,UAAU,EACX,MAAM,yBAAyB,CAAC;AAajC,8CAA8C;AAC9C,UAAU,WAAW;IACnB,MAAM,EAAE,YAAY,CAAC;IACrB,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,SAAS,CAAC;IACrB,oEAAoE;IACpE,OAAO,EAAE,MAAM,CAAC;IAChB,uGAAuG;IACvG,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,4GAA4G;IAC5G,iBAAiB,EAAE;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,EAAE,CAAA;KAAE,CAAC;IACzD,oEAAoE;IACpE,eAAe,EAAE,OAAO,CAAC;IACzB,mEAAmE;IACnE,sBAAsB,EAAE,MAAM,CAAC;IAC/B,2DAA2D;IAC3D,eAAe,EAAE,OAAO,CAAC;IACzB,gEAAgE;IAChE,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,sFAAsF;IACtF,mBAAmB,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;CAClC;AAED;;;GAGG;AACH,eAAO,MAAM,qBAAqB;;;;;;;;;;;;;;;;;;;;;;;;EAUhC,CAAC;AAEH;;;;;;;;;;GAUG;AACH,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,UAAU,GAAG,eAAe,CA6CrE;AAoiDD;;;;GAIG;AACH,wBAAsB,sBAAsB,CAAC,KAAK,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC,CA6C9E;AAwxED;;;;;GAKG;AACH,eAAO,MAAM,gBAAgB,EAAE,iBAwqD9B,CAAC;AAEF,yDAAyD;AACzD,eAAe,gBAAgB,CAAC;AAEhC,2CAA2C;AAC3C,eAAO,MAAM,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAwCnB,CAAC"}

package/dist/register-openclaw.js

@@ -7,7 +7,7 @@
  * - Hooks registered via `api.on()` (modern) or `api.registerHook()` (legacy fallback)
  * - CLI registered via `api.registerCli()`
  */
-import { ZodError } from 'zod';
+import { z, ZodError } from 'zod';
 import { createApiClient } from './api-client.js';
 import { redactConfig, resolveConfigSecretsSync, resolveNamespaceConfig, validateRawConfig } from './config.js';
 import { extractContext, getUserScopeKey, resolveAgentId } from './context.js';
@@ -39,6 +39,19 @@ import { blendScores, computeGeoScore, haversineDistanceKm } from './utils/geo.j
 import { createBoundaryMarkers, detectInjectionPatternsAsync, sanitizeMessageForContext, sanitizeMetadataField, wrapExternalMessage, } from './utils/injection-protection.js';
 import { injectionLogLimiter } from './utils/injection-log-rate-limiter.js';
 import { reverseGeocode } from './utils/nominatim.js';
+/**
+ * Zod schema enforcing the gateway contract: every content block
+ * must have type "text" and a non-empty text string (#2230).
+ */
+export const AgentToolResultSchema = z.object({
+    content: z
+        .array(z.object({
+        type: z.literal('text'),
+        text: z.string().min(1),
+    }))
+        .min(1),
+    isError: z.boolean().optional(),
+});
 /**
  * Convert internal ToolResult format to AgentToolResult format expected by OpenClaw Gateway.
  *
@@ -51,9 +64,10 @@ import { reverseGeocode } from './utils/nominatim.js';
  * `estimateMessageChars` (#2220, #2228).
  */
 export function toAgentToolResult(result) {
+    let candidate;
     if (result.success && result.data) {
         let text;
-        if (typeof result.data.content === 'string') {
+        if (typeof result.data.content === 'string' && result.data.content.length > 0) {
             text = result.data.content;
         }
         else {
@@ -66,16 +80,32 @@ export function toAgentToolResult(result) {
                 text = String(result.data);
             }
         }
+        candidate = { content: [{ type: 'text', text }] };
+    }
+    else {
+        // For errors, format the error message
+        const errorText = result.error && String(result.error).trim()
+            ? String(result.error)
+            : 'An unexpected error occurred';
+        candidate = {
+            content: [{ type: 'text', text: `Error: ${errorText}` }],
+            isError: true,
+        };
+    }
+    // Runtime guard: validate the output matches the gateway contract (#2230).
+    const parsed = AgentToolResultSchema.safeParse(candidate);
+    if (!parsed.success) {
+        // Do NOT throw — returning an error result is safer than crashing.
+        // Log enough context to diagnose which tool produced bad output.
+        const dataShape = result.data ? Object.keys(result.data).join(',') : 'none';
+        console.error(`[openclaw-plugin] toAgentToolResult: output failed schema validation (#2230). ` +
+            `success=${result.success} dataKeys=${dataShape} zodError=${parsed.error.message}`);
         return {
-            content: [{ type: 'text', text }],
+            content: [{ type: 'text', text: '(invalid tool result)' }],
+            isError: true,
         };
     }
-    // For errors, format the error message
-    const errorText = result.error ?? 'An unexpected error occurred';
-    return {
-        content: [{ type: 'text', text: `Error: ${errorText}` }],
-        isError: true,
-    };
+    return candidate;
 }
 /** Namespace property for store/create tools (Issue #1428) */
 const namespaceProperty = {