@xfxstudio/claworld 0.1.1 → 0.1.2

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

@@ -3,6 +3,7 @@ import { buildRuntimeAuthHeaders } from '../plugin/account-identity.js';
 import { createRuntimeBoundaryError } from '../../lib/runtime-errors.js';
 import {
   buildCandidateDeliverySummary as buildBackendCandidateDeliverySummary,
+  buildResolvedWorldJoinOrchestration as buildBackendResolvedWorldJoinOrchestration,
   buildWorldJoinOutcomeOrchestration as buildBackendWorldJoinOutcomeOrchestration,
   buildRequiredFieldExplanation as buildBackendRequiredFieldExplanation,
   buildWorldProfileCollectionFlow as buildBackendWorldProfileCollectionFlow,
@@ -196,7 +197,7 @@ function normalizeWorldDetail(payload = {}) {
       requiredFields,
       optionalFields,
       hints: normalizeStringList(payload.hints),
-      nextAction: normalizeText(payload.nextAction, 'collect_profile_fields_then_call_join'),
+      nextAction: normalizeText(payload.nextAction, 'call_join_world'),
       sessionOverview: payload.sessionOverview && typeof payload.sessionOverview === 'object' ? payload.sessionOverview : {},
       matchingOverview: payload.matchingOverview && typeof payload.matchingOverview === 'object' ? payload.matchingOverview : {},
       requiredFieldExplanation:
@@ -261,7 +262,7 @@ function normalizeWorldDetail(payload = {}) {
     requiredFields,
     optionalFields,
     hints: normalizeStringList(joinSchema.hints),
-    nextAction: normalizeText(joinSchema.nextAction, 'collect_profile_fields_then_call_join'),
+    nextAction: normalizeText(joinSchema.nextAction, 'call_join_world'),
     sessionOverview,
     matchingOverview,
     requiredFieldExplanation:
@@ -323,7 +324,7 @@ function normalizeJoinCheckResponse(payload = {}, { worldId = null, profile = {}
     ),
     nextAction: normalizeText(
       payload.nextAction,
-      accepted ? 'join_world_when_membership_persistence_exists' : 'collect_missing_profile_fields',
+      accepted ? 'call_join_world' : 'retry_join_world_after_profile_update',
     ),
     profileCollectionFlow:
       payload.profileCollectionFlow && typeof payload.profileCollectionFlow === 'object'
@@ -405,11 +406,24 @@ function normalizeCandidateScoreBreakdown(entries = []) {
 
 function normalizeCandidate(candidate = {}, index = 0) {
   const normalizedRank = normalizeNumber(candidate.rank, null);
+  const targetAgentId = normalizeText(
+    candidate.targetAgentId || candidate.requestChat?.targetAgentId,
+    null,
+  );
+  const requestChat = targetAgentId
+    ? {
+      worldId: normalizeText(candidate.requestChat?.worldId, normalizeText(candidate.worldId, 'unknown-world')),
+      targetAgentId,
+    }
+    : 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),
+    targetAgentId,
+    requestChat,
     profileSummary: normalizeCandidateProfileSummary(candidate.profileSummary),
     compatibilitySignals: Array.isArray(candidate.compatibilitySignals)
       ? candidate.compatibilitySignals.map((signal, signalIndex) => normalizeCompatibilitySignal(signal, signalIndex))
@@ -438,7 +452,7 @@ function normalizeCandidateFeedResponse(payload = {}, { worldId = null, agentId
     deliveryMode: normalizeText(payload.deliveryMode, 'agent_review_before_live_session'),
     nextAction: normalizeText(
       payload.nextAction,
-      candidates.length > 0 ? 'review_candidates_before_requesting_live_session' : 'wait_for_more_candidates',
+      candidates.length > 0 ? 'review_candidates_then_request_chat' : 'wait_for_more_candidates',
     ),
     candidateDelivery: payload.candidateDelivery && typeof payload.candidateDelivery === 'object'
       ? payload.candidateDelivery
@@ -455,15 +469,39 @@ function normalizeCandidateFeedResponse(payload = {}, { worldId = null, agentId
 
 function normalizeWorldJoinResponse(payload = {}, { worldId = null, agentId = null } = {}) {
   const membership = payload.membership && typeof payload.membership === 'object' ? payload.membership : null;
+  const normalizedWorldId = normalizeText(payload.worldId, worldId || 'unknown-world');
+  const normalizedAgentId = normalizeText(payload.agentId || membership?.agentId, agentId || null);
+  const membershipStatus = normalizeText(payload.membershipStatus || membership?.status, 'unknown');
+  const candidateFeed = payload.candidateFeed && typeof payload.candidateFeed === 'object'
+    ? normalizeCandidateFeedResponse(payload.candidateFeed, {
+      worldId: normalizedWorldId,
+      agentId: normalizedAgentId,
+    })
+    : null;
 
   return {
-    worldId: normalizeText(payload.worldId, worldId || 'unknown-world'),
-    agentId: normalizeText(payload.agentId || membership?.agentId, agentId || null),
-    membershipStatus: normalizeText(payload.membershipStatus || membership?.status, 'unknown'),
+    status: normalizeText(payload.status, membershipStatus === 'active' ? 'joined' : 'accepted'),
+    worldId: normalizedWorldId,
+    agentId: normalizedAgentId,
+    membershipStatus,
+    normalizedProfile: normalizeProfile(
+      payload.normalizedProfile && typeof payload.normalizedProfile === 'object'
+        ? payload.normalizedProfile
+        : membership?.profileSnapshot,
+    ),
     membership,
+    nextAction: normalizeText(
+      payload.nextAction,
+      membershipStatus === 'active' ? 'review_candidate_feed' : null,
+    ),
     nextStageSummary: payload.nextStageSummary && typeof payload.nextStageSummary === 'object'
       ? payload.nextStageSummary
       : {},
+    candidateFeed,
+    candidateDelivery:
+      payload.candidateDelivery && typeof payload.candidateDelivery === 'object'
+        ? payload.candidateDelivery
+        : (candidateFeed ? buildCandidateDeliverySummary(candidateFeed) : null),
     orchestration: payload.orchestration && typeof payload.orchestration === 'object'
       ? payload.orchestration
       : null,
@@ -572,7 +610,7 @@ function normalizeWorldSearchResponse(payload = {}, { worldId = null, agentId =
     status: normalizeText(payload.status, items.length > 0 ? 'search_ready' : 'no_matches'),
     nextAction: normalizeText(
       payload.nextAction,
-      items.length > 0 ? 'select_player_and_start_conversation' : 'broaden_search_or_wait',
+      items.length > 0 ? 'request_chat_with_selected_candidate' : 'broaden_search_or_wait',
     ),
     items,
   };
@@ -668,10 +706,10 @@ function buildProfileCollectionFollowUp(promptFields = []) {
 
   const labels = promptFields.map((field) => field.label);
   if (promptFields.length === 1) {
-    return `After the user answers ${labels[0]}, merge it into the saved profile draft and re-run join-check before asking anything else.`;
+    return `After the user answers ${labels[0]}, merge it into the saved profile draft and retry join_world before asking anything else.`;
   }
 
-  return `After the user answers ${joinAsNaturalLanguage(labels)}, merge those fields into the saved profile draft and re-run join-check before asking anything else.`;
+  return `After the user answers ${joinAsNaturalLanguage(labels)}, merge those fields into the saved profile draft and retry join_world before asking anything else.`;
 }
 
 function normalizeSelectionInput(selection) {
@@ -716,7 +754,7 @@ function buildSelectionRetryContract(status, selection, items = [], matches = []
         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 and explain the required fields before join-check.',
+        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.',
       },
     };
   }
@@ -736,7 +774,7 @@ function buildSelectionRetryContract(status, selection, items = [], matches = []
       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 join-check.',
+      followUp: 'Once the user chooses a valid world, confirm it, fetch the world detail, and explain the required fields before calling join_world.',
     },
   };
 }
@@ -1139,50 +1177,42 @@ export async function submitWorldJoin({
         fetchImpl,
         logger,
       });
-    const joinCheck = normalizeJoinCheckResponse(joinResult.body?.joinCheck || joinResult.body, {
+    const joinCheck = normalizeJoinCheckResponse(joinResult.body, {
       worldId: resolvedWorldId,
       profile: joinProfile.mergedProfile,
     });
-    const profileCollectionFlow = joinCheck.profileCollectionFlow && typeof joinCheck.profileCollectionFlow === 'object'
-      ? {
-        ...joinCheck.profileCollectionFlow,
+    const profileCollectionFlow = {
+      ...buildBackendWorldProfileCollectionFlow({
         worldDetail: detail,
         joinCheck,
         profile: joinCheck.normalizedProfile,
-        appliedProfileUpdate: joinProfile.appliedProfileUpdate,
-      }
-      : {
-        ...buildBackendWorldProfileCollectionFlow({
-          worldDetail: detail,
-          joinCheck,
-          profile: joinCheck.normalizedProfile,
-          maxFieldsPerStep,
-        }),
-        worldDetail: detail,
-        joinCheck,
-        profile: joinCheck.normalizedProfile,
-        appliedProfileUpdate: joinProfile.appliedProfileUpdate,
-      };
+        maxFieldsPerStep,
+      }),
+      worldDetail: detail,
+      joinCheck,
+      profile: joinCheck.normalizedProfile,
+      appliedProfileUpdate: joinProfile.appliedProfileUpdate,
+    };
 
     return {
       status: 'needs_profile',
       worldId: resolvedWorldId,
       agentId: resolvedAgentId,
       membershipStatus: normalizeText(joinResult.body?.membershipStatus, 'inactive'),
-      searchEnabled: false,
-      missingRequiredFields: projectMissingRequiredFields(joinCheck.missingFields),
+      normalizedProfile: profileCollectionFlow.profile,
+      missingFields: projectMissingRequiredFields(joinCheck.missingFields),
       nextMissingField: joinCheck.nextMissingField
         ? projectMissingRequiredFields([joinCheck.nextMissingField])[0]
         : null,
-      normalizedProfile: profileCollectionFlow.profile,
-      nextAction: 'complete_required_profile_fields_then_retry_join',
+      nextAction: normalizeText(joinResult.body?.nextAction, 'retry_join_world_after_profile_update'),
+      missingFieldGuidance: joinCheck.missingFieldGuidance,
+      candidateFeed: null,
+      candidateDelivery: null,
       joinCheck,
       profileCollectionFlow,
-      orchestration: profileCollectionFlow.orchestration || null,
-      providedRequiredFieldIds: profileCollectionFlow.providedRequiredFieldIds,
-      promptFields: profileCollectionFlow.promptFields,
-      remainingRequiredFieldCount: profileCollectionFlow.remainingRequiredFieldCount,
-      revalidationCheckpoint: profileCollectionFlow.revalidationCheckpoint,
+      profileDraft: profileCollectionFlow.profile,
+      missingRequiredFields: projectMissingRequiredFields(joinCheck.missingFields),
+      orchestration: null,
     };
   }
 
@@ -1192,13 +1222,16 @@ export async function submitWorldJoin({
   });
 
   return {
-    status: normalizedJoinResult.membershipStatus === 'active' ? 'activated' : 'accepted',
+    status: normalizedJoinResult.status,
     worldId: normalizedJoinResult.worldId,
     agentId: normalizedJoinResult.agentId,
     membershipStatus: normalizedJoinResult.membershipStatus,
-    searchEnabled: normalizedJoinResult.membershipStatus === 'active',
+    normalizedProfile: normalizedJoinResult.normalizedProfile,
     membership: normalizedJoinResult.membership,
+    nextAction: normalizedJoinResult.nextAction,
     nextStageSummary: normalizedJoinResult.nextStageSummary,
+    candidateFeed: normalizedJoinResult.candidateFeed,
+    candidateDelivery: normalizedJoinResult.candidateDelivery,
     orchestration: normalizedJoinResult.orchestration || null,
   };
 }
@@ -1643,6 +1676,9 @@ export async function resolveWorldJoinFlow({
   agentId = null,
   profile = {},
   profileSnapshot = null,
+  profileUpdate = null,
+  profilePatch = null,
+  maxFieldsPerStep = 1,
   limit = null,
   fetchImpl,
   logger = console,
@@ -1662,7 +1698,7 @@ export async function resolveWorldJoinFlow({
     throw new Error('claworld product-shell join flow requires worldId');
   }
 
-  const joinResult = await joinWorld({
+  const joinResult = await submitWorldJoin({
     cfg,
     accountId,
     runtimeConfig,
@@ -1670,20 +1706,28 @@ export async function resolveWorldJoinFlow({
     agentId,
     profile,
     profileSnapshot,
+    profileUpdate,
+    profilePatch,
+    maxFieldsPerStep,
     fetchImpl,
     logger,
   });
-  const candidateFeed = await fetchWorldCandidateFeed({
-    cfg,
-    accountId,
-    runtimeConfig,
-    worldId: resolvedWorldId,
-    agentId: joinResult.agentId || agentId,
-    limit,
-    fetchImpl,
-    logger,
-  });
-  const candidateDelivery = buildCandidateDeliverySummary(candidateFeed, {
+  if (joinResult.status === 'needs_profile') {
+    return joinResult;
+  }
+  const candidateFeed = limit == null && joinResult.candidateFeed
+    ? joinResult.candidateFeed
+    : await fetchWorldCandidateFeed({
+      cfg,
+      accountId,
+      runtimeConfig,
+      worldId: resolvedWorldId,
+      agentId: joinResult.agentId || agentId,
+      limit,
+      fetchImpl,
+      logger,
+    });
+  const candidateDelivery = joinResult.candidateDelivery || buildCandidateDeliverySummary(candidateFeed, {
     worldDetail: detail,
     limit,
   });
@@ -1702,11 +1746,20 @@ export async function resolveWorldJoinFlow({
     agentId: joinResult.agentId || normalizeText(agentId, null),
     worldDetail: detail,
     membershipStatus: joinResult.membershipStatus,
+    normalizedProfile: joinResult.normalizedProfile,
     membership: joinResult.membership,
+    nextAction: normalizeText(joinResult.nextAction, candidateDelivery.nextAction),
     nextStageSummary: joinResult.nextStageSummary,
     joinResult,
     candidateFeed,
     candidateDelivery,
-    orchestration: joinOrchestration,
+    requestChatAction: candidateDelivery.requestChatAction,
+    orchestration: buildBackendResolvedWorldJoinOrchestration({
+      joinResult: {
+        ...joinResult,
+        orchestration: joinOrchestration,
+      },
+      candidateDelivery,
+    }),
   };
 }

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

@@ -162,6 +162,106 @@ function projectOrchestration(orchestration = null) {
   };
 }
 
+function projectRequestChatPayload(
+  requestChat = null,
+  {
+    accountId = null,
+    requestToolName = 'claworld_request_chat',
+  } = {},
+) {
+  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 normalizedAccountId = normalizeText(accountId, null);
+
+  return {
+    worldId,
+    targetAgentId,
+    requestTool: normalizeText(requestToolName, null),
+    requestPayload: {
+      ...(normalizedAccountId ? { accountId: normalizedAccountId } : {}),
+      worldId,
+      targetAgentId,
+    },
+  };
+}
+
+function projectRequestChatAction(
+  requestChatAction = null,
+  {
+    accountId = null,
+    requestToolName = 'claworld_request_chat',
+  } = {},
+) {
+  if (!requestChatAction || typeof requestChatAction !== 'object' || Array.isArray(requestChatAction)) return null;
+  const worldId = normalizeText(requestChatAction.worldId, null);
+  if (!worldId) return null;
+
+  const normalizedAccountId = normalizeText(accountId, null);
+
+  return {
+    action: normalizeText(requestChatAction.action, 'request_chat'),
+    worldId,
+    requiredFields: normalizeStringList(requestChatAction.requiredFields),
+    requestTool: normalizeText(requestToolName, null),
+    requestPayloadTemplate: {
+      ...(normalizedAccountId ? { accountId: normalizedAccountId } : {}),
+      worldId,
+      targetAgentId: ':targetAgentId',
+    },
+    summary: normalizeText(requestChatAction.summary, null),
+  };
+}
+
+function projectToolCandidateDeliverySummary(
+  candidateDelivery = {},
+  {
+    accountId = null,
+    requestToolName = 'claworld_request_chat',
+  } = {},
+) {
+  if (!candidateDelivery || typeof candidateDelivery !== 'object' || Array.isArray(candidateDelivery)) return null;
+
+  const candidateSummaries = Array.isArray(candidateDelivery.candidateSummaries)
+    ? candidateDelivery.candidateSummaries.map((summary) => ({
+      candidateId: normalizeText(summary.candidateId, null),
+      sourceMembershipId: normalizeText(summary.sourceMembershipId, null),
+      displayName: normalizeText(summary.displayName, null),
+      headline: normalizeText(summary.headline, null),
+      rank: normalizeOptionalInteger(summary.rank, null),
+      score: normalizeOptionalInteger(summary.score, null),
+      targetAgentId: normalizeText(summary.targetAgentId, summary.requestChat?.targetAgentId || null),
+      requestChat: projectRequestChatPayload(summary.requestChat, {
+        accountId,
+        requestToolName,
+      }),
+      requiredFieldSummary: normalizeStringList(summary.requiredFieldSummary),
+      optionalFieldSummary: normalizeStringList(summary.optionalFieldSummary),
+      compatibilitySummary: normalizeStringList(summary.compatibilitySummary),
+      deliveryReasonSummary: normalizeText(summary.deliveryReasonSummary, null),
+      expiresAt: normalizeText(summary.expiresAt, null),
+      summary: normalizeText(summary.summary, null),
+    }))
+    : [];
+
+  return {
+    status: normalizeText(candidateDelivery.status, null),
+    worldId: normalizeText(candidateDelivery.worldId, null),
+    deliveredCandidateCount: normalizeInteger(candidateDelivery.deliveredCandidateCount, candidateSummaries.length),
+    totalCandidateCount: normalizeInteger(candidateDelivery.totalCandidateCount, candidateSummaries.length),
+    remainingCandidateCount: normalizeInteger(candidateDelivery.remainingCandidateCount, 0),
+    nextAction: normalizeText(candidateDelivery.nextAction, null),
+    requestChatAction: projectRequestChatAction(candidateDelivery.requestChatAction, {
+      accountId,
+      requestToolName,
+    }),
+    candidateSummaries,
+    orchestration: projectOrchestration(candidateDelivery.orchestration),
+  };
+}
+
 export function projectToolWorldList(worldDirectory = {}) {
   const worlds = Array.isArray(worldDirectory.items)
     ? [...worldDirectory.items]
@@ -255,8 +355,8 @@ export function projectToolWorldProfileCollectionResponse(
         promptFieldIds: promptFields.map((field) => field.fieldId).filter(Boolean),
       },
     nextAction: readyToJoin
-      ? 'retry_join_with_profile_draft'
-      : 'collect_missing_profile_fields_and_recheck',
+      ? 'call_join_world'
+      : 'retry_join_world_after_profile_update',
     nextTool: readyToJoin ? normalizeText(joinToolName, null) : normalizeText(continueToolName, null),
     continueTool: normalizeText(continueToolName, null),
     joinTool: normalizeText(joinToolName, null),
@@ -277,6 +377,60 @@ export function projectToolWorldProfileCollectionResponse(
   };
 }
 
+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}`),
+    headline: normalizeText(summary.headline, null),
+    rank: normalizeInteger(summary.rank, 0) || null,
+    score: normalizeInteger(summary.score, 0) || null,
+    summary: normalizeText(summary.summary, null),
+    expiresAt: normalizeText(summary.expiresAt, null),
+  };
+}
+
+function projectToolCandidateFeed(joinResult = {}) {
+  const candidateDelivery = joinResult.candidateDelivery && typeof joinResult.candidateDelivery === 'object'
+    ? joinResult.candidateDelivery
+    : null;
+  const candidateFeed = joinResult.candidateFeed && typeof joinResult.candidateFeed === 'object'
+    ? joinResult.candidateFeed
+    : null;
+  const candidateSummaries = Array.isArray(candidateDelivery?.candidateSummaries)
+    ? candidateDelivery.candidateSummaries.map((summary, index) => projectToolCandidateSummary(summary, index))
+    : Array.isArray(candidateFeed?.candidates)
+      ? candidateFeed.candidates.map((candidate, index) => projectToolCandidateSummary({
+        candidateId: candidate.candidateId,
+        targetAgentId: candidate.targetAgentId,
+        displayName: candidate.profileSummary?.displayName,
+        headline: candidate.profileSummary?.headline,
+        rank: candidate.rank,
+        score: candidate.score,
+        summary: normalizeText(candidate.deliveryReason?.summary, null),
+        expiresAt: candidate.expiresAt,
+      }, index))
+      : [];
+
+  return {
+    status: normalizeText(
+      candidateDelivery?.status,
+      normalizeText(candidateFeed?.status, candidateSummaries.length > 0 ? 'candidate_summary_ready' : 'candidate_summary_pending'),
+    ),
+    nextAction: normalizeText(
+      candidateDelivery?.nextAction,
+      normalizeText(candidateFeed?.nextAction, candidateSummaries.length > 0 ? 'review_candidates_then_request_chat' : 'wait_for_more_candidates'),
+    ),
+    deliveredCandidateCount: normalizeInteger(candidateDelivery?.deliveredCandidateCount, candidateSummaries.length),
+    totalCandidateCount: normalizeInteger(
+      candidateDelivery?.totalCandidateCount,
+      normalizeInteger(candidateFeed?.totalCandidates, candidateSummaries.length),
+    ),
+    remainingCandidateCount: normalizeInteger(candidateDelivery?.remainingCandidateCount, 0),
+    candidates: candidateSummaries,
+  };
+}
+
 export function projectToolJoinWorldResponse(
   joinResult = {},
   {
@@ -287,34 +441,56 @@ export function projectToolJoinWorldResponse(
 ) {
   if (joinResult.status === 'needs_profile') {
     if (joinResult.profileCollectionFlow && typeof joinResult.profileCollectionFlow === 'object') {
+      const profileCollectionResponse = projectToolWorldProfileCollectionResponse(joinResult.profileCollectionFlow, {
+        accountId,
+        continueToolName,
+        joinToolName,
+      });
+      const normalizedProfile = joinResult.normalizedProfile && typeof joinResult.normalizedProfile === 'object'
+        ? joinResult.normalizedProfile
+        : profileCollectionResponse.profileDraft;
+      const missingFields = Array.isArray(joinResult.missingFields)
+        ? joinResult.missingFields
+        : (Array.isArray(joinResult.missingRequiredFields) ? joinResult.missingRequiredFields : []);
+
       return {
-        ...projectToolWorldProfileCollectionResponse(joinResult.profileCollectionFlow, {
-          accountId,
-          continueToolName,
-          joinToolName,
-        }),
+        ...profileCollectionResponse,
         membershipStatus: joinResult.membershipStatus || 'inactive',
-        searchEnabled: false,
-        nextAction: 'collect_missing_profile_fields_and_retry_join',
+        normalizedProfile,
+        profileDraft: normalizedProfile,
+        missingFields,
+        missingRequiredFields: missingFields,
+        nextAction: normalizeText(joinResult.nextAction, profileCollectionResponse.nextAction),
+        missingFieldGuidance: joinResult.missingFieldGuidance && typeof joinResult.missingFieldGuidance === 'object'
+          ? joinResult.missingFieldGuidance
+          : null,
       };
     }
 
-    const profileDraft = joinResult.normalizedProfile && typeof joinResult.normalizedProfile === 'object'
+    const normalizedProfile = joinResult.normalizedProfile && typeof joinResult.normalizedProfile === 'object'
       ? joinResult.normalizedProfile
       : {};
+    const missingFields = Array.isArray(joinResult.missingFields)
+      ? joinResult.missingFields
+      : (Array.isArray(joinResult.missingRequiredFields) ? joinResult.missingRequiredFields : []);
+
     return {
-    status: 'needs_profile',
-    worldId: joinResult.worldId,
-    accountId: normalizeText(accountId, null),
-    membershipStatus: joinResult.membershipStatus || 'inactive',
-    searchEnabled: false,
-      missingRequiredFields: Array.isArray(joinResult.missingRequiredFields) ? joinResult.missingRequiredFields : [],
+      status: 'needs_profile',
+      worldId: joinResult.worldId,
+      accountId: normalizeText(accountId, null),
+      membershipStatus: joinResult.membershipStatus || 'inactive',
+      normalizedProfile,
+      profileDraft: normalizedProfile,
+      missingFields,
+      missingRequiredFields: missingFields,
       nextMissingField: joinResult.nextMissingField || null,
-      profileDraft,
-      nextAction: 'collect_missing_profile_fields_and_retry_join',
-      nextTool: normalizeText(continueToolName, null),
-      continueTool: normalizeText(continueToolName, null),
+      nextAction: normalizeText(joinResult.nextAction, 'retry_join_world_after_profile_update'),
+      nextTool: normalizeText(joinToolName, null),
+      continueTool: normalizeText(joinToolName, null),
       joinTool: normalizeText(joinToolName, null),
+      missingFieldGuidance: joinResult.missingFieldGuidance && typeof joinResult.missingFieldGuidance === 'object'
+        ? joinResult.missingFieldGuidance
+        : null,
       orchestration: projectOrchestration(joinResult.orchestration),
       guidance: joinResult.orchestration && typeof joinResult.orchestration === 'object'
         ? {
@@ -326,11 +502,18 @@ export function projectToolJoinWorldResponse(
   }
 
   return {
-    status: joinResult.status === 'activated' ? 'activated' : 'accepted',
+    status: joinResult.membershipStatus === 'active' ? 'joined' : 'accepted',
     worldId: joinResult.worldId,
     accountId: normalizeText(accountId, null),
     membershipStatus: joinResult.membershipStatus || 'unknown',
-    searchEnabled: joinResult.searchEnabled === true,
+    normalizedProfile: joinResult.normalizedProfile && typeof joinResult.normalizedProfile === 'object'
+      ? joinResult.normalizedProfile
+      : {},
+    nextAction: normalizeText(joinResult.nextAction, 'review_candidate_feed'),
+    candidateFeed: projectToolCandidateFeed(joinResult),
+    requestChatTool: 'claworld_request_chat',
+    candidateDelivery: projectToolCandidateDeliverySummary(joinResult.candidateDelivery, { accountId }),
+    requestChatAction: projectRequestChatAction(joinResult.requestChatAction, { accountId }),
     orchestration: projectOrchestration(joinResult.orchestration),
     guidance: joinResult.orchestration && typeof joinResult.orchestration === 'object'
       ? {
@@ -342,15 +525,21 @@ export function projectToolJoinWorldResponse(
 }
 
 export function projectToolSearchWorldResponse(searchResult = {}, { accountId = null } = {}) {
+  const compatibilityMessage = 'Compatibility-only manual world search. Candidate feed review is the canonical path before request_chat.';
   if (searchResult.status === 'not_joined') {
     return {
       status: 'not_joined',
       worldId: searchResult.worldId,
       accountId: normalizeText(accountId, null),
+      discoveryMode: 'compatibility_search',
+      canonicalDiscoveryMode: 'candidate_feed',
       query: searchResult.query || {},
       limit: normalizeInteger(searchResult.limit, 10),
       results: [],
-      message: normalizeText(searchResult.message, 'Join the world before searching it.'),
+      message: normalizeText(
+        searchResult.message,
+        'Join the world first. Candidate feed review is the canonical path before request_chat; search remains compatibility-only.',
+      ),
     };
   }
 
@@ -371,8 +560,11 @@ export function projectToolSearchWorldResponse(searchResult = {}, { accountId =
     status: results.length > 0 ? 'ready' : 'empty',
     worldId: searchResult.worldId,
     accountId: normalizeText(accountId, null),
+    discoveryMode: 'compatibility_search',
+    canonicalDiscoveryMode: 'candidate_feed',
     query: searchResult.query || {},
     limit: normalizeInteger(searchResult.limit, results.length || 10),
+    message: compatibilityMessage,
     results,
   };
 }

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

@@ -29,12 +29,12 @@ export const CLAWORLD_WORLD_TOOL_NAMES = Object.freeze([
   'claworld_list_worlds',
   'claworld_get_world_detail',
   'claworld_join_world',
-  'claworld_search_world',
   'claworld_broadcast_world',
 ]);
 
 export const CLAWORLD_OPTIONAL_WORLD_HELPER_TOOL_NAMES = Object.freeze([
   'claworld_prepare_world_join',
+  'claworld_search_world',
 ]);
 
 export const CLAWORLD_ADVANCED_TOOL_NAMES = Object.freeze([