@xfxstudio/claworld 0.2.15 → 0.2.17

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

@@ -0,0 +1,146 @@
+import { createRuntimeBoundaryError } from '../../lib/runtime-errors.js';
+
+export const DUPLICATE_CONNECTION_CLOSE_CODE = 4001;
+export const STALE_CONNECTION_CLOSE_CODE = 4002;
+export const TERMINAL_CLOSE_REASONS = new Set(['duplicate_connection_replaced', 'stale_connection']);
+export const DEFAULT_REPLY_ACK_TIMEOUT_MS = 5000;
+
+export function normalizeRelayWebSocketUrl(serverUrl) {
+  const parsed = new URL(serverUrl);
+  if (parsed.protocol === 'http:') parsed.protocol = 'ws:';
+  if (parsed.protocol === 'https:') parsed.protocol = 'wss:';
+
+  const pathname = parsed.pathname || '/';
+  const normalizedPathname = pathname.replace(/\/+$/, '') || '/';
+  parsed.pathname = normalizedPathname === '/' || normalizedPathname === ''
+    ? '/ws'
+    : normalizedPathname.endsWith('/ws')
+      ? normalizedPathname
+      : normalizedPathname + '/ws';
+
+  return parsed.toString();
+}
+
+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 }
+    : {};
+  return {
+    eventType: data.eventType || 'delivery',
+    deliveryId: data.deliveryId || null,
+    sessionKey: data.sessionKey || null,
+    createdAt: data.createdAt || null,
+    updatedAt: data.updatedAt || null,
+    turnCreatedAt: data.turnCreatedAt || null,
+    payload: data.payload && typeof data.payload === 'object' && !Array.isArray(data.payload)
+      ? { ...data.payload }
+      : {},
+    metadata,
+  };
+}
+
+export function normalizeOptionalText(value) {
+  if (value == null) return null;
+  const normalized = String(value).trim();
+  return normalized || null;
+}
+
+export function requireClientMessageId(value = null) {
+  const normalized = normalizeOptionalText(value);
+  if (!normalized) {
+    throw new Error('claworld relay clientMessageId is required for POST /v1/messages');
+  }
+  return normalized;
+}
+
+export function buildReplyAckTimeoutError({ deliveryId, timeoutMs, context = {} } = {}) {
+  return createRuntimeBoundaryError({
+    code: 'relay_reply_ack_timeout',
+    category: 'transport',
+    status: 504,
+    message: `timed out waiting for relay reply acknowledgement for ${deliveryId || 'unknown-delivery'} after ${timeoutMs}ms`,
+    publicMessage: 'relay reply acknowledgement timed out',
+    recoverable: true,
+    context,
+  });
+}
+
+export function buildAcceptedAckTimeoutError({ deliveryId, timeoutMs, context = {} } = {}) {
+  return createRuntimeBoundaryError({
+    code: 'relay_delivery_accept_ack_timeout',
+    category: 'transport',
+    status: 504,
+    message: `timed out waiting for relay delivery acceptance acknowledgement for ${deliveryId || 'unknown-delivery'} after ${timeoutMs}ms`,
+    publicMessage: 'relay delivery acceptance acknowledgement timed out',
+    recoverable: true,
+    context,
+  });
+}
+
+export function buildReplyFallbackError({
+  deliveryId = null,
+  status = 502,
+  body = {},
+  context = {},
+} = {}) {
+  return createRuntimeBoundaryError({
+    code: normalizeOptionalText(body?.code) || normalizeOptionalText(body?.error) || 'relay_reply_fallback_failed',
+    category: status >= 500 ? 'runtime' : 'transport',
+    status: Number.isInteger(status) ? status : 502,
+    message: normalizeOptionalText(body?.message) || normalizeOptionalText(body?.reason) || 'relay reply fallback failed',
+    publicMessage: 'relay reply fallback failed',
+    recoverable: status >= 500,
+    context: {
+      deliveryId: normalizeOptionalText(deliveryId),
+      ...context,
+    },
+  });
+}
+
+export function buildKeepSilentAckTimeoutError({ deliveryId, timeoutMs, context = {} } = {}) {
+  return createRuntimeBoundaryError({
+    code: 'relay_kept_silent_ack_timeout',
+    category: 'transport',
+    status: 504,
+    message: `timed out waiting for relay kept_silent acknowledgement for ${deliveryId || 'unknown-delivery'} after ${timeoutMs}ms`,
+    publicMessage: 'relay kept_silent acknowledgement timed out',
+    recoverable: true,
+    context,
+  });
+}
+
+export function buildKeepSilentFallbackError({
+  deliveryId = null,
+  status = 502,
+  body = {},
+  context = {},
+} = {}) {
+  return createRuntimeBoundaryError({
+    code: normalizeOptionalText(body?.code) || normalizeOptionalText(body?.error) || 'relay_kept_silent_fallback_failed',
+    category: status >= 500 ? 'runtime' : 'transport',
+    status: Number.isInteger(status) ? status : 502,
+    message: normalizeOptionalText(body?.message) || normalizeOptionalText(body?.reason) || 'relay kept_silent fallback failed',
+    publicMessage: 'relay kept_silent fallback failed',
+    recoverable: status >= 500,
+    context: {
+      deliveryId: normalizeOptionalText(deliveryId),
+      ...context,
+    },
+  });
+}
+
+export function isReplyAlreadyApplied(result = null, deliveryId = null) {
+  if (!result || result.status !== 409) return false;
+  if (normalizeOptionalText(result.body?.reason) !== 'delivery_not_replyable') return false;
+  if (normalizeOptionalText(result.body?.delivery?.deliveryId) !== normalizeOptionalText(deliveryId)) return false;
+  return normalizeOptionalText(result.body?.delivery?.status) === 'replied';
+}
+
+export function isDeliveryKeptSilentAlreadyApplied(result = null, deliveryId = null) {
+  if (!result || result.status !== 409) return false;
+  if (normalizeOptionalText(result.body?.reason) !== 'delivery_not_replyable') return false;
+  if (normalizeOptionalText(result.body?.delivery?.deliveryId) !== normalizeOptionalText(deliveryId)) return false;
+  return normalizeOptionalText(result.body?.delivery?.status) === 'kept_silent';
+}

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

