fix: align approval text with codex

Author: NikolaiSviridov

src/CodexApprovalHandler.ts

@@ -13,11 +13,6 @@ import {logger} from "./Logger";
 import {stripShellPrefix} from "./CodexEventHandler";
 import {ApprovalOptionId} from "./ApprovalOptionId";
 
-const APPROVAL_OPTIONS: acp.PermissionOption[] = [
-    { optionId: ApprovalOptionId.AllowOnce, name: "Allow Once", kind: "allow_once" },
-    { optionId: ApprovalOptionId.AllowForSession, name: "Allow for Session", kind: "allow_always" },
-    { optionId: ApprovalOptionId.RejectOnce, name: "Reject", kind: "reject_once" },
-];
 
 // Pair each displayed ACP option with the exact Codex decision it represents,
 // so response conversion does not reconstruct decisions from labels or metadata.
@@ -98,7 +93,7 @@ export class CodexApprovalHandler implements ApprovalHandler {
             } else if (typeof decision !== "string" && "applyNetworkPolicyAmendment" in decision) {
                 amendmentIndex = networkAmendmentCount++;
             }
-            return this.convertCommandDecisionToOption(decision, amendmentIndex);
+            return this.convertCommandDecisionToOption(params, decision, amendmentIndex);
         });
     }
 
@@ -128,12 +123,17 @@ export class CodexApprovalHandler implements ApprovalHandler {
     }
 
     private convertCommandDecisionToOption(
+        params: CommandExecutionRequestApprovalParams,
         decision: CommandExecutionApprovalDecision,
         amendmentIndex: number
     ): CommandDecisionOption {
         if (decision === "accept") {
             return {
-                option: { optionId: ApprovalOptionId.AllowOnce, name: "Yes, proceed", kind: "allow_once" },
+                option: {
+                    optionId: ApprovalOptionId.AllowOnce,
+                    name: params.networkApprovalContext ? "Yes, just this once" : "Yes, proceed",
+                    kind: "allow_once"
+                },
                 decision
             };
         }
@@ -142,7 +142,9 @@ export class CodexApprovalHandler implements ApprovalHandler {
             return {
                 option: {
                     optionId: ApprovalOptionId.AllowForSession,
-                    name: "Yes, and don't ask again for this exact command",
+                    name: params.networkApprovalContext
+                        ? "Yes, and allow this host for this conversation"
+                        : "Yes, and don't ask again for this command in this session",
                     kind: "allow_always"
                 },
                 decision
@@ -211,8 +213,9 @@ export class CodexApprovalHandler implements ApprovalHandler {
     private networkPolicyApprovalLabel(
         amendment: { host: string; action: "allow" | "deny" }
     ): string {
-        const decision = amendment.action === "deny" ? "No" : "Yes";
-        return `${decision}, and don't ask again for network access to \`${amendment.host}\``;
+        return amendment.action === "deny"
+            ? "No, and block this host in the future"
+            : "Yes, and allow this host in the future";
     }
 
     // ACP responses only return the selected optionId. The network field is
@@ -248,7 +251,19 @@ export class CodexApprovalHandler implements ApprovalHandler {
                 status: "pending",
                 content: reasonContent ? [reasonContent] : null,
             },
-            options: APPROVAL_OPTIONS,
+            options: [
+                { optionId: ApprovalOptionId.AllowOnce, name: "Yes, proceed", kind: "allow_once" },
+                {
+                    optionId: ApprovalOptionId.AllowForSession,
+                    name: "Yes, and don't ask again for these files",
+                    kind: "allow_always"
+                },
+                {
+                    optionId: ApprovalOptionId.RejectOnce,
+                    name: "No, and tell Codex what to do differently",
+                    kind: "reject_once"
+                },
+            ],
         };
     }
 

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

@@ -26,7 +26,7 @@
         },
         {
           "optionId": "allow_for_session",
-          "name": "Yes, and don't ask again for this exact command",
+          "name": "Yes, and don't ask again for this command in this session",
           "kind": "allow_always"
         },
         {

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

@@ -26,12 +26,12 @@
         },
         {
           "optionId": "allow_for_session",
-          "name": "Yes, and don't ask again for this exact command",
+          "name": "Yes, and don't ask again for this command in this session",
           "kind": "allow_always"
         },
         {
           "optionId": "apply_network_policy_amendment",
-          "name": "Yes, and don't ask again for network access to `registry.npmjs.org`",
+          "name": "Yes, and allow this host in the future",
           "kind": "allow_always"
         },
         {

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

@@ -29,7 +29,7 @@
         },
         {
           "optionId": "allow_for_session",
-          "name": "Yes, and don't ask again for this exact command",
+          "name": "Yes, and don't ask again for this command in this session",
           "kind": "allow_always"
         },
         {

src/__tests__/CodexACPAgent/data/approval-file-change.json

@@ -20,17 +20,17 @@
       "options": [
         {
           "optionId": "allow_once",
-          "name": "Allow Once",
+          "name": "Yes, proceed",
           "kind": "allow_once"
         },
         {
           "optionId": "allow_for_session",
-          "name": "Allow for Session",
+          "name": "Yes, and don't ask again for these files",
           "kind": "allow_always"
         },
         {
           "optionId": "reject_once",
-          "name": "Reject",
+          "name": "No, and tell Codex what to do differently",
           "kind": "reject_once"
         }
       ]