diff --git a/apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.ts b/apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.ts index a83be3cd01527..c7f68aabba116 100644 --- a/apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.ts +++ b/apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.ts @@ -1566,7 +1566,8 @@ export const layerQueryRunner: Layer.Layer< const child = spawnProcess(spawnOptions); spawnedProcess = child; // A spawn that fails emits only "error". - const releaseAgent = portDiscovery.trackAgent(); + // The CLI carries the thread itself, so a port it holds would read as its server. + const releaseAgent = portDiscovery.trackAgent("pid" in child ? child.pid : undefined); child.once("exit", releaseAgent); child.on("error", releaseAgent); processExited = child.exitCode !== null || child.signalCode != null; diff --git a/apps/server/src/preview/PortScanner.test.ts b/apps/server/src/preview/PortScanner.test.ts index d9b226e21f4fe..fe1f76bac8c25 100644 --- a/apps/server/src/preview/PortScanner.test.ts +++ b/apps/server/src/preview/PortScanner.test.ts @@ -959,6 +959,63 @@ effectIt.effect.each(["linux", "darwin"] as const)( }, ); +effectIt.effect.each(["linux", "darwin"] as const)( + "does not list the agent CLI's own listener on %s, only the servers it started", + (platform) => { + const cliPort = 43_126; + const jobPort = 43_127; + const thread = `${PortScanner.AGENT_THREAD_ENV}=thread-agent`; + const missing = FileSystem.makeNoop({}); + const procEnviron: Record = { + "/proc/7000/environ": `PATH=/usr/bin\0${thread}\0`, + "/proc/7100/environ": `PATH=/usr/bin\0${thread}\0`, + }; + const layer = PortScanner.layer.pipe( + Layer.provide( + Layer.mergeAll( + FileSystem.layerNoop({ + readFileString: (path) => { + const content = procEnviron[path]; + return content === undefined ? missing.readFileString(path) : Effect.succeed(content); + }, + }), + Layer.succeed(ProcessRunner.ProcessRunner, { + run: (input) => + Effect.succeed( + processOutput( + input.command === "lsof" + ? `p7000\ncclaude\nn127.0.0.1:${cliPort}\np7100\ncnode\nn127.0.0.1:${jobPort}\n` + : ` 7000 claude --output-format stream-json PATH=/usr/bin ${thread}\n` + + ` 7100 node server.js PATH=/usr/bin ${thread}\n`, + ), + ), + }), + Layer.succeed(HostProcess.Platform, platform), + FetchHttpClient.layer.pipe( + Layer.provide(Layer.succeed(FetchHttpClient.Fetch, globalThis.fetch)), + ), + ), + ), + ); + + return Effect.gen(function* () { + const scanner = yield* PortScanner.PortDiscovery; + scanner.trackAgent(7000); + expect(yield* scanner.scan()).toEqual([ + { + host: "localhost", + port: jobPort, + url: `http://localhost:${jobPort}`, + processName: "node", + pid: 7100, + terminal: null, + agent: { threadId: "thread-agent" }, + }, + ]); + }).pipe(Effect.provide(layer)); + }, +); + effectIt.effect("stops only a job's own process group", () => Effect.sync(() => { const serverPid = 100; diff --git a/apps/server/src/preview/PortScanner.ts b/apps/server/src/preview/PortScanner.ts index d950cd636f4f5..c67681b942183 100644 --- a/apps/server/src/preview/PortScanner.ts +++ b/apps/server/src/preview/PortScanner.ts @@ -53,10 +53,11 @@ export class PortDiscovery extends Context.Service< }) => Effect.Effect; /** * Counts a running agent until the returned function is called. While one runs, any - * listener may be a server it started. Synchronous because provider spawn callbacks run - * outside Effect. + * listener may be a server it started. `cliPid` is the agent CLI's own process when it carries + * the thread itself: a port it holds is not a server. Synchronous because provider spawn + * callbacks run outside Effect. */ - readonly trackAgent: () => () => void; + readonly trackAgent: (cliPid?: number) => () => void; /** * Tells an agent CLI's adapter which of its commands a user stop is about to signal, so the * exit is not reported to the agent as the command finishing by itself. @@ -531,6 +532,7 @@ export const make = Effect.gen(function* PortDiscoveryMake() { const agentThreadsRef = yield* Ref.make>(new Map()); const agentCommandStopWatchers = new Set(); let runningAgents = 0; + const agentCliPids = new Set(); // An agent that exited, or a cache cleared with a marked listener, owes one listener read: the // servers it left may still run. So does startup, for agents that ran before a restart. let agentScanPending = true; @@ -588,7 +590,9 @@ export const make = Effect.gen(function* PortDiscoveryMake() { const threads = yield* readAgentThreads(pids.filter((pid) => !terminalOwners.has(pid))); const owners = new Map(terminalOwners); for (const [pid, threadId] of threads) { - if (threadId !== null) owners.set(pid, { terminal: null, agent: { threadId } }); + if (threadId !== null && !agentCliPids.has(pid)) { + owners.set(pid, { terminal: null, agent: { threadId } }); + } } return owners; }); @@ -1062,13 +1066,15 @@ export const make = Effect.gen(function* PortDiscoveryMake() { }); }); - const trackAgent: PortDiscovery["Service"]["trackAgent"] = () => { + const trackAgent: PortDiscovery["Service"]["trackAgent"] = (cliPid) => { runningAgents += 1; + if (cliPid !== undefined) agentCliPids.add(cliPid); let released = false; return () => { if (released) return; released = true; runningAgents -= 1; + if (cliPid !== undefined) agentCliPids.delete(cliPid); agentScanPending = true; }; };