@xfxstudio/claworld 0.2.7 → 0.2.8

package/src/product-shell/social/chat-request-service.js

@@ -1,5 +1,4 @@
 import { normalizeAgentProfile, resolveAgentDisplayName, resolveAgentVisibility } from '../../lib/agent-profile.js';
-import { normalizeChatRequestInput } from '../../lib/chat-request.js';
 import { createKickoffBrief, resolveStoredKickoffBrief } from '../../lib/relay/kickoff-text.js';
 import { WORLD_ACTIONS } from '../worlds/world-authorization.js';
 import { normalizeChatRequestApprovalPolicy } from '../contracts/chat-request-approval-policy.js';
@@ -282,92 +281,6 @@ function projectChatRequestOrigin(request = {}) {
   };
 }
 
-function hasConversationScope(conversation = null) {
-  return Boolean(conversation && typeof conversation === 'object' && !Array.isArray(conversation) && Object.keys(conversation).length > 0);
-}
-
-function resolveConversationLinkRequest(requests = [], conversation = {}) {
-  const conversationMeta = conversation?.meta && typeof conversation.meta === 'object' && !Array.isArray(conversation.meta)
-    ? conversation.meta
-    : {};
-  const approvalRequestId = normalizeText(conversationMeta.approvalRequestId, null);
-  if (approvalRequestId) {
-    return requests.find((request) => normalizeText(request.chatRequestId || request.requestId, null) === approvalRequestId) || null;
-  }
-
-  const conversationKey = normalizeText(conversation?.conversationKey, null);
-  if (!conversationKey) return null;
-
-  return requests.find((request) => {
-    const kickoff = request?.kickoff && typeof request.kickoff === 'object' && !Array.isArray(request.kickoff)
-      ? request.kickoff
-      : {};
-    return normalizeText(kickoff.conversationKey, null) === conversationKey
-      || normalizeText(request?.conversation?.conversationKey, null) === conversationKey;
-  }) || null;
-}
-
-function resolveInboxChatDirection(viewerAgentId, request = null) {
-  if (!request) return null;
-  if (viewerAgentId === request.fromAgentId) return 'outbound';
-  if (viewerAgentId === request.toAgentId) return 'inbound';
-  return 'related';
-}
-
-function resolveInboxChatCounterpartyAgentId(viewerAgentId, request = null, conversation = null) {
-  if (request) {
-    if (viewerAgentId === request.fromAgentId) return request.toAgentId;
-    if (viewerAgentId === request.toAgentId) return request.fromAgentId;
-  }
-
-  const participantIds = Array.isArray(conversation?.participantIds) ? conversation.participantIds : [];
-  return participantIds.find((participantId) => participantId && participantId !== viewerAgentId) || null;
-}
-
-function resolveInboxChatStatus(conversation = {}, request = null) {
-  const kickoffStatus = normalizeText(request?.kickoff?.status, null);
-  if (kickoffStatus === 'sent') return 'opening';
-  if (kickoffStatus === 'kept_silent') return 'silent';
-  if (kickoffStatus === 'failed') return 'kickoff_failed';
-  const conversationStatus = normalizeText(conversation?.status, 'active');
-  if (conversationStatus === 'active') return 'active';
-  if (conversationStatus === 'closed') return 'ended';
-  return conversationStatus;
-}
-
-function resolveInboxConversationWorldSummary(worldService, request = {}, conversation = {}) {
-  const requestContext = request?.requestContext && typeof request.requestContext === 'object' && !Array.isArray(request.requestContext)
-    ? request.requestContext
-    : {};
-  const requestConversation = request?.conversation && typeof request.conversation === 'object' && !Array.isArray(request.conversation)
-    ? request.conversation
-    : {};
-  const conversationMeta = conversation?.meta && typeof conversation.meta === 'object' && !Array.isArray(conversation.meta)
-    ? conversation.meta
-    : {};
-  const worldMeta = conversationMeta.world && typeof conversationMeta.world === 'object' && !Array.isArray(conversationMeta.world)
-    ? conversationMeta.world
-    : {};
-  const worldId = normalizeConversationWorldId(requestConversation.worldId)
-    || normalizeConversationWorldId(requestContext.conversation?.worldId)
-    || normalizeConversationWorldId(worldMeta.worldId)
-    || normalizeConversationWorldId(conversationMeta.worldId);
-
-  if (!worldId) {
-    return {
-      mode: 'direct',
-      worldId: null,
-      world: null,
-    };
-  }
-
-  return {
-    mode: 'world',
-    worldId,
-    world: projectWorldSummary(worldService, worldId),
-  };
-}
-
 export function createChatRequestService({
   store = null,
   relay = null,
@@ -437,27 +350,8 @@ export function createChatRequestService({
     };
   }
 
-  function projectChatInboxChat(conversation = {}, viewerAgentId = null, request = null) {
-    const direction = resolveInboxChatDirection(viewerAgentId, request);
-    const counterpartyAgentId = resolveInboxChatCounterpartyAgentId(viewerAgentId, request, conversation);
-
-    return {
-      chatRequestId: normalizeText(request?.chatRequestId || request?.requestId, null),
-      status: resolveInboxChatStatus(conversation, request),
-      ...(direction ? { direction } : {}),
-      createdAt: normalizeText(conversation.createdAt, normalizeText(request?.createdAt, null)),
-      updatedAt: normalizeText(conversation.updatedAt, null),
-      lastTurnAt: normalizeText(conversation.lastTurnAt, null),
-      conversationKey: normalizeText(conversation.conversationKey, null),
-      localSessionKey: normalizeText(conversation.sessionKey, null),
-      counterparty: projectAgent(assertStore(), counterpartyAgentId, presence),
-      conversation: resolveInboxConversationWorldSummary(worldService, request, conversation),
-    };
-  }
-
   return {
     projectChatRequest,
-    projectChatInboxChat,
     async syncApprovalPolicy({
       actorAgentId,
       credentialId = null,
@@ -495,7 +389,6 @@ export function createChatRequestService({
       openingMessage = null,
       openingPayload = null,
       worldId = null,
-      requestContext = null,
       origin = null,
       broadcast = null,
       source = 'chat_request',
@@ -506,36 +399,29 @@ export function createChatRequestService({
         throw createInvalidChatRequestError('chat_request_target_required', 'chat request target requires targetAgentId');
       }
       const targetAgent = requireAgent(normalizedTargetAgentId);
-      const normalizedSource = normalizeText(source, 'chat_request');
-      const normalizedRequestInput = normalizeChatRequestInput({
-        requestContext,
-        source: normalizedSource,
-      });
-      const normalizedWorldId = normalizeConversationWorldId(worldId)
-        || normalizeConversationWorldId(normalizedRequestInput.conversation?.worldId);
+      const normalizedWorldId = normalizeConversationWorldId(worldId);
       if (!targetAgent?.address) {
         throw createTargetAddressNotFoundError(normalizedTargetAgentId);
       }
-      const normalizedOpeningPayload = cloneJsonObject(openingPayload) || cloneJsonObject(normalizedRequestInput.openingPayload);
+      const normalizedOpeningPayload = cloneJsonObject(openingPayload);
       const normalizedKickoffBrief = createKickoffBrief({
         text: typeof kickoffBrief === 'object' && kickoffBrief !== null && !Array.isArray(kickoffBrief)
           ? kickoffBrief.text
-          : normalizeText(openingMessage, normalizeText(normalizedRequestInput.openingMessage, null)),
+          : openingMessage,
         payload: typeof kickoffBrief === 'object' && kickoffBrief !== null && !Array.isArray(kickoffBrief)
           ? kickoffBrief.payload
           : normalizedOpeningPayload,
         source: typeof kickoffBrief === 'object' && kickoffBrief !== null && !Array.isArray(kickoffBrief)
           ? kickoffBrief.source
-          : normalizedSource === 'world_broadcast'
+          : source === 'world_broadcast'
             ? 'world_broadcast_brief'
             : 'chat_request_brief',
       });
-      const normalizedOrigin = normalizeChatRequestOrigin(origin) || normalizeChatRequestOrigin(normalizedRequestInput.origin);
-      const normalizedBroadcast = normalizeChatRequestBroadcastMetadata(broadcast)
-        || normalizeChatRequestBroadcastMetadata(normalizedRequestInput.broadcast);
+      const normalizedOrigin = normalizeChatRequestOrigin(origin);
+      const normalizedBroadcast = normalizeChatRequestBroadcastMetadata(broadcast);
       if (normalizedWorldId) {
         worldService?.requireWorld?.(normalizedWorldId);
-        if (normalizedSource !== 'world_broadcast') {
+        if (normalizeText(source, 'chat_request') !== 'world_broadcast') {
           const authorization = worldAuthorizationService.evaluateWorldAction({
             worldId: normalizedWorldId,
             actorAgentId: fromAgentId,
@@ -559,10 +445,9 @@ export function createChatRequestService({
         conversation: {
           ...(normalizedWorldId ? { worldId: normalizedWorldId } : {}),
         },
-        requestContext: cloneJsonObject(requestContext),
         origin: normalizedOrigin,
         broadcast: normalizedBroadcast,
-        source: normalizedSource,
+        source: normalizeText(source, 'chat_request'),
       });
       if (result.status < 200 || result.status >= 300) {
         throw createRelayResponseError(result, 'chat_request_create_failed');
@@ -610,55 +495,23 @@ export function createChatRequestService({
       };
     },
 
-    listChatInbox({ agentId, direction = null } = {}) {
+    listChatRequests({ agentId, direction = null } = {}) {
       requireAgent(agentId);
       const normalizedDirection = normalizeDirection(direction);
-      let requests = assertStore().listChatRequests ? assertStore().listChatRequests() : [];
-      requests = requests.filter((request) => request.fromAgentId === agentId || request.toAgentId === agentId);
+      let items = assertStore().listChatRequests ? assertStore().listChatRequests() : [];
+      items = items.filter((request) => request.status === 'pending');
+      items = items.filter((request) => request.fromAgentId === agentId || request.toAgentId === agentId);
       if (normalizedDirection === 'inbound') {
-        requests = requests.filter((request) => request.toAgentId === agentId);
+        items = items.filter((request) => request.toAgentId === agentId);
       } else if (normalizedDirection === 'outbound') {
-        requests = requests.filter((request) => request.fromAgentId === agentId);
+        items = items.filter((request) => request.fromAgentId === agentId);
       }
 
-      const pendingRequests = sortByRecency(
-        requests.filter((request) => request.status === 'pending'),
-        'createdAt',
-      ).map((request) => projectChatRequest(request, agentId));
-
-      const conversations = assertStore().listConversations
-        ? assertStore().listConversations({ participantId: agentId })
-        : [];
-      const chats = sortByRecency(
-        conversations
-          .map((conversation) => {
-            const linkedRequest = resolveConversationLinkRequest(requests, conversation);
-            if (!linkedRequest && !normalizeText(conversation?.meta?.approvalRequestId, null)) return null;
-            const projected = projectChatInboxChat(conversation, agentId, linkedRequest);
-            if (!projected) return null;
-            if (normalizedDirection && projected.direction !== normalizedDirection) return null;
-            return projected;
-          })
-          .filter(Boolean),
-        'lastTurnAt',
-        'updatedAt',
-        'createdAt',
-      );
-
       return {
-        counts: {
-          pendingRequestCount: pendingRequests.length,
-          chatCount: chats.length,
-        },
-        pendingRequests,
-        chats,
+        items: sortByRecency(items, 'createdAt').map((request) => projectChatRequest(request, agentId)),
       };
     },
 
-    listChatRequests({ agentId, direction = null } = {}) {
-      return this.listChatInbox({ agentId, direction });
-    },
-
     async acceptChatRequest(chatRequestId, { actorAgentId } = {}) {
       requireAgent(actorAgentId);
       const normalizedChatRequestId = normalizeText(chatRequestId, null);

package/src/product-shell/worlds/world-admin-service.js

@@ -12,6 +12,36 @@ function normalizeBoolean(value, fallback = false) {
   return fallback;
 }
 
+const OWNER_WORLD_STATUSES = new Set(['draft', 'enabled', 'paused', 'closed', 'disabled']);
+
+function normalizeOwnerWorldStatus(value, fallback = null) {
+  const normalized = normalizeText(value, fallback);
+  return OWNER_WORLD_STATUSES.has(normalized) ? normalized : fallback;
+}
+
+function inferEnabledFromOwnerWorldStatus(status, fallback = null) {
+  const normalizedStatus = normalizeOwnerWorldStatus(status, null);
+  if (!normalizedStatus) return fallback;
+  return normalizedStatus === 'enabled';
+}
+
+function projectOwnerWorldMetaStatus(status, enabled) {
+  const normalizedStatus = normalizeOwnerWorldStatus(status, enabled === true ? 'enabled' : 'draft');
+  switch (normalizedStatus) {
+    case 'enabled':
+      return 'creator_enabled';
+    case 'paused':
+      return 'creator_paused';
+    case 'closed':
+      return 'creator_closed';
+    case 'disabled':
+      return 'creator_disabled';
+    case 'draft':
+    default:
+      return 'creator_draft';
+  }
+}
+
 function summarizeWorldContextText(worldContextText, fallback = null) {
   const normalized = normalizeText(worldContextText, null);
   if (!normalized) return fallback;
@@ -154,7 +184,7 @@ function buildWorldRecord({
   status = null,
   existingMetrics = null,
 } = {}) {
-  const resolvedStatus = status || (enabled ? 'enabled' : 'draft');
+  const resolvedStatus = normalizeOwnerWorldStatus(status, enabled ? 'enabled' : 'draft');
   const participantContextField = buildDefaultEntryProfileField();
   const resolvedWorldContextText = buildWorldContextText({
     worldId,
@@ -186,7 +216,7 @@ function buildWorldRecord({
     matching: buildMatchingStrategy(),
     conversationTemplate: buildConversationTemplate(null, null),
     meta: {
-      status: resolvedStatus === 'enabled' ? 'creator_enabled' : 'creator_draft',
+      status: projectOwnerWorldMetaStatus(resolvedStatus, enabled),
       persistence: 'store',
     },
     creatorAgentId,
@@ -314,6 +344,7 @@ export function createWorldAdminService({ worldService, worldAuthorizationServic
       displayName,
       worldContextText,
       enabled = false,
+      status = null,
     } = {}) {
       const storeBacked = assertStore();
       const resolvedOwnerAgentId = assertActorAgent(ownerAgentId || creatorAgentId);
@@ -330,6 +361,7 @@ export function createWorldAdminService({ worldService, worldAuthorizationServic
         summary: summarizeWorldContextText(resolvedWorldContextText, resolvedDisplayName),
         worldContextText: resolvedWorldContextText,
         enabled: normalizeBoolean(enabled, false),
+        status: normalizeOwnerWorldStatus(status, normalizeBoolean(enabled, false) ? 'enabled' : 'draft'),
       });
 
       const created = await storeBacked.createWorldConfig(worldRecord);
@@ -367,10 +399,14 @@ export function createWorldAdminService({ worldService, worldAuthorizationServic
         worldRole: authorization.worldRole,
       });
     },
-    async manageWorld({ actorAgentId, creatorAgentId, worldId, changes = null, enabled = null } = {}) {
+    async manageWorld({ actorAgentId, creatorAgentId, worldId, changes = null, enabled = null, status = null } = {}) {
       const storeBacked = assertStore();
       const resolvedActorAgentId = assertActorAgent(actorAgentId || creatorAgentId);
       const hasChanges = changes && typeof changes === 'object' && !Array.isArray(changes);
+      const normalizedStatus = normalizeOwnerWorldStatus(status, null);
+      const resolvedEnabled = normalizedStatus != null
+        ? inferEnabledFromOwnerWorldStatus(normalizedStatus, null)
+        : (enabled == null ? null : normalizeBoolean(enabled, false));
 
       const authorization = requireWorldOwner({
         worldId,
@@ -378,7 +414,7 @@ export function createWorldAdminService({ worldService, worldAuthorizationServic
       });
 
       const existingWorld = authorization.world;
-      if (!hasChanges && enabled == null) {
+      if (!hasChanges && resolvedEnabled == null && normalizedStatus == null) {
         return projectManagedWorld(storeBacked, existingWorld, {
           worldRole: authorization.worldRole,
         });
@@ -397,20 +433,24 @@ export function createWorldAdminService({ worldService, worldAuthorizationServic
           displayName: nextDisplayName,
           summary: summarizeWorldContextText(nextWorldContextText, nextDisplayName),
           worldContextText: nextWorldContextText,
-          enabled: enabled == null ? existingWorld.enabled === true : normalizeBoolean(enabled, false),
-          status: enabled == null
-            ? existingWorld.status
-            : (normalizeBoolean(enabled, false) ? 'enabled' : 'disabled'),
+          enabled: resolvedEnabled == null ? existingWorld.enabled === true : resolvedEnabled,
+          status: normalizedStatus || (
+            resolvedEnabled == null
+              ? existingWorld.status
+              : (resolvedEnabled ? 'enabled' : 'disabled')
+          ),
           existingMetrics: existingWorld.metrics || null,
         });
-      } else if (enabled != null) {
+      } else if (resolvedEnabled != null || normalizedStatus != null) {
+        const nextEnabled = resolvedEnabled == null ? existingWorld.enabled === true : resolvedEnabled;
+        const nextStatus = normalizedStatus || (nextEnabled ? 'enabled' : 'disabled');
         nextRecord = {
           ...existingWorld,
-          enabled: normalizeBoolean(enabled, false),
-          status: normalizeBoolean(enabled, false) ? 'enabled' : 'disabled',
+          enabled: nextEnabled,
+          status: nextStatus,
           meta: {
             ...(existingWorld.meta || {}),
-            status: normalizeBoolean(enabled, false) ? 'creator_enabled' : 'creator_disabled',
+            status: projectOwnerWorldMetaStatus(nextStatus, nextEnabled),
           },
         };
       }

package/src/product-shell/worlds/world-routes.js

@@ -393,6 +393,7 @@ export function registerWorldRoutes(
         worldId: req.params.worldId,
         changes: req.body?.changes || null,
         enabled: Object.prototype.hasOwnProperty.call(req.body || {}, 'enabled') ? req.body.enabled : null,
+        status: req.body?.status || null,
       });
       res.json(result);
     } catch (error) {