@xfxstudio/claworld 2026.4.30-testing.2 → 2026.5.3-testing.1

package/src/openclaw/runtime/working-memory.js

@@ -202,7 +202,7 @@ function buildClaworldManagementStartupPrompt(options = {}) {
     '',
     '## Session Routing',
     '- Reports/approval requests: use explicit reportTargetSessionKey, else sessions/index.json main.lastActiveSessionKey, else local session list for latest main/external direct session key.',
-    '- Conversation details: prefer sessions/index.json chatRequestId -> sessionArtifacts. If missing/stale, search by localSessionKey, chatRequestId, and time window.',
+    '- Conversation details: prefer sessions/index.json chatRequestId -> artifacts. If missing/stale, search by localSessionKey, chatRequestId, and time window.',
     '- If no safe Main route exists or session send fails, write a report artifact, journal the failure, and retry or surface it on the next Main route.',
     '',
     '## Write Rules',
@@ -846,8 +846,31 @@ function compactDirectoryObject(value = {}) {
   return cleanJournalObject(value);
 }
 
+function compactSessionArtifact(artifact = {}) {
+  const sessionFile = firstText(artifact.sessionFile, artifact.transcriptPath);
+  const transcriptPath = firstText(
+    artifact.transcriptPath && artifact.transcriptPath !== sessionFile ? artifact.transcriptPath : null,
+  );
+  const deliveryId = firstText(artifact.deliveryId);
+  return compactDirectoryObject({
+    sessionId: firstText(artifact.sessionId),
+    sessionFile,
+    transcriptPath,
+    deliveryId,
+    sourceEventId: deliveryId ? null : firstText(artifact.sourceEventId, artifact.eventId),
+    seenAt: firstText(artifact.seenAt, artifact.lastSeenAt, artifact.firstSeenAt),
+  });
+}
+
+function normalizeSessionArtifacts(artifacts = []) {
+  if (!Array.isArray(artifacts)) return [];
+  return artifacts.reduce((nextArtifacts, artifact) => (
+    upsertSessionArtifact(nextArtifacts, artifact)
+  ), []);
+}
+
 function upsertSessionArtifact(artifacts = [], artifact = {}) {
-  const normalizedArtifact = compactDirectoryObject(artifact);
+  const normalizedArtifact = compactSessionArtifact(artifact);
   if (
     !normalizedArtifact.sessionId
     && !normalizedArtifact.sessionFile
@@ -870,8 +893,7 @@ function upsertSessionArtifact(artifacts = [], artifact = {}) {
     nextArtifacts[index] = compactDirectoryObject({
       ...nextArtifacts[index],
       ...normalizedArtifact,
-      firstSeenAt: nextArtifacts[index].firstSeenAt || normalizedArtifact.firstSeenAt,
-      lastSeenAt: normalizedArtifact.lastSeenAt || nextArtifacts[index].lastSeenAt,
+      seenAt: normalizedArtifact.seenAt || nextArtifacts[index].seenAt,
     });
     return nextArtifacts;
   }
@@ -879,24 +901,52 @@ function upsertSessionArtifact(artifacts = [], artifact = {}) {
   return nextArtifacts;
 }
 
-function applySessionArtifactHints(target = {}, relations = {}) {
-  const nextTarget = { ...target };
-  if (relations.sessionId) nextTarget.latestSessionId = relations.sessionId;
-  if (relations.sessionFile) nextTarget.latestSessionFile = relations.sessionFile;
-  if (relations.transcriptPath) nextTarget.latestTranscriptPath = relations.transcriptPath;
-  return nextTarget;
+function buildLatestSessionHint(source = {}, timestamp = null) {
+  const artifact = compactSessionArtifact({
+    sessionId: source.sessionId || source.latestSessionId,
+    sessionFile: source.sessionFile || source.latestSessionFile,
+    transcriptPath: source.transcriptPath || source.latestTranscriptPath,
+    seenAt: timestamp || source.seenAt || source.lastSeenAt || source.firstSeenAt,
+  });
+  if (!artifact.sessionId && !artifact.sessionFile && !artifact.transcriptPath) return null;
+  const latest = { ...artifact };
+  delete latest.deliveryId;
+  delete latest.sourceEventId;
+  return compactDirectoryObject(latest);
 }
 
-function buildSessionArtifact({ relations = {}, timestamp = null } = {}) {
+function normalizeChatRequestDirectoryEntry(entry = {}) {
+  const current = isPlainObject(entry) ? entry : {};
+  const artifacts = normalizeSessionArtifacts(
+    Array.isArray(current.artifacts) ? current.artifacts : current.sessionArtifacts,
+  );
   return compactDirectoryObject({
+    firstSeenAt: current.firstSeenAt,
+    lastSeenAt: current.lastSeenAt,
+    artifacts,
+  });
+}
+
+function normalizeChatRequestsDirectory(chatRequests = {}) {
+  if (!isPlainObject(chatRequests)) return {};
+  const normalized = {};
+  for (const [chatRequestId, entry] of Object.entries(chatRequests)) {
+    const normalizedEntry = normalizeChatRequestDirectoryEntry(entry);
+    if (Object.keys(normalizedEntry).length > 0) {
+      normalized[chatRequestId] = normalizedEntry;
+    }
+  }
+  return normalized;
+}
+
+function buildSessionArtifact({ relations = {}, timestamp = null } = {}) {
+  return compactSessionArtifact({
     sessionId: relations.sessionId,
     sessionFile: relations.sessionFile,
-    sessionStorePath: relations.sessionStorePath,
     transcriptPath: relations.transcriptPath,
     deliveryId: relations.deliveryId,
     eventId: relations.eventId,
-    firstSeenAt: timestamp,
-    lastSeenAt: timestamp,
+    seenAt: timestamp,
   });
 }
 
@@ -943,19 +993,20 @@ function applyClaworldSessionDirectoryUpdate(directory = {}, input = {}) {
   const currentSession = isPlainObject(conversationSessions[localSessionKey])
     ? conversationSessions[localSessionKey]
     : {};
-  let nextSession = applySessionArtifactHints(
-    compactDirectoryObject({
-      ...currentSession,
-      localSessionKey,
-      relaySessionKey,
-      conversationKey: firstText(currentSession.conversationKey, relations.conversationKey),
-      worldId: firstText(currentSession.worldId, relations.worldId),
-      localAgentId: firstText(currentSession.localAgentId, relations.localAgentId),
-      firstSeenAt: currentSession.firstSeenAt || timestamp,
-      lastSeenAt: timestamp,
-    }),
-    relations,
-  );
+  const currentLatest = isPlainObject(currentSession.latest)
+    ? buildLatestSessionHint(currentSession.latest)
+    : buildLatestSessionHint(currentSession);
+  const nextLatest = buildLatestSessionHint(relations, timestamp) || currentLatest;
+  let nextSession = compactDirectoryObject({
+    relaySessionKey: firstText(relaySessionKey, currentSession.relaySessionKey),
+    conversationKey: firstText(currentSession.conversationKey, relations.conversationKey),
+    worldId: firstText(currentSession.worldId, relations.worldId),
+    localAgentId: firstText(currentSession.localAgentId, relations.localAgentId),
+    firstSeenAt: currentSession.firstSeenAt || timestamp,
+    lastSeenAt: timestamp,
+    latest: nextLatest,
+    chatRequests: normalizeChatRequestsDirectory(currentSession.chatRequests),
+  });
 
   const chatRequestId = normalizeChatRequestId(input, relations);
   if (chatRequestId) {
@@ -966,16 +1017,14 @@ function applyClaworldSessionDirectoryUpdate(directory = {}, input = {}) {
       ? chatRequests[chatRequestId]
       : {};
     const artifact = buildSessionArtifact({ relations, timestamp });
-    const nextRequest = applySessionArtifactHints(
-      compactDirectoryObject({
-        ...currentRequest,
-        chatRequestId,
-        firstSeenAt: currentRequest.firstSeenAt || timestamp,
-        lastSeenAt: timestamp,
-        sessionArtifacts: upsertSessionArtifact(currentRequest.sessionArtifacts, artifact),
-      }),
-      relations,
-    );
+    const currentArtifacts = Array.isArray(currentRequest.artifacts)
+      ? currentRequest.artifacts
+      : currentRequest.sessionArtifacts;
+    const nextRequest = compactDirectoryObject({
+      firstSeenAt: currentRequest.firstSeenAt || timestamp,
+      lastSeenAt: timestamp,
+      artifacts: upsertSessionArtifact(currentArtifacts, artifact),
+    });
     chatRequests[chatRequestId] = nextRequest;
     nextSession = compactDirectoryObject({
       ...nextSession,