A self-improving RLM agent for coding workflows and long-running autonomous tasks.
Rust
Release the daemon worker client socket after a failed connect (#2508)
Sebastian Müllera0660bb5f823
diff --git a/packages/coding-agent/.changes/fix-daemon-worker-connect-retry.md b/packages/coding-agent/.changes/fix-daemon-worker-connect-retry.mdnew file mode 100644index 0000000000..7019043d69--- /dev/null+++ b/packages/coding-agent/.changes/fix-daemon-worker-connect-retry.md@@ -0,0 +1 @@+- Fixed the daemon worker client keeping a stale socket after a failed or timed-out connect, so the next connect attempt on that client threw "already connected" instead of opening a fresh socket.diff --git a/packages/coding-agent/src/modes/daemon/daemon-client.ts b/packages/coding-agent/src/modes/daemon/daemon-client.tsindex a725e652a3..a10205ec3c 100644--- a/packages/coding-agent/src/modes/daemon/daemon-client.ts+++ b/packages/coding-agent/src/modes/daemon/daemon-client.ts@@ -216,37 +216,16 @@ export class DaemonClient {this.socket = socket;this.detachReader = attachJsonlLineReader(socket, (line) => this.handleLine(line));- await new Promise<void>((resolve, reject) => {- const timeout = setTimeout(() => {- cleanup();- this.clearSocketReference(socket);- socket.destroy();- reject(- new Error(- `Timed out after ${timeoutMs}ms connecting to the Prime Agent daemon. ${daemonEndpointDetails(this.socketPath)}`,- ),- );- }, timeoutMs);- const cleanup = () => {- clearTimeout(timeout);- socket.off("connect", onConnect);- socket.off("error", onError);- };- const onConnect = () => {- cleanup();- resolve();- };- const onError = (error: Error) => {- cleanup();- this.clearSocketReference(socket);- reject(- new Error(- `Failed to connect to the Prime Agent daemon: ${error.message}. ${daemonEndpointDetails(this.socketPath)}`,- ),- );- };- socket.once("connect", onConnect);- socket.once("error", onError);+ await awaitSocketConnect(socket, timeoutMs, {+ onFailure: () => this.clearSocketReference(socket),+ timeoutError: () =>+ new Error(+ `Timed out after ${timeoutMs}ms connecting to the Prime Agent daemon. ${daemonEndpointDetails(this.socketPath)}`,+ ),+ connectError: (error) =>+ new Error(+ `Failed to connect to the Prime Agent daemon: ${error.message}. ${daemonEndpointDetails(this.socketPath)}`,+ ),});socket.on("error", (error) =>@@ -657,6 +636,45 @@ function isDaemonClosing(value: unknown): value is Extract<DaemonOutbound, { typreturn candidate.type === "daemon_closing" && (candidate.reason === "shutdown" || candidate.reason === "update");}+/**+ * `onFailure` drops the caller's socket reference, so a failed connect never leaves the client+ * holding a socket it never connected.+ */+export function awaitSocketConnect(+ socket: Socket,+ timeoutMs: number,+ handlers: {+ onFailure: () => void;+ timeoutError: () => Error;+ connectError: (error: Error) => Error;+ },+): Promise<void> {+ return new Promise<void>((resolve, reject) => {+ const timeout = setTimeout(() => {+ cleanup();+ handlers.onFailure();+ socket.destroy();+ reject(handlers.timeoutError());+ }, timeoutMs);+ const cleanup = () => {+ clearTimeout(timeout);+ socket.off("connect", onConnect);+ socket.off("error", onError);+ };+ const onConnect = () => {+ cleanup();+ resolve();+ };+ const onError = (error: Error) => {+ cleanup();+ handlers.onFailure();+ reject(handlers.connectError(error));+ };+ socket.once("connect", onConnect);+ socket.once("error", onError);+ });+}+function isDaemonHello(value: unknown): value is DaemonHello {if (!value || typeof value !== "object") {return false;diff --git a/packages/coding-agent/src/modes/daemon/daemon-worker-client.ts b/packages/coding-agent/src/modes/daemon/daemon-worker-client.tsindex 1f70fe04bf..654bb8e4f3 100644--- a/packages/coding-agent/src/modes/daemon/daemon-worker-client.ts+++ b/packages/coding-agent/src/modes/daemon/daemon-worker-client.ts@@ -2,6 +2,7 @@ import { createConnection, type Socket } from "node:net";import { serializeJsonLine } from "../rpc/jsonl.js";import { type PrivateFrame, PrivateFramedChannel } from "../session-worker/private-framing.js";import {+ awaitSocketConnect,type DaemonClientMessageListener,type DaemonClientRequestOptions,DaemonSocketClosedError,@@ -85,27 +86,10 @@ export class DaemonWorkerClient {this.channel = new PrivateFramedChannel(socket, isDaemonWorkerFrameHeader);this.channel.onFrame((frame) => this.handleFrame(frame));- await new Promise<void>((resolve, reject) => {- const timeout = setTimeout(() => {- cleanup();- socket.destroy();- reject(new Error(`Timed out connecting to daemon worker socket: ${this.socketPath}`));- }, timeoutMs);- const cleanup = () => {- clearTimeout(timeout);- socket.off("connect", onConnect);- socket.off("error", onError);- };- const onConnect = () => {- cleanup();- resolve();- };- const onError = (error: Error) => {- cleanup();- reject(error);- };- socket.once("connect", onConnect);- socket.once("error", onError);+ await awaitSocketConnect(socket, timeoutMs, {+ onFailure: () => this.clearSocketReference(socket),+ timeoutError: () => new Error(`Timed out connecting to daemon worker socket: ${this.socketPath}`),+ connectError: (error) => error,});socket.on("error", (error) => this.notifyClosed(socket, this.directCloseError(error)));@@ -343,6 +327,14 @@ export class DaemonWorkerClient {}}+ private clearSocketReference(socket: Socket): void {+ if (this.socket !== socket) {+ return;+ }+ this.socket = undefined;+ this.channel = undefined;+ }+private notifyClosed(socket: Socket, error: Error): void {if (this.socket !== socket) {return;diff --git a/packages/coding-agent/test/daemon-client.test.ts b/packages/coding-agent/test/daemon-client.test.tsindex 6770782400..2dcd9f5651 100644--- a/packages/coding-agent/test/daemon-client.test.ts+++ b/packages/coding-agent/test/daemon-client.test.ts@@ -6,6 +6,7 @@ import {DAEMON_PROTOCOL_VERSION,DAEMON_SCHEMA_REVISION,} from "../src/modes/daemon/daemon-protocol.js";+import { DaemonWorkerClient } from "../src/modes/daemon/daemon-worker-client.js";import { listDaemonHeartbeats } from "../src/modes/daemon/heartbeat-catalog.js";const netMock = vi.hoisted(() => {@@ -1041,6 +1042,23 @@ async function captureRejection(promise: Promise<void>): Promise<Error> {throw new Error("Expected daemon client connect attempt to reject");}+describe("DaemonWorkerClient", () => {+ it("drops the socket reference when the connect attempt fails, so the client can retry", async () => {+ netMock.sockets.length = 0;+ const client = new DaemonWorkerClient("/tmp/prime-agent-worker-missing.sock");++ const firstAttempt = captureRejection(client.connect());+ netMock.sockets[0]!.emit("error", new Error("worker connect failed"));+ await expect(firstAttempt).resolves.toMatchObject({ message: "worker connect failed" });+ expect(client.isConnected).toBe(false);++ const secondAttempt = captureRejection(client.connect());+ expect(netMock.sockets).toHaveLength(2);+ netMock.sockets[1]!.emit("error", new Error("retry reached socket"));+ await expect(secondAttempt).resolves.toMatchObject({ message: "retry reached socket" });+ });+});+describe("daemon heartbeat catalog", () => {it("waits for the daemon hello before checking heartbeat capabilities", async () => {let greeted = false;