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

package/openclaw.plugin.json

@@ -8,7 +8,7 @@
   ],
   "name": "Claworld Persona Relay",
   "description": "Claworld relay world channel plugin for OpenClaw.",
-  "version": "2026.4.29-testing.2",
+  "version": "2026.4.30-runtime-binding-fix.1",
   "configSchema": {
     "type": "object",
     "additionalProperties": false,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xfxstudio/claworld",
-  "version": "2026.4.29-testing.2",
+  "version": "2026.4.30-runtime-binding-fix.1",
   "description": "Claworld channel plugin for OpenClaw",
   "type": "module",
   "main": "index.js",

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

@@ -2479,6 +2479,75 @@ export function createClaworldChannelPlugin({
     });
   }
 
+  function resolveCachedAccountBinding({ runtimeConfig, accountId = null }) {
+    const normalizedRuntimeConfig = applyRuntimeIdentity(runtimeConfig);
+    const accountKey = resolveAccountBindingKey(normalizedRuntimeConfig, accountId || null);
+    const cachedBinding = accountBindingStates.get(accountKey)?.binding || null;
+    if (
+      !cachedBinding
+      || !cachedBinding.runtimeConfig?.serverUrl
+      || cachedBinding.runtimeConfig.serverUrl !== normalizedRuntimeConfig.serverUrl
+    ) {
+      return null;
+    }
+
+    return {
+      ...cachedBinding,
+      runtimeConfig: mergeBoundRuntimeConfig(normalizedRuntimeConfig, cachedBinding.runtimeConfig),
+      bindingSource: cachedBinding.bindingSource || 'binding_cache',
+    };
+  }
+
+  function commitRuntimeBinding({
+    context = {},
+    runtime = null,
+    runtimeSource = null,
+    accountId = null,
+    runtimeConfig = {},
+    bindingSource = 'configured_app_token',
+    relayAgent = null,
+  } = {}) {
+    const normalizedRuntimeConfig = applyRuntimeIdentity(runtimeConfig);
+    const normalizedAccountId = normalizeClaworldText(
+      normalizedRuntimeConfig.accountId,
+      normalizeClaworldText(accountId, normalizeClaworldText(context.accountId, 'default')),
+    );
+    const accountKey = resolveAccountBindingKey(normalizedRuntimeConfig, normalizedAccountId);
+    const runtimeResolution = runtimeSource
+      ? { runtime, runtimeSource }
+      : resolvePluginRuntimeCandidate(runtime || context.runtime || null);
+    const currentRuntimeContext = accountRuntimeContexts.get(accountKey)
+      || accountRuntimeContexts.get(normalizedAccountId)
+      || null;
+
+    rememberAccountBinding({
+      runtimeConfig: normalizedRuntimeConfig,
+      accountId: normalizedAccountId,
+      bindingSource,
+      relayAgent,
+    });
+
+    accountRuntimeContexts.set(accountKey, {
+      ...(currentRuntimeContext || {}),
+      runtime: currentRuntimeContext?.runtime || runtimeResolution.runtime || null,
+      runtimeSource: currentRuntimeContext?.runtimeSource || runtimeResolution.runtimeSource || null,
+      cfg: currentRuntimeContext?.cfg || context.cfg || null,
+      accountId: normalizedAccountId,
+      runtimeConfig: normalizedRuntimeConfig,
+      relayAgent: relayAgent || currentRuntimeContext?.relayAgent || null,
+      bindingSource,
+      deferredFailure: null,
+      deferredErrorMessage: null,
+    });
+
+    return {
+      accountKey,
+      accountId: normalizedAccountId,
+      runtimeConfig: normalizedRuntimeConfig,
+      bindingSource,
+    };
+  }
+
   async function ensureAccountRelayBinding({ runtimeConfig, accountId = null }) {
     const normalizedRuntimeConfig = applyRuntimeIdentity(runtimeConfig);
     const accountKey = resolveAccountBindingKey(normalizedRuntimeConfig, accountId || null);
@@ -2493,9 +2562,7 @@ export function createClaworldChannelPlugin({
       return {
         ...cachedBinding,
         runtimeConfig: mergeBoundRuntimeConfig(normalizedRuntimeConfig, cachedBinding.runtimeConfig),
-        bindingSource: cachedBinding.bindingSource === 'configured_app_token'
-          ? 'configured_app_token'
-          : 'binding_cache',
+        bindingSource: cachedBinding.bindingSource || 'binding_cache',
       };
     }
 
@@ -2616,8 +2683,13 @@ export function createClaworldChannelPlugin({
       };
     }
 
+    const backupAgentId = normalizeClaworldText(
+      backup?.agentId,
+      normalizeClaworldText(runtimeConfig?.relay?.agentId, null),
+    );
     const restoredRuntimeConfig = applyRuntimeIdentity(runtimeConfig, {
       appToken: backupToken,
+      agentId: backupAgentId,
     });
 
     try {
@@ -2625,6 +2697,7 @@ export function createClaworldChannelPlugin({
         runtime,
         accountId,
         appToken: backupToken,
+        relayAgentId: backupAgentId,
       });
     } catch (error) {
       logger.warn?.(`[claworld:${accountId || 'default'}] failed to persist restored runtime appToken`, {
@@ -2652,16 +2725,89 @@ export function createClaworldChannelPlugin({
       accountId: runtimeConfig.accountId || accountId || null,
       runtimeConfig,
       agentId: context.agentId || runtimeConfig.relay?.agentId || null,
-      bindingSource: runtimeContext?.deferredFailure ? 'runtime_context_deferred' : 'runtime_context',
+      bindingSource: runtimeContext?.deferredFailure
+        ? 'runtime_context_deferred'
+        : (runtimeContext?.bindingSource || 'runtime_context'),
     };
   }
 
-  async function resolveBoundRuntimeContext(context = {}) {
+  async function resolveAccountViewRuntimeContext(context = {}) {
     const configuredContext = resolveConfiguredRuntimeContext(context);
     const cfg = configuredContext.cfg || {};
     const accountId = configuredContext.accountId || null;
     let runtimeConfig = configuredContext.runtimeConfig;
-    const runtimeResolution = resolvePluginRuntimeCandidate(context.runtime || null);
+    const runtimeResolution = resolvePluginRuntimeCandidate(
+      context.runtime || configuredContext.runtime || null,
+    );
+    let bindingSource = configuredContext.bindingSource || null;
+    let relayAgent = configuredContext.relayAgent || null;
+
+    const runtimeContext = accountRuntimeContexts.get(
+      resolveAccountBindingKey(runtimeConfig, accountId || null),
+    ) || accountRuntimeContexts.get(accountId || 'default') || null;
+    if (runtimeContext?.runtimeConfig && !runtimeContext?.deferredFailure) {
+      runtimeConfig = mergeBoundRuntimeConfig(runtimeConfig, runtimeContext.runtimeConfig);
+      bindingSource = runtimeContext.bindingSource || bindingSource || 'runtime_context';
+      relayAgent = runtimeContext.relayAgent || relayAgent;
+    }
+
+    const cachedBinding = resolveCachedAccountBinding({ runtimeConfig, accountId });
+    if (cachedBinding && resolveRuntimeAppToken(cachedBinding.runtimeConfig)) {
+      runtimeConfig = cachedBinding.runtimeConfig;
+      bindingSource = cachedBinding.bindingSource || bindingSource || 'binding_cache';
+      relayAgent = cachedBinding.relayAgent || relayAgent;
+    }
+
+    if (!resolveRuntimeAppToken(runtimeConfig)) {
+      const restoredBinding = await maybeRestoreRuntimeAppToken({
+        runtime: runtimeResolution.runtime,
+        accountId,
+        runtimeConfig,
+      });
+      if (restoredBinding.restored) {
+        runtimeConfig = restoredBinding.runtimeConfig;
+        bindingSource = 'installer_state_backup';
+        logger.info?.(`[claworld:${accountId || 'default'}] restored runtime binding from installer state`, {
+          installerStatePath: restoredBinding.installerStatePath || null,
+          relayAgentId: runtimeConfig?.relay?.agentId || null,
+        });
+        commitRuntimeBinding({
+          context: configuredContext,
+          runtime: runtimeResolution.runtime,
+          runtimeSource: runtimeResolution.runtimeSource,
+          accountId,
+          runtimeConfig,
+          bindingSource,
+          relayAgent,
+        });
+      }
+    }
+
+    if (resolveRuntimeAppToken(runtimeConfig) && (!bindingSource || bindingSource === 'runtime_context')) {
+      bindingSource = 'configured_app_token';
+    }
+
+    return {
+      ...configuredContext,
+      cfg: runtimeContext?.cfg || cfg,
+      accountId: runtimeConfig.accountId || accountId || null,
+      runtimeConfig,
+      runtime: runtimeResolution.runtime,
+      runtimeSource: runtimeResolution.runtimeSource,
+      agentId: configuredContext.agentId || runtimeConfig.relay?.agentId || null,
+      bindingSource,
+      relayAgent,
+    };
+  }
+
+  async function resolveBoundRuntimeContext(context = {}) {
+    const configuredContext = await resolveAccountViewRuntimeContext(context);
+    const cfg = configuredContext.cfg || {};
+    const accountId = configuredContext.accountId || null;
+    let runtimeConfig = configuredContext.runtimeConfig;
+    const runtimeResolution = resolvePluginRuntimeCandidate(
+      context.runtime || configuredContext.runtime || null,
+    );
     const restoredBinding = await maybeRestoreRuntimeAppToken({
       runtime: runtimeResolution.runtime,
       accountId,
@@ -2684,7 +2830,7 @@ export function createClaworldChannelPlugin({
         runtime: runtimeResolution.runtime,
         runtimeSource: runtimeResolution.runtimeSource,
         agentId: configuredContext.agentId || runtimeConfig.relay?.agentId || null,
-        bindingSource: 'runtime_context',
+        bindingSource: configuredContext.bindingSource || runtimeContext.bindingSource || 'runtime_context',
       };
     }
     const binding = await ensureAccountRelayBinding({ runtimeConfig, accountId });
@@ -3021,7 +3167,7 @@ export function createClaworldChannelPlugin({
   }
 
   async function getRuntimePublicIdentity(context = {}) {
-    const resolvedContext = resolveConfiguredRuntimeContext(context);
+    const resolvedContext = await resolveAccountViewRuntimeContext(context);
     return fetchPublicIdentity({
       runtimeConfig: resolvedContext.runtimeConfig,
       agentId: resolvedContext.agentId || null,
@@ -3032,7 +3178,10 @@ export function createClaworldChannelPlugin({
   }
 
 async function updateRuntimePublicIdentity(context = {}) {
-    const resolvedContext = resolveConfiguredRuntimeContext(context);
+    const resolvedContext = await resolveAccountViewRuntimeContext(context);
+    const runtimeResolution = resolvePluginRuntimeCandidate(
+      context.runtime || resolvedContext.runtime || null,
+    );
     const updateResult = await updatePublicIdentity({
       runtimeConfig: resolvedContext.runtimeConfig,
       agentId: resolvedContext.agentId || null,
@@ -3073,7 +3222,6 @@ async function updateRuntimePublicIdentity(context = {}) {
     );
 
     if (shouldPersistRuntimeBinding) {
-      const runtimeResolution = resolvePluginRuntimeCandidate(context.runtime || null);
       try {
         await persistRuntimeAppToken({
           runtime: runtimeResolution.runtime,
@@ -3087,23 +3235,19 @@ async function updateRuntimePublicIdentity(context = {}) {
           error: error?.message || String(error),
         });
       }
+    }
 
-      rememberAccountBinding({
+    if (resolveRuntimeAppToken(boundRuntimeConfig) && nextAgentId) {
+      commitRuntimeBinding({
+        context: resolvedContext,
+        runtime: runtimeResolution.runtime,
+        runtimeSource: runtimeResolution.runtimeSource,
         runtimeConfig: boundRuntimeConfig,
         accountId: resolvedContext.accountId || boundRuntimeConfig.accountId || null,
-        bindingSource: runtimeActivation ? 'activated_app_token' : 'configured_app_token',
+        bindingSource: runtimeActivation
+          ? 'activated_app_token'
+          : (resolvedContext.bindingSource || 'configured_app_token'),
       });
-
-      const accountKey = resolveAccountBindingKey(boundRuntimeConfig, resolvedContext.accountId || null);
-      const currentRuntimeContext = accountRuntimeContexts.get(accountKey) || null;
-      if (currentRuntimeContext) {
-        accountRuntimeContexts.set(accountKey, {
-          ...currentRuntimeContext,
-          runtimeConfig: boundRuntimeConfig,
-          deferredFailure: null,
-          deferredErrorMessage: null,
-        });
-      }
     }
 
     const payload = updateResult && typeof updateResult === 'object' && !Array.isArray(updateResult)
@@ -3289,6 +3433,7 @@ async function generateRuntimeProfileCard(context = {}) {
     },
     helpers: {
       resolveToolRuntimeContext: resolveBoundRuntimeContext,
+      resolveToolAccountViewContext: resolveAccountViewRuntimeContext,
       pairing: {
         resolveAgentIdentity: async (context = {}) => resolveRelayAgentSummary({
           runtimeConfig: context.runtimeConfig || resolveClaworldRuntimeConfig(context.cfg || {}, context.accountId || null),

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

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

package/src/openclaw/plugin/register.js

@@ -673,7 +673,18 @@ function createTerminalToolAdapters(api, plugin, internalTools) {
             ...context,
             agentId: normalizeText(params.agentId, context.agentId),
           });
-        return buildTerminalActionResult({ tool: publicProfileTool, action, payload });
+        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 });
       },
     },
     {
@@ -1958,12 +1969,29 @@ function buildRegisteredTools(api, plugin) {
 
         const cfg = await loadCurrentConfig(api);
         const accountId = normalizeText(params.accountId, plugin.config.defaultAccountId(cfg) || null);
-        const runtimeConfig = plugin.config.resolveRuntimeConfig(cfg, accountId);
+        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 identityPayload = await plugin.runtime.productShell.profile.getPublicIdentity({
-          cfg,
-          accountId,
+          ...viewContext,
           runtimeConfig,
-          agentId: runtimeConfig.relay?.agentId || null,
+          accountId,
+          agentId: normalizeText(viewContext.agentId, runtimeConfig.relay?.agentId || null),
           generateShareCard,
           expiresInSeconds: params.expiresInSeconds ?? null,
         });
@@ -1995,7 +2023,7 @@ function buildRegisteredTools(api, plugin) {
             ? (pairedAgentId ? null : 'missing_agent_id')
             : 'missing_app_token',
           bindingSource: hasConfiguredAppToken
-            ? 'configured_app_token'
+            ? normalizeText(viewContext.bindingSource, 'configured_app_token')
             : (runtimeConfig.registration?.enabled === true ? 'registration_pending' : 'unbound'),
           runtimeConfig: pairedAgentId
             ? {