@xfxstudio/claworld 0.2.13 → 0.2.15

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

@@ -36,12 +36,9 @@ import {
   buildWorldSelectionPrompt,
   buildCandidateDeliverySummary,
   buildPostSetupWorldDirectory,
-  broadcastWorld,
-  fetchWorldSearch,
   fetchWorldCandidateFeed,
   fetchWorldDetail,
   joinWorld,
-  submitWorldSearch,
   resolveWorldSelection,
   resolveWorldSelectionFlow,
 } from '../runtime/product-shell-helper.js';
@@ -53,7 +50,6 @@ import {
   serializeRuntimeBoundaryError,
 } from '../../lib/runtime-errors.js';
 import { PUBLIC_IDENTITY_STATUS } from '../../lib/public-identity.js';
-import { v4 as uuidv4 } from 'uuid';
 
 function normalizeRelayHttpBaseUrl(serverUrl) {
   const parsed = new URL(serverUrl);
@@ -70,8 +66,12 @@ function normalizePluginOptionalText(value) {
   return normalized || null;
 }
 
-function resolveClientMessageId(value = null) {
-  return normalizePluginOptionalText(value) || `cmsg_${uuidv4()}`;
+function requireClientMessageId(value = null) {
+  const normalized = normalizePluginOptionalText(value);
+  if (!normalized) {
+    throw new Error('claworld outbound clientMessageId is required for POST /v1/messages');
+  }
+  return normalized;
 }
 
 function buildRelayAgentSummary(item = {}) {
@@ -338,7 +338,7 @@ async function deliverRelayMessage({ runtimeConfig, to, text, fetchImpl, logger,
   }
   payload.source = normalizeClaworldText(payload.source, 'openclaw-claworld');
   payload.accountId = normalizeClaworldText(payload.accountId, runtimeConfig.accountId);
-  const clientMessageId = resolveClientMessageId(
+  const clientMessageId = requireClientMessageId(
     outboundContext.clientMessageId || outboundContext.metadata?.clientMessageId || null
   );
 
@@ -433,129 +433,6 @@ function createRelayRouteError({
   });
 }
 
-async function createFriendRequest({
-  runtimeConfig,
-  fromAgentId,
-  targetAgentId,
-  message = null,
-  metadata = {},
-  fetchImpl,
-}) {
-  const baseUrl = normalizeRelayHttpBaseUrl(runtimeConfig.serverUrl);
-  const result = await fetchJson(fetchImpl, `${baseUrl}/v1/friend-requests`, {
-    method: 'POST',
-    headers: {
-      'content-type': 'application/json',
-      ...(runtimeConfig.apiKey ? { 'x-api-key': runtimeConfig.apiKey } : {}),
-      ...buildRuntimeAuthHeaders(runtimeConfig),
-    },
-    body: JSON.stringify({
-      fromAgentId,
-      targetAgentId,
-      message: normalizeClaworldText(message, null),
-      metadata: metadata && typeof metadata === 'object' && !Array.isArray(metadata) ? metadata : {},
-    }),
-  });
-  if (!result.ok) {
-    createRelayRouteError({
-      result,
-      runtimeConfig,
-      code: 'friend_request_failed',
-      publicMessage: 'failed to create friend request',
-      context: { fromAgentId, targetAgentId },
-    });
-  }
-  return result.body || {};
-}
-
-async function listFriendRequests({
-  runtimeConfig,
-  agentId,
-  direction = null,
-  status = null,
-  fetchImpl,
-}) {
-  const baseUrl = normalizeRelayHttpBaseUrl(runtimeConfig.serverUrl);
-  const path = buildRelayJsonPath('/v1/friend-requests', {
-    agentId,
-    direction,
-    status,
-  });
-  const result = await fetchJson(fetchImpl, `${baseUrl}${path}`, {
-    method: 'GET',
-    headers: {
-      ...(runtimeConfig.apiKey ? { 'x-api-key': runtimeConfig.apiKey } : {}),
-      ...buildRuntimeAuthHeaders(runtimeConfig),
-    },
-  });
-  if (!result.ok) {
-    createRelayRouteError({
-      result,
-      runtimeConfig,
-      code: 'friend_request_list_failed',
-      publicMessage: 'failed to list friend requests',
-      context: { agentId, direction, status },
-    });
-  }
-  return result.body || {};
-}
-
-async function acceptFriendRequest({
-  runtimeConfig,
-  actorAgentId,
-  friendRequestId,
-  fetchImpl,
-}) {
-  const baseUrl = normalizeRelayHttpBaseUrl(runtimeConfig.serverUrl);
-  const result = await fetchJson(fetchImpl, `${baseUrl}/v1/friend-requests/${encodeURIComponent(friendRequestId)}/accept`, {
-    method: 'POST',
-    headers: {
-      'content-type': 'application/json',
-      ...(runtimeConfig.apiKey ? { 'x-api-key': runtimeConfig.apiKey } : {}),
-      ...buildRuntimeAuthHeaders(runtimeConfig),
-    },
-    body: JSON.stringify({ actorAgentId }),
-  });
-  if (!result.ok) {
-    createRelayRouteError({
-      result,
-      runtimeConfig,
-      code: 'friend_request_accept_failed',
-      publicMessage: 'failed to accept friend request',
-      context: { actorAgentId, friendRequestId },
-    });
-  }
-  return result.body || {};
-}
-
-async function rejectFriendRequest({
-  runtimeConfig,
-  actorAgentId,
-  friendRequestId,
-  fetchImpl,
-}) {
-  const baseUrl = normalizeRelayHttpBaseUrl(runtimeConfig.serverUrl);
-  const result = await fetchJson(fetchImpl, `${baseUrl}/v1/friend-requests/${encodeURIComponent(friendRequestId)}/reject`, {
-    method: 'POST',
-    headers: {
-      'content-type': 'application/json',
-      ...(runtimeConfig.apiKey ? { 'x-api-key': runtimeConfig.apiKey } : {}),
-      ...buildRuntimeAuthHeaders(runtimeConfig),
-    },
-    body: JSON.stringify({ actorAgentId }),
-  });
-  if (!result.ok) {
-    createRelayRouteError({
-      result,
-      runtimeConfig,
-      code: 'friend_request_reject_failed',
-      publicMessage: 'failed to reject friend request',
-      context: { actorAgentId, friendRequestId },
-    });
-  }
-  return result.body || {};
-}
-
 async function createChatRequest({
   runtimeConfig,
   fromAgentId,
@@ -693,62 +570,6 @@ async function rejectChatRequest({
   return result.body || {};
 }
 
-async function syncChatRequestApprovalPolicy({
-  runtimeConfig,
-  fetchImpl,
-  logger,
-}) {
-  const baseUrl = normalizeRelayHttpBaseUrl(runtimeConfig.serverUrl);
-  let result;
-  try {
-    result = await fetchJson(fetchImpl, `${baseUrl}/v1/chat-requests/approval-policy`, {
-      method: 'PUT',
-      headers: {
-        'content-type': 'application/json',
-        ...(runtimeConfig.apiKey ? { 'x-api-key': runtimeConfig.apiKey } : {}),
-        ...buildRuntimeAuthHeaders(runtimeConfig),
-      },
-      body: JSON.stringify({
-        accountId: runtimeConfig.accountId || null,
-        approval: runtimeConfig.approval || {},
-      }),
-    });
-  } catch (error) {
-    logger.warn?.(`[claworld:${runtimeConfig.accountId || 'default'}] approval policy sync failed`, {
-      error: error?.message || String(error),
-      code: error?.code || null,
-      category: error?.category || null,
-    });
-    return {
-      ok: false,
-      status: error?.status || null,
-      body: null,
-      error,
-    };
-  }
-  if (!result.ok) {
-    logger.warn?.(`[claworld:${runtimeConfig.accountId || 'default'}] approval policy sync failed`, {
-      status: result.status,
-      body: result.body,
-    });
-    return {
-      ok: false,
-      status: result.status,
-      body: result.body,
-    };
-  }
-
-  logger.info?.(`[claworld:${runtimeConfig.accountId || 'default'}] approval policy sync ok`, {
-    mode: result.body?.approvalPolicy?.policy?.mode || runtimeConfig.approval?.mode || null,
-    syncedAt: result.body?.approvalPolicy?.syncedAt || null,
-  });
-  return {
-    ok: true,
-    status: result.status,
-    body: result.body,
-  };
-}
-
 function waitForAbort(signal) {
   return new Promise((resolve) => {
     if (!signal) return resolve({ reason: 'missing_abort_signal' });
@@ -932,7 +753,7 @@ async function fetchPublicIdentity({
       recommendedDisplayName,
       nextAction: 'set_public_identity',
       requiredAction: 'set_public_identity',
-      nextTool: 'claworld_profile',
+      nextTool: 'claworld_account',
       missingFields: [
         {
           fieldId: 'displayName',
@@ -963,6 +784,7 @@ async function fetchPublicIdentity({
       ...buildRuntimeAuthHeaders(runtimeConfig),
     },
     body: JSON.stringify({
+      accountId: runtimeConfig.accountId || null,
       ...(agentId ? { agentId } : {}),
       action: 'view',
       ...(generateShareCard === true ? { generateShareCard: true } : {}),
@@ -1057,6 +879,7 @@ async function updatePublicIdentity({
       ...buildRuntimeAuthHeaders(resolvedRuntimeConfig),
     },
     body: JSON.stringify({
+      accountId: resolvedRuntimeConfig.accountId || null,
       ...(resolvedAgentId ? { agentId: resolvedAgentId } : {}),
       action: 'update_identity',
       displayName: normalizedDisplayName,
@@ -1089,6 +912,53 @@ async function updatePublicIdentity({
   };
 }
 
+async function updateChatRequestApprovalPolicy({
+  runtimeConfig,
+  agentId = null,
+  chatRequestApprovalPolicy = null,
+  fetchImpl,
+}) {
+  if (!resolveRuntimeAppToken(runtimeConfig)) {
+    throw createRuntimeBoundaryError({
+      code: 'claworld_account_unactivated',
+      category: 'conflict',
+      status: 409,
+      message: 'claworld account must be activated before updating chat policy',
+      publicMessage: 'activate the Claworld account before changing chat policy',
+      recoverable: true,
+    });
+  }
+
+  const baseUrl = normalizeRelayHttpBaseUrl(runtimeConfig.serverUrl);
+  const result = await fetchJson(fetchImpl, `${baseUrl}/v1/profile`, {
+    method: 'POST',
+    headers: {
+      'content-type': 'application/json',
+      ...(runtimeConfig.apiKey ? { 'x-api-key': runtimeConfig.apiKey } : {}),
+      ...buildRuntimeAuthHeaders(runtimeConfig),
+    },
+    body: JSON.stringify({
+      accountId: runtimeConfig.accountId || null,
+      ...(agentId ? { agentId } : {}),
+      action: 'update_chat_policy',
+      chatRequestApprovalPolicy,
+    }),
+  });
+  if (!result.ok) {
+    createRelayRouteError({
+      result,
+      runtimeConfig,
+      code: 'chat_request_approval_policy_update_failed',
+      publicMessage: 'failed to update chat policy',
+      context: {
+        accountId: runtimeConfig.accountId || null,
+        agentId: normalizeClaworldText(agentId, null),
+      },
+    });
+  }
+  return result.body || {};
+}
+
 async function renderAgentCard({
   runtimeConfig,
   agentId = null,
@@ -2333,12 +2203,6 @@ export function createClaworldChannelPlugin({
           }
         }
 
-        await syncChatRequestApprovalPolicy({
-          runtimeConfig,
-          fetchImpl,
-          logger,
-        });
-
         accountRuntimeContexts.set(accountKey, {
           runtime: pluginRuntime,
           cfg: context.cfg || null,
@@ -2518,7 +2382,7 @@ export function createClaworldChannelPlugin({
     });
   }
 
-  async function updateRuntimePublicIdentity(context = {}) {
+async function updateRuntimePublicIdentity(context = {}) {
     const resolvedContext = resolveConfiguredRuntimeContext(context);
     const updateResult = await updatePublicIdentity({
       runtimeConfig: resolvedContext.runtimeConfig,
@@ -2577,9 +2441,19 @@ export function createClaworldChannelPlugin({
     const payload = updateResult && typeof updateResult === 'object' && !Array.isArray(updateResult)
       ? { ...updateResult }
       : {};
-    delete payload.runtimeConfig;
-    return payload;
-  }
+  delete payload.runtimeConfig;
+  return payload;
+}
+
+async function updateRuntimeChatRequestApprovalPolicy(context = {}) {
+  const resolvedContext = await resolveBoundRuntimeContext(context);
+  return updateChatRequestApprovalPolicy({
+    runtimeConfig: resolvedContext.runtimeConfig,
+    agentId: resolvedContext.agentId || null,
+    chatRequestApprovalPolicy: context.chatRequestApprovalPolicy || null,
+    fetchImpl,
+  });
+}
 
   async function generateRuntimeProfileCard(context = {}) {
     const resolvedContext = await resolveBoundRuntimeContext(context);
@@ -2748,45 +2622,6 @@ export function createClaworldChannelPlugin({
         }),
       },
       social: {
-        sendFriendRequest: async (context = {}) => {
-          const resolvedContext = await resolveBoundRuntimeContext(context);
-          return createFriendRequest({
-            runtimeConfig: resolvedContext.runtimeConfig,
-            fromAgentId: resolvedContext.agentId || null,
-            targetAgentId: context.targetAgentId || null,
-            message: context.message || null,
-            metadata: context.metadata || {},
-            fetchImpl,
-          });
-        },
-        listFriendRequests: async (context = {}) => {
-          const resolvedContext = await resolveBoundRuntimeContext(context);
-          return listFriendRequests({
-            runtimeConfig: resolvedContext.runtimeConfig,
-            agentId: resolvedContext.agentId || null,
-            direction: context.direction || null,
-            status: context.status || null,
-            fetchImpl,
-          });
-        },
-        acceptFriendRequest: async (context = {}) => {
-          const resolvedContext = await resolveBoundRuntimeContext(context);
-          return acceptFriendRequest({
-            runtimeConfig: resolvedContext.runtimeConfig,
-            actorAgentId: resolvedContext.agentId || null,
-            friendRequestId: context.friendRequestId || null,
-            fetchImpl,
-          });
-        },
-        rejectFriendRequest: async (context = {}) => {
-          const resolvedContext = await resolveBoundRuntimeContext(context);
-          return rejectFriendRequest({
-            runtimeConfig: resolvedContext.runtimeConfig,
-            actorAgentId: resolvedContext.agentId || null,
-            friendRequestId: context.friendRequestId || null,
-            fetchImpl,
-          });
-        },
         requestChat: async (context = {}) => {
           const resolvedContext = await resolveBoundRuntimeContext(context);
           const requestContext = resolvedContext.requesterSessionKey
@@ -2815,15 +2650,6 @@ export function createClaworldChannelPlugin({
             fetchImpl,
           });
         },
-        listChatRequests: async (context = {}) => {
-          const resolvedContext = await resolveBoundRuntimeContext(context);
-          return listChatInbox({
-            runtimeConfig: resolvedContext.runtimeConfig,
-            agentId: resolvedContext.agentId || null,
-            direction: context.direction || null,
-            fetchImpl,
-          });
-        },
         acceptChatRequest: async (context = {}) => {
           const resolvedContext = await resolveBoundRuntimeContext(context);
           return acceptChatRequest({
@@ -2846,6 +2672,7 @@ export function createClaworldChannelPlugin({
       profile: {
         getPublicIdentity: getRuntimePublicIdentity,
         updatePublicIdentity: updateRuntimePublicIdentity,
+        updateChatRequestApprovalPolicy: updateRuntimeChatRequestApprovalPolicy,
         generateShareCard: generateRuntimeProfileCard,
       },
       postSetup: {
@@ -2899,34 +2726,6 @@ export function createClaworldChannelPlugin({
             logger,
           });
         },
-        fetchWorldSearch: async (context = {}) => {
-          const resolvedContext = await resolveBoundRuntimeContext(context);
-          return fetchWorldSearch({
-            cfg: resolvedContext.cfg || {},
-            accountId: resolvedContext.accountId || null,
-            runtimeConfig: resolvedContext.runtimeConfig || null,
-            worldId: context.worldId || null,
-            agentId: resolvedContext.agentId || null,
-            query: context.query || {},
-            limit: context.limit ?? null,
-            fetchImpl,
-            logger,
-          });
-        },
-        submitWorldSearch: async (context = {}) => {
-          const resolvedContext = await resolveBoundRuntimeContext(context);
-          return submitWorldSearch({
-            cfg: resolvedContext.cfg || {},
-            accountId: resolvedContext.accountId || null,
-            runtimeConfig: resolvedContext.runtimeConfig || null,
-            worldId: context.worldId || null,
-            agentId: resolvedContext.agentId || null,
-            query: context.query || {},
-            limit: context.limit ?? null,
-            fetchImpl,
-            logger,
-          });
-        },
         resolveWorldSelection: (context = {}) => resolveWorldSelection(
           context.worldDirectory || {},
           context.selection ?? context.userChoice ?? null,
@@ -3001,6 +2800,7 @@ export function createClaworldChannelPlugin({
         profile: {
           getPublicIdentity: getRuntimePublicIdentity,
           updatePublicIdentity: updateRuntimePublicIdentity,
+          updateChatRequestApprovalPolicy: updateRuntimeChatRequestApprovalPolicy,
           generateShareCard: generateRuntimeProfileCard,
         },
         fetchWorldDirectory: async (context = {}) => {
@@ -3054,52 +2854,6 @@ export function createClaworldChannelPlugin({
             logger,
           });
         },
-        fetchWorldSearch: async (context = {}) => {
-          const resolvedContext = await resolveBoundRuntimeContext(context);
-          return fetchWorldSearch({
-            cfg: resolvedContext.cfg || {},
-            accountId: resolvedContext.accountId || null,
-            runtimeConfig: resolvedContext.runtimeConfig || null,
-            worldId: context.worldId || null,
-            agentId: resolvedContext.agentId || null,
-            query: context.query || {},
-            limit: context.limit ?? null,
-            fetchImpl,
-            logger,
-          });
-        },
-        submitWorldSearch: async (context = {}) => {
-          const resolvedContext = await resolveBoundRuntimeContext(context);
-          return submitWorldSearch({
-            cfg: resolvedContext.cfg || {},
-            accountId: resolvedContext.accountId || null,
-            runtimeConfig: resolvedContext.runtimeConfig || null,
-            worldId: context.worldId || null,
-            agentId: resolvedContext.agentId || null,
-            query: context.query || {},
-            limit: context.limit ?? null,
-            fetchImpl,
-            logger,
-          });
-        },
-        broadcastWorld: async (context = {}) => {
-          const resolvedContext = await resolveBoundRuntimeContext(context);
-          return broadcastWorld({
-            cfg: resolvedContext.cfg || {},
-            accountId: resolvedContext.accountId || null,
-            runtimeConfig: resolvedContext.runtimeConfig || null,
-            worldId: context.worldId || null,
-            agentId: resolvedContext.agentId || null,
-            message: context.message || null,
-            payload: context.payload || {},
-            audience: context.audience || null,
-            replyPolicy: context.replyPolicy || null,
-            ...(Object.prototype.hasOwnProperty.call(context, 'excludeSelf') ? { excludeSelf: context.excludeSelf } : {}),
-            conversation: context.conversation || {},
-            fetchImpl,
-            logger,
-          });
-        },
         resolveWorldSelection,
         buildCandidateDeliverySummary,
         resolveWorldSelectionFlow: async (context = {}) => {

package/src/openclaw/plugin/config-schema.js

@@ -3,12 +3,6 @@ import {
   normalizeRuntimeRegistration,
   resolveRuntimeAppToken,
 } from './account-identity.js';
-import {
-  CHAT_REQUEST_APPROVAL_POLICY_MODES,
-  CHAT_REQUEST_APPROVAL_POLICY_ORIGIN_TYPES,
-  DEFAULT_CHAT_REQUEST_APPROVAL_POLICY_MODE,
-  normalizeChatRequestApprovalPolicy,
-} from '../../product-shell/contracts/chat-request-approval-policy.js';
 
 const REQUIRED_KEYS = ['enabled', 'serverUrl', 'apiKey', 'accountId'];
 
@@ -124,45 +118,6 @@ const SINGLE_ACCOUNT_PROPERTIES = {
       },
     },
   },
-  approval: {
-    type: 'object',
-    additionalProperties: false,
-    properties: {
-      mode: {
-        type: 'string',
-        enum: [...CHAT_REQUEST_APPROVAL_POLICY_MODES],
-        description: 'Declarative inbound chat-request approval policy for this account.',
-        default: DEFAULT_CHAT_REQUEST_APPROVAL_POLICY_MODE,
-      },
-      blocks: {
-        type: 'object',
-        additionalProperties: false,
-        properties: {
-          originTypes: {
-            type: 'array',
-            items: {
-              type: 'string',
-              enum: [...CHAT_REQUEST_APPROVAL_POLICY_ORIGIN_TYPES],
-            },
-            description: 'Optional canonical chat-request origin types that should be rejected by backend policy.',
-          },
-          worldIds: {
-            type: 'array',
-            items: {
-              type: 'string',
-              minLength: 1,
-            },
-            description: 'Optional world ids that should be rejected by backend policy.',
-          },
-        },
-      },
-      autoAccept: {
-        type: 'boolean',
-        description: 'Legacy alias. `true` maps to `approval.mode = "open"` and `false` maps to `approval.mode = "manual_review"`.',
-        default: false,
-      },
-    },
-  },
   testing: {
     type: 'object',
     additionalProperties: false,
@@ -204,7 +159,7 @@ export const claworldChannelConfigJsonSchema = {
 export const claworldChannelConfigSchema = {
   channelId: CLAWORLD_CHANNEL_ID,
   required: REQUIRED_KEYS,
-  optional: ['name', 'heartbeatSeconds', 'reconnect', 'routing', 'approval', 'testing', 'appToken', 'registration', 'relay', 'toolProfile', 'defaultAccount', 'accounts'],
+  optional: ['name', 'heartbeatSeconds', 'reconnect', 'routing', 'testing', 'appToken', 'registration', 'relay', 'toolProfile', 'defaultAccount', 'accounts'],
   jsonSchema: claworldChannelConfigJsonSchema,
   description:
     '最小 OpenClaw claworld channel 配置；支持单账号或 accounts.<id> 多账号模式。canonical flow uses appToken + registration.displayName bootstrap.',
@@ -284,12 +239,6 @@ export function validateClaworldChannelConfig(config = {}, accountId = null) {
   const errors = [];
   const registration = normalizeRuntimeRegistration(candidate);
   const appToken = resolveRuntimeAppToken(candidate);
-  const approval = normalizeChatRequestApprovalPolicy(candidate.approval, {
-    legacyAutoAccept: typeof candidate.approval?.autoAccept === 'boolean'
-      ? candidate.approval.autoAccept
-      : null,
-  });
-
   const configuredIds = listConfiguredClaworldAccountIds(config);
   const hasMultipleAccounts = configuredIds.length > 1;
   const explicitDefaultAccount = String(root?.defaultAccount || '').trim();
@@ -354,7 +303,6 @@ export function validateClaworldChannelConfig(config = {}, accountId = null) {
       fallbackTarget,
       allowHumanInterrupt: candidate.routing?.allowHumanInterrupt !== false,
     },
-    approval,
     testing: {
       allowBridgedCommandDispatch: candidate.testing?.allowBridgedCommandDispatch === true,
     },
@@ -391,7 +339,6 @@ export function inspectClaworldChannelAccount(config = {}, accountId = null) {
     heartbeatSeconds: normalized.heartbeatSeconds,
     reconnect: normalized.reconnect,
     routing: normalized.routing,
-    approval: normalized.approval,
     testing: normalized.testing,
     appToken: normalized.appToken || null,
     registration: normalized.registration,
@@ -421,7 +368,6 @@ export function resolveClaworldRuntimeConfig(config = {}, accountId = null) {
   return {
     ...result.normalized,
     accountId: result.normalized.accountId || accountId || readDefaultAccountId(config) || 'default',
-    approval: result.normalized.approval,
     relay: result.normalized.relay,
   };
 }