@xfxstudio/claworld 0.1.5 → 0.2.1

package/src/product-shell/contracts/world-orchestration.js

@@ -68,13 +68,6 @@ export function normalizeProfile(profile = {}) {
   );
 }
 
-export function mergeProfileState(profile = {}, profileUpdate = {}) {
-  return {
-    ...normalizeProfile(profile),
-    ...normalizeProfile(profileUpdate),
-  };
-}
-
 function normalizeLookupText(value) {
   return normalizeText(value, '')?.toLowerCase() || '';
 }
@@ -108,12 +101,9 @@ function normalizeWorldSummary(world = {}) {
   return {
     worldId: normalizeText(rawWorldId, 'unknown-world'),
     displayName: normalizeText(summary.displayName || world.displayName, normalizeText(rawWorldId, 'Unknown World')),
-    summary: normalizeText(summary.summary || world.summary, ''),
-    category: normalizeText(summary.category || world.category, 'general'),
+    worldContextText: normalizeText(summary.worldContextText || world.worldContextText, ''),
     hotness: normalizeInteger(summary.hotness || world.hotness || world.activatedMemberCount, 0),
     requiredFieldCount: normalizeInteger(summary.requiredFieldCount || world.requiredFieldCount, 0),
-    matchingMode: normalizeText(summary.matchingMode || world.matchingMode, 'manual_review'),
-    sessionMode: normalizeText(summary.sessionMode || world.sessionMode, 'a2a'),
   };
 }
 
