@cydm/happy-elves 0.1.0-beta.241 → 0.1.0-beta.245

package/apps/cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cydm/happy-elves-cli",
-  "version": "0.1.0-beta.241",
+  "version": "0.1.0-beta.245",
   "private": true,
   "type": "module"
 }

package/apps/daemon/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cydm/happy-elves-daemon",
-  "version": "0.1.0-beta.241",
+  "version": "0.1.0-beta.245",
   "private": true,
   "type": "module"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cydm/happy-elves",
-  "version": "0.1.0-beta.241",
+  "version": "0.1.0-beta.245",
   "description": "Remote controller for local coding agents with hosted or self-hosted relay support.",
   "type": "module",
   "bin": {

package/packages/client/dist/transport.js

@@ -101,11 +101,14 @@ export async function sendCommand(context, command, waitForDone = false, timeout
     const targetTurnId = "turnId" in command ? command.turnId : undefined;
     return await new Promise((resolve, reject) => {
         let settled = false;
+        let retainedPoller;
         const finish = (result) => {
             if (settled)
                 return;
             settled = true;
             globalThis.clearTimeout(timer);
+            if (retainedPoller)
+                globalThis.clearInterval(retainedPoller);
             ws.close();
             resolve(result);
         };
@@ -114,6 +117,8 @@ export async function sendCommand(context, command, waitForDone = false, timeout
                 return;
             settled = true;
             globalThis.clearTimeout(timer);
+            if (retainedPoller)
+                globalThis.clearInterval(retainedPoller);
             ws.close();
             reject(error);
         };
@@ -125,7 +130,11 @@ export async function sendCommand(context, command, waitForDone = false, timeout
             dispatch: ackedDispatch,
             events,
         });
+        let retainedLookupInFlight = false;
         const resolveFromRetainedTurnIfDone = (sessionId, turnId) => {
+            if (retainedLookupInFlight)
+                return;
+            retainedLookupInFlight = true;
             void context.sessionEvents(sessionId, { limit: 1000 })
                 .then(({ events: retainedEvents }) => retainedEvents.filter((event) => event.turnId === turnId))
                 .then(async (turnEvents) => {
@@ -142,7 +151,19 @@ export async function sendCommand(context, command, waitForDone = false, timeout
                 events.sort((left, right) => left.id - right.id);
                 finish(commandResultFromAck());
             })
-                .catch(() => { });
+                .catch(() => { })
+                .finally(() => {
+                retainedLookupInFlight = false;
+            });
+        };
+        const startRetainedTurnPoller = (sessionId, turnId) => {
+            if (retainedPoller)
+                return;
+            resolveFromRetainedTurnIfDone(sessionId, turnId);
+            retainedPoller = globalThis.setInterval(() => {
+                if (!settled)
+                    resolveFromRetainedTurnIfDone(sessionId, turnId);
+            }, 2_000);
         };
         const timer = globalThis.setTimeout(() => {
             fail(new ControllerClientError("Timed out waiting for command result", "COMMAND_TIMEOUT", {
@@ -182,7 +203,7 @@ export async function sendCommand(context, command, waitForDone = false, timeout
                     finish(commandResultFromAck());
                 }
                 else if (targetSessionId && targetTurnId) {
-                    resolveFromRetainedTurnIfDone(targetSessionId, targetTurnId);
+                    startRetainedTurnPoller(targetSessionId, targetTurnId);
                 }
                 return;
             }