@xfxstudio/claworld 2026.7.2-testing.1 → 2026.7.8-testing.1

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

@@ -32,6 +32,56 @@ export function normalizeObject(value, fallback = null) {
   return value;
 }
 
+function normalizePlainText(value, fallback = null) {
+  if (value == null || typeof value === 'object' || typeof value === 'function') return fallback;
+  return normalizeText(value, fallback);
+}
+
+function resolveAccountManagementProfilePayload(payload = null) {
+  return normalizeObject(payload?.profile, null);
+}
+
+function resolveToolIdentityPayload(payload = null) {
+  return resolveAccountManagementProfilePayload(payload) || normalizeObject(payload, null);
+}
+
+function resolveToolPublicIdentityPayload(payload = null) {
+  const identityPayload = resolveToolIdentityPayload(payload);
+  return normalizeObject(identityPayload?.publicIdentity, null);
+}
+
+function resolveToolAccountProfilePayload(payload = null) {
+  const identityPayload = resolveToolIdentityPayload(payload);
+  return normalizeObject(identityPayload?.accountProfile, null);
+}
+
+function resolveToolShareCardPayload(payload = null) {
+  const identityPayload = resolveToolIdentityPayload(payload);
+  if (identityPayload && Object.prototype.hasOwnProperty.call(identityPayload, 'shareCard')) {
+    return identityPayload.shareCard;
+  }
+  return undefined;
+}
+
+function resolveToolPluginVersionPayload(payload = null) {
+  const identityPayload = resolveToolIdentityPayload(payload);
+  return identityPayload?.clientVersionStatus || null;
+}
+
+export function resolveToolAgentId(payload = null, fallback = null) {
+  const identityPayload = resolveToolIdentityPayload(payload);
+  return normalizePlainText(identityPayload?.agentId, fallback);
+}
+
+export function resolveToolDisplayName(payload = null, fallback = null) {
+  const identityPayload = resolveToolIdentityPayload(payload);
+  const publicIdentity = resolveToolPublicIdentityPayload(payload);
+  return normalizePlainText(
+    publicIdentity?.displayName,
+    normalizePlainText(identityPayload?.recommendedDisplayName, fallback),
+  );
+}
+
 function resolveRuntimeAppToken(runtimeConfig = {}) {
   return normalizeText(
     runtimeConfig?.appToken,
@@ -94,7 +144,7 @@ async function buildPendingPublicIdentityError({
       accountId: normalizeText(accountId, null),
       agentId: normalizeText(
         agentId,
-        normalizeText(identityPayload?.agentId, null),
+        resolveToolAgentId(identityPayload, null),
       ),
       httpStatus: 409,
       backendCode: 'public_identity_incomplete',
@@ -496,7 +546,6 @@ export const ACCOUNT_ACTIONS = Object.freeze([
   'view',
   'update_identity',
   'update_profile',
-  'update_chat_policy',
 ]);
 
 function normalizeAccountAction(value, fallback = null) {
@@ -509,36 +558,40 @@ export function inferAccountAction(params = {}) {
   if (explicitAction) return explicitAction;
   if (normalizeText(params.displayName, null)) return 'update_identity';
   if (Object.prototype.hasOwnProperty.call(params, 'profile')) return 'update_profile';
-  if (normalizeObject(params.chatRequestApprovalPolicy, null)) return 'update_chat_policy';
   return 'view';
 }
 
 function projectToolPublicIdentity(payload = null) {
-  if (!payload || typeof payload !== 'object') return null;
+  const identityPayload = resolveToolIdentityPayload(payload);
+  if (!identityPayload) return null;
+  const publicIdentity = resolveToolPublicIdentityPayload(payload);
   return {
-    status: payload.status || null,
-    ready: payload.ready ?? null,
-    publicIdentity: payload.publicIdentity && typeof payload.publicIdentity === 'object'
+    status: normalizePlainText(identityPayload.status, null),
+    ready: identityPayload.ready ?? null,
+    publicIdentity: publicIdentity
       ? {
-          status: payload.publicIdentity.status || null,
-          displayIdentity: payload.publicIdentity.displayIdentity || null,
-          displayName: payload.publicIdentity.displayName || null,
-          code: payload.publicIdentity.code || null,
-          confirmedAt: payload.publicIdentity.confirmedAt || null,
-          updatedAt: payload.publicIdentity.updatedAt || null,
+          status: normalizePlainText(publicIdentity.status, null),
+          displayIdentity: normalizePlainText(publicIdentity.displayIdentity, null),
+          displayName: normalizePlainText(publicIdentity.displayName, null),
+          code: normalizePlainText(publicIdentity.code, null),
+          confirmedAt: normalizePlainText(publicIdentity.confirmedAt, null),
+          updatedAt: normalizePlainText(publicIdentity.updatedAt, null),
         }
       : null,
-    recommendedDisplayName: payload.recommendedDisplayName || null,
-    requiredAction: payload.requiredAction || null,
-    nextAction: payload.nextAction || null,
-    nextTool: payload.nextTool || null,
-    missingFields: Array.isArray(payload.missingFields) ? payload.missingFields : [],
-    feedbackSummary: payload.feedbackSummary && typeof payload.feedbackSummary === 'object'
+    recommendedDisplayName: normalizePlainText(
+      identityPayload.recommendedDisplayName,
+      null,
+    ),
+    requiredAction: normalizePlainText(identityPayload.requiredAction, null),
+    nextAction: normalizePlainText(identityPayload.nextAction, null),
+    nextTool: normalizePlainText(identityPayload.nextTool, null),
+    missingFields: Array.isArray(identityPayload.missingFields) ? identityPayload.missingFields : [],
+    feedbackSummary: identityPayload.feedbackSummary && typeof identityPayload.feedbackSummary === 'object'
       ? {
-          totalLikesReceived: Number(payload.feedbackSummary.totalLikesReceived || 0),
-          totalDislikesReceived: Number(payload.feedbackSummary.totalDislikesReceived || 0),
-          totalLikesGiven: Number(payload.feedbackSummary.totalLikesGiven || 0),
-          totalDislikesGiven: Number(payload.feedbackSummary.totalDislikesGiven || 0),
+          totalLikesReceived: Number(identityPayload.feedbackSummary.totalLikesReceived || 0),
+          totalDislikesReceived: Number(identityPayload.feedbackSummary.totalDislikesReceived || 0),
+          totalLikesGiven: Number(identityPayload.feedbackSummary.totalLikesGiven || 0),
+          totalDislikesGiven: Number(identityPayload.feedbackSummary.totalDislikesGiven || 0),
         }
       : null,
   };
@@ -598,23 +651,28 @@ function projectToolAccountIdentityFields(identityPayload = null) {
 }
 
 function projectToolAccountProfile(identityPayload = null) {
-  return normalizeText(identityPayload?.profile, null);
+  const identityPayloadSource = resolveToolIdentityPayload(identityPayload);
+  const profilePayload = resolveToolAccountProfilePayload(identityPayload);
+  return normalizePlainText(
+    profilePayload?.profile,
+    normalizePlainText(identityPayloadSource?.profile, null),
+  );
 }
 
 function projectToolAccountProfileState(identityPayload = null) {
-  const profilePayload = normalizeObject(identityPayload?.accountProfile, null);
-  const profile = normalizeText(profilePayload?.profile, projectToolAccountProfile(identityPayload));
+  const profilePayload = resolveToolAccountProfilePayload(identityPayload);
+  const profile = normalizePlainText(profilePayload?.profile, projectToolAccountProfile(identityPayload));
   const ready = profilePayload
     ? profilePayload.ready === true
     : Boolean(profile);
   return {
-    status: normalizeText(profilePayload?.status, ready ? 'ready' : 'pending'),
+    status: normalizePlainText(profilePayload?.status, ready ? 'ready' : 'pending'),
     ready,
     profile,
-    reason: normalizeText(profilePayload?.reason, ready ? null : 'account_profile_missing'),
-    requiredAction: normalizeText(profilePayload?.requiredAction, ready ? null : 'update_agent_profile'),
-    nextAction: normalizeText(profilePayload?.nextAction, ready ? null : 'update_agent_profile'),
-    nextTool: normalizeText(profilePayload?.nextTool, ready ? null : 'claworld_manage_account'),
+    reason: normalizePlainText(profilePayload?.reason, ready ? null : 'account_profile_missing'),
+    requiredAction: normalizePlainText(profilePayload?.requiredAction, ready ? null : 'update_agent_profile'),
+    nextAction: normalizePlainText(profilePayload?.nextAction, ready ? null : 'update_agent_profile'),
+    nextTool: normalizePlainText(profilePayload?.nextTool, ready ? null : 'claworld_manage_account'),
     missingFields: Array.isArray(profilePayload?.missingFields)
       ? profilePayload.missingFields
       : (ready
@@ -629,31 +687,12 @@ function projectToolAccountProfileState(identityPayload = null) {
   };
 }
 
-function projectToolChatRequestApprovalPolicy(payload = null) {
-  const policy = normalizeObject(payload, null);
-  if (!policy) return null;
-  return {
-    agentId: normalizeText(policy.agentId, null),
-    schemaVersion: Number.isInteger(policy.schemaVersion) ? policy.schemaVersion : null,
-    syncedAt: normalizeText(policy.syncedAt, null),
-    credentialId: normalizeText(policy.credentialId, null),
-    source: normalizeObject(policy.source, {})
-      ? {
-          channel: normalizeText(policy.source?.channel, null),
-          integration: normalizeText(policy.source?.integration, null),
-          accountId: normalizeText(policy.source?.accountId, null),
-        }
-      : {},
-    policy: normalizeObject(policy.policy, {})
-      ? {
-          mode: normalizeText(policy.policy?.mode, null),
-          blocks: {
-            originTypes: Array.isArray(policy.policy?.blocks?.originTypes) ? policy.policy.blocks.originTypes : [],
-            worldIds: Array.isArray(policy.policy?.blocks?.worldIds) ? policy.policy.blocks.worldIds : [],
-          },
-        }
-      : null,
-  };
+function resolveToolPublicIdentityReady(identityPayload = null, publicIdentityState = {}) {
+  const diagnostics = normalizeObject(identityPayload?.diagnostics, null);
+  if (typeof diagnostics?.publicIdentityReady === 'boolean') return diagnostics.publicIdentityReady;
+  const identityStatus = normalizePlainText(publicIdentityState?.publicIdentity?.status, null);
+  if (identityStatus) return identityStatus === 'ready';
+  return resolveToolIdentityPayload(identityPayload)?.ready === true || identityPayload?.ready === true;
 }
 
 function projectToolPluginVersionStatus(payload = null) {
@@ -685,11 +724,34 @@ export function projectToolAccountViewResponse({
   accountId = null,
   pairingPayload = null,
   identityPayload = null,
+  accountPayload = null,
 } = {}) {
   const publicIdentityState = projectToolAccountIdentityFields(identityPayload);
   const accountProfile = projectToolAccountProfileState(identityPayload);
-  const publicIdentityReady = identityPayload?.ready === true;
-  const accountProfileReady = accountProfile.ready === true;
+  const accountView = normalizeObject(accountPayload, null);
+  const accountRecord = normalizeObject(accountView?.account, null);
+  const accountRelay = normalizeObject(accountView?.relay, null);
+  const accountDiagnostics = normalizeObject(accountView?.diagnostics, null);
+  const publicIdentityReady = resolveToolPublicIdentityReady(identityPayload, publicIdentityState);
+  const accountProfileReady = accountProfile.ready === true
+    || accountRecord?.profileReady === true
+    || accountDiagnostics?.accountProfileReady === true;
+  const resolvedAccountProfile = accountProfile.ready === true
+    ? accountProfile
+    : {
+        ...accountProfile,
+        status: accountProfileReady ? 'ready' : accountProfile.status,
+        ready: accountProfileReady,
+        profile: normalizeText(
+          accountRecord?.agentProfile,
+          normalizeText(accountRecord?.profile, accountProfile.profile),
+        ),
+        reason: accountProfileReady ? null : accountProfile.reason,
+        requiredAction: accountProfileReady ? null : accountProfile.requiredAction,
+        nextAction: accountProfileReady ? null : accountProfile.nextAction,
+        nextTool: accountProfileReady ? null : accountProfile.nextTool,
+        missingFields: accountProfileReady ? [] : accountProfile.missingFields,
+      };
   const emailVerified = pairingPayload?.emailVerified === true;
   const runtimePaired = pairingPayload?.status === 'paired';
   const bindingReady = typeof pairingPayload?.bindingReady === 'boolean'
@@ -720,11 +782,11 @@ export function projectToolAccountViewResponse({
       }
     : !accountProfileReady
       ? {
-          requiredAction: accountProfile.requiredAction,
-          nextAction: accountProfile.nextAction,
-          nextTool: accountProfile.nextTool,
-          missingFields: accountProfile.missingFields,
-          reason: accountProfile.reason,
+            requiredAction: resolvedAccountProfile.requiredAction,
+            nextAction: resolvedAccountProfile.nextAction,
+            nextTool: resolvedAccountProfile.nextTool,
+            missingFields: resolvedAccountProfile.missingFields,
+            reason: resolvedAccountProfile.reason,
         }
       : {
           requiredAction: null,
@@ -733,10 +795,20 @@ export function projectToolAccountViewResponse({
           missingFields: [],
           reason: null,
         };
-  const relayResolved = pairingPayload?.relayAgent?.resolved ?? null;
-  const relayOnline = pairingPayload?.relayAgent?.online ?? null;
-  const resolvedShareCard = identityPayload && Object.prototype.hasOwnProperty.call(identityPayload, 'shareCard')
-    ? projectToolShareCard(identityPayload.shareCard)
+  const relayIdentityResolved = typeof pairingPayload?.relayAgent?.resolved === 'boolean'
+    ? pairingPayload.relayAgent.resolved
+    : null;
+  const relayOnline = typeof accountRelay?.online === 'boolean'
+    ? accountRelay.online
+    : (typeof accountDiagnostics?.relayOnline === 'boolean'
+        ? accountDiagnostics.relayOnline
+        : (typeof pairingPayload?.relayAgent?.online === 'boolean' ? pairingPayload.relayAgent.online : null));
+  const relayResolved = typeof accountRelay?.resolved === 'boolean'
+    ? accountRelay.resolved
+    : (typeof relayOnline === 'boolean');
+  const shareCardPayload = resolveToolShareCardPayload(identityPayload);
+  const resolvedShareCard = shareCardPayload !== undefined
+    ? projectToolShareCard(shareCardPayload)
     : undefined;
   return {
     action: 'view',
@@ -765,6 +837,7 @@ export function projectToolAccountViewResponse({
       bindingStatus,
       publicIdentityReady,
       accountProfileReady,
+      relayIdentityResolved,
       relayPresenceResolved: relayResolved,
       relayOnline,
     },
@@ -774,21 +847,20 @@ export function projectToolAccountViewResponse({
         normalizeText(pairingPayload?.relayAgent?.agentId, null),
       ),
       displayName: normalizeText(pairingPayload?.relayAgent?.displayName, null),
-      discoverable: pairingPayload?.relayAgent?.discoverable ?? null,
-      contactable: pairingPayload?.relayAgent?.contactable ?? null,
+      visibilityMode: normalizeText(pairingPayload?.relayAgent?.visibilityMode, null),
+      contactPolicy: normalizeText(pairingPayload?.relayAgent?.contactPolicy, null),
       online: relayOnline,
       resolved: relayResolved,
       bindingStatus,
     },
-    profile: accountProfile.profile,
+    profile: resolvedAccountProfile.profile,
     ...publicIdentityState,
-    accountProfile,
+    accountProfile: resolvedAccountProfile,
     requiredAction: blockedAction.requiredAction,
     nextAction: blockedAction.nextAction,
     nextTool: blockedAction.nextTool,
     missingFields: blockedAction.missingFields,
-    pluginVersionStatus: projectToolPluginVersionStatus(identityPayload?.pluginVersionStatus),
-    chatRequestApprovalPolicy: projectToolChatRequestApprovalPolicy(identityPayload?.chatRequestApprovalPolicy),
+    pluginVersionStatus: projectToolPluginVersionStatus(resolveToolPluginVersionPayload(identityPayload)),
     ...(resolvedShareCard !== undefined ? { shareCard: resolvedShareCard } : {}),
   };
 }
@@ -802,12 +874,13 @@ export function projectToolAccountMutationResponse({
 } = {}) {
   const publicIdentityState = projectToolAccountIdentityFields(identityPayload);
   const accountProfile = projectToolAccountProfileState(identityPayload);
+  const identityShareCardPayload = resolveToolShareCardPayload(identityPayload);
   const resolvedShareCard = shareCard !== undefined
     ? shareCard
-    : (identityPayload && Object.prototype.hasOwnProperty.call(identityPayload, 'shareCard')
-        ? projectToolShareCard(identityPayload.shareCard)
+    : (identityShareCardPayload !== undefined
+        ? projectToolShareCard(identityShareCardPayload)
         : undefined);
-  const publicIdentityReady = identityPayload?.ready === true;
+  const publicIdentityReady = resolveToolPublicIdentityReady(identityPayload, publicIdentityState);
   const accountProfileReady = accountProfile.ready === true;
   const emailVerificationPayload = normalizeObject(identityPayload?.emailVerification, null);
   const emailVerified = identityPayload?.emailVerified === true
@@ -874,8 +947,7 @@ export function projectToolAccountMutationResponse({
     nextTool: blockedAction.nextTool,
     missingFields: blockedAction.missingFields,
     reason: blockedAction.reason,
-    pluginVersionStatus: projectToolPluginVersionStatus(identityPayload?.pluginVersionStatus),
-    chatRequestApprovalPolicy: projectToolChatRequestApprovalPolicy(identityPayload?.chatRequestApprovalPolicy),
+    pluginVersionStatus: projectToolPluginVersionStatus(resolveToolPluginVersionPayload(identityPayload)),
     ...(resolvedShareCard !== undefined ? { shareCard: resolvedShareCard } : {}),
     ...(runtimeIdentity ? { runtimeIdentity } : {}),
     ...(action === 'update_identity'
@@ -888,10 +960,6 @@ export function projectToolAccountMutationResponse({
         ? {
             updated: ['profile'],
           }
-        : action === 'update_chat_policy'
-          ? {
-              updated: ['chatRequestApprovalPolicy'],
-            }
           : {}),
   };
 }