lody 0.44.2-next.1 → 0.44.3-next.1

package/dist/index.js

@@ -36820,7 +36820,7 @@ Mongoose Error Code: ${error2.code}` : ""}`
     return client;
   }
   const name = "lody";
-  const version$4 = "0.44.2-next.1";
+  const version$4 = "0.44.3-next.1";
   const description = "Lody Agent CLI tool for managing remote command execution";
   const type = "module";
   const main$3 = "dist/index.js";
@@ -112230,6 +112230,9 @@ ${this.stack.split("\n").slice(1).join("\n")}` : this.toString();
     isTransportConnected() {
       return this.transportStatus === "connected";
     }
+    isRecovering() {
+      return !this.isCleanedUp && !this.isStreamsHealthy();
+    }
     setTransportStatus(status) {
       this.transportStatus = status;
       if (status === "disconnected") {
@@ -113429,6 +113432,9 @@ ${this.stack.split("\n").slice(1).join("\n")}` : this.toString();
     isTransportConnected() {
       return this.connectionRecovery.isTransportConnected();
     }
+    isTransportRecovering() {
+      return this.connectionRecovery.isRecovering();
+    }
     getConnectedRoomCount() {
       return this.sessions.size + this.codeSessions.size;
     }
@@ -122333,23 +122339,20 @@ The postId is ${normalizedFeedbackPostId}. Use the feedback-progress-reporter sk
       }
       return Boolean(meta.latestUserMsgId && meta.latestUserMsgId !== meta.lastHandledUserMsgId);
     }
-    async setHistorySyncWaitStatus(sessionId, sessionDoc, detail) {
-      try {
-        await sessionDoc.setStatus(SessionStatusFactory.initializing(void 0, detail));
-      } catch (error2) {
-        this.deps.logger.debug(`[${sessionId}] Failed to set history sync wait status (${detail}): ${formatErrorMessage(error2)}`);
-      }
-    }
     async waitForPendingUserTurnHistorySync(sessionId, sessionDoc, meta) {
       this.deps.logger.debug(`[${sessionId}] Pending user turn metadata is visible but history is missing it; waiting up to ${SessionDispatchWatcher.HISTORY_SYNC_WAIT_TIMEOUT_MS / 1e3}s for history CRDT sync`);
-      let currentWaitDetail = "joining-history";
-      await this.setHistorySyncWaitStatus(sessionId, sessionDoc, currentWaitDetail);
       try {
         await sessionDoc.ensureDocRoomJoined();
       } catch (error2) {
         this.deps.logger.debug(`[${sessionId}] Failed to ensure session history room is joined before waiting: ${formatErrorMessage(error2)}`);
       }
-      const turnAfterJoin = await this.checkHistoryAndQueue(sessionDoc, meta);
+      await sessionDoc.waitUntilSynced();
+      const freshMeta = await sessionDoc.getMetaState() ?? meta;
+      if (!this.hasPendingUserTurnSignal(freshMeta)) {
+        this.deps.logger.debug(`[${sessionId}] Pending user turn pointer cleared during pre-wait sync; exiting wait`);
+        return null;
+      }
+      const turnAfterJoin = await this.checkHistoryAndQueue(sessionDoc, freshMeta);
       if (turnAfterJoin) {
         return turnAfterJoin;
       }
@@ -122367,18 +122370,11 @@ The postId is ${normalizedFeedbackPostId}. Use the feedback-progress-reporter sk
           unsubscribeMirror?.();
           unsubscribeStatus?.();
         };