@@ -11,151 +11,23 @@ import {
   createRuntimeBoundaryError,
   logRuntimeBoundary,
 } from '../../lib/runtime-errors.js';
-
-const DUPLICATE_CONNECTION_CLOSE_CODE = 4001;
-const STALE_CONNECTION_CLOSE_CODE = 4002;
-const TERMINAL_CLOSE_REASONS = new Set(['duplicate_connection_replaced', 'stale_connection']);
-const DEFAULT_REPLY_ACK_TIMEOUT_MS = 5000;
-
-function normalizeRelayWebSocketUrl(serverUrl) {
-  const parsed = new URL(serverUrl);
-  if (parsed.protocol === 'http:') parsed.protocol = 'ws:';
-  if (parsed.protocol === 'https:') parsed.protocol = 'wss:';
-
-  const pathname = parsed.pathname || '/';
-  const normalizedPathname = pathname.replace(/\/+$/, '') || '/';
-  parsed.pathname = normalizedPathname === '/' || normalizedPathname === ''
-    ? '/ws'
-    : normalizedPathname.endsWith('/ws')
-      ? normalizedPathname
-      : normalizedPathname + '/ws';
-
-  return parsed.toString();
-}
-
-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 }
-    : {};
-  return {
-    eventType: data.eventType || 'delivery',
-    deliveryId: data.deliveryId || null,
-    sessionKey: data.sessionKey || null,
-    createdAt: data.createdAt || null,
-    updatedAt: data.updatedAt || null,
-    turnCreatedAt: data.turnCreatedAt || null,
-    payload: data.payload && typeof data.payload === 'object' && !Array.isArray(data.payload)
-      ? { ...data.payload }
-      : {},
-    metadata,
-  };
-}
-
-function normalizeOptionalText(value) {
-  if (value == null) return null;
-  const normalized = String(value).trim();
-  return normalized || null;
-}
-
-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 = {} } = {}) {
-  return createRuntimeBoundaryError({
-    code: 'relay_reply_ack_timeout',
-    category: 'transport',
-    status: 504,
-    message: `timed out waiting for relay reply acknowledgement for ${deliveryId || 'unknown-delivery'} after ${timeoutMs}ms`,
-    publicMessage: 'relay reply acknowledgement timed out',
-    recoverable: true,
-    context,
-  });
-}
-
-function buildAcceptedAckTimeoutError({ deliveryId, timeoutMs, context = {} } = {}) {
-  return createRuntimeBoundaryError({
-    code: 'relay_delivery_accept_ack_timeout',
-    category: 'transport',
-    status: 504,
-    message: `timed out waiting for relay delivery acceptance acknowledgement for ${deliveryId || 'unknown-delivery'} after ${timeoutMs}ms`,
-    publicMessage: 'relay delivery acceptance acknowledgement timed out',
-    recoverable: true,
-    context,
-  });
-}
-
-function buildReplyFallbackError({
-  deliveryId,
-  status,
-  body,
-  context = {},
-} = {}) {
-  return createRuntimeBoundaryError({
-    code: normalizeOptionalText(body?.code) || normalizeOptionalText(body?.error) || 'relay_reply_fallback_failed',
-    category: status >= 500 ? 'runtime' : 'transport',
-    status: Number.isInteger(status) ? status : 502,
-    message: normalizeOptionalText(body?.message) || normalizeOptionalText(body?.reason) || 'relay reply fallback failed',
-    publicMessage: 'relay reply fallback failed',
-    recoverable: status >= 500,
-    context: {
-      deliveryId: normalizeOptionalText(deliveryId),
-      ...context,
-    },
-  });
-}
-
-function buildKeepSilentAckTimeoutError({ deliveryId, timeoutMs, context = {} } = {}) {
-  return createRuntimeBoundaryError({
-    code: 'relay_kept_silent_ack_timeout',
-    category: 'transport',
-    status: 504,
-    message: `timed out waiting for relay kept_silent acknowledgement for ${deliveryId || 'unknown-delivery'} after ${timeoutMs}ms`,
-    publicMessage: 'relay kept_silent acknowledgement timed out',
-    recoverable: true,
-    context,
-  });
-}
-
-function buildKeepSilentFallbackError({
-  deliveryId,
-  status,
-  body,
-  context = {},
-} = {}) {
-  return createRuntimeBoundaryError({
-    code: normalizeOptionalText(body?.code) || normalizeOptionalText(body?.error) || 'relay_kept_silent_fallback_failed',
-    category: status >= 500 ? 'runtime' : 'transport',
-    status: Number.isInteger(status) ? status : 502,
-    message: normalizeOptionalText(body?.message) || normalizeOptionalText(body?.reason) || 'relay kept_silent fallback failed',
-    publicMessage: 'relay kept_silent fallback failed',
-    recoverable: status >= 500,
-    context: {
-      deliveryId: normalizeOptionalText(deliveryId),
-      ...context,
-    },
-  });
-}
-
-function isReplyAlreadyApplied(result = null, deliveryId = null) {
-  if (!result || result.status !== 409) return false;
-  if (normalizeOptionalText(result.body?.reason) !== 'delivery_not_replyable') return false;
-  if (normalizeOptionalText(result.body?.delivery?.deliveryId) !== normalizeOptionalText(deliveryId)) return false;
-  return normalizeOptionalText(result.body?.delivery?.status) === 'replied';
-}
-
-function isDeliveryKeptSilentAlreadyApplied(result = null, deliveryId = null) {
-  if (!result || result.status !== 409) return false;
-  if (normalizeOptionalText(result.body?.reason) !== 'delivery_not_replyable') return false;
-  if (normalizeOptionalText(result.body?.delivery?.deliveryId) !== normalizeOptionalText(deliveryId)) return false;
-  return normalizeOptionalText(result.body?.delivery?.status) === 'kept_silent';
-}
+import {
+  buildAcceptedAckTimeoutError,
+  buildInboundEnvelope,
+  buildKeepSilentAckTimeoutError,
+  buildKeepSilentFallbackError,
+  buildReplyAckTimeoutError,
+  buildReplyFallbackError,
+  DEFAULT_REPLY_ACK_TIMEOUT_MS,
+  DUPLICATE_CONNECTION_CLOSE_CODE,
+  isDeliveryKeptSilentAlreadyApplied,
+  isReplyAlreadyApplied,
+  normalizeOptionalText,
+  normalizeRelayWebSocketUrl,
+  requireClientMessageId,
+  STALE_CONNECTION_CLOSE_CODE,
+  TERMINAL_CLOSE_REASONS,
+} from './relay-client-shared.js';
 
 export class ClaworldRelayClient extends EventEmitter {
   constructor({
@@ -587,7 +459,7 @@ export class ClaworldRelayClient extends EventEmitter {
     config,
     agentId,
     credential = null,
-    clientVersion = 'claworld-plugin/0.2.15',
+    clientVersion = 'claworld-plugin/0.2.17',
     sessionTarget,
     fallbackTarget,
   } = {}) {
@@ -1320,14 +1192,17 @@ export class ClaworldRelayClient extends EventEmitter {
     }
   }
 
-  async createChatRequest({ fromAgentId, targetAgentId, requestContext = {} } = {}) {
+  async createChatRequest({ fromAgentId, displayName, agentCode, requestContext = {} } = {}) {
     const normalized = normalizeChatRequestInput({ requestContext, source: 'direct_lookup' });
+    const normalizedDisplayName = normalizeOptionalText(displayName);
+    const normalizedAgentCode = normalizeOptionalText(agentCode)?.toUpperCase() || null;
     return await this.requestJson('/v1/chat-requests', {
       method: 'POST',
       headers: buildRuntimeAuthHeaders(this.runtimeConfig, { 'content-type': 'application/json' }),
       body: JSON.stringify({
         fromAgentId,
-        targetAgentId,
+        ...(normalizedDisplayName ? { displayName: normalizedDisplayName } : {}),
+        ...(normalizedAgentCode ? { agentCode: normalizedAgentCode } : {}),
         kickoffBrief: normalized.kickoffBrief || null,
         openingMessage: normalized.openingMessage || null,
         worldId: normalized.conversation?.worldId || null,
@@ -1420,7 +1295,7 @@ export class ClaworldRelayClient extends EventEmitter {
     });
   }
 
-  async establishConversation({ fromAgentId, targetAgentId, requestContext = {}, openingPayload = {} } = {}) {
+  async establishConversation({ fromAgentId, displayName = null, agentCode = null, requestContext = {}, openingPayload = {} } = {}) {
     const normalizedRequestContext = requestContext && typeof requestContext === 'object' && !Array.isArray(requestContext)
       ? { ...requestContext }
       : {};
@@ -1436,7 +1311,8 @@ export class ClaworldRelayClient extends EventEmitter {
 
     const requestResult = await this.createChatRequest({
       fromAgentId,
-      targetAgentId,
+      displayName,
+      agentCode,
       requestContext: normalizedRequestContext,
     });
     if (requestResult.status !== 201) {

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

@@ -23,48 +23,6 @@ function normalizeStringList(values = []) {
   return [...new Set(values.map((value) => normalizeText(value, null)).filter(Boolean))];
 }
 
-function isEmptyProfileValue(value) {
-  if (value == null) return true;
-  if (typeof value === 'string') return value.trim() === '';
-  if (Array.isArray(value)) return value.length === 0 || value.every((entry) => isEmptyProfileValue(entry));
-  if (typeof value === 'object') {
-    const entries = Object.values(value);
-    return entries.length === 0 || entries.every((entry) => isEmptyProfileValue(entry));
-  }
-  return false;
-}
-
-function normalizeProfileValue(value) {
-  if (typeof value === 'string') return value.trim();
-  if (Array.isArray(value)) {
-    return value
-      .map((entry) => normalizeProfileValue(entry))
-      .filter((entry) => entry !== undefined && !isEmptyProfileValue(entry));
-  }
-  if (value && typeof value === 'object') {
-    return Object.fromEntries(
-      Object.entries(value)
-        .filter(([, entry]) => entry !== undefined)
-        .map(([key, entry]) => [key, normalizeProfileValue(entry)]),
-    );
-  }
-  return value;
-}
-
-function normalizeProfile(profile = {}) {
-  if (!profile || typeof profile !== 'object' || Array.isArray(profile)) return {};
-
-  return Object.fromEntries(
-    Object.entries(profile)
-      .filter(([key, value]) => normalizeText(key, null) && value !== undefined)
-      .map(([key, value]) => [normalizeText(key, null), normalizeProfileValue(value)]),
-  );
-}
-
-function normalizeLookupText(value) {
-  return normalizeText(value, '')?.toLowerCase() || '';
-}
-
 function sentenceCase(value, fallback = '') {
   const normalized = normalizeText(value, fallback);
   if (!normalized) return fallback;
@@ -83,10 +41,6 @@ function joinAsNaturalLanguage(values = []) {
   return `${items.slice(0, -1).join(', ')}, and ${items.at(-1)}`;
 }
 
-function summarizeWorldChoices(items = []) {
-  return items.map((world) => `${world.displayName} [${world.worldId}]`);
-}
-
 function normalizeWorldSummary(world = {}) {
   const summary = world.agentSummary && typeof world.agentSummary === 'object' ? world.agentSummary : world;
   const rawWorldId = world.worldId || summary.worldId;
@@ -284,43 +238,31 @@ function normalizeDeliveryReason(reason = {}) {
   };
 }
 
-function normalizeCandidateScoreBreakdown(entries = []) {
-  if (!Array.isArray(entries)) return [];
-
-  return entries.map((entry, index) => ({
-    signalId: normalizeText(entry.signalId, `score_signal_${index + 1}`),
-    label: normalizeText(entry.label, `Signal ${index + 1}`),
-    weight: normalizeNumber(entry.weight, 0),
-    sourceFieldIds: normalizeStringList(entry.sourceFieldIds),
-    matched: entry.matched === true,
-    requesterValue: entry.requesterValue ?? null,
-    candidateValue: entry.candidateValue ?? null,
-    sharedValues: Array.isArray(entry.sharedValues) ? normalizeStringList(entry.sharedValues) : [],
-    overlapCount: normalizeInteger(entry.overlapCount, 0),
-    contribution: normalizeNumber(entry.contribution, 0),
-  }));
-}
-
 function normalizeCandidate(candidate = {}, index = 0) {
   const normalizedRank = normalizeNumber(candidate.rank, null);
-  const targetAgentId = normalizeText(
-    candidate.targetAgentId || candidate.requestChat?.targetAgentId,
+  const displayName = normalizeText(
+    candidate.displayName || candidate.profileSummary?.displayName || candidate.requestChat?.displayName,
     null,
   );
-  const requestChat = targetAgentId
+  const agentCode = normalizeText(
+    candidate.agentCode || candidate.requestChat?.agentCode,
+    null,
+  )?.toUpperCase() || null;
+  const requestChat = displayName && agentCode
     ? {
       worldId: normalizeText(candidate.requestChat?.worldId, normalizeText(candidate.worldId, 'unknown-world')),
-      targetAgentId,
+      displayName,
+      agentCode,
     }
     : null;
 
   return {
     candidateId: normalizeText(candidate.candidateId, `candidate_${index + 1}`),
     worldId: normalizeText(candidate.worldId, 'unknown-world'),
-    targetAgentId: normalizeText(candidate.targetAgentId, null),
     sourceMembershipId: normalizeText(candidate.sourceMembershipId, null),
     online: candidate.online === true,
-    targetAgentId,
+    displayName,
+    agentCode,
     requestChat,
     profileSummary: normalizeCandidateProfileSummary(candidate.profileSummary),
     compatibilitySignals: Array.isArray(candidate.compatibilitySignals)
@@ -340,8 +282,6 @@ function normalizeCandidate(candidate = {}, index = 0) {
     joinedAt: normalizeText(candidate.joinedAt, null),
     rank: normalizedRank == null ? null : Math.max(1, Math.trunc(normalizedRank)),
     score: normalizeNumber(candidate.score, null),
-    scoreBreakdown: normalizeCandidateScoreBreakdown(candidate.scoreBreakdown),
-    scoringInputs: candidate.scoringInputs && typeof candidate.scoringInputs === 'object' ? candidate.scoringInputs : {},
   };
 }
 
@@ -391,10 +331,9 @@ function normalizeWorldJoinResponse(payload = {}, { worldId = null, agentId = nu
     worldId: normalizedWorldId,
     agentId: normalizedAgentId,
     membershipStatus,
-    normalizedProfile: normalizeProfile(
-      payload.normalizedProfile && typeof payload.normalizedProfile === 'object'
-        ? payload.normalizedProfile
-        : membership?.profileSnapshot,
+    participantContextText: normalizeText(
+      payload.participantContextText,
+      membership?.participantContextText || null,
     ),
     membership,
     nextAction: normalizeText(
@@ -443,73 +382,6 @@ export function buildCandidateDeliverySummary(candidateFeed = {}, { worldDetail
   return buildBackendCandidateDeliverySummary(candidateFeed, { worldDetail, limit });
 }
 
-function normalizeSelectionInput(selection) {
-  if (selection && typeof selection === 'object') {
-    const asWorldId = normalizeText(selection.worldId, null);
-    const asDisplayName = normalizeText(selection.displayName, null);
-    const asChoice = normalizeText(selection.selection || selection.choice || selection.value, null);
-    const text = asWorldId || asDisplayName || asChoice || '';
-    return {
-      raw: selection,
-      text,
-      normalized: normalizeLookupText(text),
-      index: /^\d+$/.test(String(text)) ? normalizeInteger(text, 0) : null,
-    };
-  }
-
-  const text = normalizeText(selection, '');
-  return {
-    raw: selection,
-    text,
-    normalized: normalizeLookupText(text),
-    index: /^\d+$/.test(String(text)) ? normalizeInteger(text, 0) : null,
-  };
-}
-
-function buildSelectionRetryContract(status, selection, items = [], matches = []) {
-  const choiceLabel = selection.text ? `"${selection.text}"` : 'that choice';
-  const retryWorlds = (matches.length > 0 ? matches : items).map((world) => normalizeWorldSummary(world));
-  const retrySummary = summarizeWorldChoices(retryWorlds);
-
-  if (status === 'ambiguous') {
-    return {
-      status,
-      selection: {
-        input: selection.text || null,
-        matchedBy: null,
-        worldId: null,
-        displayName: null,
-      },
-      candidateWorlds: retryWorlds,
-      orchestration: {
-        stage: 'post_setup_world_selection_retry',
-        system: 'The world choice matched multiple worlds. Show the narrowed list and ask the user to pick one exact world ID or display name.',
-        user: `The choice ${choiceLabel} is ambiguous. Matching worlds: ${joinAsNaturalLanguage(retrySummary)}. Ask the user to choose one exact world ID or display name.`,
-        followUp: 'Once the user confirms one exact world, fetch its detail, explain the required fields, and use join_world when enough profile data is available.',
-      },
-    };
-  }
-
-  return {
-    status: 'no_match',
-    selection: {
-      input: selection.text || null,
-      matchedBy: null,
-      worldId: null,
-      displayName: null,
-    },
-    candidateWorlds: retryWorlds,
-    orchestration: {
-      stage: 'post_setup_world_selection_retry',
-      system: 'The world choice did not match the available world directory. Re-list the worlds and ask the user to choose one by world ID or display name.',
-      user: retrySummary.length > 0
-        ? `I could not match ${choiceLabel} to an available world. Available worlds: ${joinAsNaturalLanguage(retrySummary)}. Ask the user to choose one by world ID or display name.`
-        : 'No worlds are currently available. Tell the user setup is complete but world selection cannot continue yet.',
-      followUp: 'Once the user chooses a valid world, confirm it, fetch the world detail, and explain the required fields before calling join_world.',
-    },
-  };
-}
-
 export function buildWorldSelectionPrompt(worldDirectory = {}) {
   return worldDirectory?.orchestration && typeof worldDirectory.orchestration === 'object'
     ? worldDirectory.orchestration

package/src/openclaw/runtime/tool-contracts.js

@@ -97,19 +97,22 @@ function projectRequestChatPayload(
 ) {
   if (!requestChat || typeof requestChat !== 'object' || Array.isArray(requestChat)) return null;
   const worldId = normalizeText(requestChat.worldId, null);
-  const targetAgentId = normalizeText(requestChat.targetAgentId, null);
-  if (!worldId || !targetAgentId) return null;
+  const displayName = normalizeText(requestChat.displayName, null);
+  const agentCode = normalizeText(requestChat.agentCode, null)?.toUpperCase() || null;
+  if (!worldId || !displayName || !agentCode) return null;
 
   const normalizedAccountId = normalizeText(accountId, null);
 
   return {
     worldId,
-    targetAgentId,
+    displayName,
+    agentCode,
     requestTool: normalizeText(requestToolName, null),
     requestPayload: {
       ...(normalizedAccountId ? { accountId: normalizedAccountId } : {}),
       worldId,
-      targetAgentId,
+      displayName,
+      agentCode,
     },
   };
 }
@@ -135,7 +138,8 @@ function projectRequestChatAction(
     requestPayloadTemplate: {
       ...(normalizedAccountId ? { accountId: normalizedAccountId } : {}),
       worldId,
-      targetAgentId: ':targetAgentId',
+      displayName: ':displayName',
+      agentCode: ':agentCode',
     },
     summary: normalizeText(requestChatAction.summary, null),
   };
@@ -159,7 +163,7 @@ function projectToolCandidateDeliverySummary(
       online: summary.online === true,
       rank: normalizeOptionalInteger(summary.rank, null),
       score: normalizeOptionalInteger(summary.score, null),
-      targetAgentId: normalizeText(summary.targetAgentId, summary.requestChat?.targetAgentId || null),
+      agentCode: normalizeText(summary.agentCode, summary.requestChat?.agentCode || null)?.toUpperCase() || null,
       requestChat: projectRequestChatPayload(summary.requestChat, {
         accountId,
         requestToolName,
@@ -235,8 +239,8 @@ export function projectToolWorldDetail(worldDetail = {}) {
 function projectToolCandidateSummary(summary = {}, index = 0) {
   return {
     candidateId: normalizeText(summary.candidateId, `candidate_${index + 1}`),
-    targetAgentId: normalizeText(summary.targetAgentId, null),
     displayName: normalizeText(summary.displayName, `Candidate ${index + 1}`),
+    agentCode: normalizeText(summary.agentCode, null)?.toUpperCase() || null,
     headline: normalizeText(summary.headline, null),
     online: summary.online === true,
     rank: normalizeInteger(summary.rank, 0) || null,
@@ -259,8 +263,8 @@ function projectToolCandidateFeed(joinResult = {}) {
     : Array.isArray(candidateFeed?.candidates)
       ? candidateFeed.candidates.map((candidate, index) => projectToolCandidateSummary({
         candidateId: candidate.candidateId,
-        targetAgentId: candidate.targetAgentId,
         displayName: candidate.profileSummary?.displayName,
+        agentCode: normalizeText(candidate.agentCode, candidate.requestChat?.agentCode || null),
         headline: candidate.profileSummary?.headline,
         online: candidate.online === true,
         rank: candidate.rank,
@@ -294,9 +298,6 @@ export function projectToolJoinWorldResponse(
   joinResult = {},
   { accountId = null } = {},
 ) {
-  const normalizedProfile = joinResult.normalizedProfile && typeof joinResult.normalizedProfile === 'object'
-    ? joinResult.normalizedProfile
-    : {};
   return {
     status: joinResult.membershipStatus === 'active' ? 'joined' : 'accepted',
     worldId: joinResult.worldId,
@@ -304,9 +305,8 @@ export function projectToolJoinWorldResponse(
     membershipStatus: joinResult.membershipStatus || 'unknown',
     participantContextText: normalizeText(
       joinResult.participantContextText,
-      normalizedProfile.participantContextText || joinResult.membership?.participantContextText || null,
+      joinResult.membership?.participantContextText || null,
     ),
-    normalizedProfile,
     nextAction: normalizeText(joinResult.nextAction, 'review_candidate_feed'),
     candidateFeed: projectToolCandidateFeed(joinResult),
     requestChatTool: 'claworld_request_chat',
@@ -538,9 +538,11 @@ export function projectToolChatRequestMutationResponse(result = {}, { accountId
           ? 'runtime_owns_live_conversation'
           : kickoff?.status === 'sent'
             ? 'wait_for_sender_opener_delivery'
-          : kickoff?.status === 'failed'
-            ? 'backend_kickoff_failed'
-            : 'chat_request_accepted_without_opening_message'
+            : kickoff?.status === 'queued'
+              ? 'wait_for_sender_runtime_availability'
+              : kickoff?.status === 'failed'
+                ? 'backend_kickoff_failed'
+                : 'chat_request_accepted_without_opening_message'
         : normalizedStatus === 'pending'
           ? 'wait_for_peer_acceptance'
           : 'chat_request_closed',