@xfxstudio/claworld 0.2.22 → 0.2.23-beta.1

package/openclaw.plugin.json

@@ -8,7 +8,7 @@
   ],
   "name": "Claworld Persona Relay",
   "description": "Claworld relay world channel plugin for OpenClaw.",
-  "version": "0.2.22",
+  "version": "0.2.23-beta.1",
   "configSchema": {
     "type": "object",
     "additionalProperties": false,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xfxstudio/claworld",
-  "version": "0.2.22",
+  "version": "0.2.23-beta.1",
   "description": "Claworld channel plugin for OpenClaw",
   "type": "module",
   "main": "index.js",

package/src/openclaw/plugin/claworld-channel-plugin.js

@@ -174,6 +174,20 @@ const CLAWORLD_RELAY_OPERATIONAL_NOTICE_PATTERNS = [
   /^⚠️\s*Agent failed before reply:/i,
 ];
 
+// Older/runtime-variant OpenClaw hosts may surface provider/runtime failures as
+// plain final text without setting `isError`. Keep this fallback at the bridge
+// boundary so business logic never has to guess.
+const CLAWORLD_RELAY_RUNTIME_ERROR_PATTERNS = [
+  /^⚠️\s*Agent failed before reply:/i,
+  /^LLM request failed:/i,
+  /^LLM request timed out\./i,
+  /^LLM request unauthorized\./i,
+  /^The AI service is temporarily overloaded\./i,
+  /^The AI service returned an error\./i,
+  /^⚠️\s*API rate limit reached\./i,
+  /^⚠️\s*.+\s+returned a billing error\b/i,
+];
+
 const CLAWORLD_RELAY_OPERATIONAL_SUFFIX_PATTERNS = [
   /^Usage:\s+.+\s+in\s+\/\s+.+\s+out(?:\s+·\s+est\s+.+)?$/i,
 ];
@@ -201,18 +215,21 @@ function classifyRelayContinuationText(text) {
   if (!normalized) {
     return {
       text: '',
-      operational: Boolean(String(text || '').trim()),
+      operationalNotice: Boolean(String(text || '').trim()),
+      runtimeError: false,
     };
   }
   if (CLAWORLD_RELAY_OPERATIONAL_NOTICE_PATTERNS.some((pattern) => pattern.test(normalized))) {
     return {
       text: '',
-      operational: true,
+      operationalNotice: true,
+      runtimeError: false,
     };
   }
   return {
     text: normalized,
-    operational: false,
+    operationalNotice: false,
+    runtimeError: false,
   };
 }
 
@@ -220,6 +237,45 @@ function sanitizeRelayContinuationText(text) {
   return classifyRelayContinuationText(text).text;
 }
 
+function classifyRelayContinuationPayload(payload = {}) {
+  const rawText = String(payload?.text ?? payload?.body ?? '').trim();
+  const normalized = stripRelayOperationalSuffix(rawText);
+  const textClassification = classifyRelayContinuationText(rawText);
+  const runtimeError = payload?.isError === true
+    || CLAWORLD_RELAY_RUNTIME_ERROR_PATTERNS.some((pattern) => pattern.test(normalized));
+  if (runtimeError) {
+    return {
+      text: '',
+      previewText: normalized,
+      operationalNotice: false,
+      runtimeError: true,
+      nonRenderable: true,
+    };
+  }
+  return {
+    text: textClassification.text,
+    previewText: normalized,
+    operationalNotice: textClassification.operationalNotice,
+    runtimeError: false,
+    nonRenderable: textClassification.operationalNotice,
+  };
+}
+
+function resolveRelaySilentReason(runtimeOutputSummary = {}, continuation = {}) {
+  const counts = runtimeOutputSummary?.counts || {};
+  if (Number(counts.runtimeErrorFinal || 0) > 0) {
+    return 'runtime_failed_before_reply';
+  }
+  if (Number(counts.operationalNotice || 0) > 0 && Number(counts.nonRenderableFinal || 0) === Number(counts.final || 0)) {
+    return 'operational_notice_only';
+  }
+  const normalizedSource = normalizePluginOptionalText(continuation?.source);
+  if (normalizedSource && normalizedSource !== 'none') {
+    return normalizedSource;
+  }
+  return 'no_renderable_reply';
+}
+
 function previewRuntimeOutputText(text, maxLength = 120) {
   const normalized = String(text || '').replace(/\s+/g, ' ').trim();
   if (!normalized) return '';
@@ -1269,7 +1325,9 @@ function createDeliveryReplyDispatcher({
       reasoningEnd: 0,
       compactionStart: 0,
       compactionEnd: 0,
+      nonRenderableFinal: 0,
       operationalNotice: 0,
+      runtimeErrorFinal: 0,
     },
     previews: {
       final: [],
@@ -1278,6 +1336,7 @@ function createDeliveryReplyDispatcher({
       partial: [],
       reasoning: [],
       operationalNotice: [],
+      runtimeErrorFinal: [],
     },
     relayContinuationSource: 'none',
     relayContinuationPreview: null,
@@ -1288,14 +1347,21 @@ function createDeliveryReplyDispatcher({
     runtimeOutputSummary.counts[kind] += 1;
     const text = String(payload?.text ?? payload?.body ?? '').trim();
     if (kind === 'final') {
-      if (text) {
-        finalTexts.push(text);
-        appendRuntimeOutputPreview(runtimeOutputSummary.previews.final, text);
-        const classified = classifyRelayContinuationText(text);
-        if (classified.operational) {
-          runtimeOutputSummary.counts.operationalNotice += 1;
-          appendRuntimeOutputPreview(runtimeOutputSummary.previews.operationalNotice, text);
-        }
+      const classified = classifyRelayContinuationPayload(payload);
+      if (classified.text) {
+        finalTexts.push(classified.text);
+        appendRuntimeOutputPreview(runtimeOutputSummary.previews.final, classified.text);
+      }
+      if (classified.nonRenderable) {
+        runtimeOutputSummary.counts.nonRenderableFinal += 1;
+      }
+      if (classified.operationalNotice) {
+        runtimeOutputSummary.counts.operationalNotice += 1;
+        appendRuntimeOutputPreview(runtimeOutputSummary.previews.operationalNotice, classified.previewText || text);
+      }
+      if (classified.runtimeError) {
+        runtimeOutputSummary.counts.runtimeErrorFinal += 1;
+        appendRuntimeOutputPreview(runtimeOutputSummary.previews.runtimeErrorFinal, classified.previewText || text);
       }
       return;
     }
@@ -1328,6 +1394,30 @@ function createDeliveryReplyDispatcher({
     runtimeOutputSummary.counts[kind] += 1;
   };
 
+  const submitRelayReply = async (replyText) => {
+    if (typeof relayClient?.submitDeliveryReply !== 'function') {
+      throw new Error('relay client does not support reply submission');
+    }
+    return await relayClient.submitDeliveryReply({
+      deliveryId,
+      sessionKey,
+      replyText,
+      source: 'openclaw-autochain',
+    });
+  };
+
+  const submitRelayKeptSilent = async (reason) => {
+    if (typeof relayClient?.submitDeliveryKeptSilent !== 'function') {
+      throw new Error('relay client does not support kept_silent submission');
+    }
+    return await relayClient.submitDeliveryKeptSilent({
+      deliveryId,
+      sessionKey,
+      reason,
+      source: 'openclaw-autochain',
+    });
+  };
+
   const flushReply = async (text) => {
     const normalized = String(text || '').trim();
     if (!normalized || replied || suppressed) return false;
@@ -1335,25 +1425,9 @@ function createDeliveryReplyDispatcher({
       suppressed = true;
       return false;
     }
-    if (typeof relayClient.sendReplyAndWaitForAck === 'function') {
-      const replyResult = await relayClient.sendReplyAndWaitForAck({
-        deliveryId,
-        sessionKey,
-        replyText: normalized,
-        source: 'openclaw-autochain',
-      });
-      replyTransport = replyResult?.transport || 'websocket';
-      replyFallbackUsed = replyResult?.fallbackUsed === true;
-    } else {
-      relayClient.sendReply({
-        deliveryId,
-        sessionKey,
-        replyText: normalized,
-        source: 'openclaw-autochain',
-      });
-      replyTransport = 'websocket-fire-and-forget';
-      replyFallbackUsed = false;
-    }
+    const replyResult = await submitRelayReply(normalized);
+    replyTransport = replyResult?.transport || null;
+    replyFallbackUsed = replyResult?.fallbackUsed === true;
     replied = true;
     return true;
   };
@@ -1364,19 +1438,11 @@ function createDeliveryReplyDispatcher({
       suppressed = true;
       return false;
     }
-    if (typeof relayClient.sendKeepSilentAndWaitForAck === 'function') {
-      const silentResult = await relayClient.sendKeepSilentAndWaitForAck({
-        deliveryId,
-        sessionKey,
-        reason: normalizePluginOptionalText(reason) || 'no_renderable_reply',
-        source: 'openclaw-autochain',
-      });
-      keptSilentTransport = silentResult?.transport || 'websocket';
-      keptSilentFallbackUsed = silentResult?.fallbackUsed === true;
-    } else {
-      keptSilentTransport = 'unsupported';
-      keptSilentFallbackUsed = false;
-    }
+    const silentResult = await submitRelayKeptSilent(
+      normalizePluginOptionalText(reason) || 'no_renderable_reply',
+    );
+    keptSilentTransport = silentResult?.transport || null;
+    keptSilentFallbackUsed = silentResult?.fallbackUsed === true;
     keptSilent = true;
     return true;
   };
@@ -1411,21 +1477,35 @@ function createDeliveryReplyDispatcher({
   const markDispatchIdle = async () => {
     await dispatchApi.dispatcher.waitForIdle?.();
     if (!replied && !suppressed) {
-      const continuation = buildRelayContinuationText({
+      const allowPartialFallback = (
+        runtimeOutputSummary.counts.final > 0
+        && finalTexts.length === 0
+        && blockTexts.length === 0
+        && runtimeOutputSummary.counts.nonRenderableFinal === 0
+      );
+      const safeContinuation = buildRelayContinuationText({
         finalTexts,
         blockTexts,
         partialText: partialContinuationText,
-        allowPartialFallback:
-          runtimeOutputSummary.counts.final > 0 && finalTexts.length === 0 && blockTexts.length === 0,
+        allowPartialFallback,
       });
-      runtimeOutputSummary.relayContinuationSource = continuation.source;
-      runtimeOutputSummary.relayContinuationPreview = continuation.text
-        ? previewRuntimeOutputText(continuation.text)
+      runtimeOutputSummary.relayContinuationSource = safeContinuation.source;
+      runtimeOutputSummary.relayContinuationPreview = safeContinuation.text
+        ? previewRuntimeOutputText(safeContinuation.text)
         : null;
-      if (continuation.text) {
-        await flushReply(continuation.text);
+      if (safeContinuation.text) {
+        await flushReply(safeContinuation.text);
       } else {
-        await flushKeptSilent(continuation.source);
+        const silentReason = resolveRelaySilentReason(runtimeOutputSummary, safeContinuation);
+        if (runtimeOutputSummary.counts.runtimeErrorFinal > 0) {
+          logger.warn?.(`[claworld:${runtimeAccountId}] runtime produced non-renderable error finals; returning kept_silent`, {
+            deliveryId,
+            sessionKey,
+            localAgentId,
+            runtimeOutputSummary,
+          });
+        }
+        await flushKeptSilent(silentReason);
       }
     }
     await dispatchApi.markDispatchIdle?.();
@@ -1470,13 +1550,14 @@ function createDeliveryReplyDispatcher({
         final: [...runtimeOutputSummary.previews.final],
         block: [...runtimeOutputSummary.previews.block],
         tool: [...runtimeOutputSummary.previews.tool],
-        partial: [...runtimeOutputSummary.previews.partial],
-        reasoning: [...runtimeOutputSummary.previews.reasoning],
-        operationalNotice: [...runtimeOutputSummary.previews.operationalNotice],
-      },
-      relayContinuationSource: runtimeOutputSummary.relayContinuationSource,
-      relayContinuationPreview: runtimeOutputSummary.relayContinuationPreview,
-      replyTransport,
+      partial: [...runtimeOutputSummary.previews.partial],
+      reasoning: [...runtimeOutputSummary.previews.reasoning],
+      operationalNotice: [...runtimeOutputSummary.previews.operationalNotice],
+      runtimeErrorFinal: [...runtimeOutputSummary.previews.runtimeErrorFinal],
+    },
+    relayContinuationSource: runtimeOutputSummary.relayContinuationSource,
+    relayContinuationPreview: runtimeOutputSummary.relayContinuationPreview,
+    replyTransport,
       replyFallbackUsed,
       keptSilentTransport,
       keptSilentFallbackUsed,
@@ -1709,12 +1790,13 @@ async function maybeBridgeRuntimeDelivery({
   });
 
   try {
-    if (typeof relayClient?.sendAcceptedAndWaitForAck === 'function') {
-      await relayClient.sendAcceptedAndWaitForAck({
-        deliveryId,
-        sessionKey,
-        source: 'runtime_dispatch',
-      });
+    const acceptedResult = await relayClient.acceptDeliveryHttp({
+      deliveryId,
+      sessionKey,
+      source: 'runtime_dispatch',
+    });
+    if (acceptedResult.status < 200 || acceptedResult.status >= 300) {
+      throw new Error(`failed to submit relay delivery acceptance: ${acceptedResult.status}`);
     }
   } catch (error) {
     logger.warn?.(`[claworld:${runtimeAccountId}] delivery acceptance acknowledgement failed`, {
@@ -1748,8 +1830,8 @@ async function maybeBridgeRuntimeDelivery({
     && metadata.allowReply !== false
     && replied !== true
     && runtimeOutputSummary.counts.final > 0
-    && runtimeOutputSummary.counts.operationalNotice > 0
-    && runtimeOutputSummary.counts.final === runtimeOutputSummary.counts.operationalNotice
+    && runtimeOutputSummary.counts.nonRenderableFinal > 0
+    && runtimeOutputSummary.counts.final === runtimeOutputSummary.counts.nonRenderableFinal
     && runtimeOutputSummary.counts.block === 0
     && runtimeOutputSummary.counts.tool === 0
     && runtimeOutputSummary.counts.partial === 0

package/src/openclaw/plugin/relay-client.js

@@ -29,6 +29,21 @@ import {
   TERMINAL_CLOSE_REASONS,
 } from './relay-client-shared.js';
 
+const DELIVERY_VISIBILITY_RETRY_ATTEMPTS = 20;
+const DELIVERY_VISIBILITY_RETRY_DELAY_MS = 10;
+
+function isDeliveryVisibilityMiss(result = {}) {
+  return Number(result?.status) === 404
+    && normalizeOptionalText(result?.body?.error) === 'delivery_not_found';
+}
+
+async function waitForDeliveryVisibilityRetry() {
+  await new Promise((resolve) => {
+    const timer = setTimeout(resolve, DELIVERY_VISIBILITY_RETRY_DELAY_MS);
+    if (typeof timer?.unref === 'function') timer.unref();
+  });
+}
+
 export class ClaworldRelayClient extends EventEmitter {
   constructor({
     logger = console,
@@ -244,6 +259,18 @@ export class ClaworldRelayClient extends EventEmitter {
     return { status: response.status, body };
   }
 
+  async requestJsonWithDeliveryVisibilityRetry(pathName, init = {}, fallback = {}) {
+    let attempt = 0;
+    while (true) {
+      const result = await this.requestJson(pathName, init, fallback);
+      if (!isDeliveryVisibilityMiss(result) || attempt >= DELIVERY_VISIBILITY_RETRY_ATTEMPTS - 1) {
+        return result;
+      }
+      attempt += 1;
+      await waitForDeliveryVisibilityRetry();
+    }
+  }
+
   async openSocket({
     wsUrl,
     agentId,
@@ -879,7 +906,7 @@ export class ClaworldRelayClient extends EventEmitter {
       replyText,
       source,
     });
-    const result = await this.requestJson(`/v1/deliveries/${encodeURIComponent(envelope.deliveryId)}/reply`, {
+    const result = await this.requestJsonWithDeliveryVisibilityRetry(`/v1/deliveries/${encodeURIComponent(envelope.deliveryId)}/reply`, {
       method: 'POST',
       headers: buildRuntimeAuthHeaders(this.runtimeConfig, { 'content-type': 'application/json' }),
       body: JSON.stringify({
@@ -901,7 +928,7 @@ export class ClaworldRelayClient extends EventEmitter {
 
   async acceptDeliveryHttp({ deliveryId, sessionKey = null, source = 'runtime_dispatch' } = {}) {
     const normalizedDeliveryId = normalizeOptionalText(deliveryId);
-    const result = await this.requestJson(`/v1/deliveries/${encodeURIComponent(normalizedDeliveryId)}/accepted`, {
+    const result = await this.requestJsonWithDeliveryVisibilityRetry(`/v1/deliveries/${encodeURIComponent(normalizedDeliveryId)}/accepted`, {
       method: 'POST',
       headers: buildRuntimeAuthHeaders(this.runtimeConfig, { 'content-type': 'application/json' }),
       body: JSON.stringify({
@@ -932,6 +959,10 @@ export class ClaworldRelayClient extends EventEmitter {
     timeoutMs = DEFAULT_REPLY_ACK_TIMEOUT_MS,
     httpFallback = true,
   } = {}) {
+    const ackPromise = this.waitForReplyAck({
+      deliveryId,
+      timeoutMs,
+    });
     const envelope = this.sendReply({
       deliveryId,
       sessionKey,
@@ -940,10 +971,7 @@ export class ClaworldRelayClient extends EventEmitter {
     });
 
     try {
-      const ack = await this.waitForReplyAck({
-        deliveryId: envelope.deliveryId,
-        timeoutMs,
-      });
+      const ack = await ackPromise;
       return {
         ok: true,
         envelope,
@@ -1011,6 +1039,24 @@ export class ClaworldRelayClient extends EventEmitter {
     }
   }
 
+  async submitDeliveryReply({
+    deliveryId,
+    sessionKey,
+    replyText,
+    source = 'subagent',
+    timeoutMs = DEFAULT_REPLY_ACK_TIMEOUT_MS,
+    httpFallback = true,
+  } = {}) {
+    return await this.sendReplyAndWaitForAck({
+      deliveryId,
+      sessionKey,
+      replyText,
+      source,
+      timeoutMs,
+      httpFallback,
+    });
+  }
+
   async sendAcceptedAndWaitForAck({
     deliveryId,
     sessionKey,
@@ -1018,6 +1064,10 @@ export class ClaworldRelayClient extends EventEmitter {
     timeoutMs = DEFAULT_REPLY_ACK_TIMEOUT_MS,
     httpFallback = true,
   } = {}) {
+    const ackPromise = this.waitForAcceptedAck({
+      deliveryId,
+      timeoutMs,
+    });
     const envelope = this.sendAccepted({
       deliveryId,
       sessionKey,
@@ -1025,10 +1075,7 @@ export class ClaworldRelayClient extends EventEmitter {
     });
 
     try {
-      const ack = await this.waitForAcceptedAck({
-        deliveryId: envelope.deliveryId,
-        timeoutMs,
-      });
+      const ack = await ackPromise;
       return {
         ok: true,
         envelope,
@@ -1082,7 +1129,7 @@ export class ClaworldRelayClient extends EventEmitter {
 
   async keepDeliverySilentHttp({ deliveryId, reason = null, source = 'openclaw-autochain' } = {}) {
     const normalizedDeliveryId = normalizeOptionalText(deliveryId);
-    const result = await this.requestJson(`/v1/deliveries/${encodeURIComponent(normalizedDeliveryId)}/kept-silent`, {
+    const result = await this.requestJsonWithDeliveryVisibilityRetry(`/v1/deliveries/${encodeURIComponent(normalizedDeliveryId)}/kept-silent`, {
       method: 'POST',
       headers: buildRuntimeAuthHeaders(this.runtimeConfig, { 'content-type': 'application/json' }),
       body: JSON.stringify({
@@ -1113,6 +1160,10 @@ export class ClaworldRelayClient extends EventEmitter {
     timeoutMs = DEFAULT_REPLY_ACK_TIMEOUT_MS,
     httpFallback = true,
   } = {}) {
+    const ackPromise = this.waitForKeepSilentAck({
+      deliveryId,
+      timeoutMs,
+    });
     const envelope = this.sendKeepSilent({
       deliveryId,
       sessionKey,
@@ -1121,10 +1172,7 @@ export class ClaworldRelayClient extends EventEmitter {
     });
 
     try {
-      const ack = await this.waitForKeepSilentAck({
-        deliveryId: envelope.deliveryId,
-        timeoutMs,
-      });
+      const ack = await ackPromise;
       return {
         ok: true,
         envelope,
@@ -1192,6 +1240,24 @@ export class ClaworldRelayClient extends EventEmitter {
     }
   }
 
+  async submitDeliveryKeptSilent({
+    deliveryId,
+    sessionKey,
+    reason = null,
+    source = 'openclaw-autochain',
+    timeoutMs = DEFAULT_REPLY_ACK_TIMEOUT_MS,
+    httpFallback = true,
+  } = {}) {
+    return await this.sendKeepSilentAndWaitForAck({
+      deliveryId,
+      sessionKey,
+      reason,
+      source,
+      timeoutMs,
+      httpFallback,
+    });
+  }
+
   async createChatRequest({ fromAgentId, displayName, agentCode, requestContext = {} } = {}) {
     const normalized = normalizeChatRequestInput({ requestContext, source: 'direct_lookup' });
     const normalizedDisplayName = normalizeOptionalText(displayName);