-        const updateWaitStatus = (detail) => {
-          if (currentWaitDetail === detail) {
-            return;
-          }
-          currentWaitDetail = detail;
-          void this.setHistorySyncWaitStatus(sessionId, sessionDoc, detail);
-        };
         const checkForTurn = () => {
           if (settled) {
             return;
           }
-          void this.checkHistoryAndQueue(sessionDoc, meta).then((turn) => {
+          void this.checkHistoryAndQueue(sessionDoc, freshMeta).then((turn) => {
             if (settled || !turn) {
               return;
             }
@@ -122398,7 +122394,6 @@ The postId is ${normalizedFeedbackPostId}. Use the feedback-progress-reporter sk
           }
           reconnectAttempted = true;
           void (async () => {
-            updateWaitStatus("reconnecting-history");
             const jitterMs = SessionDispatchWatcher.getReconnectJitterMs();
             this.deps.logger.debug(`[${sessionId}] Session history room ${reason}; attempting one rejoin in ${jitterMs}ms`);
             await SessionDispatchWatcher.sleep(jitterMs);
@@ -122417,14 +122412,6 @@ The postId is ${normalizedFeedbackPostId}. Use the feedback-progress-reporter sk
           if (settled || !status) {
             return;
           }
-          if (status === "connecting" || status === "joined") {
-            updateWaitStatus("joining-history");
-            return;
-          }
-          if (status === "reconnecting") {
-            updateWaitStatus("reconnecting-history");
-            return;
-          }
           if (status === "disconnected" || status === "error") {
             attemptReconnectOnce(status);
           }
@@ -122461,16 +122448,20 @@ The postId is ${normalizedFeedbackPostId}. Use the feedback-progress-reporter sk
       if (meta.machineId !== this.deps.machineId || meta.isArchived || !this.hasPendingUserTurnSignal(meta)) {
         return;
       }
-      await this.deps.workspaceDocument.repo.upsertDocMeta?.(roomId, {
+      const pendingUserMsgId = meta.processingUserMsgId ?? meta.latestUserMsgId ?? meta.lastHandledUserMsgId;
+      const recoveryPatch = {
         status: SessionStatusFactory.idle(),
-        latestUserMsgId: void 0,
-        processingUserMsgId: void 0,
         dispatchError: {
           code: SessionDispatchWatcher.DISPATCH_HISTORY_SYNC_TIMEOUT_CODE,
           message: "Dispatch recovery could not reconnect to this session after 5 minutes. Send a new message to retry.",
           at: getServerNow()
         }
-      });
+      };
+      if (pendingUserMsgId) {
+        recoveryPatch.lastHandledUserMsgId = pendingUserMsgId;
+        recoveryPatch.latestUserMsgId = pendingUserMsgId;
+      }
+      await this.deps.workspaceDocument.repo.upsertDocMeta?.(roomId, recoveryPatch);
       const watched = this.watchedSessions.get(sessionId);
       watched?.unsubscribe();
       this.watchedSessions.delete(sessionId);
@@ -133184,6 +133175,9 @@ export PATH=${toSingleQuotedShellString(ghShimBinDir)}:"$PATH"
     isControlPlaneReady() {
       return this.documentManager.isTransportConnected();
     }
+    isControlPlaneRecovering() {
+      return this.documentManager.isTransportRecovering();
+    }
     getActiveSessionCount() {
       return this.runtime.getActiveSessionCount();
     }
@@ -135013,23 +135007,26 @@ export PATH=${toSingleQuotedShellString(ghShimBinDir)}:"$PATH"
     refreshRuntimeState() {
       const desiredCount = this.desiredWorkspaces.size;
       let connectedCount = 0;
+      let reconnectingCount = 0;
       let totalActiveSessions = 0;
       let totalConnectedRooms = 0;
       for (const runtime of this.runtimes.values()) {
         if (runtime.lody.isControlPlaneReady()) {
           connectedCount += 1;
+        } else if (runtime.lody.isControlPlaneRecovering()) {
+          reconnectingCount += 1;
         }
         totalActiveSessions += runtime.lody.getActiveSessionCount();
         totalConnectedRooms += runtime.lody.getConnectedRoomCount();
       }
       this.runtimeStateReporter.setActiveSessionCount(totalActiveSessions);
       this.runtimeStateReporter.setConnectedRoomCount(totalConnectedRooms);
-      const nextConnectivity = desiredCount === 0 ? "online" : connectedCount === 0 ? "offline" : connectedCount < desiredCount ? "reconnecting" : "online";
+      const hasWorkspaceRetry = this.retryTimers.size > 0 || this.startInFlight.size > 0;
+      const nextConnectivity = desiredCount === 0 ? "online" : connectedCount === desiredCount ? "online" : reconnectingCount > 0 || hasWorkspaceRetry ? "reconnecting" : "offline";
       if (this.lastConnectivity !== nextConnectivity) {
         this.lastConnectivity = nextConnectivity;
         this.runtimeStateReporter.setConnectivity(nextConnectivity);
       }
-      const hasWorkspaceRetry = this.retryTimers.size > 0 || this.startInFlight.size > 0;
       if (hasWorkspaceRetry && !this.hasWorkspaceRetryIssue) {
         this.hasWorkspaceRetryIssue = true;
         this.runtimeStateReporter.upsertIssue({
@@ -167312,10 +167309,18 @@ ${entry2.text}`).join("\n\n");
   }
   const DEFAULT_MIN_RETRY_MS$1 = 1e3;
   const DEFAULT_MAX_RETRY_MS$1 = 3e4;
-  function buildRetryDelay(attempt, minMs = DEFAULT_MIN_RETRY_MS$1, maxMs = DEFAULT_MAX_RETRY_MS$1) {
+  const DEFAULT_JITTER_FRACTION = 0.2;
+  function buildRetryDelay(attempt, minMs = DEFAULT_MIN_RETRY_MS$1, maxMs = DEFAULT_MAX_RETRY_MS$1, options = {}) {
     const exponent = Math.max(0, attempt);
-    const delay2 = minMs * 2 ** exponent;
-    return Math.min(delay2, maxMs);
+    const baseDelay = Math.min(minMs * 2 ** exponent, maxMs);
+    const jitterFraction = Math.max(0, options.jitterFraction ?? DEFAULT_JITTER_FRACTION);
+    if (jitterFraction === 0) {
+      return baseDelay;
+    }
+    const random2 = options.random ?? Math.random;
+    const randomValue = Math.min(1, Math.max(0, random2()));
+    const jitterMultiplier = 1 + (randomValue * 2 - 1) * jitterFraction;
+    return Math.min(Math.max(0, Math.round(baseDelay * jitterMultiplier)), maxMs);
   }
   class FailureWindow {
     historyMs = [];
@@ -167376,6 +167381,7 @@ ${result.stderr}`;
     probeFailureThreshold;
     minRetryMs;
     maxRetryMs;
+    retryRandom;
     failureWindow;
     triggered = false;
     inFlight = false;
@@ -167407,6 +167413,7 @@ ${result.stderr}`;
       this.probeFailureThreshold = options.probeFailureThreshold ?? DEFAULT_PROBE_FAILURE_THRESHOLD;
       this.minRetryMs = options.minRetryMs ?? DEFAULT_MIN_RETRY_MS;
       this.maxRetryMs = options.maxRetryMs ?? DEFAULT_MAX_RETRY_MS;
+      this.retryRandom = options.retryRandom ?? Math.random;
       this.failureWindow = new FailureWindow(options.fatalFailureWindowMs ?? DEFAULT_FATAL_FAILURE_WINDOW_MS, options.fatalFailureThreshold ?? DEFAULT_FATAL_FAILURE_THRESHOLD);
     }
     getState() {
@@ -167486,6 +167493,9 @@ ${result.stderr}`;
         this.latestRuntimeState = runtimeState;
         this.probeFailureCount = 0;
         this.probeUnavailable = false;
+        this.clearRetryTimer();
+        this.attempt = 0;
+        this.failureWindow.reset();
         this.lastStateMessage = void 0;
       } else {
         this.probeFailureCount += 1;
@@ -167506,7 +167516,9 @@ ${result.stderr}`;
       } else if (this.fatalReason) {
         phase = "fatal";
       } else if (runtime) {
-        phase = runtime.phase === "fatal" ? "fatal" : runtime.phase;
+        phase = runtime.phase === "fatal" ? "fatal" : runtime.connectivity === "reconnecting" ? "reconnecting" : runtime.phase;
+      } else if (this.retryTimer) {
+        phase = "reconnecting";
       } else if (childRunning) {
         phase = this.probeUnavailable ? "offline" : "starting";
       } else if (this.probeUnavailable && !this.inFlight && !this.retryTimer) {
@@ -167563,7 +167575,9 @@ ${result.stderr}`;
     scheduleRetry(reason, recordFailure = true) {
       if (this.fatalReason) return;
       if (recordFailure && this.recordFailure(reason)) return;
-      const delay2 = buildRetryDelay(this.attempt, this.minRetryMs, this.maxRetryMs);
+      const delay2 = buildRetryDelay(this.attempt, this.minRetryMs, this.maxRetryMs, {
+        random: this.retryRandom
+      });
       this.attempt += 1;
       this.clearRetryTimer();
       this.pendingRetryInMs = delay2;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lody",
-  "version": "0.44.2-next.1",
+  "version": "0.44.3-next.1",
   "description": "Lody Agent CLI tool for managing remote command execution",
   "type": "module",
   "main": "dist/index.js",