@xfxstudio/claworld 0.1.5 → 0.2.1

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

@@ -35,18 +35,13 @@ import {
   buildWorldSelectionPrompt,
   buildCandidateDeliverySummary,
   buildPostSetupWorldDirectory,
-  buildRequiredFieldExplanation,
   broadcastWorld,
   fetchWorldSearch,
   fetchWorldCandidateFeed,
-  fetchWorldJoinCheck,
   fetchWorldDetail,
   joinWorld,
-  submitWorldJoin,
   submitWorldSearch,
-  resolveWorldJoinFlow,
   resolveWorldSelection,
-  resolveWorldProfileCollectionFlow,
   resolveWorldSelectionFlow,
 } from '../runtime/product-shell-helper.js';
 import { getClaworldRuntime } from './runtime.js';
@@ -55,11 +50,6 @@ import {
   normalizeRuntimeBoundaryError,
   serializeRuntimeBoundaryError,
 } from '../../lib/runtime-errors.js';
-import {
-  ACCEPTED_CHAT_KICKOFF_PAYLOAD_KIND,
-  readAcceptedChatKickoffRuntimeContext,
-  resolveAcceptedChatKickoffViewer,
-} from '../../lib/accepted-chat-kickoff.js';
 
 function normalizeRelayHttpBaseUrl(serverUrl) {
   const parsed = new URL(serverUrl);
@@ -212,13 +202,10 @@ function normalizeClaworldInteger(value, fallback = null) {
   return Math.trunc(normalized);
 }
 
-function shouldAuthorizeBridgedCommand({ runtimeConfig = {}, relayEvent, incomingText }) {
+function shouldAuthorizeBridgedCommand({ runtimeConfig = {}, incomingText }) {
   if (runtimeConfig.testing?.allowBridgedCommandDispatch !== true) {
     return false;
   }
-  if (relayEvent !== 'turn.deliver') {
-    return false;
-  }
   return typeof incomingText === 'string' && incomingText.trim().startsWith('/');
 }
 
@@ -227,6 +214,7 @@ const CLAWORLD_RELAY_OPERATIONAL_NOTICE_PATTERNS = [
   /^🧹\s*Auto-compaction complete(?:\s*\(count \d+\))?\.$/i,
   /^↪️\s*Model Fallback:/i,
   /^↪️\s*Model Fallback cleared:/i,
+  /^⚠️\s*Agent failed before reply:/i,
 ];
 
 const CLAWORLD_RELAY_OPERATIONAL_SUFFIX_PATTERNS = [
@@ -352,52 +340,6 @@ function resolveContinuationState(turnData = {}) {
   };
 }
 
-function resolveBackendGuidanceMessages(payload = {}) {
-  const guidance = payload?.guidance;
-  if (!guidance || typeof guidance !== 'object' || Array.isArray(guidance)) return [];
-  const messages = Array.isArray(guidance.messages) ? guidance.messages : [];
-  return messages
-    .map((message, index) => {
-      const text = normalizeClaworldText(message?.text, null);
-      if (!text) return null;
-      return {
-        text,
-        contextKey:
-          normalizeClaworldText(message?.contextKey, null)
-          || `claworld:backend-guidance:${normalizeClaworldText(message?.kind, 'message')}:${index}`,
-      };
-    })
-    .filter(Boolean);
-}
-
-function enqueueBackendGuidance({
-  runtime,
-  sessionKey,
-  payload,
-} = {}) {
-  if (!runtime?.system?.enqueueSystemEvent || !sessionKey) {
-    return { skipped: true, reason: 'missing_runtime_or_session', count: 0 };
-  }
-
-  const messages = resolveBackendGuidanceMessages(payload);
-  if (messages.length === 0) {
-    return { skipped: true, reason: 'no_backend_guidance', count: 0 };
-  }
-
-  for (const message of messages) {
-    runtime.system.enqueueSystemEvent(message.text, {
-      sessionKey,
-      contextKey: message.contextKey,
-    });
-  }
-
-  return {
-    skipped: false,
-    reason: null,
-    count: messages.length,
-  };
-}
-
 function buildClaworldDirectoryEntries(config = {}, accountId = null) {
   const accountIds = listClaworldAccountIds(config);
   const currentAccountId = String(accountId || '').trim();
@@ -465,7 +407,7 @@ async function deliverRelayMessage({ runtimeConfig, to, text, fetchImpl, logger,
       conversation: {
         conversationKey: outboundContext.conversationKey || outboundContext.metadata?.conversationKey || null,
         worldId: outboundContext.worldId || outboundContext.metadata?.worldId || null,
-        scope: outboundContext.scope || outboundContext.sessionScope || outboundContext.metadata?.scope || null,
+        scope: outboundContext.scope || outboundContext.metadata?.scope || null,
         conversationId: outboundContext.conversationId || outboundContext.metadata?.conversationId || null,
         threadId: outboundContext.threadId || outboundContext.metadata?.threadId || null,
         sessionKey: outboundContext.sessionKey || outboundContext.SessionKey || null,
@@ -474,7 +416,7 @@ async function deliverRelayMessage({ runtimeConfig, to, text, fetchImpl, logger,
   });
 
   if (!result.ok) {
-    logger.error?.('[claworld:outbound] session request failed', { status: result.status, body: result.body });
+    logger.error?.('[claworld:outbound] message delivery failed', { status: result.status, body: result.body });
     throw createRuntimeBoundaryError({
       code: 'relay_message_delivery_failed',
       category: 'transport',
@@ -497,7 +439,7 @@ async function deliverRelayMessage({ runtimeConfig, to, text, fetchImpl, logger,
     chatId: toAddress,
     timestamp: Date.now(),
     meta: {
-      sessionId: result.body?.session?.sessionId || null,
+      sessionKey: result.body?.delivery?.sessionKey || outboundContext.sessionKey || outboundContext.SessionKey || null,
       turnId: result.body?.turn?.turnId || null,
       conversationKey: result.body?.conversationKey || null,
       toAddress,
@@ -669,7 +611,6 @@ async function createChatRequest({
   targetAgentId,
   openingMessage = null,
   worldId = null,
-  episodePolicy = null,
   fetchImpl,
 }) {
   const normalizedTargetAgentId = normalizeClaworldText(targetAgentId, null);
@@ -697,9 +638,6 @@ async function createChatRequest({
       targetAgentId: normalizedTargetAgentId,
       openingMessage: normalizeClaworldText(openingMessage, null),
       ...(normalizeClaworldText(worldId, null) ? { worldId: normalizeClaworldText(worldId, null) } : {}),
-      ...(episodePolicy && typeof episodePolicy === 'object' && !Array.isArray(episodePolicy)
-        ? { episodePolicy }
-        : {}),
     }),
   });
   if (!result.ok) {
@@ -1283,187 +1221,22 @@ async function ensureRelayBinding({ runtimeConfig, fetchImpl, logger }) {
   });
 }
 
-function resolveSessionCreatedWorldId(event = {}) {
-  const session = event?.raw?.data && typeof event.raw.data === 'object' ? event.raw.data : {};
-  const metadata = session.metadata && typeof session.metadata === 'object' ? session.metadata : {};
-  const candidateWorldId = [
-    metadata.worldId,
-    metadata.worldContext?.worldId,
-    session.worldContext?.worldId,
-    session.worldId,
-    session.session?.metadata?.worldId,
-    session.session?.metadata?.worldContext?.worldId,
-    session.session?.worldContext?.worldId,
-    session.session?.worldId,
-    event?.inboundEnvelope?.metadata?.worldId,
-    event?.inboundEnvelope?.metadata?.worldContext?.worldId,
-    event?.inboundEnvelope?.metadata?.session?.worldId,
-    event?.inboundEnvelope?.metadata?.session?.metadata?.worldId,
-    event?.inboundEnvelope?.metadata?.session?.metadata?.worldContext?.worldId,
-  ].map((value) => resolveNormalizedText(value, null)).find(Boolean);
-  return candidateWorldId || null;
-}
-
-function resolveTurnWorldId(event = {}) {
-  const turnData = event?.raw?.data && typeof event.raw.data === 'object' ? event.raw.data : {};
-  const metadata = turnData.metadata && typeof turnData.metadata === 'object' ? turnData.metadata : {};
-  const candidateWorldId = [
-    metadata.worldId,
-    metadata.worldContext?.worldId,
-    turnData.worldContext?.worldId,
-    turnData.worldId,
-    turnData.session?.metadata?.worldId,
-    turnData.session?.metadata?.worldContext?.worldId,
-    turnData.session?.worldContext?.worldId,
-    turnData.session?.worldId,
-    event?.inboundEnvelope?.metadata?.worldId,
-    event?.inboundEnvelope?.metadata?.worldContext?.worldId,
-    event?.inboundEnvelope?.metadata?.session?.worldId,
-    event?.inboundEnvelope?.metadata?.session?.metadata?.worldId,
-    event?.inboundEnvelope?.metadata?.session?.metadata?.worldContext?.worldId,
-  ].map((value) => resolveNormalizedText(value, null)).find(Boolean);
-  return candidateWorldId || null;
-}
-
-function resolveAcceptedChatKickoffBundle(event = {}) {
-  const turnData = event?.raw?.data && typeof event.raw.data === 'object' ? event.raw.data : {};
-  if (turnData.acceptedChatKickoff && typeof turnData.acceptedChatKickoff === 'object' && !Array.isArray(turnData.acceptedChatKickoff)) {
-    return turnData.acceptedChatKickoff;
-  }
-  const payload = turnData.payload && typeof turnData.payload === 'object' && !Array.isArray(turnData.payload)
-    ? turnData.payload
+function resolveDeliveryWorldId(delivery = {}) {
+  const metadata = delivery?.metadata && typeof delivery.metadata === 'object' && !Array.isArray(delivery.metadata)
+    ? delivery.metadata
     : {};
-  if (payload.kickoffBundle && typeof payload.kickoffBundle === 'object' && !Array.isArray(payload.kickoffBundle)) {
-    return payload.kickoffBundle;
-  }
-  return null;
+  return resolveNormalizedText(metadata.worldId, null) || null;
 }
 
-function resolveAcceptedChatKickoffRuntimeContext(event = {}, { bundle = null, localAgentId = null, fallback = 'recipient' } = {}) {
-  const turnData = event?.raw?.data && typeof event.raw.data === 'object' ? event.raw.data : {};
-  if (
-    turnData.acceptedChatKickoffRuntimeContext
-    && typeof turnData.acceptedChatKickoffRuntimeContext === 'object'
-    && !Array.isArray(turnData.acceptedChatKickoffRuntimeContext)
-  ) {
-    return turnData.acceptedChatKickoffRuntimeContext;
-  }
-  const payload = turnData.payload && typeof turnData.payload === 'object' && !Array.isArray(turnData.payload)
-    ? turnData.payload
-    : {};
-  if (
-    payload.acceptedChatKickoffRuntimeContext
-    && typeof payload.acceptedChatKickoffRuntimeContext === 'object'
-    && !Array.isArray(payload.acceptedChatKickoffRuntimeContext)
-  ) {
-    return payload.acceptedChatKickoffRuntimeContext;
-  }
-  if (!bundle) return null;
-  return readAcceptedChatKickoffRuntimeContext(bundle, {
-    viewer: resolveAcceptedChatKickoffViewer(bundle, {
-      localAgentId,
-      fallback,
-    }),
-  });
-}
-
-function buildWorldAwareSessionKey(sessionKey, worldId = null) {
-  if (!worldId) return sessionKey;
-  return `${sessionKey}:world:${worldId}`;
-}
-
-function buildSessionWorldCacheKey(runtimeAccountId, sessionId) {
-  const accountId = resolveNormalizedText(runtimeAccountId, 'default');
-  if (!sessionId || !accountId) return null;
-  return `${accountId}:${sessionId}`;
-}
-
-function resolveSessionCreatedPeerAgentId(session = {}, localRelayAgentId = null) {
-  const agentAId = normalizeClaworldText(session.agentAId, null);
-  const agentBId = normalizeClaworldText(session.agentBId, null);
-  const localAgentId = normalizeClaworldText(localRelayAgentId, null);
-
-  if (localAgentId && agentAId === localAgentId) return agentBId;
-  if (localAgentId && agentBId === localAgentId) return agentAId;
-  return agentAId || agentBId || null;
-}
-
-async function maybeInjectWorldSessionStartupContext({
-  runtime,
-  cfg,
-  runtimeConfig,
-  runtimeAccountId,
-  event,
-  logger,
-  sessionIdToWorldId,
-} = {}) {
-  const worldCache = sessionIdToWorldId || null;
-  if (!runtime?.system?.enqueueSystemEvent || !runtime?.channel?.routing?.resolveAgentRoute) {
-    return { skipped: true, reason: 'missing_runtime_system_or_routing' };
-  }
-
-  const session = event?.raw?.data && typeof event.raw.data === 'object' ? event.raw.data : {};
-  const worldId = resolveSessionCreatedWorldId(event);
-  if (!worldId) {
-    return { skipped: true, reason: 'not_world_scoped' };
-  }
-  const sessionLookupKey = buildSessionWorldCacheKey(runtimeAccountId, session.sessionId);
-  if (sessionLookupKey && worldCache) {
-    worldCache.set(sessionLookupKey, worldId);
-  }
-
-  const peerAgentId = resolveSessionCreatedPeerAgentId(session, runtimeConfig?.relay?.agentId || null);
-  if (!peerAgentId) {
-    return { skipped: true, reason: 'peer_agent_unresolved' };
-  }
-
-  const currentCfg = cfg || await runtime.config?.loadConfig?.() || {};
-  const routePeerId = resolveRelayAddress(peerAgentId, runtimeConfig);
-  const route = runtime.channel.routing.resolveAgentRoute({
-    cfg: currentCfg,
-    channel: 'claworld',
-    accountId: runtimeConfig.accountId,
-    peer: { kind: 'direct', id: routePeerId || peerAgentId },
-  }) || {};
-  const sessionKey = route.sessionKey || `agent:${route.agentId || runtimeConfig.accountId}:main`;
-  const worldSessionKey = buildWorldAwareSessionKey(sessionKey, worldId);
-  const enqueueResult = enqueueBackendGuidance({
-    runtime,
-    sessionKey: worldSessionKey,
-    payload: session,
-  });
-  if (enqueueResult.skipped) {
-    return { skipped: true, reason: enqueueResult.reason, worldId, sessionKey: worldSessionKey };
-  }
-
-  logger.info?.(`[claworld:${runtimeAccountId}] injected backend-authored world startup guidance`, {
-    worldId,
-    sessionId: session.sessionId || null,
-    sessionKey: worldSessionKey,
-    routePeerId: routePeerId || peerAgentId,
-    guidanceCount: enqueueResult.count,
-  });
-
-  return {
-    skipped: false,
-    ok: true,
-    worldId,
-    sessionKey: worldSessionKey,
-  };
-}
-
-function buildRelayInboundEnvelope({
+function buildDeliveryInboundEnvelope({
   runtime,
   currentCfg,
-  runtimeAccountId,
   remoteIdentity,
   incomingText,
   contextText = null,
   commandText = null,
-  sessionId,
-  turnId,
-  relayEvent,
-  mode = 'direct',
+  deliveryId,
+  sessionKey,
   worldId = null,
   conversationKey = null,
 }) {
@@ -1477,12 +1250,10 @@ function buildRelayInboundEnvelope({
   const remoteLabel = String(remoteIdentity || 'unknown-peer').trim() || 'unknown-peer';
   const systemLines = [
     `[claworld peer ${remoteLabel}]`,
-    `[claworld mode ${mode}]`,
     ...(worldId ? [`[claworld world ${worldId}]`] : []),
     ...(conversationKey ? [`[claworld conversation ${conversationKey}]`] : []),
-    `[claworld session ${sessionId}]`,
-    `[claworld turn ${turnId}]`,
-    `[relay event ${relayEvent}]`,
+    `[claworld session ${sessionKey}]`,
+    `[claworld delivery ${deliveryId}]`,
   ];
   const rawBody = `${bodyText}\n\n${systemLines.join('\n')}`;
   const normalizedCommandText = String(commandText || '').trim();
@@ -1511,24 +1282,22 @@ function buildRelayInboundEnvelope({
   };
 }
 
-function createRelayReplyDispatcher({
+function createDeliveryReplyDispatcher({
   runtime,
   currentCfg,
-  route,
   relayClient,
-  sessionId,
-  turnId,
-  relayEvent,
-  localRelayAgentId,
-  allowRelayContinuation = true,
+  deliveryId,
+  sessionKey,
+  localAgentId = null,
+  allowReply = true,
   logger,
   runtimeAccountId,
 }) {
   const prefixContext = runtime?.channel?.reply?.createReplyPrefixContext
-    ? runtime.channel.reply.createReplyPrefixContext({ cfg: currentCfg, agentId: route.agentId })
+    ? runtime.channel.reply.createReplyPrefixContext({ cfg: currentCfg, agentId: localAgentId || runtimeAccountId })
     : { responsePrefix: '', responsePrefixContextProvider: () => ({}) };
   const humanDelay = runtime?.channel?.reply?.resolveHumanDelayConfig
-    ? runtime.channel.reply.resolveHumanDelayConfig(currentCfg, route.agentId)
+    ? runtime.channel.reply.resolveHumanDelayConfig(currentCfg, localAgentId || runtimeAccountId)
     : undefined;
 
   let replied = false;
@@ -1610,33 +1379,16 @@ function createRelayReplyDispatcher({
   const flushReply = async (text) => {
     const normalized = String(text || '').trim();
     if (!normalized || replied || suppressed) return false;
-    if (allowRelayContinuation === false) {
+    if (allowReply === false) {
       suppressed = true;
       return false;
     }
-    if (relayEvent === 'turn.reply') {
-      if (!localRelayAgentId) {
-        throw new Error('missing local relay agent id for relay continuation');
-      }
-      const result = await relayClient.createTurn({
-        sessionId,
-        fromAgentId: localRelayAgentId,
-        payload: {
-          text: normalized,
-          source: 'openclaw-autochain',
-        },
-      });
-      if (result.status !== 201) {
-        throw new Error(`failed to create follow-up relay turn: ${result.status}`);
-      }
-    } else {
-      relayClient.sendTurnReply({
-        sessionId,
-        messageId: turnId,
-        replyText: normalized,
-        source: 'openclaw-autochain',
-      });
-    }
+    relayClient.sendReply({
+      deliveryId,
+      sessionKey,
+      replyText: normalized,
+      source: 'openclaw-autochain',
+    });
     replied = true;
     return true;
   };
@@ -1659,9 +1411,9 @@ function createRelayReplyDispatcher({
       }
     },
     onError: (error, info) => {
-      logger.error?.(`[claworld:${runtimeAccountId}] turn bridge dispatch error`, {
-        sessionId,
-        turnId,
+      logger.error?.(`[claworld:${runtimeAccountId}] delivery bridge dispatch error`, {
+        deliveryId,
+        sessionKey,
         kind: info?.kind || null,
         error: error?.message || String(error),
       });
@@ -1681,9 +1433,8 @@ function createRelayReplyDispatcher({
       runtimeOutputSummary.relayContinuationPreview = continuation.text
         ? previewRuntimeOutputText(continuation.text)
         : null;
-      const continuationText = continuation.text;
-      if (continuationText) {
-        await flushReply(continuationText);
+      if (continuation.text) {
+        await flushReply(continuation.text);
       }
     }
     await dispatchApi.markDispatchIdle?.();
@@ -1737,7 +1488,7 @@ function createRelayReplyDispatcher({
   };
 }
 
-async function maybeBridgeDeliveredTurn({
+async function maybeBridgeRuntimeDelivery({
   relayClient,
   runtimeConfig,
   runtimeAccountId,
@@ -1746,175 +1497,119 @@ async function maybeBridgeDeliveredTurn({
   runtime,
   cfg,
   inbound,
-  sessionIdToWorldId,
 }) {
-  const worldCache = sessionIdToWorldId || null;
-  const relayEvent = event?.relayEvent || 'turn.deliver';
-  const turnData = event?.raw?.data || {};
-  const sessionId = turnData.sessionId || event?.inboundEnvelope?.session_id || null;
-  const turnId = turnData.turnId || event?.inboundEnvelope?.event_id || null;
-  const kickoffBundle = resolveAcceptedChatKickoffBundle(event);
-  const payload = turnData.payload && typeof turnData.payload === 'object' && !Array.isArray(turnData.payload)
-    ? turnData.payload
+  const delivery = event?.delivery && typeof event.delivery === 'object' && !Array.isArray(event.delivery)
+    ? event.delivery
     : {};
-  const localRelayAgentId = runtimeConfig.relay?.agentId || relayClient?.boundAgentId || null;
-  const kickoffRuntimeContext = resolveAcceptedChatKickoffRuntimeContext(event, {
-    bundle: kickoffBundle,
-    localAgentId: localRelayAgentId,
-    fallback: relayEvent === 'turn.deliver' ? 'sender' : 'recipient',
-  });
-  const incomingText = turnData.payload?.text
-    || event?.inboundEnvelope?.payload?.text
-    || (
-      payload.kind === ACCEPTED_CHAT_KICKOFF_PAYLOAD_KIND
-        ? kickoffRuntimeContext?.text || ''
-        : ''
-    );
-  const fromAgentId = turnData.fromAgentId || event?.inboundEnvelope?.from_agent_id || null;
-  const conversationKey = turnData.conversationKey || null;
-  const bridgedCommandText = payload.kind === ACCEPTED_CHAT_KICKOFF_PAYLOAD_KIND
-    ? kickoffRuntimeContext?.briefText || kickoffBundle?.request?.brief?.text || incomingText
-    : incomingText;
-  const kickoffContextText = relayEvent === 'turn.reply'
-    && kickoffBundle?.kickoffTurnId
-    && kickoffBundle.kickoffTurnId === turnId
-    ? kickoffRuntimeContext?.text || null
-    : null;
-  const senderId = fromAgentId || 'unknown-peer';
+  const metadata = delivery.metadata && typeof delivery.metadata === 'object' && !Array.isArray(delivery.metadata)
+    ? delivery.metadata
+    : {};
+  const payload = delivery.payload && typeof delivery.payload === 'object' && !Array.isArray(delivery.payload)
+    ? delivery.payload
+    : {};
+  const deliveryId = resolveNormalizedText(delivery.deliveryId, null);
+  const sessionKey = resolveNormalizedText(delivery.sessionKey, null);
+  const incomingText = resolveNormalizedText(payload.text, null);
+  const contextText = null;
+  const fromAgentId = resolveNormalizedText(metadata.fromAgentId, null);
+  const remoteAddress = resolveNormalizedText(metadata.fromAddress, null)
+    || resolveRelayAddress(fromAgentId || '', runtimeConfig)
+    || fromAgentId
+    || 'unknown-peer';
+  const remoteRouteIdentity = resolveRelayAddress(fromAgentId || '', runtimeConfig)
+    || remoteAddress;
+
   if (
-    !runtime?.channel?.routing?.resolveAgentRoute
-    || !runtime?.channel?.reply?.finalizeInboundContext
+    !runtime?.channel?.reply?.finalizeInboundContext
     || !runtime?.channel?.reply?.dispatchReplyFromConfig
     || !runtime?.channel?.reply?.createReplyDispatcherWithTyping
   ) {
-    logger.warn?.(`[claworld:${runtimeAccountId}] skipping relay bridge: missing runtime bridge hooks`, {
-      relayEvent,
-      sessionId,
-      turnId,
+    logger.warn?.(`[claworld:${runtimeAccountId}] skipping delivery bridge: missing runtime bridge hooks`, {
+      deliveryId,
+      sessionKey,
     });
     return { skipped: true, reason: 'missing_runtime_bridge_hooks' };
   }
-  if (!sessionId || !turnId || !incomingText) {
-    logger.warn?.(`[claworld:${runtimeAccountId}] skipping relay bridge: missing turn payload`, {
-      relayEvent,
-      sessionId,
-      turnId,
+  if (!deliveryId || !sessionKey || !incomingText) {
+    logger.warn?.(`[claworld:${runtimeAccountId}] skipping delivery bridge: missing delivery payload`, {
+      deliveryId,
+      sessionKey,
       hasIncomingText: Boolean(incomingText),
     });
-    return { skipped: true, reason: 'missing_turn_payload' };
+    return { skipped: true, reason: 'missing_delivery_payload' };
   }
 
   const currentCfg = cfg || await runtime.config?.loadConfig?.() || {};
-  const localAddress = resolveRelayAddress(runtimeConfig.accountId || '', runtimeConfig);
-  const remoteAddress = resolveRelayAddress(senderId, runtimeConfig);
-  const routePeerId = remoteAddress || senderId;
-  const worldId = resolveTurnWorldId(event);
-  const sessionLookupKey = buildSessionWorldCacheKey(runtimeAccountId, sessionId);
-  const resolvedWorldId = worldId || (sessionLookupKey ? worldCache?.get(sessionLookupKey) : null);
-  if (sessionLookupKey && resolvedWorldId && worldCache) {
-    worldCache.set(sessionLookupKey, resolvedWorldId);
-  }
-  // Gateway reply dispatch stays on the dedicated `claworld` channel surface.
-  // Accept may have been reviewed from another main-agent channel, but live
-  // continuation/generation cannot hop across channels mid-session.
-  const route = runtime.channel.routing.resolveAgentRoute({
-    cfg: currentCfg,
-    channel: 'claworld',
-    accountId: runtimeConfig.accountId,
-    peer: { kind: 'direct', id: routePeerId },
-  }) || {};
-  const routed = inbound?.routeInboundEvent?.(event?.inboundEnvelope || {}, {
+  const routed = inbound?.routeInboundEvent?.(delivery, {
     sessionTarget: runtimeConfig.routing?.sessionTarget,
     fallbackTarget: runtimeConfig.routing?.fallbackTarget,
-    route,
   }) || null;
-
-  const sessionKey = route.sessionKey || `agent:${route.agentId || runtimeConfig.accountId}:main`;
-  const worldSessionKey = buildWorldAwareSessionKey(sessionKey, resolvedWorldId);
+  const worldId = resolveDeliveryWorldId(delivery);
   const commandAuthorized = shouldAuthorizeBridgedCommand({
     runtimeConfig,
-    relayEvent,
-    incomingText: bridgedCommandText,
+    incomingText,
   });
-  const { Body, RawBody, CommandBody, ContextLines } = buildRelayInboundEnvelope({
+  const { Body, RawBody, CommandBody, ContextLines } = buildDeliveryInboundEnvelope({
     runtime,
     currentCfg,
-    runtimeAccountId,
-    remoteIdentity: routePeerId,
+    remoteIdentity: remoteAddress,
     incomingText,
-    contextText: kickoffContextText,
-    commandText: bridgedCommandText,
-    sessionId,
-    turnId,
-    relayEvent,
-    mode: resolvedWorldId ? 'world' : 'direct',
-    worldId: resolvedWorldId,
-    conversationKey,
+    contextText,
+    commandText: incomingText,
+    deliveryId,
+    sessionKey,
+    worldId,
+    conversationKey: metadata.conversationKey || null,
   });
+  const localAddress = resolveRelayAddress(runtimeConfig.accountId || '', runtimeConfig);
   const inboundCtx = runtime.channel.reply.finalizeInboundContext({
     Body,
     RawBody,
     CommandBody,
     BodyForAgent: RawBody,
     BodyForCommands: CommandBody,
-    From: routePeerId ? `claworld:${routePeerId}` : `claworld:${senderId}`,
+    From: `claworld:${remoteRouteIdentity}`,
     To: localAddress ? `claworld:${localAddress}` : `claworld:${runtimeConfig.accountId}`,
-    SessionKey: worldSessionKey,
+    SessionKey: sessionKey,
     AccountId: runtimeConfig.accountId,
     OriginatingChannel: 'claworld',
-    OriginatingFrom: routePeerId || senderId,
-    // Match OpenClaw DM channel semantics: `To` is the local account surface,
-    // while `OriginatingTo` is the remote peer to reply back to.
-    OriginatingTo: routePeerId || localAddress || runtimeConfig.accountId,
+    OriginatingFrom: remoteRouteIdentity,
+    OriginatingTo: remoteRouteIdentity,
     ChatType: 'direct',
-    SenderName: routePeerId || senderId,
-    SenderId: routePeerId || senderId,
-    MessageId: turnId,
+    SenderName: remoteAddress,
+    SenderId: remoteRouteIdentity,
+    MessageId: deliveryId,
     Provider: 'claworld',
     Surface: 'claworld',
-    ConversationLabel: routePeerId || senderId,
+    ConversationLabel: remoteAddress,
     Timestamp: Date.now(),
-    MessageSid: turnId,
+    MessageSid: deliveryId,
     WasMentioned: false,
     CommandAuthorized: commandAuthorized,
-    RelaySessionId: sessionId,
-    RelayTurnId: turnId,
+    RelayDeliveryId: deliveryId,
     RelayFromAgentId: fromAgentId,
     UntrustedContext: ContextLines,
   });
 
-  enqueueBackendGuidance({
-    runtime,
-    sessionKey: worldSessionKey,
-    payload: turnData,
-  });
-
-  logger.info?.(`[claworld:${runtimeAccountId}] bridging ${relayEvent} into agent session`, {
-    sessionId,
-    turnId,
-    routePeerId,
-    routeSessionKey: worldSessionKey,
+  logger.info?.(`[claworld:${runtimeAccountId}] routing delivery into runtime session`, {
+    deliveryId,
+    sessionKey,
+    remoteIdentity: remoteAddress,
     routeStatus: routed?.status || null,
     bodyPreview: String(Body || '').slice(0, 240),
     rawBodyPreview: String(RawBody || '').slice(0, 240),
-    inboundAccountId: inboundCtx?.AccountId || null,
-    inboundTo: inboundCtx?.To || null,
-    inboundFrom: inboundCtx?.From || null,
-    originatingTo: inboundCtx?.OriginatingTo || null,
-    originatingFrom: inboundCtx?.OriginatingFrom || null,
+    allowReply: metadata.allowReply !== false,
     commandAuthorized,
   });
 
-  const { dispatcher, replyOptions, markDispatchIdle, didReply, getRuntimeOutputSummary } = createRelayReplyDispatcher({
+  const { dispatcher, replyOptions, markDispatchIdle, didReply, getRuntimeOutputSummary } = createDeliveryReplyDispatcher({
     runtime,
     currentCfg,
-    route,
     relayClient,
-    sessionId,
-    turnId,
-    relayEvent,
-    localRelayAgentId,
-    allowRelayContinuation: resolveContinuationState(turnData).allowed !== false,
+    deliveryId,
+    sessionKey,
+    localAgentId: runtimeConfig.relay?.agentId || relayClient?.boundAgentId || null,
+    allowReply: metadata.allowReply !== false,
     logger,
     runtimeAccountId,
   });
@@ -1928,13 +1623,11 @@ async function maybeBridgeDeliveredTurn({
   const replied = didReply();
   const runtimeOutputSummary = getRuntimeOutputSummary();
 
-  logger.info?.(`[claworld:${runtimeAccountId}] relay message bridge completed`, {
-    sessionId,
-    turnId,
-    relayEvent,
+  logger.info?.(`[claworld:${runtimeAccountId}] delivery bridge completed`, {
+    deliveryId,
+    sessionKey,
     queuedFinal: Boolean(dispatchResult?.queuedFinal),
     replied,
-    routeSessionKey: worldSessionKey,
     routeStatus: routed?.status || null,
     runtimeOutputSummary,
   });
@@ -1944,7 +1637,7 @@ async function maybeBridgeDeliveredTurn({
     ok: true,
     replied,
     queuedFinal: Boolean(dispatchResult?.queuedFinal),
-    routeSessionKey: worldSessionKey,
+    sessionKey,
     routeStatus: routed?.status || null,
   };
 }
@@ -1962,7 +1655,6 @@ export function createClaworldChannelPlugin({
   const relayClients = new Map();
   const lifecycles = new Map();
   const accountRuntimeContexts = new Map();
-  const sessionIdToWorldId = new Map();
 
   async function persistRuntimeAppToken({ runtime, accountId, appToken }) {
     if (!runtime?.config?.loadConfig || !runtime?.config?.writeConfigFile) {
@@ -2028,16 +1720,6 @@ export function createClaworldChannelPlugin({
     };
   }
 
-  function clearSessionWorldCache(runtimeAccountId = 'default') {
-    const accountId = resolveNormalizedText(runtimeAccountId, 'default');
-    const prefix = `${accountId}:`;
-    Array.from(sessionIdToWorldId.keys()).forEach((cacheKey) => {
-      if (cacheKey.startsWith(prefix)) {
-        sessionIdToWorldId.delete(cacheKey);
-      }
-    });
-  }
-
   function getAccountLifecycle(accountKey = 'default') {
     if (lifecycles.has(accountKey)) return lifecycles.get(accountKey);
 
@@ -2189,31 +1871,15 @@ export function createClaworldChannelPlugin({
         });
         relayClient.on?.('runtime_event', (event) => {
           logger.debug?.(`[claworld:${runtimeAccountId}] inbound relay event`, {
-            relayEvent: event?.relayEvent,
+            eventType: event?.eventType || null,
             target: event?.route?.target || null,
-            sessionId: event?.inboundEnvelope?.session_id || null,
+            deliveryId: event?.delivery?.deliveryId || null,
+            sessionKey: event?.delivery?.sessionKey || null,
           });
 
-          if (event?.relayEvent === 'session.created') {
+          if (event?.eventType === 'delivery') {
             const runtimeContext = accountRuntimeContexts.get(accountKey) || {};
-            maybeInjectWorldSessionStartupContext({
-              runtime: runtimeContext.runtime,
-              cfg: runtimeContext.cfg,
-              runtimeConfig,
-              runtimeAccountId,
-              event,
-              logger,
-              sessionIdToWorldId,
-            }).catch((error) => {
-              logger.error?.(`[claworld:${runtimeAccountId}] world startup injection exception`, {
-                error: error?.message || String(error),
-              });
-            });
-          }
-
-          if (event?.relayEvent === 'turn.deliver') {
-            const runtimeContext = accountRuntimeContexts.get(accountKey) || {};
-            maybeBridgeDeliveredTurn({
+            maybeBridgeRuntimeDelivery({
               relayClient,
               runtimeConfig,
               runtimeAccountId,
@@ -2222,28 +1888,8 @@ export function createClaworldChannelPlugin({
               runtime: runtimeContext.runtime,
               cfg: runtimeContext.cfg,
               inbound,
-              sessionIdToWorldId,
             }).catch((error) => {
-              logger.error?.(`[claworld:${runtimeAccountId}] turn bridge exception`, {
-                error: error?.message || String(error),
-              });
-            });
-          }
-
-          if (event?.relayEvent === 'turn.reply') {
-            const runtimeContext = accountRuntimeContexts.get(accountKey) || {};
-            maybeBridgeDeliveredTurn({
-              relayClient,
-              runtimeConfig,
-              runtimeAccountId,
-              event,
-              logger,
-              runtime: runtimeContext.runtime,
-              cfg: runtimeContext.cfg,
-              inbound,
-              sessionIdToWorldId,
-            }).catch((error) => {
-              logger.error?.(`[claworld:${runtimeAccountId}] reply bridge exception`, {
+              logger.error?.(`[claworld:${runtimeAccountId}] delivery bridge exception`, {
                 error: error?.message || String(error),
               });
             });
@@ -2274,7 +1920,6 @@ export function createClaworldChannelPlugin({
           relayClients.delete(accountKey);
         }
         accountRuntimeContexts.delete(accountKey);
-        clearSessionWorldCache(accountKey);
       },
     });
 
@@ -2492,14 +2137,13 @@ export function createClaworldChannelPlugin({
     },
     inbound: {
       routeRelayEvent: (event = {}, options = {}) => {
-        const envelope = {
-          session_id: event.session_id || event.sessionId || null,
-          event_id: event.event_id || event.eventId || null,
-          from_agent_id: event.from_agent_id || event.fromAgentId || null,
-          type: event.type || 'message',
+        return inbound.routeInboundEvent({
+          eventType: event.eventType || event.type || 'delivery',
+          deliveryId: event.deliveryId || event.event_id || event.eventId || null,
+          sessionKey: event.sessionKey || null,
           payload: event.payload || {},
-        };
-        return inbound.routeInboundEvent(envelope, options);
+          metadata: event.metadata || {},
+        }, options);
       },
     },
     outbound: {
@@ -2583,7 +2227,6 @@ export function createClaworldChannelPlugin({
             targetAgentId: context.targetAgentId || null,
             openingMessage: context.openingMessage || context.message || context.text || null,
             worldId: context.worldId || null,
-            episodePolicy: context.episodePolicy || null,
             fetchImpl,
           });
         },
@@ -2631,19 +2274,6 @@ export function createClaworldChannelPlugin({
             logger,
           });
         },
-        fetchWorldJoinCheck: async (context = {}) => {
-          const resolvedContext = await resolveBoundRuntimeContext(context);
-          return fetchWorldJoinCheck({
-            cfg: resolvedContext.cfg || {},
-            accountId: resolvedContext.accountId || null,
-            runtimeConfig: resolvedContext.runtimeConfig || null,
-            worldId: context.worldId || null,
-            profile: context.profile || {},
-            maxFieldsPerStep: context.maxFieldsPerStep ?? context.maxPromptFields ?? null,
-            fetchImpl,
-            logger,
-          });
-        },
         joinWorld: async (context = {}) => {
           const resolvedContext = await resolveBoundRuntimeContext(context);
           return joinWorld({
@@ -2652,25 +2282,7 @@ export function createClaworldChannelPlugin({
             runtimeConfig: resolvedContext.runtimeConfig || null,
             worldId: context.worldId || null,
             agentId: resolvedContext.agentId || null,
-            profile: context.profile || {},
-            profileSnapshot: context.profileSnapshot ?? null,
-            maxFieldsPerStep: context.maxFieldsPerStep ?? context.maxPromptFields ?? null,
-            fetchImpl,
-            logger,
-          });
-        },
-        submitWorldJoin: async (context = {}) => {
-          const resolvedContext = await resolveBoundRuntimeContext(context);
-          return submitWorldJoin({
-            cfg: resolvedContext.cfg || {},
-            accountId: resolvedContext.accountId || null,
-            runtimeConfig: resolvedContext.runtimeConfig || null,
-            worldId: context.worldId || null,
-            agentId: resolvedContext.agentId || null,
-            profile: context.profile || {},
-            profileSnapshot: context.profileSnapshot ?? null,
-            profileUpdate: context.profileUpdate ?? context.profilePatch ?? null,
-            maxFieldsPerStep: context.maxFieldsPerStep ?? context.maxPromptFields ?? 1,
+            participantContextText: context.participantContextText || null,
             fetchImpl,
             logger,
           });
@@ -2721,39 +2333,6 @@ export function createClaworldChannelPlugin({
           context.selection ?? context.userChoice ?? null,
         ),
         buildCandidateDeliverySummary,
-        buildRequiredFieldExplanation,
-        resolveWorldProfileCollectionFlow: async (context = {}) => {
-          const resolvedContext = await resolveBoundRuntimeContext(context);
-          return resolveWorldProfileCollectionFlow({
-            cfg: resolvedContext.cfg || {},
-            accountId: resolvedContext.accountId || null,
-            runtimeConfig: resolvedContext.runtimeConfig || null,
-            worldId: context.worldId || null,
-            worldDetail: context.worldDetail || null,
-            profile: context.profile || {},
-            profileUpdate: context.profileUpdate ?? context.profilePatch ?? null,
-            maxFieldsPerStep: context.maxFieldsPerStep ?? context.maxPromptFields ?? 1,
-            fetchImpl,
-            logger,
-          });
-        },
-        resolveWorldJoinFlow: async (context = {}) => {
-          const resolvedContext = await resolveBoundRuntimeContext(context);
-          return resolveWorldJoinFlow({
-            cfg: resolvedContext.cfg || {},
-            accountId: resolvedContext.accountId || null,
-            runtimeConfig: resolvedContext.runtimeConfig || null,
-            worldId: context.worldId || null,
-            worldDetail: context.worldDetail || null,
-            agentId: resolvedContext.agentId || null,
-            profile: context.profile || {},
-            profileSnapshot: context.profileSnapshot ?? null,
-            profileUpdate: context.profileUpdate ?? context.profilePatch ?? null,
-            limit: context.limit ?? context.candidateLimit ?? null,
-            fetchImpl,
-            logger,
-          });
-        },
         resolveWorldSelectionFlow: async (context = {}) => {
           const resolvedContext = await resolveBoundRuntimeContext(context);
           return resolveWorldSelectionFlow({
@@ -2763,7 +2342,6 @@ export function createClaworldChannelPlugin({
             worldDirectory: context.worldDirectory || null,
             selection: context.selection ?? context.userChoice ?? null,
             profile: context.profile || {},
-            maxFieldsPerStep: context.maxFieldsPerStep ?? context.maxPromptFields ?? 1,
             fetchImpl,
             logger,
           });
@@ -2777,17 +2355,8 @@ export function createClaworldChannelPlugin({
             accountId: resolvedContext.accountId || null,
             runtimeConfig: resolvedContext.runtimeConfig || null,
             agentId: resolvedContext.agentId || null,
-            adminAgentIds: context.adminAgentIds || [],
-            eligibility: context.eligibility || 'active',
-            ...(Object.prototype.hasOwnProperty.call(context, 'broadcast') ? { broadcast: context.broadcast } : {}),
             displayName: context.displayName || null,
-            summary: context.summary || null,
-            description: context.description || null,
-            entryProfileSchema: context.entryProfileSchema || {},
-            sessionTemplate: context.sessionTemplate || null,
-            interactionRules: context.interactionRules || null,
-            prohibitedRules: context.prohibitedRules || null,
-            ratingRules: context.ratingRules || null,
+            worldContextText: context.worldContextText || null,
             enabled: context.enabled === true,
             fetchImpl,
             logger,
@@ -2854,19 +2423,6 @@ export function createClaworldChannelPlugin({
             logger,
           });
         },
-        fetchWorldJoinCheck: async (context = {}) => {
-          const resolvedContext = await resolveBoundRuntimeContext(context);
-          return fetchWorldJoinCheck({
-            cfg: resolvedContext.cfg || {},
-            accountId: resolvedContext.accountId || null,
-            runtimeConfig: resolvedContext.runtimeConfig || null,
-            worldId: context.worldId || null,
-            profile: context.profile || {},
-            maxFieldsPerStep: context.maxFieldsPerStep ?? context.maxPromptFields ?? null,
-            fetchImpl,
-            logger,
-          });
-        },
         joinWorld: async (context = {}) => {
           const resolvedContext = await resolveBoundRuntimeContext(context);
           return joinWorld({
@@ -2875,25 +2431,7 @@ export function createClaworldChannelPlugin({
             runtimeConfig: resolvedContext.runtimeConfig || null,
             worldId: context.worldId || null,
             agentId: resolvedContext.agentId || null,
-            profile: context.profile || {},
-            profileSnapshot: context.profileSnapshot ?? null,
-            maxFieldsPerStep: context.maxFieldsPerStep ?? context.maxPromptFields ?? null,
-            fetchImpl,
-            logger,
-          });
-        },
-        submitWorldJoin: async (context = {}) => {
-          const resolvedContext = await resolveBoundRuntimeContext(context);
-          return submitWorldJoin({
-            cfg: resolvedContext.cfg || {},
-            accountId: resolvedContext.accountId || null,
-            runtimeConfig: resolvedContext.runtimeConfig || null,
-            worldId: context.worldId || null,
-            agentId: resolvedContext.agentId || null,
-            profile: context.profile || {},
-            profileSnapshot: context.profileSnapshot ?? null,
-            profileUpdate: context.profileUpdate ?? context.profilePatch ?? null,
-            maxFieldsPerStep: context.maxFieldsPerStep ?? context.maxPromptFields ?? 1,
+            participantContextText: context.participantContextText || null,
             fetchImpl,
             logger,
           });
@@ -2959,39 +2497,6 @@ export function createClaworldChannelPlugin({
         },
         resolveWorldSelection,
         buildCandidateDeliverySummary,
-        buildRequiredFieldExplanation,
-        resolveWorldProfileCollectionFlow: async (context = {}) => {
-          const resolvedContext = await resolveBoundRuntimeContext(context);
-          return resolveWorldProfileCollectionFlow({
-            cfg: resolvedContext.cfg || {},
-            accountId: resolvedContext.accountId || null,
-            runtimeConfig: resolvedContext.runtimeConfig || null,
-            worldId: context.worldId || null,
-            worldDetail: context.worldDetail || null,
-            profile: context.profile || {},
-            profileUpdate: context.profileUpdate ?? context.profilePatch ?? null,
-            maxFieldsPerStep: context.maxFieldsPerStep ?? context.maxPromptFields ?? 1,
-            fetchImpl,
-            logger,
-          });
-        },
-        resolveWorldJoinFlow: async (context = {}) => {
-          const resolvedContext = await resolveBoundRuntimeContext(context);
-          return resolveWorldJoinFlow({
-            cfg: resolvedContext.cfg || {},
-            accountId: resolvedContext.accountId || null,
-            runtimeConfig: resolvedContext.runtimeConfig || null,
-            worldId: context.worldId || null,
-            worldDetail: context.worldDetail || null,
-            agentId: resolvedContext.agentId || null,
-            profile: context.profile || {},
-            profileSnapshot: context.profileSnapshot ?? null,
-            profileUpdate: context.profileUpdate ?? context.profilePatch ?? null,
-            limit: context.limit ?? context.candidateLimit ?? null,
-            fetchImpl,
-            logger,
-          });
-        },
         resolveWorldSelectionFlow: async (context = {}) => {
           const resolvedContext = await resolveBoundRuntimeContext(context);
           return resolveWorldSelectionFlow({
@@ -3001,7 +2506,6 @@ export function createClaworldChannelPlugin({
             worldDirectory: context.worldDirectory || null,
             selection: context.selection ?? context.userChoice ?? null,
             profile: context.profile || {},
-            maxFieldsPerStep: context.maxFieldsPerStep ?? context.maxPromptFields ?? 1,
             fetchImpl,
             logger,
           });
@@ -3034,23 +2538,14 @@ export function createClaworldChannelPlugin({
         moderation: {
           createWorld: async (context = {}) => {
             const resolvedContext = await resolveBoundRuntimeContext(context);
-            return createModeratedWorld({
+          return createModeratedWorld({
               cfg: resolvedContext.cfg || {},
               accountId: resolvedContext.accountId || null,
               runtimeConfig: resolvedContext.runtimeConfig || null,
               agentId: resolvedContext.agentId || null,
-              adminAgentIds: context.adminAgentIds || [],
-              eligibility: context.eligibility || 'active',
-              ...(Object.prototype.hasOwnProperty.call(context, 'broadcast') ? { broadcast: context.broadcast } : {}),
               displayName: context.displayName || null,
-              summary: context.summary || null,
-            description: context.description || null,
-            entryProfileSchema: context.entryProfileSchema || {},
-            sessionTemplate: context.sessionTemplate || null,
-            interactionRules: context.interactionRules || null,
-            prohibitedRules: context.prohibitedRules || null,
-            ratingRules: context.ratingRules || null,
-            enabled: context.enabled === true,
+              worldContextText: context.worldContextText || null,
+              enabled: context.enabled === true,
               fetchImpl,
               logger,
             });
@@ -3120,7 +2615,7 @@ export function createClaworldChannelPlugin({
           'native channel setup/onboarding',
           'relay websocket adapter tests',
           'manual relay-agent binding',
-          'minimal outbound session-request send',
+          'minimal outbound conversation send',
         ],
         notImplemented: [
           '真实 OpenClaw sdk import/types 对齐',