fix: remove deleted api field availableDecisions

Author: NikolaiSviridov

src/CodexApprovalHandler.ts

@@ -87,10 +87,7 @@ export class CodexApprovalHandler implements ApprovalHandler {
     private buildCommandDecisionOptions(
         params: CommandExecutionRequestApprovalParams
     ): CommandDecisionOption[] {
-        // Older app-server versions did not send availableDecisions; they only
-        // sent proposed amendment fields. Reconstruct that older decision list
-        // as a compatibility fallback.
-        const decisions = params.availableDecisions ?? this.buildLegacyFallbackCommandDecisions(params);
+        const decisions = this.buildCommandDecisions(params);
         let execAmendmentCount = 0;
         let networkAmendmentCount = 0;
 
@@ -105,7 +102,7 @@ export class CodexApprovalHandler implements ApprovalHandler {
         });
     }
 
-    private buildLegacyFallbackCommandDecisions(
+    private buildCommandDecisions(
         params: CommandExecutionRequestApprovalParams
     ): CommandExecutionApprovalDecision[] {
         const decisions: CommandExecutionApprovalDecision[] = ["accept", "acceptForSession"];
@@ -218,9 +215,9 @@ export class CodexApprovalHandler implements ApprovalHandler {
         return `${decision}, and don't ask again for network access to \`${amendment.host}\``;
     }
 
-    // ACP responses only return the selected optionId. The legacy network field
-    // is plural and availableDecisions is an array, so repeated amendments need
-    // unique IDs while the common single-amendment ID stays stable.
+    // ACP responses only return the selected optionId. The network field is
+    // plural, so repeated amendments need unique IDs while the common
+    // single-amendment ID stays stable.
     private indexedOptionId(optionId: ApprovalOptionId, index: number): ApprovalOptionId | string {
         return index === 0 ? optionId : `${optionId}:${index}`;
     }

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

@@ -107,47 +107,7 @@ describe('Approval Events', () => {
             await promptPromise;
         });
 
-        it('should map available execpolicy amendment approval to Codex decision', async () => {
-            const { promptPromise, completeTurn } = setupSessionWithPendingPrompt();
-            const execpolicyAmendment = ['env', 'GRADLE_USER_HOME=/workspace/.gradle-home', './gradlew', 'build'];
-            fixture.setPermissionResponse({
-                outcome: { outcome: 'selected', optionId: 'allow_command_prefix_rule' }
-            });
-
-            const params: CommandExecutionRequestApprovalParams = {
-                threadId: sessionId,
-                turnId: 'turn-1',
-                itemId: 'item-prefix-rule',
-                reason: 'Build the project',
-                proposedExecpolicyAmendment: ['ignored-fallback'],
-                availableDecisions: [
-                    'accept',
-                    { acceptWithExecpolicyAmendment: { execpolicy_amendment: execpolicyAmendment } },
-                    'decline',
-                ],
-            };
-
-            const response = await fixture.sendServerRequest(
-                'item/commandExecution/requestApproval',
-                params
-            );
-
-            expect(response).toEqual({
-                decision: {
-                    acceptWithExecpolicyAmendment: {
-                        execpolicy_amendment: execpolicyAmendment,
-                    },
-                },
-            });
-            await expect(fixture.getAcpConnectionDump(['_meta'])).toMatchFileSnapshot(
-                'data/approval-command-prefix-rule.json'
-            );
-
-            completeTurn();
-            await promptPromise;
-        });
-
-        it('should add fallback execpolicy amendment option when availableDecisions is absent', async () => {
+        it('should map execpolicy amendment approval to Codex decision', async () => {
             const { promptPromise, completeTurn } = setupSessionWithPendingPrompt();
             const execpolicyAmendment = ['npm', 'run'];
             fixture.setPermissionResponse({
@@ -179,34 +139,6 @@ describe('Approval Events', () => {
             await promptPromise;
         });
 
-        it('should respect availableDecisions when prefix-rule approval is omitted', async () => {
-            const { promptPromise, completeTurn } = setupSessionWithPendingPrompt();
-            fixture.setPermissionResponse({
-                outcome: { outcome: 'selected', optionId: 'allow_once' }
-            });
-
-            const params: CommandExecutionRequestApprovalParams = {
-                threadId: sessionId,
-                turnId: 'turn-1',
-                itemId: 'item-no-prefix-rule',
-                reason: 'Run exact command only',
-                proposedExecpolicyAmendment: ['npm', 'run'],
-                availableDecisions: ['accept', 'decline'],
-            };
-
-            await fixture.sendServerRequest(
-                'item/commandExecution/requestApproval',
-                params
-            );
-
-            await expect(fixture.getAcpConnectionDump(['_meta'])).toMatchFileSnapshot(
-                'data/approval-command-available-decisions-without-prefix.json'
-            );
-
-            completeTurn();
-            await promptPromise;
-        });
-
         it('should map network policy amendment approval to Codex decision', async () => {
             const { promptPromise, completeTurn } = setupSessionWithPendingPrompt();
             const networkPolicyAmendment = { host: 'registry.npmjs.org', action: 'allow' } as const;
@@ -220,11 +152,7 @@ describe('Approval Events', () => {
                 itemId: 'item-network-policy',
                 reason: 'Allow network access',
                 proposedExecpolicyAmendment: null,
-                availableDecisions: [
-                    'accept',
-                    { applyNetworkPolicyAmendment: { network_policy_amendment: networkPolicyAmendment } },
-                    'cancel',
-                ],
+                proposedNetworkPolicyAmendments: [networkPolicyAmendment],
             };
 
             const response = await fixture.sendServerRequest(
@@ -247,32 +175,6 @@ describe('Approval Events', () => {
             await promptPromise;
         });
 
-        it('should map explicit cancel option to cancel when advertised', async () => {
-            const { promptPromise, completeTurn } = setupSessionWithPendingPrompt();
-            fixture.setPermissionResponse({
-                outcome: { outcome: 'selected', optionId: 'cancel' }
-            });
-
-            const params: CommandExecutionRequestApprovalParams = {
-                threadId: sessionId,
-                turnId: 'turn-1',
-                itemId: 'item-explicit-cancel',
-                reason: 'Test command',
-                proposedExecpolicyAmendment: null,
-                availableDecisions: ['accept', 'cancel'],
-            };
-
-            const response = await fixture.sendServerRequest(
-                'item/commandExecution/requestApproval',
-                params
-            );
-
-            expect(response).toEqual({ decision: 'cancel' });
-
-            completeTurn();
-            await promptPromise;
-        });
-
         it('should return cancel when no handler registered', async () => {
             const params: CommandExecutionRequestApprovalParams = {
                 threadId: 'non-existent-session',

src/__tests__/CodexACPAgent/data/approval-command-network-policy.json

@@ -24,13 +24,18 @@
           "name": "Yes, proceed",
           "kind": "allow_once"
         },
+        {
+          "optionId": "allow_for_session",
+          "name": "Yes, and don't ask again for this exact command",
+          "kind": "allow_always"
+        },
         {
           "optionId": "apply_network_policy_amendment",
           "name": "Yes, and don't ask again for network access to `registry.npmjs.org`",
           "kind": "allow_always"
         },
         {
-          "optionId": "cancel",
+          "optionId": "reject_once",
           "name": "No, and tell Codex what to do differently",
           "kind": "reject_once"
         }