@bivy/bivy 0.17.3-staging.18 → 0.17.3-staging.19

package/dist/server.js

@@ -1941,10 +1941,13 @@ const dedupeSessionNew = (requestId, create) => sessionNewDedupe.run(requestId,
 // generic key->promise cache as above, reused for a different key) — see
 // issue #154's queued follow-ups. A client that isn't sure whether a queued
 // item's send actually reached the node before the socket dropped (see
-// AppController.retryStuckFollowups) resends it verbatim after reconnecting;
+// FollowupCoordinator.retrySending) resends it verbatim after reconnecting;
 // this makes that safe by collapsing a retried clientMessageId onto the
-// original broadcast + turn instead of double-prompting the runtime.
-const promptDedupe = createSessionNewDedupe();
+// original broadcast + turn instead of double-prompting the runtime. The key is
+// kept for a day, not session.new's 10 minutes: a phone backgrounded mid-send
+// can reconnect long after the turn ended, and an expired key turned its
+// retry into a fresh, duplicate turn at the bottom of the chat.
+const promptDedupe = createSessionNewDedupe({ ttlMs: 24 * 60 * 60_000 });
 const dedupePrompt = (clientMessageId, run) => promptDedupe.run(clientMessageId, run);
 // Preview traffic has isolated per-view origins and a private gateway. Relay
 // delivery needs no listener; direct ingress is an optional operator override.
@@ -2910,7 +2913,7 @@ const RELAY_COMMANDS = {
             relay?.sendEvent({ type: "integrations.updated", integrations: integrations.list() });
         }
     },
-    async prompt(msg) {
+    async prompt(msg, ctx) {
         const text = String(msg.text ?? "").trim();
         const { images, imageNotes, imageRefs, files } = attachmentsFrom(msg.attachments);
         if (!text && !images.length && !files.length)
@@ -2963,6 +2966,14 @@ const RELAY_COMMANDS = {
         eventLog.appendAttachments(record.id, promptText, [...imageRefs, ...fileRefs]);
         const agentPrompt = promptForAgent(record, promptText);
         const cmid = typeof msg.clientMessageId === "string" && msg.clientMessageId ? msg.clientMessageId : undefined;
+        // A retry of a prompt we already took: the caller missed our echo (that is
+        // why it retried), so acknowledge it again — to the caller only, since
+        // other clients already rendered the first one. Without this the client
+        // keeps the message "sending" and resends it on every reconnect.
+        if (promptDedupe.has(cmid)) {
+            ctx.reply({ type: "session.user_message", sessionId: record.id, text: promptText, clientMessageId: cmid, retry: true });
+            return;
+        }
         void dedupePrompt(cmid, async () => {
             broadcast({ type: "session.user_message", sessionId: record.id, text: promptText, clientMessageId: msg.clientMessageId });
             void sessionNamer.maybeNameSession(record, promptText);

package/dist/session/session-new-dedupe.js

@@ -38,5 +38,5 @@ export function createSessionNewDedupe(options = {}) {
         });
         return p;
     }
-    return { run, size: () => inflight.size };
+    return { run, has: (requestId) => Boolean(requestId && inflight.has(requestId)), size: () => inflight.size };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bivy/bivy",
-  "version": "0.17.3-staging.18",
+  "version": "0.17.3-staging.19",
   "type": "module",
   "license": "AGPL-3.0-only",
   "description": "Run coding agents on machines you own. Open-source, self-hostable agent workspace.",