@sjawhar/pi-legion-envoy 5.30.2 → 5.30.4

package/dist/envoy.js

@@ -30475,6 +30475,23 @@ var EnvelopeSchema = exports_external.object({
   urgency: exports_external.enum(["low", "med", "high", "blocking"]).optional(),
   expects_reply: exports_external.enum(["none", "optional", "required"]).optional()
 });
+var MINTED_DEDUPE_KEY_PATTERN = "^(?:envoy\\.role\\.forward\\.)?(?:publish|agent\\.[^.]+)\\.(?:[0-9a-f]{32}|[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12})$";
+var mintedDedupeKey = new RegExp(MINTED_DEDUPE_KEY_PATTERN);
+function dedupeKeyNamesItsEvent(envelope) {
+  const key = envelope.dedupe_key;
+  if (key === undefined)
+    return false;
+  if (envelope.source === "dispatch" || mintedDedupeKey.test(key))
+    return true;
+  switch (envelope.source) {
+    case "github":
+    case "slack":
+    case "ghostwispr":
+      return envelope.source_event_id !== undefined && envelope.source_event_id !== "" && key === `${envelope.source}.${envelope.source_event_id}`;
+    default:
+      return false;
+  }
+}
 // ../contracts/src/handoff-schema.ts
 var HANDOFF_SCHEMA_VERSION = 1;
 var HANDOFF_PHASES = ["architect", "plan", "implement", "test", "review"];
