@xfxstudio/claworld 2026.4.30-testing.2 → 2026.4.30-testing.3

package/src/openclaw/plugin/register-tooling.js

@@ -653,7 +653,19 @@ export function projectToolAccountViewResponse({
   identityPayload = null,
 } = {}) {
   const identityReady = identityPayload?.ready === true;
-  const ready = pairingPayload?.status === 'paired' && identityReady;
+  const activationReady = pairingPayload?.status === 'paired';
+  const bindingReady = typeof pairingPayload?.bindingReady === 'boolean'
+    ? pairingPayload.bindingReady
+    : activationReady;
+  const bindingStatus = normalizeText(
+    pairingPayload?.bindingStatus,
+    activationReady
+      ? (bindingReady ? 'bound' : 'identity_unresolved')
+      : 'unactivated',
+  );
+  const ready = activationReady && identityReady;
+  const relayResolved = pairingPayload?.relayAgent?.resolved ?? null;
+  const relayOnline = pairingPayload?.relayAgent?.online ?? null;
   const resolvedShareCard = identityPayload && Object.prototype.hasOwnProperty.call(identityPayload, 'shareCard')
     ? projectToolShareCard(identityPayload.shareCard)
     : undefined;
@@ -668,7 +680,15 @@ export function projectToolAccountViewResponse({
     reason: normalizeText(pairingPayload?.reason, null),
     bindingSource: normalizeText(pairingPayload?.bindingSource, null),
     activation: {
-      status: pairingPayload?.status === 'paired' ? 'ready' : 'pending',
+      status: activationReady ? 'ready' : 'pending',
+    },
+    diagnostics: {
+      toolReachable: true,
+      bindingReady,
+      bindingStatus,
+      publicIdentityReady: identityReady,
+      relayPresenceResolved: relayResolved,
+      relayOnline,
     },
     relay: {
       agentId: normalizeText(
@@ -678,9 +698,9 @@ export function projectToolAccountViewResponse({
       displayName: normalizeText(pairingPayload?.relayAgent?.displayName, null),
       discoverable: pairingPayload?.relayAgent?.discoverable ?? null,
       contactable: pairingPayload?.relayAgent?.contactable ?? null,
-      online: pairingPayload?.relayAgent?.online ?? null,
-      resolved: pairingPayload?.relayAgent?.resolved ?? null,
-      bindingStatus: pairingPayload?.status === 'paired' ? 'bound' : 'unactivated',
+      online: relayOnline,
+      resolved: relayResolved,
+      bindingStatus,
     },
     profile: projectToolAccountProfile(identityPayload),
     ...projectToolAccountIdentityFields(identityPayload),

package/src/openclaw/plugin/register.js

@@ -18,7 +18,6 @@ import {
   buildClaworldToolMaintenanceEvent,
   ensureClaworldWorkingMemory,
   resolveClaworldBootstrapTarget,
-  updateClaworldSessionDirectory,
 } from '../runtime/working-memory.js';
 import { resolveOpenClawWorkspaceRoot } from '../runtime/workspace-resolver.js';
 import { setClaworldRuntime } from './runtime.js';
@@ -1969,7 +1968,16 @@ function buildRegisteredTools(api, plugin) {
           expiresInSeconds: params.expiresInSeconds ?? null,
         });
         const pairedAgentId = identityPayload?.agentId || runtimeConfig.relay?.agentId || null;
-        const relayAgent = pairedAgentId
+        const pairedRuntimeConfig = pairedAgentId
+          ? {
+            ...runtimeConfig,
+            relay: {
+              ...(runtimeConfig.relay && typeof runtimeConfig.relay === 'object' ? runtimeConfig.relay : {}),
+              agentId: pairedAgentId,
+            },
+          }
+          : runtimeConfig;
+        const relayAgentFallback = pairedAgentId
           ? {
             agentId: pairedAgentId,
             displayName: normalizeText(
@@ -1990,23 +1998,39 @@ function buildRegisteredTools(api, plugin) {
           || runtimeConfig.relay?.appToken
           || runtimeConfig.relay?.credentialToken,
         );
+        const activationReady = hasConfiguredAppToken;
+        const bindingReady = activationReady && Boolean(pairedAgentId);
+        const bindingStatus = activationReady
+          ? (bindingReady ? 'bound' : 'identity_unresolved')
+          : 'unactivated';
+        let relayAgent = relayAgentFallback;
+        if (hasConfiguredAppToken && pairedAgentId && typeof plugin.helpers?.pairing?.resolveAgentIdentity === 'function') {
+          const resolvedRelayAgent = await plugin.helpers.pairing.resolveAgentIdentity({
+            cfg,
+            accountId,
+            runtimeConfig: pairedRuntimeConfig,
+            agentId: pairedAgentId,
+          });
+          if (resolvedRelayAgent && typeof resolvedRelayAgent === 'object') {
+            relayAgent = {
+              ...relayAgentFallback,
+              ...resolvedRelayAgent,
+              agentId: normalizeText(resolvedRelayAgent.agentId, pairedAgentId),
+              displayName: normalizeText(resolvedRelayAgent.displayName, relayAgentFallback?.displayName ?? null),
+            };
+          }
+        }
         const pairingPayload = {
-          status: hasConfiguredAppToken ? 'paired' : 'unpaired',
-          reason: hasConfiguredAppToken
+          status: activationReady ? 'paired' : 'unpaired',
+          bindingReady,
+          bindingStatus,
+          reason: activationReady
             ? (pairedAgentId ? null : 'missing_agent_id')
             : 'missing_app_token',
-          bindingSource: hasConfiguredAppToken
+          bindingSource: activationReady
             ? 'configured_app_token'
             : (runtimeConfig.registration?.enabled === true ? 'registration_pending' : 'unbound'),
-          runtimeConfig: pairedAgentId
-            ? {
-              ...runtimeConfig,
-              relay: {
-                ...(runtimeConfig.relay && typeof runtimeConfig.relay === 'object' ? runtimeConfig.relay : {}),
-                agentId: pairedAgentId,
-              },
-            }
-            : runtimeConfig,
+          runtimeConfig: pairedRuntimeConfig,
           relayAgent,
         };
         return buildToolResult(projectToolAccountViewResponse({
@@ -2071,45 +2095,13 @@ export function registerClaworldPluginFull(api, plugin) {
     });
 
     api.on('before_tool_call', async (event, ctx) => {
-      const toolName = normalizeText(event?.toolName, null);
-      if (!toolName || !toolName.startsWith('claworld_')) return;
+      if (event?.toolName !== 'claworld_manage_conversations') return;
       const params = event?.params && typeof event.params === 'object' && !Array.isArray(event.params)
         ? event.params
         : {};
+      if (normalizeTerminalConversationAction(params.action, null) !== 'request') return;
       const requesterSessionKey = normalizeText(ctx?.sessionKey, null);
-      if (requesterSessionKey) {
-        const logger = getHookLogger(api);
-        try {
-          const workspaceRoot = await resolveHookWorkspaceRoot(api, event, ctx);
-          if (workspaceRoot) {
-            await updateClaworldSessionDirectory(
-              workspaceRoot,
-              {
-                timestamp: event?.timestamp || ctx?.timestamp || null,
-                source: 'claworld_hook',
-                eventType: 'before_tool_call',
-                kind: toolName,
-                toolName,
-                relations: {
-                  localSessionKey: requesterSessionKey,
-                  sessionKey: requesterSessionKey,
-                  localAgentId: normalizeText(ctx?.agentId ?? ctx?.AgentId, null),
-                },
-                context: ctx || {},
-              },
-            );
-          }
-        } catch (error) {
-          logger?.warn?.('[claworld:working-memory] unable to update session directory before tool call', error);
-        }
-      }
-      if (
-        toolName !== 'claworld_manage_conversations'
-        || normalizeTerminalConversationAction(params.action, null) !== 'request'
-        || !requesterSessionKey
-      ) {
-        return;
-      }
+      if (!requesterSessionKey) return;
       return {
         params: {
           ...params,
@@ -2131,7 +2123,6 @@ export function registerClaworldPluginFull(api, plugin) {
           params: event?.params || {},
           result: hookToolResult(event),
           timestamp: event?.timestamp || ctx?.timestamp || null,
-          context: ctx || {},
         });
         if (!maintenanceEvent) return;
         await appendClaworldJournalEvent(workspaceRoot, maintenanceEvent);

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

@@ -5,6 +5,51 @@ export const STALE_CONNECTION_CLOSE_CODE = 4002;
 export const TERMINAL_CLOSE_REASONS = new Set(['duplicate_connection_replaced', 'stale_connection']);
 export const DEFAULT_REPLY_ACK_TIMEOUT_MS = 5000;
 
+function cloneObject(value, fallback = {}) {
+  if (!value || typeof value !== 'object' || Array.isArray(value)) return { ...fallback };
+  return { ...value };
+}
+
+function normalizeEnvelopeText(value, fallback = null) {
+  if (value == null) return fallback;
+  const normalized = String(value).trim();
+  return normalized || fallback;
+}
+
+function resolveEnvelopeMessageId(data = {}, payload = {}) {
+  const notification = payload.notification && typeof payload.notification === 'object' && !Array.isArray(payload.notification)
+    ? payload.notification
+    : data.notification && typeof data.notification === 'object' && !Array.isArray(data.notification)
+      ? data.notification
+      : {};
+  const metadata = data.metadata && typeof data.metadata === 'object' && !Array.isArray(data.metadata)
+    ? data.metadata
+    : payload.metadata && typeof payload.metadata === 'object' && !Array.isArray(payload.metadata)
+      ? payload.metadata
+      : {};
+  const candidates = [
+    data.deliveryId,
+    data.inboxItemId,
+    data.messageId,
+    data.eventId,
+    data.notificationId,
+    payload.deliveryId,
+    payload.inboxItemId,
+    payload.messageId,
+    payload.eventId,
+    payload.notificationId,
+    metadata.messageId,
+    metadata.eventId,
+    metadata.notificationId,
+    notification.notificationId,
+  ];
+  for (const candidate of candidates) {
+    const normalized = normalizeEnvelopeText(candidate, null);
+    if (normalized) return normalized;
+  }
+  return null;
+}
+
 export function normalizeRelayWebSocketUrl(serverUrl) {
   const parsed = new URL(serverUrl);
   if (parsed.protocol === 'http:') parsed.protocol = 'ws:';
@@ -23,62 +68,63 @@ export function normalizeRelayWebSocketUrl(serverUrl) {
 
 export function buildInboundEnvelope(message = {}) {
   const data = message.data || {};
+  const directPayload = data.payload && typeof data.payload === 'object' && !Array.isArray(data.payload)
+    ? { ...data.payload }
+    : {};
   const metadata = data.metadata && typeof data.metadata === 'object' && !Array.isArray(data.metadata)
     ? { ...data.metadata }
-    : {};
-  if (message.event !== 'delivery') {
-    const eventType = normalizeOptionalText(data.eventType) || normalizeOptionalText(message.event);
-    const notification = data.notification && typeof data.notification === 'object' && !Array.isArray(data.notification)
-      ? data.notification
-      : {};
-    const targetAgentId = normalizeOptionalText(
-      data.targetAgentId
-      || notification.targetAgentId
-      || metadata.targetAgentId,
-    );
-    const sessionKey = normalizeOptionalText(
-      data.sessionKey
-      || notification.targetSessionKey
-      || metadata.sessionKey,
-    ) || (targetAgentId ? `management:${targetAgentId}` : null);
-    if (!eventType || !sessionKey) return null;
-    return {
-      eventType,
-      eventName: normalizeOptionalText(data.eventName) || normalizeOptionalText(message.event),
-      eventId: normalizeOptionalText(data.eventId)
-        || normalizeOptionalText(data.inboxItemId)
-        || normalizeOptionalText(notification.notificationId)
-        || null,
-      sessionKey,
-      targetAgentId,
-      conversationKey: normalizeOptionalText(data.conversationKey)
-        || normalizeOptionalText(notification.relatedObjects?.conversationKey)
-        || null,
-      worldId: normalizeOptionalText(data.worldId)
-        || normalizeOptionalText(notification.relatedObjects?.worldId)
-        || null,
-      createdAt: data.createdAt || notification.createdAt || null,
-      updatedAt: data.updatedAt || notification.updatedAt || null,
-      payload: data && typeof data === 'object' && !Array.isArray(data)
-        ? { ...data }
-        : {},
-      metadata: {
-        ...metadata,
-        relayEvent: normalizeOptionalText(message.event),
-        inboxItemId: normalizeOptionalText(data.inboxItemId) || null,
-      },
-    };
+    : directPayload.metadata && typeof directPayload.metadata === 'object' && !Array.isArray(directPayload.metadata)
+      ? { ...directPayload.metadata }
+      : cloneObject(data.meta, {});
+  const payloadEventType = normalizeEnvelopeText(directPayload.eventType, null);
+  const dataEventType = normalizeEnvelopeText(data.eventType, null);
+  const eventType = dataEventType
+    || payloadEventType
+    || (message.event === 'delivery' ? 'delivery' : normalizeEnvelopeText(message.event, null));
+  const payload = Object.keys(directPayload).length > 0
+    ? { ...directPayload }
+    : cloneObject(data, {});
+  if (Object.keys(directPayload).length > 0) {
+    for (const key of [
+      'eventType',
+      'eventName',
+      'sessionKind',
+      'sessionKey',
+      'targetSessionKey',
+      'targetAgentId',
+      'text',
+      'body',
+      'notification',
+    ]) {
+      if (payload[key] == null && data[key] != null) payload[key] = data[key];
+    }
   }
+  const targetAgentId = normalizeEnvelopeText(
+    data.targetAgentId,
+    normalizeEnvelopeText(payload.targetAgentId, null),
+  );
+  const sessionKey = normalizeEnvelopeText(
+    data.sessionKey,
+    normalizeEnvelopeText(
+      payload.sessionKey,
+      normalizeEnvelopeText(
+        data.targetSessionKey,
+        normalizeEnvelopeText(payload.targetSessionKey, null),
+      ),
+    ),
+  );
+  const isDeliveryEvent = message.event === 'delivery';
+  const isRoutableEvent = Boolean(eventType && sessionKey);
+  if (!isDeliveryEvent && !isRoutableEvent) return null;
   return {
-    eventType: data.eventType || 'delivery',
-    deliveryId: data.deliveryId || null,
-    sessionKey: data.sessionKey || null,
-    createdAt: data.createdAt || null,
+    eventType: eventType || 'delivery',
+    deliveryId: resolveEnvelopeMessageId(data, payload),
+    sessionKey,
+    targetAgentId,
+    createdAt: data.createdAt || data.availableAt || null,
     updatedAt: data.updatedAt || null,
     turnCreatedAt: data.turnCreatedAt || null,
-    payload: data.payload && typeof data.payload === 'object' && !Array.isArray(data.payload)
-      ? { ...data.payload }
-      : {},
+    payload,
     metadata,
   };
 }