fix: remove description for elicitation option _meta

NikolaiSviridov · NikolaiSviridov · commit f78faeee8f75 · 2026-05-25T13:47:06.000+02:00
diff --git a/src/CodexElicitationHandler.ts b/src/CodexElicitationHandler.ts
@@ -23,13 +23,11 @@ function buildToolApprovalOption(
     optionId: string,
     name: string,
     kind: acp.PermissionOption["kind"],
-    description: string
 ): acp.PermissionOption {
     return {
         optionId,
         name,
-        kind,
-        _meta: { description },
+        kind
     };
 }
 
@@ -73,8 +71,7 @@ function buildToolApprovalOptions(
         buildToolApprovalOption(
             ApprovalOptionId.AllowOnce,
             "Allow",
-            "allow_once",
-            "Run the tool and continue."
+            "allow_once"
         ),
     ];
     // Codex advertises MCP tool approval persistence choices in request _meta.persist.
@@ -83,23 +80,20 @@ function buildToolApprovalOptions(
         options.push(buildToolApprovalOption(
             ApprovalOptionId.AllowForSession,
             "Allow for this session",
-            "allow_always",
-            "Run the tool and remember this choice for this session."
+            "allow_always"
         ));
     }
     if (persistOptions.has("always") && allowPersistentApproval) {
         options.push(buildToolApprovalOption(
             ApprovalOptionId.AllowPersist,
             "Always allow",
-            "allow_always",
-            "Run the tool and remember this choice for future tool calls."
+            "allow_always"
         ));
     }
     options.push(buildToolApprovalOption(
         ApprovalOptionId.RejectOnce,
         "Cancel",
-        "reject_once",
-        "Cancel this tool call."
+        "reject_once"
     ));
     return options;
 }
diff --git a/src/__tests__/CodexACPAgent/data/elicitation-tool-approval-all-persist.json b/src/__tests__/CodexACPAgent/data/elicitation-tool-approval-all-persist.json
@@ -24,31 +24,29 @@
           }
         }
       },
-      "_meta": "_meta",
+      "_meta": {
+        "is_mcp_tool_approval": true
+      },
       "options": [
         {
           "optionId": "allow_once",
           "name": "Allow",
-          "kind": "allow_once",
-          "_meta": "_meta"
+          "kind": "allow_once"
         },
         {
           "optionId": "allow_for_session",
           "name": "Allow for this session",
-          "kind": "allow_always",
-          "_meta": "_meta"
+          "kind": "allow_always"
         },
         {
           "optionId": "allow_persist",
           "name": "Always allow",
-          "kind": "allow_always",
-          "_meta": "_meta"
+          "kind": "allow_always"
         },
         {
           "optionId": "reject_once",
           "name": "Cancel",
-          "kind": "reject_once",
-          "_meta": "_meta"
+          "kind": "reject_once"
         }
       ]
     }
diff --git a/src/__tests__/CodexACPAgent/data/elicitation-tool-approval-no-persist.json b/src/__tests__/CodexACPAgent/data/elicitation-tool-approval-no-persist.json
@@ -24,19 +24,19 @@
           }
         }
       },
-      "_meta": "_meta",
+      "_meta": {
+        "is_mcp_tool_approval": true
+      },
       "options": [
         {
           "optionId": "allow_once",
           "name": "Allow",
-          "kind": "allow_once",
-          "_meta": "_meta"
+          "kind": "allow_once"
         },
         {
           "optionId": "reject_once",
           "name": "Cancel",
-          "kind": "reject_once",
-          "_meta": "_meta"
+          "kind": "reject_once"
         }
       ]
     }
diff --git a/src/__tests__/CodexACPAgent/data/elicitation-tool-approval-session-only.json b/src/__tests__/CodexACPAgent/data/elicitation-tool-approval-session-only.json
@@ -24,25 +24,24 @@
           }
         }
       },
-      "_meta": "_meta",
+      "_meta": {
+        "is_mcp_tool_approval": true
+      },
       "options": [
         {
           "optionId": "allow_once",
           "name": "Allow",
-          "kind": "allow_once",
-          "_meta": "_meta"
+          "kind": "allow_once"
         },
         {
           "optionId": "allow_for_session",
           "name": "Allow for this session",
-          "kind": "allow_always",
-          "_meta": "_meta"
+          "kind": "allow_always"
         },
         {
           "optionId": "reject_once",
           "name": "Cancel",
-          "kind": "reject_once",
-          "_meta": "_meta"
+          "kind": "reject_once"
         }
       ]
     }
diff --git a/src/__tests__/CodexACPAgent/elicitation-events.test.ts b/src/__tests__/CodexACPAgent/elicitation-events.test.ts
@@ -146,7 +146,7 @@ describe('Elicitation Events', () => {
             };
 
             await fixture.sendServerRequest('mcpServer/elicitation/request', params);
-            await expect(fixture.getAcpConnectionDump(['_meta'])).toMatchFileSnapshot('data/elicitation-tool-approval-all-persist.json');
+            await expect(fixture.getAcpConnectionDump([])).toMatchFileSnapshot('data/elicitation-tool-approval-all-persist.json');
 
             completeTurn();
             await promptPromise;
@@ -173,25 +173,21 @@ describe('Elicitation Events', () => {
                     optionId: 'allow_once',
                     name: 'Allow',
                     kind: 'allow_once',
-                    _meta: { description: 'Run the tool and continue.' },
                 },
                 {
                     optionId: 'allow_for_session',
                     name: 'Allow for this session',
                     kind: 'allow_always',
-                    _meta: { description: 'Run the tool and remember this choice for this session.' },
                 },
                 {
                     optionId: 'allow_persist',
                     name: 'Always allow',
                     kind: 'allow_always',
-                    _meta: { description: 'Run the tool and remember this choice for future tool calls.' },
                 },
                 {
                     optionId: 'reject_once',
                     name: 'Cancel',
                     kind: 'reject_once',
-                    _meta: { description: 'Cancel this tool call.' },
                 },
             ]);
 
