@xfxstudio/claworld 0.2.13 → 0.2.15

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

@@ -1,6 +1,5 @@
 import { EventEmitter } from 'events';
 import WebSocket from 'ws';
-import { v4 as uuidv4 } from 'uuid';
 import { resolveClaworldRuntimeConfig } from './config-schema.js';
 import { buildRuntimeAuthHeaders } from './account-identity.js';
 import { createRelayEventProtocol } from '../protocol/relay-event-protocol.js';
@@ -60,8 +59,12 @@ function normalizeOptionalText(value) {
   return normalized || null;
 }
 
-function resolveClientMessageId(value = null) {
-  return normalizeOptionalText(value) || `cmsg_${uuidv4()}`;
+function requireClientMessageId(value = null) {
+  const normalized = normalizeOptionalText(value);
+  if (!normalized) {
+    throw new Error('claworld relay clientMessageId is required for POST /v1/messages');
+  }
+  return normalized;
 }
 
 function buildReplyAckTimeoutError({ deliveryId, timeoutMs, context = {} } = {}) {
@@ -584,7 +587,7 @@ export class ClaworldRelayClient extends EventEmitter {
     config,
     agentId,
     credential = null,
-    clientVersion = 'claworld-plugin/0.2.8',
+    clientVersion = 'claworld-plugin/0.2.15',
     sessionTarget,
     fallbackTarget,
   } = {}) {
@@ -1376,7 +1379,7 @@ export class ClaworldRelayClient extends EventEmitter {
   }
 
   async deliverMessage({ fromAgentId, targetAgentId, clientMessageId = null, payload = {}, conversation = {} } = {}) {
-    const resolvedClientMessageId = resolveClientMessageId(clientMessageId);
+    const resolvedClientMessageId = requireClientMessageId(clientMessageId);
     const result = await this.requestJson('/v1/messages', {
       method: 'POST',
       headers: buildRuntimeAuthHeaders(this.runtimeConfig, { 'content-type': 'application/json' }),
@@ -1439,7 +1442,7 @@ export class ClaworldRelayClient extends EventEmitter {
     if (requestResult.status !== 201) {
       throw new Error(`failed to create chat request: ${JSON.stringify(requestResult.body)}`);
     }
-    const requestId = requestResult.body.requestId;
+    const requestId = requestResult.body?.chatRequest?.chatRequestId || requestResult.body?.requestId || null;
     return {
       requestId,
       sessionKey: null,

package/src/openclaw/runtime/product-shell-helper.js

@@ -1,10 +1,8 @@
 import { resolveClaworldRuntimeConfig } from '../plugin/config-schema.js';
-import { buildRuntimeAuthHeaders } from '../plugin/account-identity.js';
 import { createRuntimeBoundaryError } from '../../lib/runtime-errors.js';
 import { extractBackendErrorContext } from './backend-error-context.js';
 import {
   buildCandidateDeliverySummary as buildBackendCandidateDeliverySummary,
-  buildWorldSelectionPrompt as buildBackendWorldSelectionPrompt,
   resolveWorldSelection as resolveBackendWorldSelection,
 } from '../../product-shell/contracts/world-orchestration.js';
 
@@ -25,15 +23,6 @@ function normalizeStringList(values = []) {
   return [...new Set(values.map((value) => normalizeText(value, null)).filter(Boolean))];
 }
 
-function normalizeBroadcastConfig(broadcast = {}) {
-  return {
-    enabled: broadcast.enabled === true,
-    audience: normalizeText(broadcast.audience, 'members'),
-    replyPolicy: normalizeText(broadcast.replyPolicy, 'zero'),
-    excludeSelf: broadcast.excludeSelf !== false,
-  };
-}
-
 function isEmptyProfileValue(value) {
   if (value == null) return true;
   if (typeof value === 'string') return value.trim() === '';
@@ -416,88 +405,15 @@ function normalizeWorldJoinResponse(payload = {}, { worldId = null, agentId = nu
       ? payload.nextStageSummary
       : {},
     candidateFeed,
-    candidateDelivery:
-      payload.candidateDelivery && typeof payload.candidateDelivery === 'object'
-        ? payload.candidateDelivery
-        : (candidateFeed ? buildCandidateDeliverySummary(candidateFeed) : null),
+    candidateDelivery: payload.candidateDelivery && typeof payload.candidateDelivery === 'object'
+      ? payload.candidateDelivery
+      : null,
     orchestration: payload.orchestration && typeof payload.orchestration === 'object'
       ? payload.orchestration
       : null,
   };
 }
 
-function normalizeSearchMatchedField(field = {}, index = 0) {
-  return {
-    fieldId: normalizeText(field.fieldId, `field_${index + 1}`),
-    label: normalizeText(field.label, `Field ${index + 1}`),
-    matchType: normalizeText(field.matchType, 'exact'),
-    queryValue: field.queryValue ?? null,
-    candidateValue: field.candidateValue ?? null,
-    sharedValues: Array.isArray(field.sharedValues) ? normalizeStringList(field.sharedValues) : [],
-    contribution: normalizeNumber(field.contribution, 0),
-  };
-}
-
-function normalizeWorldSearchItem(item = {}, index = 0) {
-  const resolvedAgentId = normalizeText(item.agentId, normalizeText(item.playerId, `agent_${index + 1}`));
-  return {
-    agentId: resolvedAgentId,
-    playerId: normalizeText(item.playerId, resolvedAgentId),
-    membershipId: normalizeText(item.membershipId, null),
-    worldId: normalizeText(item.worldId, 'unknown-world'),
-    displayName: normalizeText(item.displayName, `Player ${index + 1}`),
-    headline: normalizeText(item.headline, null),
-    online: item.online === true,
-    connectedAt: normalizeText(item.connectedAt, null),
-    lastHeartbeatAt: normalizeText(item.lastHeartbeatAt, null),
-    score: normalizeNumber(item.score, 0),
-    matchedFieldIds: normalizeStringList(item.matchedFieldIds),
-    matchedFields: Array.isArray(item.matchedFields)
-      ? item.matchedFields.map((field, fieldIndex) => normalizeSearchMatchedField(field, fieldIndex))
-      : [],
-    resultType: normalizeText(item.resultType, 'matched'),
-    reasonSummary: normalizeText(item.reasonSummary, ''),
-    joinedAt: normalizeText(item.joinedAt, null),
-    profileSummary: normalizeCandidateProfileSummary(item.profileSummary),
-    worldFeedbackSummary: item.worldFeedbackSummary && typeof item.worldFeedbackSummary === 'object'
-      ? {
-          likesReceived: normalizeInteger(item.worldFeedbackSummary.likesReceived, 0),
-          dislikesReceived: normalizeInteger(item.worldFeedbackSummary.dislikesReceived, 0),
-        }
-      : {
-          likesReceived: 0,
-          dislikesReceived: 0,
-        },
-  };
-}
-
-function normalizeWorldSearchResponse(payload = {}, { worldId = null, agentId = null } = {}) {
-  const items = Array.isArray(payload.items)
-    ? payload.items.map((item, index) => normalizeWorldSearchItem(item, index))
-    : [];
-
-  return {
-    worldId: normalizeText(payload.worldId, worldId || 'unknown-world'),
-    agentId: normalizeText(payload.agentId, agentId || null),
-    viewerMembershipId: normalizeText(payload.viewerMembershipId, null),
-    searchModel: normalizeSearchSchema(payload.searchModel || {}, {
-      worldId: normalizeText(payload.worldId, worldId || 'unknown-world'),
-      fallbackFields: [],
-    }),
-    searchInput: normalizeProfile(payload.searchInput && typeof payload.searchInput === 'object' ? payload.searchInput : {}),
-    onlineOnly: payload.onlineOnly !== false,
-    candidateSource: normalizeText(payload.candidateSource, 'active_memberships_online'),
-    limit: normalizeInteger(payload.limit, items.length),
-    totalMatches: normalizeInteger(payload.totalMatches, items.length),
-    status: normalizeText(payload.status, items.length > 0 ? 'search_ready' : 'no_matches'),
-    nextAction: normalizeText(
-      payload.nextAction,
-      items.length > 0 ? 'request_chat_with_selected_candidate' : 'broaden_search_or_wait',
-    ),
-    items,
-  };
-}
-
 function summarizeProfileValue(value) {
   if (Array.isArray(value)) return joinAsNaturalLanguage(value.map((entry) => String(entry).trim()).filter(Boolean));
   return normalizeText(value, '');
@@ -524,8 +440,6 @@ export function buildCandidateDeliverySummary(candidateFeed = {}, { worldDetail
   if (worldDetail?.candidateDelivery && typeof worldDetail.candidateDelivery === 'object') {
     return worldDetail.candidateDelivery;
   }
-  // Older responses may still omit candidateDelivery; keep the shared builder as
-  // a compatibility fallback, not the canonical orchestration owner.
   return buildBackendCandidateDeliverySummary(candidateFeed, { worldDetail, limit });
 }
 
@@ -597,12 +511,9 @@ function buildSelectionRetryContract(status, selection, items = [], matches = []
 }
 
 export function buildWorldSelectionPrompt(worldDirectory = {}) {
-  if (worldDirectory?.orchestration && typeof worldDirectory.orchestration === 'object') {
-    return worldDirectory.orchestration;
-  }
-  // Compatibility fallback for older directory payloads that predate
-  // backend-authored orchestration.
-  return buildBackendWorldSelectionPrompt(worldDirectory);
+  return worldDirectory?.orchestration && typeof worldDirectory.orchestration === 'object'
+    ? worldDirectory.orchestration
+    : null;
 }
 
 export function buildPostSetupWorldDirectory(payload = {}, { accountId = null } = {}) {
@@ -632,7 +543,7 @@ export function buildPostSetupWorldDirectory(payload = {}, { accountId = null }
     sort,
     orchestration: payload.orchestration && typeof payload.orchestration === 'object'
       ? payload.orchestration
-      : buildWorldSelectionPrompt({ items, recommendedWorldId }),
+      : null,
   };
 }
 
@@ -709,56 +620,6 @@ function createProductShellHttpError(action, response, { accountId = null, world
   });
 }
 
-function normalizeBroadcastRequestPayload(payload = {}, { message = null } = {}) {
-  const normalizedPayload = payload && typeof payload === 'object' && !Array.isArray(payload)
-    ? { ...payload }
-    : {};
-  const normalizedMessage = normalizeText(message, null);
-  if (!normalizedMessage) return normalizedPayload;
-  return {
-    ...normalizedPayload,
-    ...(normalizedPayload.text == null ? { text: normalizedMessage } : {}),
-  };
-}
-
-function normalizeBroadcastResult(payload = {}) {
-  const requests = Array.isArray(payload.requests)
-    ? payload.requests.map((request) => ({
-      agentId: normalizeText(request.agentId, null),
-      status: normalizeText(request.status, 'created'),
-      chatRequest: request.chatRequest && typeof request.chatRequest === 'object' && !Array.isArray(request.chatRequest)
-        ? request.chatRequest
-        : null,
-    }))
-    : [];
-  const failures = Array.isArray(payload.failures)
-    ? payload.failures.map((failure) => ({
-      agentId: normalizeText(failure.agentId, null),
-      status: normalizeText(failure.status, 'failed'),
-      httpStatus: normalizeInteger(failure.httpStatus, 0),
-      error: normalizeText(failure.error, null),
-      reason: normalizeText(failure.reason, null),
-      message: normalizeText(failure.message, null),
-    }))
-    : [];
-  return {
-    status: normalizeText(payload.status, 'requests_created'),
-    worldId: normalizeText(payload.worldId, null),
-    senderAgentId: normalizeText(payload.senderAgentId, null),
-    senderRole: normalizeText(payload.senderRole, 'none'),
-    audience: normalizeText(payload.audience, 'members'),
-    excludeSelf: payload.excludeSelf !== false,
-    eligibility: normalizeText(payload.eligibility, 'active'),
-    broadcastId: normalizeText(payload.broadcastId, null),
-    totalTargets: normalizeInteger(payload.totalTargets, 0),
-    createdCount: normalizeInteger(payload.createdCount, requests.length),
-    failedCount: normalizeInteger(payload.failedCount, failures.length),
-    nextAction: normalizeText(payload.nextAction, 'recipients_review_pending_requests'),
-    requests,
-    failures,
-  };
-}
-
 export async function fetchWorldDetail({
   cfg = {},
   accountId = null,
@@ -782,7 +643,7 @@ export async function fetchWorldDetail({
     headers: {
       accept: 'application/json',
       ...(resolvedRuntimeConfig.apiKey ? { 'x-api-key': resolvedRuntimeConfig.apiKey } : {}),
-      ...(resolvedRuntimeConfig.relay?.credentialToken ? { 'x-relay-token': resolvedRuntimeConfig.relay.credentialToken } : {}),
+      ...(resolvedRuntimeConfig.relay?.credentialToken ? { authorization: `Bearer ${resolvedRuntimeConfig.relay.credentialToken}` } : {}),
     },
   });
 
@@ -834,7 +695,7 @@ export async function joinWorld({
       accept: 'application/json',
       'content-type': 'application/json',
       ...(resolvedRuntimeConfig.apiKey ? { 'x-api-key': resolvedRuntimeConfig.apiKey } : {}),
-      ...(resolvedRuntimeConfig.relay?.credentialToken ? { 'x-relay-token': resolvedRuntimeConfig.relay.credentialToken } : {}),
+      ...(resolvedRuntimeConfig.relay?.credentialToken ? { authorization: `Bearer ${resolvedRuntimeConfig.relay.credentialToken}` } : {}),
     },
     body: JSON.stringify({
       agentId: resolvedAgentId,
@@ -862,220 +723,6 @@ export async function joinWorld({
   });
 }
 
-export async function fetchWorldSearch({
-  cfg = {},
-  accountId = null,
-  runtimeConfig = null,
-  worldId = null,
-  agentId = null,
-  query = {},
-  limit = null,
-  fetchImpl,
-  logger = console,
-} = {}) {
-  if (typeof fetchImpl !== 'function') {
-    throw new Error('fetch is unavailable for claworld product-shell world search helper');
-  }
-
-  const resolvedWorldId = normalizeText(worldId, null);
-  if (!resolvedWorldId) {
-    throw new Error('claworld product-shell world search helper requires worldId');
-  }
-
-  const resolvedAgentId = normalizeText(agentId, null);
-  if (!resolvedAgentId) {
-    throw new Error('claworld product-shell world search helper requires agentId');
-  }
-
-  const resolvedRuntimeConfig = runtimeConfig || resolveClaworldRuntimeConfig(cfg, accountId);
-  const baseUrl = normalizeRelayHttpBaseUrl(resolvedRuntimeConfig.serverUrl);
-  const normalizedQuery = normalizeProfile(query);
-  const searchResult = await fetchJson(fetchImpl, `${baseUrl}/v1/worlds/${encodeURIComponent(resolvedWorldId)}/search`, {
-    method: 'POST',
-    headers: {
-      accept: 'application/json',
-      'content-type': 'application/json',
-      ...(resolvedRuntimeConfig.apiKey ? { 'x-api-key': resolvedRuntimeConfig.apiKey } : {}),
-      ...(resolvedRuntimeConfig.relay?.credentialToken ? { 'x-relay-token': resolvedRuntimeConfig.relay.credentialToken } : {}),
-    },
-    body: JSON.stringify({
-      agentId: resolvedAgentId,
-      query: normalizedQuery,
-      ...(limit != null ? { limit } : {}),
-    }),
-  });
-
-  if (!searchResult.ok) {
-    logger.error?.('[claworld:product-shell] world search failed', {
-      status: searchResult.status,
-      worldId: resolvedWorldId,
-      agentId: resolvedAgentId,
-      accountId: resolvedRuntimeConfig.accountId || accountId || null,
-      body: searchResult.body,
-    });
-    throw createProductShellHttpError('world_search', searchResult, {
-      accountId: resolvedRuntimeConfig.accountId || accountId || null,
-      worldId: resolvedWorldId,
-    });
-  }
-
-  return normalizeWorldSearchResponse(searchResult.body, {
-    worldId: resolvedWorldId,
-    agentId: resolvedAgentId,
-  });
-}
-
-export async function submitWorldSearch({
-  cfg = {},
-  accountId = null,
-  runtimeConfig = null,
-  worldId = null,
-  agentId = null,
-  query = {},
-  limit = null,
-  fetchImpl,
-  logger = console,
-} = {}) {
-  if (typeof fetchImpl !== 'function') {
-    throw new Error('fetch is unavailable for claworld product-shell world search helper');
-  }
-
-  const resolvedWorldId = normalizeText(worldId, null);
-  if (!resolvedWorldId) {
-    throw new Error('claworld product-shell world search helper requires worldId');
-  }
-
-  const resolvedAgentId = normalizeText(agentId, null);
-  if (!resolvedAgentId) {
-    throw new Error('claworld product-shell world search helper requires agentId');
-  }
-
-  const resolvedRuntimeConfig = runtimeConfig || resolveClaworldRuntimeConfig(cfg, accountId);
-  const baseUrl = normalizeRelayHttpBaseUrl(resolvedRuntimeConfig.serverUrl);
-  const normalizedQuery = normalizeProfile(query);
-  const searchResult = await fetchJson(fetchImpl, `${baseUrl}/v1/worlds/${encodeURIComponent(resolvedWorldId)}/search`, {
-    method: 'POST',
-    headers: {
-      accept: 'application/json',
-      'content-type': 'application/json',
-      ...(resolvedRuntimeConfig.apiKey ? { 'x-api-key': resolvedRuntimeConfig.apiKey } : {}),
-      ...(resolvedRuntimeConfig.relay?.credentialToken ? { 'x-relay-token': resolvedRuntimeConfig.relay.credentialToken } : {}),
-    },
-    body: JSON.stringify({
-      agentId: resolvedAgentId,
-      query: normalizedQuery,
-      ...(limit != null ? { limit } : {}),
-    }),
-  });
-
-  if (!searchResult.ok && searchResult.status !== 409) {
-    logger.error?.('[claworld:product-shell] world search failed', {
-      status: searchResult.status,
-      worldId: resolvedWorldId,
-      agentId: resolvedAgentId,
-      accountId: resolvedRuntimeConfig.accountId || accountId || null,
-      body: searchResult.body,
-    });
-    throw createProductShellHttpError('world_search', searchResult, {
-      accountId: resolvedRuntimeConfig.accountId || accountId || null,
-      worldId: resolvedWorldId,
-    });
-  }
-
-  if (searchResult.status === 409) {
-    return {
-      status: 'not_joined',
-      worldId: resolvedWorldId,
-      agentId: resolvedAgentId,
-      searchEnabled: false,
-      results: [],
-      query: normalizedQuery,
-      limit: normalizeInteger(limit, 10),
-      message: 'Join the world successfully before using world search.',
-    };
-  }
-
-  const normalizedSearch = normalizeWorldSearchResponse(searchResult.body, {
-    worldId: resolvedWorldId,
-    agentId: resolvedAgentId,
-  });
-
-  return {
-    ...normalizedSearch,
-    status: normalizedSearch.items.length > 0 ? 'ready' : 'empty',
-    searchEnabled: true,
-    results: normalizedSearch.items,
-    query: normalizedSearch.searchInput,
-  };
-}
-
-export async function broadcastWorld({
-  cfg = {},
-  accountId = null,
-  runtimeConfig = null,
-  worldId = null,
-  agentId = null,
-  message = null,
-  payload = {},
-  audience = null,
-  excludeSelf = null,
-  fetchImpl,
-  logger = console,
-} = {}) {
-  if (typeof fetchImpl !== 'function') {
-    throw new Error('fetch is unavailable for claworld product-shell world broadcast helper');
-  }
-
-  const resolvedWorldId = normalizeText(worldId, null);
-  if (!resolvedWorldId) {
-    throw new Error('claworld product-shell world broadcast helper requires worldId');
-  }
-
-  const resolvedAgentId = normalizeText(agentId, null);
-  if (!resolvedAgentId) {
-    throw new Error('claworld product-shell world broadcast helper requires agentId');
-  }
-
-  const resolvedRuntimeConfig = runtimeConfig || resolveClaworldRuntimeConfig(cfg, accountId);
-  const baseUrl = normalizeRelayHttpBaseUrl(resolvedRuntimeConfig.serverUrl);
-  const requestBody = {
-    agentId: resolvedAgentId,
-    payload: normalizeBroadcastRequestPayload(payload, { message }),
-    ...(audience ? { audience } : {}),
-    ...(excludeSelf == null ? {} : { excludeSelf: excludeSelf === true }),
-  };
-  const broadcastResult = await fetchJson(
-    fetchImpl,
-    `${baseUrl}/v1/worlds/${encodeURIComponent(resolvedWorldId)}/broadcast`,
-    {
-      method: 'POST',
-      headers: {
-        accept: 'application/json',
-        'content-type': 'application/json',
-        ...(resolvedRuntimeConfig.apiKey ? { 'x-api-key': resolvedRuntimeConfig.apiKey } : {}),
-        ...(resolvedRuntimeConfig.relay?.credentialToken ? { 'x-relay-token': resolvedRuntimeConfig.relay.credentialToken } : {}),
-      },
-      body: JSON.stringify(requestBody),
-    },
-  );
-
-  if (!broadcastResult.ok) {
-    logger.error?.('[claworld:product-shell] world broadcast failed', {
-      status: broadcastResult.status,
-      worldId: resolvedWorldId,
-      agentId: resolvedAgentId,
-      accountId: resolvedRuntimeConfig.accountId || accountId || null,
-      body: broadcastResult.body,
-    });
-    throw createProductShellHttpError('world_broadcast', broadcastResult, {
-      accountId: resolvedRuntimeConfig.accountId || accountId || null,
-      worldId: resolvedWorldId,
-    });
-  }
-
-  return normalizeBroadcastResult(broadcastResult.body);
-}
-
 export async function fetchWorldCandidateFeed({
   cfg = {},
   accountId = null,
@@ -1112,7 +759,7 @@ export async function fetchWorldCandidateFeed({
     headers: {
       accept: 'application/json',
       ...(resolvedRuntimeConfig.apiKey ? { 'x-api-key': resolvedRuntimeConfig.apiKey } : {}),
-      ...(resolvedRuntimeConfig.relay?.credentialToken ? { 'x-relay-token': resolvedRuntimeConfig.relay.credentialToken } : {}),
+      ...(resolvedRuntimeConfig.relay?.credentialToken ? { authorization: `Bearer ${resolvedRuntimeConfig.relay.credentialToken}` } : {}),
     },
   });
 
@@ -1158,7 +805,7 @@ export async function resolveWorldSelectionFlow({
         headers: {
           accept: 'application/json',
           ...(resolvedRuntimeConfig.apiKey ? { 'x-api-key': resolvedRuntimeConfig.apiKey } : {}),
-          ...(resolvedRuntimeConfig.relay?.credentialToken ? { 'x-relay-token': resolvedRuntimeConfig.relay.credentialToken } : {}),
+          ...(resolvedRuntimeConfig.relay?.credentialToken ? { authorization: `Bearer ${resolvedRuntimeConfig.relay.credentialToken}` } : {}),
         },
       });