@xfxstudio/claworld 0.2.22 → 0.2.23-beta.0

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.0",
   "configSchema": {
     "type": "object",
     "additionalProperties": false,

package/package.json

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

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

@@ -1328,6 +1328,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 +1359,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 +1372,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;
   };
@@ -1709,12 +1709,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`, {

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);