lody 0.46.2-next.1 → 0.46.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.46.2-next.1";
+  const version$4 = "0.46.3-next.1";
   const description = "Lody Agent CLI tool for managing remote command execution";
   const type = "module";
   const main$3 = "dist/index.js";
@@ -82846,7 +82846,6 @@ ${tailedOutput}` : null;
   const LODY_PRESENCE_CHANNEL = "presence";
   const LODY_PRESENCE_TTL_MS = 6e4;
   const LODY_PRESENCE_HEARTBEAT_MS = 2e4;
-  const LODY_PRESENCE_STREAM_HEARTBEAT_MS = 15e3;
   const ActiveSessionStatusSchema = discriminatedUnion("type", [
     object({
       type: literal("running")
@@ -93097,7 +93096,6 @@ stream:${scope2.streamId}`;
     adaptor;
     client;
     reconnectConfig;
-    heartbeatMs;
     debug;
     joinState;
     constructor(options) {
@@ -93107,7 +93105,6 @@ stream:${scope2.streamId}`;
         ...DEFAULT_RECONNECT_CONFIG,
         ...options.reconnectConfig
       };
-      this.heartbeatMs = options.heartbeatMs ?? 15e3;
       this.debug = options.debug ?? false;
       this.client = new StreamsTransportClient({
         streamUrl: options.streamUrl,
@@ -93188,18 +93185,15 @@ stream:${scope2.streamId}`;
       };
     }
     async startJoin(state2) {
+      state2.unsubscribeLocal = this.adaptor.subscribeLocalUpdates((update2) => {
+        this.enqueueLocal(state2, normalizeEphemeralUpdate(update2));
+      });
       state2.requestController = new AbortController();
       const firstOpen = this.waitForFirstOpen(state2);
       this.runReadLoop(state2);
       await firstOpen;
       if (state2.closed) return;
-      state2.unsubscribeLocal = this.adaptor.subscribeLocalUpdates((update2) => {
-        this.enqueueLocal(state2, normalizeEphemeralUpdate(update2));
-      });
       this.setWriteStatus(state2, "ok");
-      const fullState = normalizeEphemeralUpdate(await this.adaptor.encodeAll());
-      if (fullState != null) state2.pendingLocal.pushBack(fullState);
-      this.startHeartbeat(state2);
       await this.flushPendingLocal(state2);
       if (state2.status === "error" || state2.status === "disconnected") throw new Error(`ephemeral stream failed to join: ${state2.status}`);
     }
@@ -93257,7 +93251,6 @@ stream:${scope2.streamId}`;
       if (state2.closed) return;
       state2.closed = true;
       state2.unsubscribeLocal?.();
-      if (state2.heartbeatTimer != null) clearInterval(state2.heartbeatTimer);
       state2.requestController?.abort();
       state2.retrySleepController.abort();
       this.rejectFirstOpen(state2, closedSubscriptionError());
@@ -93285,7 +93278,6 @@ stream:${scope2.streamId}`;
             ]);
             this.setReadStatus(state2, "ok");
             this.resolveFirstOpen(state2);
