@xfxstudio/claworld 2026.4.30-runtime-binding-fix.3 → 2026.4.30-testing.2

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

@@ -278,7 +278,6 @@ export async function resolveToolContext(
   }
   return {
     cfg,
-    runtime: api?.runtime || null,
     accountId,
     runtimeConfig,
     agentId,

package/src/openclaw/plugin/register.js

@@ -18,6 +18,7 @@ import {
   buildClaworldToolMaintenanceEvent,
   ensureClaworldWorkingMemory,
   resolveClaworldBootstrapTarget,
+  updateClaworldSessionDirectory,
 } from '../runtime/working-memory.js';
 import { resolveOpenClawWorkspaceRoot } from '../runtime/workspace-resolver.js';
 import { setClaworldRuntime } from './runtime.js';
@@ -673,18 +674,7 @@ function createTerminalToolAdapters(api, plugin, internalTools) {
             ...context,
             agentId: normalizeText(params.agentId, context.agentId),
           });
-        const responsePayload = action === 'get_profile'
-          && params.generateShareCard === true
-          && typeof plugin.runtime.productShell.profile?.generateShareCard === 'function'
-          ? {
-              ...payload,
-              shareCard: await plugin.runtime.productShell.profile.generateShareCard({
-                ...context,
-                expiresInSeconds: params.expiresInSeconds ?? null,
-              }),
-            }
-          : payload;
-        return buildTerminalActionResult({ tool: publicProfileTool, action, payload: responsePayload });
+        return buildTerminalActionResult({ tool: publicProfileTool, action, payload });
       },
     },
     {
@@ -1969,29 +1959,12 @@ function buildRegisteredTools(api, plugin) {
 
         const cfg = await loadCurrentConfig(api);
         const accountId = normalizeText(params.accountId, plugin.config.defaultAccountId(cfg) || null);
-        const rawRuntimeConfig = plugin.config.resolveRuntimeConfig(cfg, accountId);
-        const viewContext = typeof plugin.helpers?.resolveToolAccountViewContext === 'function'
-          ? await plugin.helpers.resolveToolAccountViewContext({
-            cfg,
-            runtime: api?.runtime || null,
-            accountId,
-            runtimeConfig: rawRuntimeConfig,
-            agentId: normalizeText(params.agentId, rawRuntimeConfig.relay?.agentId || null),
-          })
-          : {
-              cfg,
-              runtime: api?.runtime || null,
-              accountId,
-              runtimeConfig: rawRuntimeConfig,
-              agentId: normalizeText(params.agentId, rawRuntimeConfig.relay?.agentId || null),
-              bindingSource: null,
-            };
-        const runtimeConfig = viewContext.runtimeConfig || rawRuntimeConfig;
+        const runtimeConfig = plugin.config.resolveRuntimeConfig(cfg, accountId);
         const identityPayload = await plugin.runtime.productShell.profile.getPublicIdentity({
-          ...viewContext,
-          runtimeConfig,
+          cfg,
           accountId,
-          agentId: normalizeText(viewContext.agentId, runtimeConfig.relay?.agentId || null),
+          runtimeConfig,
+          agentId: runtimeConfig.relay?.agentId || null,
           generateShareCard,
           expiresInSeconds: params.expiresInSeconds ?? null,
         });
@@ -2023,7 +1996,7 @@ function buildRegisteredTools(api, plugin) {
             ? (pairedAgentId ? null : 'missing_agent_id')
             : 'missing_app_token',
           bindingSource: hasConfiguredAppToken
-            ? normalizeText(viewContext.bindingSource, 'configured_app_token')
+            ? 'configured_app_token'
             : (runtimeConfig.registration?.enabled === true ? 'registration_pending' : 'unbound'),
           runtimeConfig: pairedAgentId
             ? {
@@ -2098,13 +2071,45 @@ export function registerClaworldPluginFull(api, plugin) {
     });
 
     api.on('before_tool_call', async (event, ctx) => {
-      if (event?.toolName !== 'claworld_manage_conversations') return;
+      const toolName = normalizeText(event?.toolName, null);
+      if (!toolName || !toolName.startsWith('claworld_')) 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) return;
+      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;
+      }
       return {
         params: {
           ...params,
@@ -2126,6 +2131,7 @@ 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

@@ -23,10 +23,52 @@ export function normalizeRelayWebSocketUrl(serverUrl) {
 
 export function buildInboundEnvelope(message = {}) {
   const data = message.data || {};
-  if (message.event !== 'delivery') return null;
   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,
+      },
+    };
+  }
   return {
     eventType: data.eventType || 'delivery',
     deliveryId: data.deliveryId || null,

package/src/openclaw/protocol/relay-event-protocol.js

@@ -1,6 +1,15 @@
 export const CLAWORLD_PLUGIN_BRIDGE_PROTOCOL = 'claworld.delivery_reply.v1';
 
 const DELIVERY_EVENT_TYPE = 'delivery';
+const MANAGEMENT_EVENT_TYPES = new Set([
+  'notification',
+  'domain_notification',
+  'management_wake',
+  'management_tick',
+  'conversation_lifecycle',
+  'platform_recommendation',
+  'ops_recommendation',
+]);
 
 function normalizeText(value, fallback = null) {
   if (value == null) return fallback;
@@ -16,27 +25,28 @@ function normalizePayload(payload = null) {
 export function createRelayEventProtocol() {
   return {
     version: CLAWORLD_PLUGIN_BRIDGE_PROTOCOL,
-    eventTypes: [DELIVERY_EVENT_TYPE],
-    requiredEnvelopeFields: ['eventType', 'deliveryId', 'sessionKey', 'payload'],
+    eventTypes: [DELIVERY_EVENT_TYPE, ...MANAGEMENT_EVENT_TYPES],
+    requiredEnvelopeFields: ['eventType', 'sessionKey', 'payload'],
     describeEvent(event = {}) {
       const payload = normalizePayload(event.payload);
       const missing = [];
-      if (normalizeText(event.eventType, null) !== DELIVERY_EVENT_TYPE) {
+      const eventType = normalizeText(event.eventType, null);
+      if (eventType !== DELIVERY_EVENT_TYPE && !MANAGEMENT_EVENT_TYPES.has(eventType)) {
         missing.push('eventType');
       }
-      if (!normalizeText(event.deliveryId, null)) {
+      if (eventType === DELIVERY_EVENT_TYPE && !normalizeText(event.deliveryId, null)) {
         missing.push('deliveryId');
       }
       if (!normalizeText(event.sessionKey, null)) {
         missing.push('sessionKey');
       }
-      if (!normalizeText(payload.text, null)) {
+      if (eventType === DELIVERY_EVENT_TYPE && !normalizeText(payload.text, null)) {
         missing.push('payload.text');
       }
       return {
         ok: missing.length === 0,
         missing,
-        role: 'delivery',
+        role: eventType === DELIVERY_EVENT_TYPE ? 'delivery' : 'management',
       };
     },
   };