doer-agent 0.2.7 → 0.2.8

package/dist/agent.js

@@ -115,13 +115,6 @@ async function initJetStreamContext(args) {
     const nc = await connect(args.token ? { servers: args.servers, token: args.token } : { servers: args.servers });
     const jsm = await nc.jetstreamManager();
     await ensureJetStreamInfra({ jsm, stream, subject, durable });
-    void nc.closed().then((error) => {
-        if (error) {
-            writeAgentInfraError(`nats connection closed with error: ${error.message}`);
-            return;
-        }
-        writeAgentInfraError("nats connection closed cleanly");
-    });
     void (async () => {
         try {
             for await (const status of nc.status()) {
@@ -3059,7 +3052,25 @@ async function deleteAgentSession(filePath, sessionId) {
     }
 }
 function publishSessionRpcResponse(args) {
-    args.nc.publish(args.responseSubject, sessionRpcCodec.encode(JSON.stringify(args.payload)));
+    try {
+        args.nc.publish(args.responseSubject, sessionRpcCodec.encode(JSON.stringify(args.payload)));
+    }
+    catch (error) {
+        const message = error instanceof Error ? error.message : String(error);
+        writeAgentError(`session rpc publish failed responseSubject=${args.responseSubject}: ${message}`);
+    }
+}
+function stopAllSessionWatchers() {
+    const stops = [...activeSessionWatchers.values()];
+    for (const stop of stops) {
+        try {
+            stop();
+        }
+        catch (error) {
+            const message = error instanceof Error ? error.message : String(error);
+            writeAgentError(`session watcher cleanup failed: ${message}`);
+        }
+    }
 }
 async function startSessionWatch(args) {
     const resolvedFile = resolveSessionFilePath(args.filePath);
@@ -3753,85 +3764,97 @@ async function main() {
         throw new Error("user-id and agent-secret are required");
     }
     const agentToken = agentSecret;
-    const { natsBootstrap, jetstream } = await connectBootstrapWithRetry({
-        serverBaseUrl,
-        userId,
-        agentToken,
-    });
     const agentVersion = await resolveAgentVersion();
-    const initialAgentId = typeof natsBootstrap.agentId === "string" ? natsBootstrap.agentId : "";
-    if (!initialAgentId) {
-        throw new Error("agent id missing from bootstrap");
-    }
-    process.stdout.write(`\n[doer-agent v${agentVersion}]\n`);
-    if (!usesDefaultServer) {
-        process.stdout.write(`- server: ${serverBaseUrl}\n`);
-    }
-    process.stdout.write(`- userId: ${userId}\n`);
-    process.stdout.write(`- agentId: ${initialAgentId}\n`);
-    process.stdout.write(`\n- transport: nats\n`);
-    process.stdout.write(`- natsServers: ${jetstream.servers.join(",")}\n`);
-    process.stdout.write(`- natsStream: ${jetstream.stream}\n`);
-    process.stdout.write(`- natsSubject: ${jetstream.subject}\n`);
-    process.stdout.write(`- natsDurable: ${jetstream.durable}\n\n`);
-    process.stdout.write(`- workspace: ${process.cwd()}\n\n`);
-    if (requestedServerBaseUrl !== serverBaseUrl) {
-        writeAgentInfo(`detected container runtime, server endpoint rewritten: ${requestedServerBaseUrl} -> ${serverBaseUrl}`);
-    }
-    let heartbeatHealthy = null;
-    const heartbeatTimer = setInterval(() => {
-        void heartbeatAgent({ serverBaseUrl, userId, agentToken })
-            .then(() => {
-            if (heartbeatHealthy === false) {
-                writeAgentInfraError(`heartbeat reconnected at=${formatLocalTimestamp()}`);
+    let bannerShown = false;
+    while (true) {
+        const { natsBootstrap, jetstream } = await connectBootstrapWithRetry({
+            serverBaseUrl,
+            userId,
+            agentToken,
+        });
+        const initialAgentId = typeof natsBootstrap.agentId === "string" ? natsBootstrap.agentId : "";
+        if (!initialAgentId) {
+            throw new Error("agent id missing from bootstrap");
+        }
+        if (!bannerShown) {
+            process.stdout.write(`\n[doer-agent v${agentVersion}]\n`);
+            if (!usesDefaultServer) {
+                process.stdout.write(`- server: ${serverBaseUrl}\n`);
             }
-            heartbeatHealthy = true;
-        })
-            .catch((error) => {
-            const message = error instanceof Error ? error.message : String(error);
-            if (heartbeatHealthy !== false) {
-                writeAgentInfraError(`heartbeat failed: ${message}`);
+            process.stdout.write(`- userId: ${userId}\n`);
+            process.stdout.write(`- agentId: ${initialAgentId}\n`);
+            process.stdout.write(`\n- transport: nats\n`);
+            process.stdout.write(`- natsServers: ${jetstream.servers.join(",")}\n`);
+            process.stdout.write(`- natsStream: ${jetstream.stream}\n`);
+            process.stdout.write(`- natsSubject: ${jetstream.subject}\n`);
+            process.stdout.write(`- natsDurable: ${jetstream.durable}\n\n`);
+            process.stdout.write(`- workspace: ${process.cwd()}\n\n`);
+            if (requestedServerBaseUrl !== serverBaseUrl) {
+                writeAgentInfo(`detected container runtime, server endpoint rewritten: ${requestedServerBaseUrl} -> ${serverBaseUrl}`);
             }
-            heartbeatHealthy = false;
+            bannerShown = true;
+        }
+        else {
+            writeAgentInfraError(`nats session restored agentId=${initialAgentId} servers=${jetstream.servers.join(",")} at=${formatLocalTimestamp()}`);
+        }
+        let heartbeatHealthy = null;
+        const heartbeatTimer = setInterval(() => {
+            void heartbeatAgent({ serverBaseUrl, userId, agentToken })
+                .then(() => {
+                if (heartbeatHealthy === false) {
+                    writeAgentInfraError(`heartbeat reconnected at=${formatLocalTimestamp()}`);
+                }
+                heartbeatHealthy = true;
+            })
+                .catch((error) => {
+                const message = error instanceof Error ? error.message : String(error);
+                if (heartbeatHealthy !== false) {
+                    writeAgentInfraError(`heartbeat failed: ${message}`);
+                }
+                heartbeatHealthy = false;
+            });
+        }, 10_000);
+        subscribeToFsRpc({
+            jetstream,
+            serverBaseUrl,
+            userId,
+            agentId: initialAgentId,
+            agentToken,
         });
-    }, 10_000);
-    subscribeToFsRpc({
-        jetstream,
-        serverBaseUrl,
-        userId,
-        agentId: initialAgentId,
-        agentToken,
-    });
-    subscribeToSessionRpc({
-        jetstream,
-        userId,
-        agentId: initialAgentId,
-    });
-    subscribeToCodexAuthRpc({
-        jetstream,
-        userId,
-        agentId: initialAgentId,
-    });
-    subscribeToSettingsRpc({
-        jetstream,
-        userId,
-        agentId: initialAgentId,
-    });
-    subscribeToGitRpc({
-        jetstream,
-        userId,
-        agentId: initialAgentId,
-    });
-    subscribeToRunRpc({
-        jetstream,
-        serverBaseUrl,
-        userId,
-        agentId: initialAgentId,
-        agentToken,
-    });
-    await new Promise(() => {
-        // Keep the long-lived agent process alive for RPC subscriptions and heartbeat.
-    });
+        subscribeToSessionRpc({
+            jetstream,
+            userId,
+            agentId: initialAgentId,
+        });
+        subscribeToCodexAuthRpc({
+            jetstream,
+            userId,
+            agentId: initialAgentId,
+        });
+        subscribeToSettingsRpc({
+            jetstream,
+            userId,
+            agentId: initialAgentId,
+        });
+        subscribeToGitRpc({
+            jetstream,
+            userId,
+            agentId: initialAgentId,
+        });
+        subscribeToRunRpc({
+            jetstream,
+            serverBaseUrl,
+            userId,
+            agentId: initialAgentId,
+            agentToken,
+        });
+        const closeError = await jetstream.nc.closed();
+        clearInterval(heartbeatTimer);
+        stopAllSessionWatchers();
+        const detail = closeError instanceof Error ? closeError.message : "clean close";
+        writeAgentInfraError(`nats session ended: ${detail}; reconnecting`);
+        await sleep(1000);
+    }
 }
 main().catch((error) => {
     const message = error instanceof Error ? error.message : String(error);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "doer-agent",
-  "version": "0.2.7",
+  "version": "0.2.8",
   "description": "Reverse-polling agent runtime for doer",
   "type": "module",
   "main": "dist/agent.js",