fix: clean up codex on shut down (#836)

Author: jonathanlab

packages/agent/src/adapters/acp-connection.ts

@@ -1,6 +1,7 @@
 import { AgentSideConnection, ndJsonStream } from "@agentclientprotocol/sdk";
 import { POSTHOG_NOTIFICATIONS } from "@/acp-extensions.js";
 import type { SessionLogWriter } from "@/session-log-writer.js";
+import type { ProcessSpawnedCallback } from "@/types.js";
 import { Logger } from "@/utils/logger.js";
 import {
   createBidirectionalStreams,
@@ -9,10 +10,7 @@ import {
   nodeWritableToWebWritable,
   type StreamPair,
 } from "@/utils/streams.js";
-import {
-  ClaudeAcpAgent,
-  type ClaudeAcpAgentOptions,
-} from "./claude/claude-agent.js";
+import { ClaudeAcpAgent } from "./claude/claude-agent.js";
 import { type CodexProcessOptions, spawnCodexProcess } from "./codex/spawn.js";
 
 export type AgentAdapter = "claude" | "codex";
@@ -25,7 +23,7 @@ export type AcpConnectionConfig = {
   /** Deployment environment - "local" for desktop, "cloud" for cloud sandbox */
   deviceType?: "local" | "cloud";
   logger?: Logger;
-  processCallbacks?: ClaudeAcpAgentOptions;
+  processCallbacks?: ProcessSpawnedCallback;
   codexOptions?: CodexProcessOptions;
   allowedModelIds?: Set<string>;
 };
@@ -239,6 +237,7 @@ function createCodexConnection(config: AcpConnectionConfig): AcpConnection {
   const codexProcess = spawnCodexProcess({
     ...config.codexOptions,
     logger,
+    processCallbacks: config.processCallbacks,
   });
 
   let clientReadable = nodeReadableToWebReadable(codexProcess.stdout);

packages/agent/src/adapters/codex/spawn.ts

@@ -1,6 +1,7 @@
 import { type ChildProcess, spawn } from "node:child_process";
 import { existsSync } from "node:fs";
 import type { Readable, Writable } from "node:stream";
+import type { ProcessSpawnedCallback } from "@/types.js";
 import { Logger } from "@/utils/logger.js";
 
 export interface CodexProcessOptions {
@@ -10,6 +11,7 @@ export interface CodexProcessOptions {
   model?: string;
   binaryPath?: string;
   logger?: Logger;
+  processCallbacks?: ProcessSpawnedCallback;
 }
 
 export interface CodexProcess {
@@ -97,18 +99,28 @@ export function spawnCodexProcess(options: CodexProcessOptions): CodexProcess {
 
   child.on("exit", (code, signal) => {
     logger.info("codex-acp process exited", { code, signal });
+    if (child.pid && options.processCallbacks?.onProcessExited) {
+      options.processCallbacks.onProcessExited(child.pid);
+    }
   });
 
   if (!child.stdin || !child.stdout) {
     throw new Error("Failed to get stdio streams from codex-acp process");
   }
 
+  if (child.pid && options.processCallbacks?.onProcessSpawned) {
+    options.processCallbacks.onProcessSpawned({
+      pid: child.pid,
+      command,
+    });
+  }
+
   return {
     process: child,
     stdin: child.stdin,
     stdout: child.stdout,
     kill: () => {
-      logger.info("Killing codex-acp process");
+      logger.info("Killing codex-acp process", { pid: child.pid });
       child.kill("SIGTERM");
     },
   };

packages/agent/src/types.ts

@@ -100,7 +100,7 @@ export interface ProcessSpawnedCallback {
   onProcessSpawned?: (info: {
     pid: number;
     command: string;
-    sessionId: string;
+    sessionId?: string;
   }) => void;
   onProcessExited?: (pid: number) => void;
 }