@@ -180,7 +170,7 @@ function normalizeWorldDetail(payload = {}) {
       requiredFieldCount: normalizeInteger(payload.requiredFieldCount, requiredFields.length) || requiredFields.length,
       optionalFieldCount: normalizeInteger(payload.optionalFieldCount, optionalFields.length) || optionalFields.length,
       matchingMode: normalizeText(payload.matchingMode, 'manual_review'),
-      sessionMode: normalizeText(payload.sessionMode, 'a2a'),
+      conversationMode: normalizeText(payload.conversationMode, 'a2a'),
       interactionRules: normalizeText(payload.interactionRules, null),
       prohibitedRules: normalizeText(payload.prohibitedRules, null),
       ratingRules: normalizeText(payload.ratingRules, null),
@@ -191,7 +181,10 @@ function normalizeWorldDetail(payload = {}) {
       optionalFields,
       hints: normalizeStringList(payload.hints),
       nextAction: normalizeText(payload.nextAction, 'call_join_world'),
-      sessionOverview: payload.sessionOverview && typeof payload.sessionOverview === 'object' ? payload.sessionOverview : {},
+      conversationOverview:
+        payload.conversationOverview && typeof payload.conversationOverview === 'object'
+          ? payload.conversationOverview
+          : {},
       matchingOverview: payload.matchingOverview && typeof payload.matchingOverview === 'object' ? payload.matchingOverview : {},
       searchSchema: normalizeSearchSchema(payload.searchSchema || {}, {
         worldId: normalizedWorldId,
@@ -204,8 +197,8 @@ function normalizeWorldDetail(payload = {}) {
   const agentSummary = payload.agentSummary && typeof payload.agentSummary === 'object' ? payload.agentSummary : {};
   const joinSchema = payload.joinSchema && typeof payload.joinSchema === 'object' ? payload.joinSchema : {};
   const fieldGuide = payload.fieldGuide && typeof payload.fieldGuide === 'object' ? payload.fieldGuide : {};
-  const sessionOverview = payload.sessionOverview && typeof payload.sessionOverview === 'object'
-    ? payload.sessionOverview
+  const conversationOverview = payload.conversationOverview && typeof payload.conversationOverview === 'object'
+    ? payload.conversationOverview
     : {};
   const matchingOverview = payload.matchingOverview && typeof payload.matchingOverview === 'object'
     ? payload.matchingOverview
@@ -237,7 +230,10 @@ function normalizeWorldDetail(payload = {}) {
     requiredFieldCount: normalizeInteger(joinSchema.requiredFieldCount, requiredFields.length) || requiredFields.length,
     optionalFieldCount: normalizeInteger(joinSchema.optionalFieldCount, optionalFields.length) || optionalFields.length,
     matchingMode: normalizeText(payload.matchingMode || agentSummary.matchingMode || matchingOverview.mode || world.matching?.mode, 'manual_review'),
-    sessionMode: normalizeText(payload.sessionMode || agentSummary.sessionMode || sessionOverview.mode || world.sessionTemplate?.mode, 'a2a'),
+    conversationMode: normalizeText(
+      payload.conversationMode || agentSummary.conversationMode || conversationOverview.mode || world.conversationTemplate?.mode,
+      'a2a',
+    ),
     interactionRules: normalizeText(payload.interactionRules || world.interactionRules, null),
     prohibitedRules: normalizeText(payload.prohibitedRules || world.prohibitedRules, null),
     ratingRules: normalizeText(payload.ratingRules || world.ratingRules, null),
@@ -248,7 +244,7 @@ function normalizeWorldDetail(payload = {}) {
     optionalFields,
     hints: normalizeStringList(payload.hints || joinSchema.hints),
     nextAction: normalizeText(payload.nextAction || joinSchema.nextAction, 'call_join_world'),
-    sessionOverview,
+    conversationOverview,
     matchingOverview,
     searchSchema: normalizeSearchSchema(searchOverview, {
       worldId,
@@ -257,55 +253,6 @@ function normalizeWorldDetail(payload = {}) {
   };
 }
 
-function normalizeJoinCheckField(field = {}, index = 0) {
-  return normalizeField(field, index, { required: true });
-}
-
-function normalizeJoinCheckResponse(payload = {}, { worldId = null, profile = {} } = {}) {
-  const missingFields = Array.isArray(payload.missingFields)
-    ? payload.missingFields.map((field, index) => normalizeJoinCheckField(field, index))
-    : [];
-  const guidance = payload.missingFieldGuidance && typeof payload.missingFieldGuidance === 'object'
-    ? payload.missingFieldGuidance
-    : {};
-  const orderedMissingFields = Array.isArray(guidance.orderedMissingFields)
-    ? guidance.orderedMissingFields.map((field, index) => normalizeJoinCheckField(field, index))
-    : missingFields;
-  const fallbackNextMissingField = orderedMissingFields[0] || missingFields[0] || null;
-  const nextMissingField = payload.nextMissingField
-    ? normalizeJoinCheckField(payload.nextMissingField)
-    : (guidance.nextMissingField ? normalizeJoinCheckField(guidance.nextMissingField) : fallbackNextMissingField);
-  const accepted = payload.accepted === true || orderedMissingFields.length === 0;
-
-  return {
-    worldId: normalizeText(payload.worldId, worldId || 'unknown-world'),
-    accepted,
-    status: normalizeText(payload.status, accepted ? 'eligible' : 'needs_profile'),
-    missingFields,
-    nextMissingField,
-    missingFieldGuidance: {
-      mode: normalizeText(guidance.mode, nextMissingField ? 'ordered_required_fields' : 'complete'),
-      orderedMissingFields,
-      orderedMissingFieldIds: normalizeStringList(
-        Array.isArray(guidance.orderedMissingFieldIds)
-          ? guidance.orderedMissingFieldIds
-          : orderedMissingFields.map((field) => field.fieldId),
-      ),
-      nextMissingField,
-      remainingRequiredFieldCount: normalizeInteger(guidance.remainingRequiredFieldCount, orderedMissingFields.length),
-    },
-    normalizedProfile: normalizeProfile(
-      payload.normalizedProfile && typeof payload.normalizedProfile === 'object'
-        ? payload.normalizedProfile
-        : profile,
-    ),
-    nextAction: normalizeText(
-      payload.nextAction,
-      accepted ? 'call_join_world' : 'retry_join_world_after_profile_update',
-    ),
-  };
-}
-
 function normalizeProfileSummaryField(field = {}, index = 0) {
   const fieldId = normalizeText(field.fieldId || field.id, `field_${index + 1}`);
   const value = Array.isArray(field.value)
@@ -450,31 +397,18 @@ function buildCandidateDeliverySummaryLine(candidateSummary = {}, index = 0) {
   return `${index + 1}. ${candidateSummary.summary}`;
 }
 
-function formatSessionOverview(detail = {}) {
-  const sessionOverview = detail.sessionOverview && typeof detail.sessionOverview === 'object'
-    ? detail.sessionOverview
+function formatConversationOverview(detail = {}) {
+  const conversationOverview = detail.conversationOverview && typeof detail.conversationOverview === 'object'
+    ? detail.conversationOverview
     : {};
-  const mode = normalizeText(detail.sessionMode || sessionOverview.mode, null);
-  const maxTurns = normalizeInteger(sessionOverview.maxTurns, null);
+  const mode = normalizeText(detail.conversationMode || conversationOverview.mode, null);
   const parts = [];
 
   if (mode) parts.push(`${mode} mode`);
-  if (maxTurns != null) parts.push(`max ${maxTurns} turns`);
 
   return parts.length > 0 ? parts.join(', ') : null;
 }
 
-function buildRaiseHandDirective(sessionOverview = {}) {
-  const mode = normalizeText(sessionOverview.raiseHandPolicy?.mode, null);
-  if (mode === 'dual_raise_hand') {
-    return 'When you are ready to conclude, include [[CLAWORLD_RAISE_HAND]] in your reply. The round closes once both agents raise hand.';
-  }
-  if (mode === 'single_raise_hand' || mode === 'either_raise_hand') {
-    return 'When you are ready to conclude, include [[CLAWORLD_RAISE_HAND]] in your reply to close the round.';
-  }
-  return null;
-}
-
 export function buildWorldSessionStartupText(detail = {}) {
   const normalizedDetail = normalizeWorldDetail(detail);
   const worldId = normalizeText(normalizedDetail.worldId, null);
@@ -482,33 +416,29 @@ export function buildWorldSessionStartupText(detail = {}) {
 
   const displayName = normalizeText(normalizedDetail.displayName, worldId);
   const summary = normalizeText(normalizedDetail.summary, null);
-  const sessionSummary = formatSessionOverview(normalizedDetail);
-  const sessionOverview = normalizedDetail.sessionOverview && typeof normalizedDetail.sessionOverview === 'object'
-    ? normalizedDetail.sessionOverview
+  const sessionSummary = formatConversationOverview(normalizedDetail);
+  const conversationOverview = normalizedDetail.conversationOverview && typeof normalizedDetail.conversationOverview === 'object'
+    ? normalizedDetail.conversationOverview
     : {};
-  const raiseHandSummary = normalizeText(sessionOverview.raiseHandPolicy?.summary, null);
-  const openingText = normalizeText(sessionOverview.openingText, null);
-  const convergenceText = normalizeText(sessionOverview.convergence?.text, null);
-  const raiseHandDirective = buildRaiseHandDirective(sessionOverview);
+  const openingText = normalizeText(conversationOverview.openingText, null);
+  const convergenceText = normalizeText(conversationOverview.convergence?.text, null);
   const interactionRules = normalizeText(normalizedDetail.interactionRules, null);
   const prohibitedRules = normalizeText(normalizedDetail.prohibitedRules, null);
   const ratingRules = normalizeText(normalizedDetail.ratingRules, null);
 
   const lines = [
-    'Internal Claworld world context for this session.',
+    'Internal Claworld world context for this conversation.',
     'Do not acknowledge, paraphrase, or announce this setup to the peer unless it is directly relevant to their message.',
     `World: ${displayName} [${worldId}]`,
     summary ? `Summary: ${summary}` : null,
     sessionSummary ? `Session overview: ${sessionSummary}` : null,
-    raiseHandSummary ? `Completion rule: ${raiseHandSummary}` : null,
     'Interruption handling: prefer reconnect/resume. Temporary silence or reconnect churn is not the normal way to close a round.',
     openingText ? `Opening focus: ${openingText}` : null,
     interactionRules ? `Interaction rules: ${interactionRules}` : null,
     prohibitedRules ? `Prohibited rules: ${prohibitedRules}` : null,
     ratingRules ? `Rating rules: ${ratingRules}` : null,
     convergenceText ? `Convergence rule: ${convergenceText}` : null,
-    raiseHandDirective ? `Completion signal: ${raiseHandDirective}` : null,
-    'Apply these world rules symmetrically when responding in this session.',
+    'Apply these world rules symmetrically when responding in this conversation.',
   ].filter(Boolean);
 
   return lines.join('\n');
@@ -584,9 +514,8 @@ function buildSelectionRetryContract(status, selection, items = [], matches = []
 export function buildWorldSelectionPrompt(worldDirectory = {}) {
   const worldLines = Array.isArray(worldDirectory.items)
     ? worldDirectory.items.map((world, index) => (
-      `${index + 1}. ${world.displayName} [${world.worldId}] - ${world.summary}`
-      + ` (category: ${world.category}; required fields: ${world.requiredFieldCount};`
-      + ` matching: ${world.matchingMode}; session: ${world.sessionMode})`
+      `${index + 1}. ${world.displayName} [${world.worldId}]`
+      + ` (required fields: ${world.requiredFieldCount}; hotness: ${normalizeInteger(world.hotness, 0)})`
     ))
     : [];
 
@@ -662,10 +591,10 @@ export function resolveWorldSelection(worldDirectory = {}, selection = null) {
     candidateWorlds: items,
     orchestration: {
       stage: 'post_setup_world_selected',
-      system: 'Confirm the resolved world choice before fetching detail and explaining the required fields.',
+      system: 'Confirm the resolved world choice before fetching detail and collecting participantContextText for join_world.',
       user: `I matched the user choice to ${selectedWorld.displayName} [${selectedWorld.worldId}]. Confirm that this is the world we will use next.`,
       confirmation: `Confirmed world: ${selectedWorld.displayName} [${selectedWorld.worldId}].`,
-      followUp: 'Fetch the selected world detail, explain the required fields, and use join_world once enough profile data is available.',
+      followUp: 'Fetch the selected world detail, explain the participant context requirement, and use join_world once participantContextText is available.',
     },
   };
 }
@@ -684,246 +613,42 @@ function buildFieldStepPrompt(field = {}, index = 0, total = 1) {
 
 export function buildRequiredFieldExplanation(worldDetail = {}) {
   const detail = normalizeWorldDetail(worldDetail);
-  const requiredFields = detail.requiredFields;
-  const optionalFields = detail.optionalFields;
-  const requiredFieldLabels = requiredFields.map((field) => field.label);
-  const optionalFieldLabels = optionalFields.map((field) => field.label);
-  const summary = requiredFields.length > 0
-    ? `To join ${detail.displayName}, I need ${requiredFields.length} required field${requiredFields.length === 1 ? '' : 's'}: ${joinAsNaturalLanguage(requiredFieldLabels)}.`
-    : `${detail.displayName} does not require any mandatory profile fields before join_world.`;
-  const steps = requiredFields.map((field, index) => ({
-    step: index + 1,
-    fieldId: field.fieldId,
-    label: field.label,
-    prompt: buildFieldStepPrompt(field, index, requiredFields.length),
-    description: field.description,
-    examples: field.examples,
-    constraints: field.constraints,
-  }));
-  const optionalContextSummary = optionalFieldLabels.length > 0
-    ? `Optional context you can add later: ${joinAsNaturalLanguage(optionalFieldLabels)}.`
-    : null;
-  const nextInstruction = steps[0]?.prompt || 'All required fields are already explained. You can move to join_world.';
+  const field = detail.requiredFields[0];
+  const summary = `To join ${detail.displayName}, I need one ${field.label} text.`;
+  const steps = [
+    {
+      step: 1,
+      fieldId: field.fieldId,
+      label: field.label,
+      prompt: buildFieldStepPrompt(field, 0, 1),
+      description: field.description,
+      examples: field.examples,
+      constraints: field.constraints,
+    },
+  ];
+  const nextInstruction = steps[0].prompt;
 
   return {
     status: 'ready',
     stage: 'post_setup_world_requirements',
     worldId: detail.worldId,
     displayName: detail.displayName,
-    requiredFieldCount: detail.requiredFieldCount,
-    optionalFieldCount: detail.optionalFieldCount,
+    requiredFieldCount: 1,
+    optionalFieldCount: 0,
     summary,
     steps,
     hints: detail.hints,
-    optionalContextSummary,
     nextAction: detail.nextAction,
     orchestration: {
       stage: 'post_setup_world_requirements',
-      system: 'Confirm the selected world, explain its required fields in plain language, and use join_world once the available profile data is enough for the backend to validate.',
+      system: 'Confirm the selected world, explain the participant context requirement in plain language, and use join_world once that text is available.',
       confirmation: `Confirmed world: ${detail.displayName} [${detail.worldId}].`,
-      user: [summary, nextInstruction, optionalContextSummary].filter(Boolean).join('\n\n'),
-      followUp: requiredFields.length > 1
-        ? `After the user answers ${steps[0].label}, continue with the remaining required fields in order, then call join_world.`
-        : (requiredFields.length === 1
-          ? 'After the user answers the required field, call join_world.'
-          : 'No required fields remain. Call join_world now.'),
+      user: [summary, nextInstruction].filter(Boolean).join('\n\n'),
+      followUp: 'After the user provides participantContextText, call join_world.',
     },
   };
 }
 
-function buildFieldLookup(worldDetail = {}) {
-  const detail = normalizeWorldDetail(worldDetail);
-  return new Map(
-    [...detail.requiredFields, ...detail.optionalFields].map((field) => [field.fieldId, field]),
-  );
-}
-
-function selectPromptFields(joinCheck = {}, worldDetail = {}, maxFieldsPerStep = 1) {
-  if (joinCheck.accepted) return [];
-
-  const fieldLookup = buildFieldLookup(worldDetail);
-  const orderedMissingFields = Array.isArray(joinCheck.missingFieldGuidance?.orderedMissingFields)
-    && joinCheck.missingFieldGuidance.orderedMissingFields.length > 0
-    ? joinCheck.missingFieldGuidance.orderedMissingFields
-    : (Array.isArray(joinCheck.missingFields) ? joinCheck.missingFields : []);
-
-  return orderedMissingFields.slice(0, Math.max(1, maxFieldsPerStep)).map((field, index) => {
-    const detailField = fieldLookup.get(field.fieldId) || {};
-    return normalizeField(
-      {
-        ...detailField,
-        ...field,
-        description: normalizeText(field.description, detailField.description || null),
-        examples: Array.isArray(detailField.examples) ? detailField.examples : field.examples,
-        constraints: detailField.constraints || field.constraints,
-      },
-      index,
-      { required: true },
-    );
-  });
-}
-
-function buildProfileFieldPrompt(field = {}, index = 0, total = 1) {
-  const examples = Array.isArray(field.examples) && field.examples.length > 0
-    ? ` Example: ${field.examples.map((example) => quoteExample(example)).join(' or ')}.`
-    : '';
-  const description = sentenceCase(
-    field.description || `Provide ${field.label} so the world can evaluate the profile`,
-    'Provide this field so the world can evaluate the profile.',
-  );
-  const prefix = total > 1 ? `${index + 1}. ` : '';
-
-  return `${prefix}${field.label}. ${description}${examples}`;
-}
-
-function listProvidedRequiredFieldIds(worldDetail = {}, profile = {}, missingFieldIds = []) {
-  const missingSet = new Set(normalizeStringList(missingFieldIds));
-  return normalizeWorldDetail(worldDetail).requiredFields
-    .filter((field) => !missingSet.has(field.fieldId) && !isEmptyProfileValue(profile[field.fieldId]))
-    .map((field) => field.fieldId);
-}
-
-function buildProfileCollectionFollowUp(promptFields = []) {
-  if (promptFields.length === 0) {
-    return 'The current profile is already eligible. Continue with the next world step without restarting profile collection.';
-  }
-
-  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 retry join_world 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.`;
-}
-
-export function buildWorldProfileCollectionFlow({
-  worldDetail = {},
-  joinCheck = {},
-  profile = {},
-  maxFieldsPerStep = 1,
-} = {}) {
-  const detail = normalizeWorldDetail(worldDetail);
-  const normalizedJoinCheck = normalizeJoinCheckResponse(joinCheck, {
-    worldId: detail.worldId,
-    profile,
-  });
-  const promptLimit = Math.max(1, normalizeInteger(maxFieldsPerStep, 1));
-  const promptFields = selectPromptFields(normalizedJoinCheck, detail, promptLimit);
-  const promptFieldIds = promptFields.map((field) => field.fieldId);
-  const providedRequiredFieldIds = listProvidedRequiredFieldIds(
-    detail,
-    normalizedJoinCheck.normalizedProfile,
-    normalizedJoinCheck.missingFieldGuidance.orderedMissingFieldIds,
-  );
-  const providedRequiredLabels = detail.requiredFields
-    .filter((field) => providedRequiredFieldIds.includes(field.fieldId))
-    .map((field) => field.label);
-  const optionalFieldLabels = detail.optionalFields.map((field) => field.label);
-  const remainingCount = normalizedJoinCheck.missingFieldGuidance.remainingRequiredFieldCount;
-  const summary = normalizedJoinCheck.accepted
-    ? `All required fields for ${detail.displayName} are currently present.`
-    : `${remainingCount} required field${remainingCount === 1 ? '' : 's'} still need to be collected for ${detail.displayName}.`;
-  const savedSummary = providedRequiredLabels.length > 0
-    ? `Already saved required fields: ${joinAsNaturalLanguage(providedRequiredLabels)}.`
-    : 'No required fields are saved yet.';
-  const promptSummary = promptFields.length === 0
-    ? null
-    : (promptFields.length === 1
-      ? 'Ask the user for this required field next:'
-      : `Ask the user for these ${promptFields.length} required fields next, and accept them in one reply if convenient:`);
-  const promptBody = promptFields.length === 0
-    ? null
-    : promptFields.map((field, index) => buildProfileFieldPrompt(field, index, promptFields.length)).join('\n');
-  const optionalContextSummary = optionalFieldLabels.length > 0
-    ? `Optional context the user can add or edit later: ${joinAsNaturalLanguage(optionalFieldLabels)}.`
-    : null;
-  const revalidationMode = normalizedJoinCheck.accepted
-    ? 'complete'
-    : (promptFields.length > 1 ? 'after_current_batch' : 'after_each_reply');
-
-  return {
-    accepted: normalizedJoinCheck.accepted,
-    status: normalizedJoinCheck.status,
-    source: 'product_shell',
-    worldId: detail.worldId,
-    displayName: detail.displayName,
-    profile: normalizedJoinCheck.normalizedProfile,
-    promptFields,
-    promptFieldIds,
-    providedRequiredFieldIds,
-    remainingRequiredFieldCount: remainingCount,
-    nextAction: normalizedJoinCheck.nextAction,
-    revalidationCheckpoint: {
-      mode: revalidationMode,
-      promptFieldIds,
-    },
-    orchestration: {
-      stage: 'post_setup_world_profile_collection',
-      system:
-        'Use the backend join_world unmet-requirement guidance as the source of truth for the next required field prompt. After every user reply or the current batch checkpoint, merge the updates into the saved profile draft and retry join_world.',
-      confirmation: `Confirmed world: ${detail.displayName} [${detail.worldId}].`,
-      user: [summary, savedSummary, promptSummary, promptBody, optionalContextSummary].filter(Boolean).join('\n\n'),
-      followUp: buildProfileCollectionFollowUp(promptFields),
-    },
-  };
-}
-
-export function buildWorldJoinOutcomeOrchestration({ worldDetail = {}, joinResult = {} } = {}) {
-  const detail = normalizeWorldDetail(worldDetail);
-  const membershipStatus = normalizeText(
-    joinResult.membershipStatus || joinResult.membership?.status,
-    'unknown',
-  );
-  const joinSummary = joinResult.nextStageSummary?.summary
-    ? sentenceCase(joinResult.nextStageSummary.summary, '')
-    : null;
-
-  return {
-    stage: 'world_join_result',
-    status: membershipStatus,
-    system:
-      'The backend already resolved the world join result. Reflect the authoritative membership outcome before any candidate-feed review, request_chat, or live-session follow-up.',
-    confirmation: `World membership in ${detail.displayName} [${detail.worldId}] is ${membershipStatus}.`,
-    user: membershipStatus === 'active'
-      ? ['Joined ' + detail.displayName + ' successfully. World membership is active.', joinSummary].filter(Boolean).join(' ')
-      : `The join result for ${detail.displayName} is ${membershipStatus}.`,
-    followUp: membershipStatus === 'active'
-      ? 'Use the backend-authored candidate-feed and candidate-delivery payloads for the next world step, and keep request_chat as the canonical conversation-start action.'
-      : 'Do not continue to world-member-only follow-up until membership becomes active.',
-  };
-}
-
-export function buildResolvedWorldSelectionOrchestration({
-  selection = null,
-  profileCollectionFlow = null,
-} = {}) {
-  const selectionOrchestration = selection?.orchestration && typeof selection.orchestration === 'object' && !Array.isArray(selection.orchestration)
-    ? selection.orchestration
-    : null;
-  const profileOrchestration = profileCollectionFlow?.orchestration && typeof profileCollectionFlow.orchestration === 'object' && !Array.isArray(profileCollectionFlow.orchestration)
-    ? profileCollectionFlow.orchestration
-    : null;
-
-  if (!profileOrchestration) return selectionOrchestration;
-
-  return {
-    stage: normalizeText(profileOrchestration.stage, normalizeText(selectionOrchestration?.stage, null)),
-    system: normalizeText(profileOrchestration.system, normalizeText(selectionOrchestration?.system, null)),
-    confirmation: normalizeText(
-      profileOrchestration.confirmation,
-      normalizeText(selectionOrchestration?.confirmation, null),
-    ),
-    user: [
-      normalizeText(profileOrchestration.confirmation, null),
-      normalizeText(profileOrchestration.user, null),
-    ].filter(Boolean).join('\n\n'),
-    followUp: normalizeText(
-      profileOrchestration.followUp,
-      normalizeText(selectionOrchestration?.followUp, null),
-    ),
-  };
-}
-
 export function buildCandidateDeliverySummary(candidateFeed = {}, { worldDetail = null, limit = null } = {}) {
   const detail = worldDetail ? normalizeWorldDetail(worldDetail) : null;
   const normalizedFeed = normalizeCandidateFeedResponse(candidateFeed, {

package/src/product-shell/feedback/feedback-routes.js

@@ -53,8 +53,9 @@ export function registerFeedbackRoutes(app, { store, feedbackService }) {
         details: req.body?.details,
         reproductionSteps: req.body?.reproductionSteps,
         worldId: req.body?.worldId,
-        sessionId: req.body?.sessionId,
-        roundId: req.body?.roundId,
+        conversationKey: req.body?.conversationKey,
+        turnId: req.body?.turnId,
+        deliveryId: req.body?.deliveryId,
         targetAgentId: req.body?.targetAgentId,
         targetAgentCode: req.body?.targetAgentCode,
         tags: req.body?.tags,
@@ -77,7 +78,7 @@ export function registerFeedbackRoutes(app, { store, feedbackService }) {
         accountId: req.query.accountId,
         reporterAgentId: req.query.reporterAgentId,
         worldId: req.query.worldId,
-        sessionId: req.query.sessionId,
+        conversationKey: req.query.conversationKey,
         source: req.query.source,
         page: req.query.page,
         limit: req.query.limit,

package/src/product-shell/feedback/feedback-service.js

@@ -122,8 +122,9 @@ function projectFeedback(feedback = {}) {
     context: feedback.context && typeof feedback.context === 'object'
       ? {
           worldId: feedback.context.worldId || null,
-          sessionId: feedback.context.sessionId || null,
-          roundId: feedback.context.roundId || null,
+          conversationKey: feedback.context.conversationKey || null,
+          turnId: feedback.context.turnId || null,
+          deliveryId: feedback.context.deliveryId || null,
           targetAgentId: feedback.context.targetAgentId || null,
           targetAgentCode: feedback.context.targetAgentCode || null,
           tags: Array.isArray(feedback.context.tags) ? feedback.context.tags : [],
@@ -133,8 +134,9 @@ function projectFeedback(feedback = {}) {
         }
       : {
           worldId: null,
-          sessionId: null,
-          roundId: null,
+          conversationKey: null,
+          turnId: null,
+          deliveryId: null,
           targetAgentId: null,
           targetAgentCode: null,
           tags: [],
@@ -181,8 +183,9 @@ export function createFeedbackService({ store } = {}) {
         },
         context: {
           worldId: normalizeText(input.worldId, normalizeText(context.worldId, null)),
-          sessionId: normalizeText(input.sessionId, normalizeText(context.sessionId, null)),
-          roundId: normalizeText(input.roundId, normalizeText(context.roundId, null)),
+          conversationKey: normalizeText(input.conversationKey, normalizeText(context.conversationKey, null)),
+          turnId: normalizeText(input.turnId, normalizeText(context.turnId, null)),
+          deliveryId: normalizeText(input.deliveryId, normalizeText(context.deliveryId, null)),
           targetAgentId: normalizeText(input.targetAgentId, normalizeText(context.targetAgentId, null)),
           targetAgentCode: normalizeText(input.targetAgentCode, normalizeText(context.targetAgentCode, null)),
           tags: normalizeStringList(input.tags || context.tags),
@@ -223,7 +226,7 @@ export function createFeedbackService({ store } = {}) {
         accountId: normalizeText(filters.accountId, null),
         reporterAgentId: normalizeText(filters.reporterAgentId, null),
         worldId: normalizeText(filters.worldId, null),
-        sessionId: normalizeText(filters.sessionId, null),
+        conversationKey: normalizeText(filters.conversationKey, null),
         source: normalizeText(filters.source, null),
         page,
         limit,
@@ -245,7 +248,7 @@ export function createFeedbackService({ store } = {}) {
           accountId: normalizeText(filters.accountId, null),
           reporterAgentId: normalizeText(filters.reporterAgentId, null),
           worldId: normalizeText(filters.worldId, null),
-          sessionId: normalizeText(filters.sessionId, null),
+          conversationKey: normalizeText(filters.conversationKey, null),
           source: normalizeText(filters.source, null),
         },
       };

package/src/product-shell/index.js

@@ -10,7 +10,7 @@ import { createMembershipService } from './membership/membership-service.js';
 import { createMatchmakingService } from './matching/matchmaking-service.js';
 import { createWorldSearchService } from './search/search-service.js';
 import { createResultService } from './results/result-service.js';
-import { createSessionOrchestrator } from './orchestration/session-orchestrator.js';
+import { createWorldConversationOrchestrator } from './orchestration/world-conversation-orchestrator.js';
 import { createSocialService } from './social/social-service.js';
 import { registerSocialRoutes } from './social/social-routes.js';
 import { createFriendService } from './social/friend-service.js';
@@ -60,7 +60,7 @@ export function createClaworldProductShell({
       return socialLookupService.lookupAgentByCode(input);
     },
   };
-  const sessionOrchestrator = createSessionOrchestrator({
+  const worldConversationOrchestrator = createWorldConversationOrchestrator({
     worldService,
     resultService,
   });
@@ -79,7 +79,7 @@ export function createClaworldProductShell({
       moderation: worldAdminService,
       feedback: feedbackService,
       results: resultService,
-      orchestration: sessionOrchestrator,
+      orchestration: worldConversationOrchestrator,
     },
     registerRoutes(app) {
       registerOnboardingRoutes(app, { onboardingService, store });
@@ -94,7 +94,7 @@ export function createClaworldProductShell({
         searchService,
         worldBroadcastService,
         worldAdminService,
-        sessionOrchestrator,
+        worldConversationOrchestrator,
       });
       registerSocialRoutes(app, { socialService: socialLookupService });
       registerFeedbackRoutes(app, { store, feedbackService });
@@ -138,11 +138,10 @@ export function createClaworldProductShell({
           'POST /v1/worlds/:worldId/search',
           'POST /v1/worlds/:worldId/broadcast',
           'GET /v1/worlds/:worldId/candidates',
-          'POST /v1/worlds/:worldId/join-check',
           'POST /v1/worlds/:worldId/join',
           'GET /v1/worlds/:worldId/memberships',
           'POST /v1/worlds/:worldId/memberships',
-          'POST /v1/worlds/:worldId/session-preview',
+          'POST /v1/worlds/:worldId/conversation-preview',
           'GET /v1/social/agents/lookup',
           'POST /v1/feedback',
           'GET /v1/moderation/worlds',