sentinelayer-cli 0.35.2 → 0.35.3

package/package.json

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

package/src/commands/session.js

@@ -1851,6 +1851,23 @@ function listenerPresenceHeartbeatFingerprint(lifecycle = {}) {
   );
 }
 
+export function listenerLifecycleIdempotencyStep(lifecycle = {}) {
+  const lifecycleType = normalizeString(lifecycle?.type) || "heartbeat";
+  const heartbeatCount = Number(lifecycle?.heartbeatCount);
+  if (
+    lifecycleType === "heartbeat" &&
+    Number.isInteger(heartbeatCount) &&
+    heartbeatCount > 0
+  ) {
+    return heartbeatCount;
+  }
+  const pollCount = Number(lifecycle?.pollCount);
+  if (Number.isInteger(pollCount) && pollCount >= 0) {
+    return pollCount;
+  }
+  return 0;
+}
+
 export function shouldPublishListenerPresenceHeartbeat({
   lifecycle = {},
   nowMs = Date.now(),
@@ -1900,6 +1917,10 @@ async function publishListenerPresenceEvent({
 } = {}) {
   const normalizedType = normalizeString(lifecycle.type) || "heartbeat";
   const eventName = listenerLifecycleEventName(normalizedType);
+  const idempotencyStep = listenerLifecycleIdempotencyStep({
+    ...lifecycle,
+    type: normalizedType,
+  });
   const identity = inferSessionAgentIdentity({
     agentId,
     model: agentModel,
@@ -1918,8 +1939,8 @@ async function publishListenerPresenceEvent({
       provider: normalizeString(identity.provider) || undefined,
       clientKind: normalizeString(identity.clientKind) || "cli",
     },
-    eventId: `session-listener-${listenerId}-${normalizedType}-${lifecycle.pollCount ?? 0}`,
-    idempotencyToken: `session-listener:${listenerId}:${normalizedType}:${lifecycle.pollCount ?? 0}`,
+    eventId: `session-listener-${listenerId}-${normalizedType}-${idempotencyStep}`,
+    idempotencyToken: `session-listener:${listenerId}:${normalizedType}:${idempotencyStep}`,
     payload: compactPayload({
       source: "session_listen",
       listenerId,
@@ -1930,6 +1951,7 @@ async function publishListenerPresenceEvent({
       cursorSuffix: lifecycle.cursorSuffix,
       cursorSource: lifecycle.cursorSource,
       pollCount: lifecycle.pollCount,
+      heartbeatCount: lifecycle.heartbeatCount,
       matched: lifecycle.matched,
       emitted: lifecycle.emitted,
       persistedCursor: lifecycle.persistedCursor,

package/src/session/listener.js

@@ -292,6 +292,7 @@ export async function listenSessionEvents({
   let activeTransport = normalizedTransport === "poll" ? "poll" : "stream";
   let streamAttempted = false;
   let streamFallbackReason = "";
+  let heartbeatCount = 0;
   let catchupNotified = false;
   let catchupEventCount = 0;
   let catchupMatchingEventCount = 0;
@@ -340,6 +341,7 @@ export async function listenSessionEvents({
     cursor: cursor || null,
     cursorSuffix,
     pollCount,
+    heartbeatCount,
     matched,
     emitted,
     persistedCursor,
@@ -474,6 +476,7 @@ export async function listenSessionEvents({
   }
 
   async function notifyHeartbeat({ stopping = false, nextPollMs = null } = {}) {
+    heartbeatCount += 1;
     const heartbeatAtMs = Number(_nowMs()) || Date.now();
     const humanActive = isRecentActivity(lastHumanActivityMs, heartbeatAtMs, activeWindowMs);
     await notifyLifecycle(