@@ -31612,6 +31629,7 @@ var InboundSenderSchema = exports_external.object({
 var InboundEnvelopeSchema = exports_external.object({
   event_id: exports_external.string().optional(),
   source: exports_external.string(),
+  source_event_id: exports_external.string().optional(),
   source_session: exports_external.string().optional(),
   topic: exports_external.string().optional(),
   dedupe_key: exports_external.string().optional(),
@@ -31655,13 +31673,72 @@ async function postDeliveryReply(config2, sessionId, delivery, result) {
 function expectsLaneReceipt(frame) {
   return frame.reply !== undefined && frame.reply !== "" && frame.subject === frame.directSubject && frame.envelopeTopic !== undefined && frame.envelopeTopic !== frame.directSubject;
 }
-function rememberBounded(seen, key, limit) {
-  seen.add(key);
-  if (seen.size > limit) {
-    const oldest = seen.values().next();
-    if (!oldest.done)
-      seen.delete(oldest.value);
-  }
+var DedupeIdentitySchema = exports_external.object({
+  event_id: exports_external.string().min(1).optional(),
+  dedupe_key: exports_external.string().min(1).optional(),
+  source: exports_external.string().optional(),
+  source_event_id: exports_external.string().optional()
+});
+var DELIVERY_DEDUPE_KEY_LIMIT = 250000;
+var DELIVERY_EVENT_ID_LIMIT = 1e4;
+function createDeliveryDedupe(now = Date.now) {
+  const keys = new Map;
+  let events = new Map;
+  let olderEvents = new Map;
+  let claims = 0;
+  return {
+    claim(frame) {
+      const eventId = frame?.event_id;
+      if (eventId !== undefined && (events.has(eventId) || olderEvents.has(eventId))) {
+        return;
+      }
+      const key = frame?.dedupe_key;
+      const named = frame !== undefined && key !== undefined && dedupeKeyNamesItsEvent(frame);
+      const at = now();
+      if (named) {
+        const claimedAt = keys.get(key);
+        if (claimedAt !== undefined && at - claimedAt < DELIVERY_DUPLICATE_WINDOW_MS) {
+          return;
+        }
+        for (const [oldest, deliveredAt] of keys) {
+          if (at - deliveredAt < DELIVERY_DUPLICATE_WINDOW_MS)
+            break;
+          keys.delete(oldest);
+        }
+        keys.delete(key);
+        if (keys.size >= DELIVERY_DEDUPE_KEY_LIMIT) {
+          const oldest = keys.keys().next();
+          if (oldest.done !== true)
+            keys.delete(oldest.value);
+        }
+        keys.set(key, at);
+      }
+      const claim = ++claims;
+      if (eventId !== undefined) {
+        if (events.size >= DELIVERY_EVENT_ID_LIMIT / 2) {
+          olderEvents = events;
+          events = new Map;
+        }
+        events.set(eventId, claim);
+      }
+      let released = false;
+      return {
+        release() {
+          if (released)
+            return;
+          released = true;
+          if (named && keys.get(key) === at)
+            keys.delete(key);
+          if (eventId === undefined)
+            return;
+          if (events.get(eventId) === claim)
+            events.delete(eventId);
+          if (olderEvents.get(eventId) === claim)
+            olderEvents.delete(eventId);
+        }
+      };
+    }
+  };
 }
 function isCommentTargetedDelivery(delivery) {
   return "comment_id" in delivery;
@@ -35893,7 +35970,7 @@ function envoyExtension(pi) {
   };
   const client = createEnvoyClient({ baseUrl: defaults.envoyUrl, fetch });
   const subscriptions = new Map;
-  const dedupeKeys = new Set;
+  const delivered = createDeliveryDedupe();
   let connection;
   let sessionDirectory = "";
   let sessionID = "";
@@ -36051,9 +36128,8 @@ function envoyExtension(pi) {
     }
     for (const topic of subscriptionRemovedTopics(raw, sessionID) ?? [])
       closeIntentionally(topic);
-    const dedupeKey = rendered.envelope?.dedupe_key;
-    const duplicate = dedupeKey !== undefined && dedupeKeys.has(dedupeKey);
-    if (!duplicate && !rendered.skip) {
+    const claim2 = rendered.skip ? undefined : delivered.claim(rendered.envelope);
+    if (claim2 !== undefined) {
       const envelope2 = rendered.envelope;
       if (envelope2 !== undefined) {
         inbox.unshift({
@@ -36065,30 +36141,28 @@ function envoyExtension(pi) {
         if (inbox.length > 50)
           inbox.pop();
       }
+      const refuse = async (delivery, error48) => {
+        claim2.release();
+        await postDispatchReply(delivery, { error: error48 });
+      };
       try {
         if (rendered.rejectedDelivery !== undefined) {
           console.warn(`[envoy] rejecting malformed Dispatch targeted delivery ${rendered.rejectedDelivery.id}`);
-          await postDispatchReply(rendered.rejectedDelivery, {
-            error: "Invalid Dispatch targeted delivery frame"
-          });
+          await refuse(rendered.rejectedDelivery, "Invalid Dispatch targeted delivery frame");
         } else if (rendered.malformedDelivery === true) {
           console.warn("[envoy] dropping malformed Dispatch targeted delivery without a reply address");
         } else if (rendered.delivery?.mode === "btw") {
           const answer = sideTurn(pi, activeSessionContext);
           if (shuttingDown) {
-            await postDispatchReply(rendered.delivery, {
-              error: "This OMP session is shutting down"
-            });
+            await refuse(rendered.delivery, "This OMP session is shutting down");
           } else if (answer === undefined) {
-            await postDispatchReply(rendered.delivery, {
-              error: "This OMP host does not support BTW delivery"
-            });
+            await refuse(rendered.delivery, "This OMP host does not support BTW delivery");
           } else {
             try {
               const reply2 = await answer({ prompt: rendered.delivery.body });
               await postDispatchReply(rendered.delivery, { body: reply2.replyText });
             } catch (error48) {
-              await postDispatchReply(rendered.delivery, { error: messageFor(error48) });
+              await refuse(rendered.delivery, messageFor(error48));
             }
           }
         } else {
@@ -36104,11 +36178,10 @@ function envoyExtension(pi) {
           }
         }
       } catch (error48) {
+        claim2.release();
         console.warn(`[envoy] failed to deliver envelope ${envelope2?.event_id ?? "unknown"}`, error48);
         throw error48;
       }
-      if (dedupeKey !== undefined)
-        rememberBounded(dedupeKeys, dedupeKey, 1000);
     }
   };
   const RESUBSCRIBE_DELAY_MS = Number(process.env.ENVOY_RESUBSCRIBE_DELAY_MS ?? "") || 5000;

package/dist/legion.js

@@ -30644,6 +30644,23 @@ var EnvelopeSchema = exports_external.object({
   urgency: exports_external.enum(["low", "med", "high", "blocking"]).optional(),
   expects_reply: exports_external.enum(["none", "optional", "required"]).optional()
 });
+var MINTED_DEDUPE_KEY_PATTERN = "^(?:envoy\\.role\\.forward\\.)?(?:publish|agent\\.[^.]+)\\.(?:[0-9a-f]{32}|[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12})$";
+var mintedDedupeKey = new RegExp(MINTED_DEDUPE_KEY_PATTERN);
+function dedupeKeyNamesItsEvent(envelope) {
+  const key = envelope.dedupe_key;
+  if (key === undefined)
+    return false;
+  if (envelope.source === "dispatch" || mintedDedupeKey.test(key))
+    return true;
+  switch (envelope.source) {
+    case "github":
+    case "slack":
+    case "ghostwispr":
+      return envelope.source_event_id !== undefined && envelope.source_event_id !== "" && key === `${envelope.source}.${envelope.source_event_id}`;
+    default:
+      return false;
+  }
+}
 // ../contracts/src/handoff-schema.ts
 var HANDOFF_SCHEMA_VERSION = 1;
 var HANDOFF_PHASES = ["architect", "plan", "implement", "test", "review"];
@@ -33685,7 +33702,7 @@ import { logger } from "@oh-my-pi/pi-utils";
 // package.json
 var package_default = {
   name: "@sjawhar/pi-legion-envoy",
-  version: "5.30.2",
+  version: "5.30.4",
   type: "module",
   omp: {
     extensions: [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sjawhar/pi-legion-envoy",
-  "version": "5.30.2",
+  "version": "5.30.4",
   "type": "module",
   "omp": {
     "extensions": [