Negotiate terminal output metadata mode (#187)

Support both _meta types.

Closes #166

Author: benbrandt

src/CodexAcpServer.ts

@@ -53,6 +53,7 @@ import {
 } from "./FastModeConfig";
 import packageJson from "../package.json";
 import {isJetBrains2026_1Client} from "./JBUtils";
+import {resolveTerminalOutputMode, type TerminalOutputMode} from "./TerminalOutputMode";
 
 export interface SessionState {
     sessionId: string,
@@ -71,6 +72,7 @@ export interface SessionState {
     fastModeEnabled: boolean;
     currentModelSupportsFast: boolean;
     sessionMcpServers?: Array<string>;
+    terminalOutputMode: TerminalOutputMode;
 }
 
 interface PendingMcpStartupSession {
@@ -103,6 +105,7 @@ export class CodexAcpServer implements acp.Agent {
     private readonly getExitCode: () => number | null;
     private readonly availableCommands: CodexCommands;
     private clientInfo: acp.Implementation | null;
+    private terminalOutputMode: TerminalOutputMode;
 
     private readonly sessions: Map<string, SessionState>;
     private readonly pendingMcpStartupSessions: Map<string, PendingMcpStartupSession>;
@@ -130,6 +133,7 @@ export class CodexAcpServer implements acp.Agent {
         this.defaultAuthRequest = defaultAuthRequest ?? null;
         this.getExitCode = getExitCode ?? (() => null);
         this.clientInfo = null;
+        this.terminalOutputMode = "terminal_output_delta";
         this.availableCommands = new CodexCommands(
             connection,
             codexAcpClient,
@@ -142,6 +146,7 @@ export class CodexAcpServer implements acp.Agent {
     ): Promise<acp.InitializeResponse> {
         logger.log("Initialize request received");
         this.clientInfo = _params.clientInfo ?? null;
+        this.terminalOutputMode = resolveTerminalOutputMode(_params.clientCapabilities);
         await this.runWithProcessCheck(() => this.codexAcpClient.initialize(_params));
         return {
             protocolVersion: acp.PROTOCOL_VERSION,
@@ -353,6 +358,7 @@ export class CodexAcpServer implements acp.Agent {
             fastModeEnabled: sessionMetadata.currentServiceTier === "fast",
             currentModelSupportsFast: currentModelSupportsFast,
             sessionMcpServers: sessionMcpServers,
+            terminalOutputMode: this.terminalOutputMode,
         }
         this.sessions.set(sessionId, sessionState);
         resumeSubscribed = false;
@@ -777,6 +783,7 @@ export class CodexAcpServer implements acp.Agent {
             fastModeEnabled: sessionMetadata.currentServiceTier === "fast",
             currentModelSupportsFast: currentModelSupportsFast,
             sessionMcpServers: sessionMcpServers,
+            terminalOutputMode: this.terminalOutputMode,
         };
         this.sessions.set(sessionId, sessionState);
         subscribed = false;

src/CodexEventHandler.ts

@@ -23,6 +23,7 @@ import type {
     ReasoningSummaryPartAddedNotification,
     ReasoningSummaryTextDeltaNotification,
     ReasoningTextDeltaNotification,
+    TerminalInteractionNotification,
     ThreadGoalClearedNotification,
     ThreadGoalUpdatedNotification,
     ThreadTokenUsageUpdatedNotification,
@@ -32,6 +33,7 @@ import type {
 import type { McpStartupCompleteEvent } from "./app-server";
 import {toTokenCount} from "./TokenCount";
 import {
+    commandExecutionUsesTerminalOutput,
     createCommandExecutionUpdate,
     createDynamicToolCallUpdate,
     createFileChangeUpdate,
@@ -51,6 +53,7 @@ import {
     fuzzyFileSearchToolCallId,
 } from "./CodexToolCallMapper";
 import { stripShellPrefix } from "./CommandUtils";
+import {createTerminalOutputMeta, type TerminalOutputMode} from "./TerminalOutputMode";
 
 export { stripShellPrefix };
 
@@ -64,6 +67,8 @@ export class CodexEventHandler {
     private readonly activeImageGenerationItems = new Set<string>();
     private readonly emittedImageViewItems = new Set<string>();
     private readonly seenReasoningDeltaItemIds = new Set<string>();
+    private readonly terminalCommandIds = new Set<string>();
+    private readonly terminalCommandOutputIds = new Set<string>();
 
     constructor(connection: acp.AgentSideConnection, sessionState: SessionState) {
         this.connection = connection;
@@ -165,13 +170,14 @@ export class CodexEventHandler {
                 return this.createThreadGoalUpdatedEvent(notification.params);
             case "thread/goal/cleared":
                 return this.createThreadGoalClearedEvent(notification.params);
+            case "item/commandExecution/terminalInteraction":
+                return this.createTerminalInteractionEvent(notification.params);
             // ignored events
             case "command/exec/outputDelta":
             case "hook/started":
             case "hook/completed":
             case "turn/diff/updated":
             case "turn/moderationMetadata":
-            case "item/commandExecution/terminalInteraction":
             case "item/fileChange/outputDelta":
             case "item/fileChange/patchUpdated":
             case "account/updated":
@@ -324,8 +330,15 @@ export class CodexEventHandler {
         switch (event.item.type) {
             case "fileChange":
                 return await createFileChangeUpdate(event.item);
-            case "commandExecution":
+            case "commandExecution": {
+                if (commandExecutionUsesTerminalOutput(event.item)) {
+                    this.terminalCommandIds.add(event.item.id);
+                } else {
+                    this.terminalCommandIds.delete(event.item.id);
+                    this.terminalCommandOutputIds.delete(event.item.id);
+                }
                 return await createCommandExecutionUpdate(event.item);
+            }
             case "mcpToolCall":
                 return await createMcpToolCallUpdate(event.item);
             case "dynamicToolCall":
@@ -435,18 +448,40 @@ export class CodexEventHandler {
     }
 
     private createCommandOutputDeltaEvent(event: CommandExecutionOutputDeltaNotification): UpdateSessionEvent {
+        if (this.terminalCommandIds.has(event.itemId) && event.delta.length > 0) {
+            this.terminalCommandOutputIds.add(event.itemId);
+        }
+        return this.createCommandOutputEvent(event.itemId, event.delta, this.commandOutputMode(event.itemId));
+    }
+
+    private createCommandOutputEvent(
+        itemId: string,
+        data: string,
+        terminalOutputMode: TerminalOutputMode
+    ): UpdateSessionEvent {
         return {
             sessionUpdate: "tool_call_update",
-            toolCallId: event.itemId,
-            _meta: {
-                terminal_output_delta: {
-                    data: event.delta,
-                    terminal_id: event.itemId
-                }
-            }
+            toolCallId: itemId,
+            _meta: createTerminalOutputMeta(terminalOutputMode, itemId, data),
         }
     }
 
+    private createTerminalInteractionEvent(event: TerminalInteractionNotification): UpdateSessionEvent {
+        return this.createCommandOutputDeltaEvent({
+            threadId: event.threadId,
+            turnId: event.turnId,
+            itemId: event.itemId,
+            delta: `\n${event.stdin}\n`,
+        });
+    }
+
+    private commandOutputMode(itemId: string): TerminalOutputMode {
+        if (this.sessionState.terminalOutputMode === "terminal_output" && !this.terminalCommandIds.has(itemId)) {
+            return "terminal_output_delta";
+        }
+        return this.sessionState.terminalOutputMode;
+    }
+
     private createMcpToolProgressEvent(event: { itemId: string, message: string }): UpdateSessionEvent {
         const logDelta = event.message.trim();
         return {
@@ -495,22 +530,37 @@ export class CodexEventHandler {
     }
 
     private completeCommandExecutionEvent(item: ThreadItem & { "type": "commandExecution" }): UpdateSessionEvent {
-        return {
+        const update: UpdateSessionEvent = {
             sessionUpdate: "tool_call_update",
             toolCallId: item.id,
             status: item.status === "completed" ? "completed" : "failed",
             rawOutput: {
                 formatted_output: item.aggregatedOutput ?? "",
                 exit_code: item.exitCode
             },
-            _meta: {
-                terminal_exit: {
-                    exit_code: item.exitCode,
-                    signal: null,
-                    terminal_id: item.id
-                }
-            }
+        };
+
+        const commandHadTerminal = this.terminalCommandIds.delete(item.id);
+        const commandHadOutput = this.terminalCommandOutputIds.delete(item.id);
+        if (!commandHadTerminal) {
+            return update;
+        }
+        const terminalMeta: Record<string, unknown> = {};
+        if (!commandHadOutput && item.aggregatedOutput) {
+            Object.assign(
+                terminalMeta,
+                createTerminalOutputMeta(this.sessionState.terminalOutputMode, item.id, item.aggregatedOutput)
+            );
         }
+        terminalMeta["terminal_exit"] = {
+            exit_code: item.exitCode,
+            signal: null,
+            terminal_id: item.id
+        };
+        return {
+            ...update,
+            _meta: terminalMeta,
+        };
     }
 
     private async updatePlan(event: TurnPlanUpdatedNotification): Promise<UpdateSessionEvent> {

src/CodexToolCallMapper.ts

@@ -34,6 +34,8 @@ type GuardianApprovalReviewNotification =
     | ItemGuardianApprovalReviewStartedNotification
     | ItemGuardianApprovalReviewCompletedNotification;
 type WebSearchItem = ThreadItem & { type: "webSearch" };
+type CommandExecutionItem = ThreadItem & { type: "commandExecution" };
+type AcpToolCallEvent = Extract<UpdateSessionEvent, { sessionUpdate: "tool_call" }>;
 
 function toAcpStatus(status: CodexItemStatus): AcpToolCallStatus {
     switch (status) {
@@ -66,32 +68,23 @@ export async function createFileChangeUpdate(
     };
 }
 
-export async function createCommandExecutionUpdate(
-    item: ThreadItem & { type: "commandExecution" }
-): Promise<UpdateSessionEvent> {
+export async function createCommandExecutionUpdate(item: CommandExecutionItem): Promise<UpdateSessionEvent> {
     const commandAction = item.commandActions.length === 1 ? item.commandActions[0] : undefined;
     if (commandAction) {
         return createCommandActionEvent(item.id, item.status, item.cwd, commandAction);
     }
     const command = stripShellPrefix(item.command);
-    return {
+    return createTerminalCommandEvent({
         sessionUpdate: "tool_call",
         toolCallId: item.id,
         kind: "execute",
         title: command,
         status: toAcpStatus(item.status),
-        content: [{ type: "terminal", terminalId: item.id }],
         rawInput: {
             command: item.command,
             cwd: item.cwd,
         },
-        _meta: {
-            terminal_info: {
-                cwd: item.cwd,
-                terminal_id: item.id,
-            },
-        },
-    };
+    }, item.id, item.cwd);
 }
 
 export async function createMcpToolCallUpdate(
@@ -348,50 +341,70 @@ function createCommandActionEvent(
     commandAction: CommandAction
 ): UpdateSessionEvent {
     const acpStatus = toAcpStatus(status);
-    if (commandAction.type === "read") {
-        return {
-            sessionUpdate: "tool_call",
-            toolCallId: id,
-            status: acpStatus,
-            kind: "read",
-            title: `Read file '${commandAction.path}'`,
-            locations: [{ path: commandAction.path }],
-        };
-    } else if (commandAction.type === "search") {
-        return {
-            sessionUpdate: "tool_call",
-            toolCallId: id,
-            status: acpStatus,
-            kind: "search",
-            title: createSearchTitle(commandAction.query, commandAction.path),
-        };
-    } else if (commandAction.type === "listFiles") {
-        const title = commandAction.path
-            ? `List files in '${commandAction.path}'`
-            : "List files";
-        return {
-            sessionUpdate: "tool_call",
-            toolCallId: id,
-            status: acpStatus,
-            kind: "read",
-            title: title,
-        };
+    switch (commandAction.type) {
+        case "read":
+            return {
+                sessionUpdate: "tool_call",
+                toolCallId: id,
+                status: acpStatus,
+                kind: "read",
+                title: `Read file '${commandAction.path}'`,
+                locations: [{ path: commandAction.path }],
+            };
+        case "search":
+            return {
+                sessionUpdate: "tool_call",
+                toolCallId: id,
+                status: acpStatus,
+                kind: "search",
+                title: createSearchTitle(commandAction.query, commandAction.path),
+            };
+        case "listFiles": {
+            const title = commandAction.path
+                ? `List files in '${commandAction.path}'`
+                : "List files";
+            return {
+                sessionUpdate: "tool_call",
+                toolCallId: id,
+                status: acpStatus,
+                kind: "read",
+                title: title,
+            };
+        }
+        case "unknown":
+            return createTerminalCommandEvent({
+                sessionUpdate: "tool_call",
+                toolCallId: id,
+                status: acpStatus,
+                kind: "execute",
+                title: stripShellPrefix(commandAction.command),
+                rawInput: {
+                    command: commandAction.command,
+                    cwd,
+                },
+            }, id, cwd);
     }
+}
+
+export function commandExecutionUsesTerminalOutput(item: CommandExecutionItem): boolean {
+    const commandAction = item.commandActions.length === 1 ? item.commandActions[0] : undefined;
+    return commandAction === undefined || commandAction.type === "unknown";
+}
+
+function createTerminalCommandEvent(
+    event: AcpToolCallEvent,
+    terminalId: string,
+    cwd: string,
+): UpdateSessionEvent {
+    const { rawInput, ...eventWithoutRawInput } = event;
     return {
-        sessionUpdate: "tool_call",
-        toolCallId: id,
-        status: acpStatus,
-        kind: "execute",
-        title: stripShellPrefix(commandAction.command),
-        content: [{ type: "terminal", terminalId: id }],
-        rawInput: {
-            command: commandAction.command,
-            cwd,
-        },
+        ...eventWithoutRawInput,
+        content: [{ type: "terminal", terminalId }],
+        ...(rawInput === undefined ? {} : { rawInput }),
         _meta: {
             terminal_info: {
                 cwd,
-                terminal_id: id,
+                terminal_id: terminalId,
             },
         },
     };