sentinelayer-cli 0.30.5 → 0.30.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sentinelayer-cli",
-  "version": "0.30.5",
+  "version": "0.30.7",
   "description": "Scaffold Sentinelayer spec/prompt/guide artifacts with secure browser auth and token bootstrap.",
   "type": "module",
   "scripts": {

package/src/commands/session.js

@@ -5867,10 +5867,11 @@ export function registerSessionCommand(program) {
         ? buildSessionActionEvents(normalizedSessionId, remoteActions.actions)
         : [];
       const includeControlEvents = Boolean(options.includeControlEvents);
+      const dedupedEvents = dedupeSessionEvents(events);
       const transcriptBaseEvents = includeControlEvents
-        ? events
-        : filterSessionMaterialEvents(events);
-      const hiddenControlEventCount = events.length - transcriptBaseEvents.length;
+        ? dedupedEvents
+        : filterSessionMaterialEvents(dedupedEvents);
+      const hiddenControlEventCount = dedupedEvents.length - transcriptBaseEvents.length;
       const exportEvents = mergeSessionActionEvents(transcriptBaseEvents, actionEvents);
       const stats = computeTranscriptStats({
         sessionMeta: sessionPayload,
@@ -6021,10 +6022,11 @@ export function registerSessionCommand(program) {
         ? buildSessionActionEvents(normalizedSessionId, remoteActions.actions)
         : [];
       const includeControlEvents = Boolean(options.includeControlEvents);
+      const dedupedEvents = dedupeSessionEvents(events);
       const transcriptBaseEvents = includeControlEvents
-        ? events
-        : filterSessionMaterialEvents(events);
-      const hiddenControlEventCount = events.length - transcriptBaseEvents.length;
+        ? dedupedEvents
+        : filterSessionMaterialEvents(dedupedEvents);
+      const hiddenControlEventCount = dedupedEvents.length - transcriptBaseEvents.length;
       const transcriptEvents = mergeSessionActionEvents(transcriptBaseEvents, actionEvents);
 
       // Pull GitHub/Google avatar + display name from the active auth

package/src/session/event-identity.js

@@ -52,9 +52,61 @@ function stableStringify(value) {
   return JSON.stringify(stableJsonValue(value));
 }
 
+function messageEventCanUseRelaxedContentKey(eventKind) {
+  return [
+    "agent_response",
+    "human_relay",
+    "session_message",
+    "session_say",
+  ].includes(keyString(eventKind));
+}
+
+function eventDurabilityScore(event = {}) {
+  let score = 0;
+  if (readSessionEventSequence(event) > 0) score += 2;
+  if (sessionEventHasDurableCursor(event)) score += 1;
+  return score;
+}
+
+function mergeObjectPreferringPrimary(primaryValue, secondaryValue) {
+  if (
+    primaryValue &&
+    typeof primaryValue === "object" &&
+    !Array.isArray(primaryValue) &&
+    secondaryValue &&
+    typeof secondaryValue === "object" &&
+    !Array.isArray(secondaryValue)
+  ) {
+    return { ...secondaryValue, ...primaryValue };
+  }
+  return primaryValue === undefined ? secondaryValue : primaryValue;
+}
+
+function mergeDuplicateEvent(existingEvent = {}, candidateEvent = {}) {
+  const existingScore = eventDurabilityScore(existingEvent);
+  const candidateScore = eventDurabilityScore(candidateEvent);
+  const candidateIsPrimary = candidateScore > existingScore || (
+    candidateScore === existingScore &&
+    sessionEventUpgradesExisting(existingEvent, candidateEvent)
+  ) || (
+    candidateScore === existingScore &&
+    !sessionEventUpgradesExisting(candidateEvent, existingEvent)
+  );
+  const primaryEvent = candidateIsPrimary ? candidateEvent : existingEvent;
+  const secondaryEvent = candidateIsPrimary ? existingEvent : candidateEvent;
+
+  return {
+    ...secondaryEvent,
+    ...primaryEvent,
+    agent: mergeObjectPreferringPrimary(primaryEvent.agent, secondaryEvent.agent),
+    payload: mergeObjectPreferringPrimary(primaryEvent.payload, secondaryEvent.payload),
+  };
+}
+
 export function sessionEventIdentityKeys(event = {}) {
   if (!event || typeof event !== "object") return [];
   const keys = [];
+  const eventKind = keyString(event.event || event.type);
   const id = keyString(event.id);
   if (id) {
     keys.push(`id:${id}`);
@@ -109,7 +161,7 @@ export function sessionEventIdentityKeys(event = {}) {
   if (message) {
     try {
       keys.push(`content:${stableStringify({
-        event: keyString(event.event || event.type),
+        event: eventKind,
         agent: keyString(event.agent?.id || event.agentId || payload.agentId || payload.authorId),
         payload: {
           channel: keyString(payload.channel),
@@ -123,6 +175,22 @@ export function sessionEventIdentityKeys(event = {}) {
     } catch {
       // Best-effort duplicate suppression only.
     }
+    if (messageEventCanUseRelaxedContentKey(eventKind)) {
+      try {
+        keys.push(`content-relaxed:${stableStringify({
+          event: eventKind,
+          agent: keyString(event.agent?.id || event.agentId || payload.agentId || payload.authorId),
+          payload: {
+            channel: keyString(payload.channel),
+            message,
+            source: keyString(payload.source),
+          },
+          ts: timestampKey(event.ts, event.timestamp, event.at),
+        })}`);
+      } catch {
+        // Best-effort duplicate suppression only.
+      }
+    }
   }
   return keys;
 }
@@ -151,7 +219,7 @@ export function dedupeSessionEvents(events = []) {
     const existingIndex = existingIndexes.length > 0 ? Math.min(...existingIndexes) : -1;
 
     if (existingIndex >= 0) {
-      deduped[existingIndex] = event;
+      deduped[existingIndex] = mergeDuplicateEvent(deduped[existingIndex], event);
       for (const key of keys) {
         indexByKey.set(key, existingIndex);
       }