@cjhyy/code-shell-chat 0.9.5 → 0.9.7

package/dist/delivery-queue.js

@@ -110,7 +110,9 @@ export class DeliveryQueue {
                     if (this.stopped)
                         throw new Error("Chat Gateway inbox is stopped");
                     const persistent = Boolean(this.config.path && (!message.attachments?.length || spooled !== undefined));
-                    const safeMessage = persistent ? serializableMessage(message, spooled) : message;
+                    const safeMessage = persistent
+                        ? serializableMessage(message, this.rehydrateAttachments(spooled))
+                        : message;
                     record = {
                         id,
                         ...(dedupeKey ? { dedupeKey } : {}),
@@ -501,7 +503,7 @@ function deliveryDedupeKey(message) {
 function targetKey(message) {
     return `${message.channel}\0${message.target}`;
 }
-function serializableMessage(message, spooled) {
+function serializableMessage(message, acceptedAttachments) {
     // Drop `attachments` before serializing: each carries a `load()` closure that
     // JSON silently discards, which would leave a persisted message claiming
     // attachments it can no longer produce. Spooled metadata is stored on the
@@ -512,10 +514,11 @@ function serializableMessage(message, spooled) {
         throw new Error("Chat Gateway message is not persistable or exceeds 1 MiB");
     }
     const parsed = JSON.parse(serialized);
-    // Keep the live attachments for THIS process; the spool only matters after a
-    // restart, and re-reading from disk while the originals are in hand is waste.
-    if (message.attachments?.length && spooled) {
-        return { ...parsed, attachments: message.attachments };
+    // Use the bytes already accepted into the durable inbox. The original load()
+    // usually fetches a short-lived remote URL, so keeping it here would download
+    // twice and could lose a successfully spooled image before Mimi sees it.
+    if (acceptedAttachments?.length) {
+        return { ...parsed, attachments: acceptedAttachments };
     }
     return parsed;
 }

package/dist/gateway.js

@@ -116,8 +116,6 @@ export function createMimiPetChat(options) {
                     const entry = {
                         outgoing: pending,
                         nextSendIndex: 0,
-                        activeSends: 0,
-                        sendFailed: false,
                     };
                     replies.set(cacheKey, entry);
                     cacheEntry = entry;
@@ -151,12 +149,7 @@ export function createMimiPetChat(options) {
         }
         // Adapter failures must escape to DeliveryQueue. Catching them above would
         // turn a failed real reply into a successful generic error and lose it.
-        if (cacheEntry) {
-            if (cacheEntry.activeSends === 0)
-                cacheEntry.sendFailed = false;
-            cacheEntry.activeSends += 1;
-        }
-        try {
+        const sendOutgoing = async () => {
             let index = cacheEntry?.nextSendIndex ?? 0;
             while (index < outgoing.length) {
                 await reply(outgoing[index]);
@@ -164,24 +157,23 @@ export function createMimiPetChat(options) {
                 if (cacheEntry)
                     cacheEntry.nextSendIndex = index;
             }
-        }
-        catch (error) {
-            if (cacheEntry)
-                cacheEntry.sendFailed = true;
-            throw error;
+        };
+        // Sharing model work alone is insufficient: overlapping deliveries can
+        // both observe nextSendIndex=0 while the first platform send is in flight.
+        // Share that send too, including its failure, then let a later queue retry
+        // resume from the first unfinished chunk.
+        const sendTask = cacheEntry ? (cacheEntry.sendTask ??= sendOutgoing()) : sendOutgoing();
+        try {
+            await sendTask;
+            // DeliveryQueue now owns a durable completed-message dedupe record.
+            // Keep memory proportional to failed/in-flight sends, not successful chat.
+            if (cacheKey && cacheEntry && replies.get(cacheKey) === cacheEntry) {
+                replies.delete(cacheKey);
+            }
         }
         finally {
-            if (cacheEntry) {
-                cacheEntry.activeSends -= 1;
-                // DeliveryQueue now owns a durable completed-message dedupe record.
-                // Keep memory proportional to failed/in-flight sends, not successful chat.
-                if (cacheKey &&
-                    cacheEntry.activeSends === 0 &&
-                    !cacheEntry.sendFailed &&
-                    replies.get(cacheKey) === cacheEntry) {
-                    replies.delete(cacheKey);
-                }
-            }
+            if (cacheEntry?.sendTask === sendTask)
+                cacheEntry.sendTask = undefined;
         }
     };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cjhyy/code-shell-chat",
-  "version": "0.9.5",
+  "version": "0.9.7",
   "description": "A standalone, transport-agnostic multi-channel chat gateway for Node.js and Bun.",
   "type": "module",
   "main": "./dist/index.js",