From 13a18600c69722e88923e674d3b893c639f47757 Mon Sep 17 00:00:00 2001
From: Cristina Poncela Cubeiro
 <140309543+cristinaponcela@users.noreply.github.com>
Date: Mon, 22 Jun 2026 15:11:14 +0200
Subject: [PATCH] fix: rpc stream

---
 packages/orchestrator/src/ipc/server.ts  |  2 +-
 packages/orchestrator/src/rpc-process.ts | 12 +++++++++---
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/packages/orchestrator/src/ipc/server.ts b/packages/orchestrator/src/ipc/server.ts
index 18ed7d49..fc77e6f3 100644
--- a/packages/orchestrator/src/ipc/server.ts
+++ b/packages/orchestrator/src/ipc/server.ts
@@ -72,6 +72,7 @@ export async function startIpcServer(handler: IpcRequestHandler): Promise<Server
 						return;
 					}
 
+					socket.removeAllListeners("data");
 					const rpcStream = handler.openRpcStream(
 						request.instanceId,
 						(response) => {
@@ -92,7 +93,6 @@ export async function startIpcServer(handler: IpcRequestHandler): Promise<Server
 					}
 
 					socket.write(encodeMessage(response));
-					socket.removeAllListeners("data");
 					socket.on("data", (rpcChunk: Buffer | string) => {
 						buffer += rpcChunk.toString();
 						for (;;) {
diff --git a/packages/orchestrator/src/rpc-process.ts b/packages/orchestrator/src/rpc-process.ts
index 221fe2eb..4c37d734 100644
--- a/packages/orchestrator/src/rpc-process.ts
+++ b/packages/orchestrator/src/rpc-process.ts
@@ -1,6 +1,8 @@
 import { type ChildProcess, spawn } from "node:child_process";
 import { randomUUID } from "node:crypto";
-import { createRequire } from "node:module";
+import { existsSync } from "node:fs";
+import { dirname, join } from "node:path";
+import { fileURLToPath } from "node:url";
 import type {
 	AgentSessionEvent,
 	RpcCommand,
@@ -25,8 +27,12 @@ export interface RpcProcessInstance {
 }
 
 function resolveCodingAgentCli(): string {
-	const require = createRequire(import.meta.url);
-	return require.resolve("@earendil-works/pi-coding-agent/dist/cli.js");
+	const packageDir = dirname(fileURLToPath(import.meta.url));
+	const workspaceCli = join(packageDir, "../../coding-agent/dist/cli.js");
+	if (existsSync(workspaceCli)) {
+		return workspaceCli;
+	}
+	throw new Error(`Unable to find coding-agent RPC CLI: ${workspaceCli}`);
 }
 
 function toError(error: unknown): Error {