Approval commands improvment

src/CodexApprovalHandler.ts

@@ -9,6 +9,7 @@ import type {
 } from "./app-server/v2";
 import type {ToolCallContent} from "@agentclientprotocol/sdk/dist/schema/types.gen";
 import {logger} from "./Logger";
+import {stripShellPrefix} from "./CodexEventHandler";
 
 const APPROVAL_OPTIONS: acp.PermissionOption[] = [
     { optionId: "allow_once", name: "Allow Once", kind: "allow_once" },
@@ -68,6 +69,7 @@ export class CodexApprovalHandler implements ApprovalHandler {
                 kind: "execute",
                 status: "pending",
                 content: reasonContent ? [reasonContent] : null,
+                rawInput: params.command ? { command: stripShellPrefix(params.command), cwd: params.cwd } : null,
             },
             options: APPROVAL_OPTIONS,
         };

src/CodexEventHandler.ts

@@ -37,6 +37,18 @@ function toAcpStatus(status: CodexItemStatus): AcpToolCallStatus {
     }
 }
 
+/**
+ * Strips shell prefix from command string (e.g., "/bin/bash -lc 'command'", "/bin/zsh -c command")
+ */
+export function stripShellPrefix(command: string): string {
+    const withoutShell = command.replace(/^(?:\/bin\/)?(?:bash|zsh|sh)\s+(?:-[lc]+\s+)?/, "");
+    // Strip surrounding single quotes if present
+    if (withoutShell.startsWith("'") && withoutShell.endsWith("'")) {
+        return withoutShell.slice(1, -1);
+    }
+    return withoutShell;
+}
+
 export class CodexEventHandler {
 
     private readonly connection: acp.AgentSideConnection;
@@ -252,7 +264,7 @@ export class CodexEventHandler {
         if (commandAction) {
             return this.createCommandActionEvent(item.id, item.status, item.cwd, commandAction);
         }
-        const command = item.command.replace(/^(?:\/bin\/)?bash\s+/, "");
+        const command = stripShellPrefix(item.command);
         return {
             sessionUpdate: "tool_call",
             toolCallId: item.id,

src/__tests__/CodexACPAgent/approval-events.test.ts

@@ -150,6 +150,72 @@ describe('Approval Events', () => {
             completeTurn();
             await promptPromise;
         });
+
+        it('should include rawInput with command and cwd', async () => {
+            const { promptPromise, completeTurn } = setupSessionWithPendingPrompt();
+            fixture.setPermissionResponse({
+                outcome: { outcome: 'selected', optionId: 'allow_once' }
+            });
+
+            const params: CommandExecutionRequestApprovalParams = {
+                threadId: sessionId,
+                turnId: 'turn-1',
+                itemId: 'item-with-command',
+                reason: 'Installing dependencies',
+                command: 'npm install',
+                cwd: '/home/user/project',
+                proposedExecpolicyAmendment: null,
+            };
+
+            await fixture.sendServerRequest(
+                'item/commandExecution/requestApproval',
+                params
+            );
+
+            await expect(fixture.getAcpConnectionDump(['_meta'])).toMatchFileSnapshot(
+                'data/approval-command-with-rawInput.json'
+            );
+
+            completeTurn();
+            await promptPromise;
+        });
+
+        it.each([
+            { command: '/bin/zsh -c npm install', expected: 'npm install' },
+            { command: '/bin/bash -lc npm install', expected: 'npm install' },
+            { command: 'zsh npm install', expected: 'npm install' },
+            { command: 'sh -c ls -la', expected: 'ls -la' },
+            { command: 'npm install', expected: 'npm install' },
+            { command: "/bin/bash -lc './tests.cmd -Darg=value'", expected: './tests.cmd -Darg=value' },
+            { command: "/bin/zsh -c 'echo hello'", expected: 'echo hello' },
+        ])('should strip shell prefix from "$command" in rawInput', async ({ command, expected }) => {
+            const { promptPromise, completeTurn } = setupSessionWithPendingPrompt();
+            fixture.setPermissionResponse({
+                outcome: { outcome: 'selected', optionId: 'allow_once' }
+            });
+
+            const params: CommandExecutionRequestApprovalParams = {
+                threadId: sessionId,
+                turnId: 'turn-1',
+                itemId: 'item-shell-prefix',
+                reason: 'Installing dependencies',
+                command,
+                cwd: '/home/user/project',
+                proposedExecpolicyAmendment: null,
+            };
+
+            await fixture.sendServerRequest(
+                'item/commandExecution/requestApproval',
+                params
+            );
+
+            const dump = fixture.getAcpConnectionDump(['_meta']);
+            const parsed = JSON.parse(dump);
+            expect(parsed.args[0].toolCall.rawInput.command).toBe(expected);
+
+            completeTurn();
+            await promptPromise;
+        });
     });
 
     describe('File change approval', () => {

src/__tests__/CodexACPAgent/data/approval-command-allow-once.json

@@ -15,7 +15,8 @@
               "text": "Running npm install"
             }
           }
-        ]
+        ],
+        "rawInput": null
       },
       "options": [
         {

src/__tests__/CodexACPAgent/data/approval-command-with-rawInput.json

@@ -0,0 +1,43 @@
+{
+  "method": "requestPermission",
+  "args": [
+    {
+      "sessionId": "test-session-id",
+      "toolCall": {
+        "toolCallId": "item-with-command",
+        "kind": "execute",
+        "status": "pending",
+        "content": [
+          {
+            "type": "content",
+            "content": {
+              "type": "text",
+              "text": "Installing dependencies"
+            }
+          }
+        ],
+        "rawInput": {
+          "command": "npm install",
+          "cwd": "/home/user/project"
+        }
+      },
+      "options": [
+        {
+          "optionId": "allow_once",
+          "name": "Allow Once",
+          "kind": "allow_once"
+        },
+        {
+          "optionId": "allow_always",
+          "name": "Allow for Session",
+          "kind": "allow_always"
+        },
+        {
+          "optionId": "reject_once",
+          "name": "Reject",
+          "kind": "reject_once"
+        }
+      ]
+    }
+  ]
+}

src/__tests__/CodexACPAgent/terminal-output-events.test.ts

@@ -77,6 +77,43 @@ describe('CodexEventHandler - terminal output events', () => {
         );
     });
 
+    it.each([
+        { command: '/bin/zsh -c npm install', expected: 'npm install' },
+        { command: '/bin/bash -lc npm install', expected: 'npm install' },
+        { command: 'zsh npm install', expected: 'npm install' },
+        { command: 'sh -c ls -la', expected: 'ls -la' },
+        { command: 'npm install', expected: 'npm install' },
+        { command: "/bin/bash -lc './tests.cmd -Darg=value'", expected: './tests.cmd -Darg=value' },
+        { command: "/bin/zsh -c 'echo hello'", expected: 'echo hello' },
+    ])('should strip shell prefix from "$command"', async ({ command, expected }) => {
+        const commandStartNotification: ServerNotification = {
+            method: 'item/started',
+            params: {
+                threadId: 'thread-1',
+                turnId: 'turn-1',
+                item: {
+                    type: 'commandExecution',
+                    id: 'command-shell-prefix',
+                    command,
+                    cwd: '/test/project',
+                    processId: null,
+                    status: 'inProgress',
+                    commandActions: [],
+                    aggregatedOutput: null,
+                    exitCode: null,
+                    durationMs: null,
+                },
+            },
+        };
+
+        await setupAndSendNotifications([commandStartNotification]);
+
+        const dump = mockFixture.getAcpConnectionDump([]);
+        const parsed = JSON.parse(dump);
+        expect(parsed.args[0].update.title).toBe(expected);
+        expect(parsed.args[0].update.rawInput.command).toBe(command);
+    });
+
     it('should stream terminal output delta', async () => {
         const outputDeltaNotification: ServerNotification = {
             method: 'item/commandExecution/outputDelta',