@@ -296,7 +292,7 @@ describe('Elicitation Events', () => {
             };
 
             await fixture.sendServerRequest('mcpServer/elicitation/request', params);
-            await expect(fixture.getAcpConnectionDump(['_meta'])).toMatchFileSnapshot('data/elicitation-tool-approval-session-only.json');
+            await expect(fixture.getAcpConnectionDump([])).toMatchFileSnapshot('data/elicitation-tool-approval-session-only.json');
 
             completeTurn();
             await promptPromise;
@@ -315,7 +311,7 @@ describe('Elicitation Events', () => {
             };
 
             await fixture.sendServerRequest('mcpServer/elicitation/request', params);
-            await expect(fixture.getAcpConnectionDump(['_meta'])).toMatchFileSnapshot('data/elicitation-tool-approval-no-persist.json');
+            await expect(fixture.getAcpConnectionDump([])).toMatchFileSnapshot('data/elicitation-tool-approval-no-persist.json');
 
             completeTurn();
             await promptPromise;

Original file line number	Diff line number	Diff line change
`@@ -24,31 +24,29 @@`
`24`	`24`	`}`
`25`	`25`	`}`
`26`	`26`	`},`
`27`		`- "_meta": "_meta",`
	`27`	`+ "_meta": {`
	`28`	`+ "is_mcp_tool_approval": true`
	`29`	`+ },`
`28`	`30`	`"options": [`
`29`	`31`	`{`
`30`	`32`	`"optionId": "allow_once",`
`31`	`33`	`"name": "Allow",`
`32`		`- "kind": "allow_once",`
`33`		`- "_meta": "_meta"`
	`34`	`+ "kind": "allow_once"`
`34`	`35`	`},`
`35`	`36`	`{`
`36`	`37`	`"optionId": "allow_for_session",`
`37`	`38`	`"name": "Allow for this session",`
`38`		`- "kind": "allow_always",`
`39`		`- "_meta": "_meta"`
	`39`	`+ "kind": "allow_always"`
`40`	`40`	`},`
`41`	`41`	`{`
`42`	`42`	`"optionId": "allow_persist",`
`43`	`43`	`"name": "Always allow",`
`44`		`- "kind": "allow_always",`
`45`		`- "_meta": "_meta"`
	`44`	`+ "kind": "allow_always"`
`46`	`45`	`},`
`47`	`46`	`{`
`48`	`47`	`"optionId": "reject_once",`
`49`	`48`	`"name": "Cancel",`
`50`		`- "kind": "reject_once",`
`51`		`- "_meta": "_meta"`
	`49`	`+ "kind": "reject_once"`
`52`	`50`	`}`
`53`	`51`	`]`
`54`	`52`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,19 +24,19 @@`
`24`	`24`	`}`
`25`	`25`	`}`
`26`	`26`	`},`
`27`		`- "_meta": "_meta",`
	`27`	`+ "_meta": {`
	`28`	`+ "is_mcp_tool_approval": true`
	`29`	`+ },`
`28`	`30`	`"options": [`
`29`	`31`	`{`
`30`	`32`	`"optionId": "allow_once",`
`31`	`33`	`"name": "Allow",`
`32`		`- "kind": "allow_once",`
`33`		`- "_meta": "_meta"`
	`34`	`+ "kind": "allow_once"`
`34`	`35`	`},`
`35`	`36`	`{`
`36`	`37`	`"optionId": "reject_once",`
`37`	`38`	`"name": "Cancel",`
`38`		`- "kind": "reject_once",`
`39`		`- "_meta": "_meta"`
	`39`	`+ "kind": "reject_once"`
`40`	`40`	`}`
`41`	`41`	`]`
`42`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,25 +24,24 @@`
`24`	`24`	`}`
`25`	`25`	`}`
`26`	`26`	`},`
`27`		`- "_meta": "_meta",`
	`27`	`+ "_meta": {`
	`28`	`+ "is_mcp_tool_approval": true`
	`29`	`+ },`
`28`	`30`	`"options": [`
`29`	`31`	`{`
`30`	`32`	`"optionId": "allow_once",`
`31`	`33`	`"name": "Allow",`
`32`		`- "kind": "allow_once",`
`33`		`- "_meta": "_meta"`
	`34`	`+ "kind": "allow_once"`
`34`	`35`	`},`
`35`	`36`	`{`
`36`	`37`	`"optionId": "allow_for_session",`
`37`	`38`	`"name": "Allow for this session",`
`38`		`- "kind": "allow_always",`
`39`		`- "_meta": "_meta"`
	`39`	`+ "kind": "allow_always"`
`40`	`40`	`},`
`41`	`41`	`{`
`42`	`42`	`"optionId": "reject_once",`
`43`	`43`	`"name": "Cancel",`
`44`		`- "kind": "reject_once",`
`45`		`- "_meta": "_meta"`
	`44`	`+ "kind": "reject_once"`
`46`	`45`	`}`
`47`	`46`	`]`
`48`	`47`	`}`