-            if (state2.unsubscribeLocal != null) this.enqueueFullState(state2);
           }, async (update2) => {
             if (update2.byteLength > 0) await this.adaptor.applyRemoteUpdates([
               update2
@@ -93333,27 +93325,10 @@ stream:${scope2.streamId}`;
         }
       }
     }
-    startHeartbeat(state2) {
-      if (this.heartbeatMs === false || this.heartbeatMs <= 0) return;
-      state2.heartbeatTimer = setInterval(() => {
-        this.enqueueFullState(state2);
-      }, this.heartbeatMs);
-    }
-    async enqueueFullState(state2) {
-      try {
-        const update2 = await this.adaptor.encodeAll();
-        this.enqueueLocal(state2, normalizeEphemeralUpdate(update2));
-      } catch (error2) {
-        this.logError("ephemeral encodeAll failed", error2, {
-          streamUrl: this.streamUrl
-        });
-        this.setWriteStatus(state2, "error");
-      }
-    }
     enqueueLocal(state2, update2) {
       if (state2.closed || update2 == null || update2.byteLength === 0) return;
       state2.pendingLocal.pushBack(update2);
-      this.flushPendingLocal(state2);
+      if (state2.writeStatus !== "connecting") this.flushPendingLocal(state2);
     }
     async flushPendingLocal(state2) {
       if (state2.flushingLocal || state2.closed) return;
@@ -94962,12 +94937,25 @@ stream:${scope2.streamId}`;
     };
   }
   function EphemeralStoreAdaptor(store) {
+    let applyingRemoteDepth = 0;
     return {
-      encodeAll: () => store.encodeAll(),
       applyRemoteUpdates: (updates) => {
-        for (const update2 of updates) store.apply(update2);
+        applyingRemoteDepth += 1;
+        try {
+          for (const update2 of updates) store.apply(update2);
+        } finally {
+          applyingRemoteDepth -= 1;
+        }
       },
-      subscribeLocalUpdates: (listener) => store.subscribeLocalUpdates(listener)
+      subscribeLocalUpdates: (listener) => {
+        const unsubscribeLocalUpdates = store.subscribeLocalUpdates((update2) => {
+          if (applyingRemoteDepth > 0) return;
+          listener(update2);
+        });
+        return () => {
+          unsubscribeLocalUpdates();
+        };
+      }
     };
   }
   function isAfter(entry2, current2) {
@@ -95862,8 +95850,7 @@ stream:${scope2.streamId}`;
       this.transport = new EphemeralStreamCrdt({
         streamUrl: toLodyPresenceStreamUrl(durableStreamUrl),
         auth: options.auth,
-        adaptor: EphemeralStoreAdaptor(this.store),
-        heartbeatMs: LODY_PRESENCE_STREAM_HEARTBEAT_MS
+        adaptor: EphemeralStoreAdaptor(this.store)
       });
       this.machineTimer = setInterval(() => {
         this.writeMachineHeartbeat();
@@ -133609,37 +133596,14 @@ export PATH=${toSingleQuotedShellString(ghShimBinDir)}:"$PATH"
         args: callbacks.args ?? [],
         getStderrTail: () => stderrTail
       });
-      agentProcess.stdin?.on("error", (err2) => {
-        if (err2.code !== "EPIPE") {
-          this.logger.error(`[${this.sessionId}] Agent stdin error: ${err2.message}`);
-        }
-      });
-      const input2 = new WritableStream({
-        write(chunk) {
-          if (agentProcess.stdin && !agentProcess.stdin.destroyed) {
-            agentProcess.stdin.write(chunk);
-          }
-        },
-        close() {
-          if (agentProcess.stdin && !agentProcess.stdin.destroyed) {
-            agentProcess.stdin.end();
-          }
-        }
-      });
-      const output = new ReadableStream({
-        start(controller) {
-          if (!agentProcess.stdout) {
-            controller.error(new Error("Agent process stdout is not available"));
-            return;
-          }
-          agentProcess.stdout.on("data", (chunk) => {
-            controller.enqueue(chunk);
-          });
-          agentProcess.stdout.on("end", () => {
-            controller.close();
-          });
-        }
-      });
+      if (!agentProcess.stdin) {
+        throw new Error("Agent process stdin is not available");
+      }
+      if (!agentProcess.stdout) {
+        throw new Error("Agent process stdout is not available");
+      }
+      const input2 = createStdinWritableStream(agentProcess.stdin);
+      const output = createStdoutReadableStream(agentProcess.stdout);
       const stream2 = ndJsonStream(input2, output);
       this.logger.debug(`[${this.sessionId}] ndJsonStream created, calling createAcpClient`);
       const { client, acpSessionId } = await createAcpClient({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lody",
-  "version": "0.46.2-next.1",
+  "version": "0.46.3-next.1",
   "description": "Lody Agent CLI tool for managing remote command execution",
   "type": "module",
   "main": "dist/index.js",
@@ -28,7 +28,7 @@
     "@better-auth/api-key": "1.5.5",
     "@convex-dev/better-auth": "0.11.2",
     "@loro-dev/flock-wasm": "^0.2.1",
-    "@loro-dev/streams-crdt": "0.8.0",
+    "@loro-dev/streams-crdt": "0.8.1",
     "@sentry/node": "^10.29.0",
     "@types/cross-spawn": "^6.0.6",
     "@types/iconv-lite": "^0.0.1",
@@ -72,8 +72,8 @@
     "winston-transport": "^4.7.1",
     "ws": "^8.18.3",
     "zod": "^4.1.5",
-    "@lody/convex": "0.0.1",
     "@lody/cli-supervisor": "0.0.1",
+    "@lody/convex": "0.0.1",
     "@lody/loro-streams-rpc": "0.0.1",
     "@lody/shared": "0.0.1",
     "loro-code": "0.0.1"