ai-sdk-provider-codex-cli 1.2.0 → 1.2.2

package/README.md

@@ -363,7 +363,7 @@ See [docs/ai-sdk-v5/configuration.md](docs/ai-sdk-v5/configuration.md) for the f
 - `minCodexVersion`: minimum supported app-server version (semver)
 - `includeRawChunks`: emit raw JSON-RPC notifications as `raw` stream parts by default
 - `serverRequests`: typed handlers for server-initiated JSON-RPC requests
-- `autoApprove`: default approval response when no custom handler is provided
+- `autoApprove`: default approval response when no custom handler is provided (covers command execution, file changes, skills, and MCP tool call approvals via `mcpServer/elicitation/request` on Codex >= 0.139)
 - `persistExtendedHistory`: request extended thread history persistence
 - `threadMode`: `stateless` (default) or `persistent` automatic thread reuse
 - `resume`: shorthand to resume an existing thread id

package/dist/index.cjs

@@ -203,6 +203,9 @@ var serverRequestsSchema = zod.z.object({
   onSkillApproval: zod.z.any().refine((val) => val === void 0 || typeof val === "function", {
     message: "onSkillApproval must be a function"
   }).optional(),
+  onMcpElicitation: zod.z.any().refine((val) => val === void 0 || typeof val === "function", {
+    message: "onMcpElicitation must be a function"
+  }).optional(),
   onToolRequestUserInput: zod.z.any().refine((val) => val === void 0 || typeof val === "function", {
     message: "onToolRequestUserInput must be a function"
   }).optional(),
@@ -1623,7 +1626,13 @@ var ExecLanguageModel = class {
   }
   emitToolInvocation(controller, toolCallId, toolName, inputPayload) {
     const inputString = safeStringify(inputPayload);
-    controller.enqueue({ type: "tool-input-start", id: toolCallId, toolName });
+    controller.enqueue({
+      type: "tool-input-start",
+      id: toolCallId,
+      toolName,
+      providerExecuted: true,
+      dynamic: true
+    });
     if (inputString) {
       controller.enqueue({ type: "tool-input-delta", id: toolCallId, delta: inputString });
     }
@@ -1633,7 +1642,8 @@ var ExecLanguageModel = class {
       toolCallId,
       toolName,
       input: inputString,
-      providerExecuted: true
+      providerExecuted: true,
+      dynamic: true
     });
   }
   emitToolResult(controller, toolCallId, toolName, item, resultPayload, metadata) {
@@ -1661,6 +1671,7 @@ var ExecLanguageModel = class {
       toolCallId,
       toolName,
       result: resultPayload ?? {},
+      dynamic: true,
       ...isError ? { isError: true } : {},
       ...Object.keys(providerMetadataEntries).length ? { providerMetadata: { "codex-cli": providerMetadataEntries } } : {}
     });
@@ -2319,10 +2330,10 @@ function normalizeItemType(type) {
 function mapTool(item) {
   const type = normalizeItemType(item.type);
   if (type === "commandexecution") {
-    return { toolName: "exec" };
+    return { toolName: "exec", dynamic: true };
   }
   if (type === "filechange") {
-    return { toolName: "patch" };
+    return { toolName: "patch", dynamic: true };
   }
   if (type === "mcptoolcall") {
     const server = typeof item.server === "string" ? item.server || "server" : "server";
@@ -2333,7 +2344,7 @@ function mapTool(item) {
     };
   }
   if (type === "websearch") {
-    return { toolName: "web_search" };
+    return { toolName: "web_search", dynamic: true };
   }
   return void 0;
 }
@@ -2400,7 +2411,8 @@ function createNotificationHandlers(context) {
     context.emitter.emitToolOutputDelta(
       itemId,
       tracked?.toolName ?? defaultToolName,
-      params.delta
+      params.delta,
+      tracked?.dynamic ?? true
     );
   };
   return {
@@ -2732,7 +2744,7 @@ var AppServerStreamEmitter = class {
       ...dynamic ? { dynamic: true } : {}
     });
   }
-  emitToolOutputDelta(toolCallId, toolName, delta) {
+  emitToolOutputDelta(toolCallId, toolName, delta, dynamic) {
     this.safeEnqueue({
       type: "tool-result",
       toolCallId,
@@ -2741,7 +2753,8 @@ var AppServerStreamEmitter = class {
       result: {
         type: "output-delta",
         delta
-      }
+      },
+      ...dynamic ? { dynamic: true } : {}
     });
   }
   emitToolResult(toolCallId, toolName, result, dynamic, isError) {
@@ -4375,6 +4388,17 @@ var skillRequestApprovalParamsSchema = zod.z.object({
   itemId: zod.z.string(),
   skillName: zod.z.string()
 }).passthrough();
+var mcpServerElicitationRequestParamsSchema = zod.z.object({
+  threadId: zod.z.string(),
+  turnId: zod.z.string().nullable().optional(),
+  serverName: zod.z.string(),
+  mode: zod.z.string().optional(),
+  message: zod.z.string().optional(),
+  requestedSchema: zod.z.unknown().optional(),
+  url: zod.z.string().optional(),
+  elicitationId: zod.z.string().optional(),
+  _meta: zod.z.record(zod.z.string(), zod.z.unknown()).nullable().optional()
+}).passthrough();
 var dynamicToolCallParamsSchema = zod.z.object({
   threadId: zod.z.string(),
   turnId: zod.z.string(),
@@ -4390,6 +4414,7 @@ var serverRequestParamSchemas = {
   "item/commandExecution/requestApproval": commandExecutionRequestApprovalParamsSchema,
   "item/fileChange/requestApproval": fileChangeRequestApprovalParamsSchema,
   "item/tool/requestUserInput": toolRequestUserInputParamsSchema,
+  "mcpServer/elicitation/request": mcpServerElicitationRequestParamsSchema,
   "skill/requestApproval": skillRequestApprovalParamsSchema,
   "item/tool/call": dynamicToolCallParamsSchema,
   "account/chatgptAuthTokens/refresh": chatgptAuthTokensRefreshParamsSchema
@@ -4413,6 +4438,11 @@ var serverRequestSchema = zod.z.discriminatedUnion("method", [
     method: zod.z.literal("item/tool/requestUserInput"),
     params: toolRequestUserInputParamsSchema
   }).passthrough(),
+  zod.z.object({
+    id: jsonRpcIdSchema,
+    method: zod.z.literal("mcpServer/elicitation/request"),
+    params: mcpServerElicitationRequestParamsSchema
+  }).passthrough(),
   zod.z.object({
     id: jsonRpcIdSchema,
     method: zod.z.literal("skill/requestApproval"),
@@ -5098,6 +5128,30 @@ var AppServerRpcClient = class extends events.EventEmitter {
         await sendResult({ decision: autoApprove ? "approve" : "decline" });
         return;
       }
+      case "mcpServer/elicitation/request": {
+        const handled = await runHandler(
+          () => handlers.onMcpElicitation?.(normalized)
+        );
+        if (handled !== void 0) {
+          await sendResult(handled);
+          return;
+        }
+        const fallback = await runHandler(
+          () => handlers.onUnhandled?.(normalized)
+        );
+        if (fallback !== void 0) {
+          await sendResult(fallback);
+          return;
+        }
+        const meta = normalized.params._meta;
+        const isToolCallApproval = meta?.codex_approval_kind === "mcp_tool_call";
+        if (isToolCallApproval && autoApprove) {
+          await sendResult({ action: "accept", content: {} });
+        } else {
+          await sendResult({ action: "decline", content: null });
+        }
+        return;
+      }
       case "item/tool/requestUserInput": {
         const handled = await runHandler(
           () => handlers.onToolRequestUserInput?.(

package/dist/index.d.cts

@@ -407,6 +407,29 @@ interface ToolRequestUserInputParams {
 interface ToolRequestUserInputResponse {
     answers: Record<string, unknown>;
 }
+type McpServerElicitationAction = 'accept' | 'decline' | 'cancel';
+interface McpServerElicitationRequestParams {
+    threadId: string;
+    /** Nullable: the elicitation may arrive outside of an active turn. */
+    turnId?: string | null;
+    serverName: string;
+    /** 'form' requests carry message/requestedSchema; 'url' requests carry url/elicitationId. */
+    mode?: string;
+    message?: string;
+    requestedSchema?: unknown;
+    url?: string;
+    elicitationId?: string;
+    /**
+     * For MCP tool approval elicitations, Codex sets
+     * `codex_approval_kind: 'mcp_tool_call'` and may include `persist` hints.
+     */
+    _meta?: Record<string, unknown> | null;
+}
+interface McpServerElicitationRequestResponse {
+    action: McpServerElicitationAction;
+    /** Structured user input for accepted elicitations; null for decline/cancel. */
+    content?: Record<string, unknown> | null;
+}
 interface DynamicToolCallParams {
     threadId: string;
     turnId: string;
@@ -547,6 +570,11 @@ interface AppServerSkillApprovalRequest {
     method: 'skill/requestApproval';
     params: SkillRequestApprovalParams;
 }
+interface AppServerMcpElicitationRequest {
+    id: JsonRpcId;
+    method: 'mcpServer/elicitation/request';
+    params: McpServerElicitationRequestParams;
+}
 interface AppServerToolRequestUserInputRequest {
     id: JsonRpcId;
     method: 'item/tool/requestUserInput';
@@ -580,6 +608,13 @@ interface CodexAppServerRequestHandlers {
     onCommandExecutionApproval?: (request: AppServerCommandExecutionApprovalRequest) => Promise<CommandExecutionRequestApprovalResponse | undefined>;
     onFileChangeApproval?: (request: AppServerFileChangeApprovalRequest) => Promise<FileChangeRequestApprovalResponse | undefined>;
     onSkillApproval?: (request: AppServerSkillApprovalRequest) => Promise<SkillRequestApprovalResponse | undefined>;
+    /**
+     * Handles `mcpServer/elicitation/request` (Codex >= 0.139), which includes
+     * MCP tool call approvals (`params._meta.codex_approval_kind === 'mcp_tool_call'`).
+     * Built-in default: accept tool call approvals when `autoApprove` is true,
+     * decline all other elicitations.
+     */
+    onMcpElicitation?: (request: AppServerMcpElicitationRequest) => Promise<McpServerElicitationRequestResponse | undefined>;
     onToolRequestUserInput?: (request: AppServerToolRequestUserInputRequest) => Promise<ToolRequestUserInputResponse | undefined>;
     onDynamicToolCall?: (request: AppServerDynamicToolCallRequest) => Promise<DynamicToolCallResponse | undefined>;
     onAuthRefresh?: (request: AppServerAuthRefreshRequest) => Promise<ChatgptAuthTokensRefreshResponse | undefined>;

package/dist/index.d.ts

@@ -407,6 +407,29 @@ interface ToolRequestUserInputParams {
 interface ToolRequestUserInputResponse {
     answers: Record<string, unknown>;
 }
+type McpServerElicitationAction = 'accept' | 'decline' | 'cancel';
+interface McpServerElicitationRequestParams {
+    threadId: string;
+    /** Nullable: the elicitation may arrive outside of an active turn. */
+    turnId?: string | null;
+    serverName: string;
+    /** 'form' requests carry message/requestedSchema; 'url' requests carry url/elicitationId. */
+    mode?: string;
+    message?: string;
+    requestedSchema?: unknown;
+    url?: string;
+    elicitationId?: string;
+    /**
+     * For MCP tool approval elicitations, Codex sets
+     * `codex_approval_kind: 'mcp_tool_call'` and may include `persist` hints.
+     */
+    _meta?: Record<string, unknown> | null;
+}
+interface McpServerElicitationRequestResponse {
+    action: McpServerElicitationAction;
+    /** Structured user input for accepted elicitations; null for decline/cancel. */
+    content?: Record<string, unknown> | null;
+}
 interface DynamicToolCallParams {
     threadId: string;
     turnId: string;
@@ -547,6 +570,11 @@ interface AppServerSkillApprovalRequest {
     method: 'skill/requestApproval';
     params: SkillRequestApprovalParams;
 }
+interface AppServerMcpElicitationRequest {
+    id: JsonRpcId;
+    method: 'mcpServer/elicitation/request';
+    params: McpServerElicitationRequestParams;
+}
 interface AppServerToolRequestUserInputRequest {
     id: JsonRpcId;
     method: 'item/tool/requestUserInput';
@@ -580,6 +608,13 @@ interface CodexAppServerRequestHandlers {
     onCommandExecutionApproval?: (request: AppServerCommandExecutionApprovalRequest) => Promise<CommandExecutionRequestApprovalResponse | undefined>;
     onFileChangeApproval?: (request: AppServerFileChangeApprovalRequest) => Promise<FileChangeRequestApprovalResponse | undefined>;
     onSkillApproval?: (request: AppServerSkillApprovalRequest) => Promise<SkillRequestApprovalResponse | undefined>;
+    /**
+     * Handles `mcpServer/elicitation/request` (Codex >= 0.139), which includes
+     * MCP tool call approvals (`params._meta.codex_approval_kind === 'mcp_tool_call'`).
+     * Built-in default: accept tool call approvals when `autoApprove` is true,
+     * decline all other elicitations.
+     */
+    onMcpElicitation?: (request: AppServerMcpElicitationRequest) => Promise<McpServerElicitationRequestResponse | undefined>;
     onToolRequestUserInput?: (request: AppServerToolRequestUserInputRequest) => Promise<ToolRequestUserInputResponse | undefined>;
     onDynamicToolCall?: (request: AppServerDynamicToolCallRequest) => Promise<DynamicToolCallResponse | undefined>;
     onAuthRefresh?: (request: AppServerAuthRefreshRequest) => Promise<ChatgptAuthTokensRefreshResponse | undefined>;

package/dist/index.js

@@ -195,6 +195,9 @@ var serverRequestsSchema = z.object({
   onSkillApproval: z.any().refine((val) => val === void 0 || typeof val === "function", {
     message: "onSkillApproval must be a function"
   }).optional(),
+  onMcpElicitation: z.any().refine((val) => val === void 0 || typeof val === "function", {
+    message: "onMcpElicitation must be a function"
+  }).optional(),
   onToolRequestUserInput: z.any().refine((val) => val === void 0 || typeof val === "function", {
     message: "onToolRequestUserInput must be a function"
   }).optional(),
@@ -1615,7 +1618,13 @@ var ExecLanguageModel = class {
   }
   emitToolInvocation(controller, toolCallId, toolName, inputPayload) {
     const inputString = safeStringify(inputPayload);
-    controller.enqueue({ type: "tool-input-start", id: toolCallId, toolName });
+    controller.enqueue({
+      type: "tool-input-start",
+      id: toolCallId,
+      toolName,
+      providerExecuted: true,
+      dynamic: true
+    });
     if (inputString) {
       controller.enqueue({ type: "tool-input-delta", id: toolCallId, delta: inputString });
     }
@@ -1625,7 +1634,8 @@ var ExecLanguageModel = class {
       toolCallId,
       toolName,
       input: inputString,
-      providerExecuted: true
+      providerExecuted: true,
+      dynamic: true
     });
   }
   emitToolResult(controller, toolCallId, toolName, item, resultPayload, metadata) {
@@ -1653,6 +1663,7 @@ var ExecLanguageModel = class {
       toolCallId,
       toolName,
       result: resultPayload ?? {},
+      dynamic: true,
       ...isError ? { isError: true } : {},
       ...Object.keys(providerMetadataEntries).length ? { providerMetadata: { "codex-cli": providerMetadataEntries } } : {}
     });
@@ -2311,10 +2322,10 @@ function normalizeItemType(type) {
 function mapTool(item) {
   const type = normalizeItemType(item.type);
   if (type === "commandexecution") {
-    return { toolName: "exec" };
+    return { toolName: "exec", dynamic: true };
   }
   if (type === "filechange") {
-    return { toolName: "patch" };
+    return { toolName: "patch", dynamic: true };
   }
   if (type === "mcptoolcall") {
     const server = typeof item.server === "string" ? item.server || "server" : "server";
@@ -2325,7 +2336,7 @@ function mapTool(item) {
     };
   }
   if (type === "websearch") {
-    return { toolName: "web_search" };
+    return { toolName: "web_search", dynamic: true };
   }
   return void 0;
 }
@@ -2392,7 +2403,8 @@ function createNotificationHandlers(context) {
     context.emitter.emitToolOutputDelta(
       itemId,
       tracked?.toolName ?? defaultToolName,
-      params.delta
+      params.delta,
+      tracked?.dynamic ?? true
     );
   };
   return {
@@ -2724,7 +2736,7 @@ var AppServerStreamEmitter = class {
       ...dynamic ? { dynamic: true } : {}
     });
   }
-  emitToolOutputDelta(toolCallId, toolName, delta) {
+  emitToolOutputDelta(toolCallId, toolName, delta, dynamic) {
     this.safeEnqueue({
       type: "tool-result",
       toolCallId,
@@ -2733,7 +2745,8 @@ var AppServerStreamEmitter = class {
       result: {
         type: "output-delta",
         delta
-      }
+      },
+      ...dynamic ? { dynamic: true } : {}
     });
   }
   emitToolResult(toolCallId, toolName, result, dynamic, isError) {
@@ -4367,6 +4380,17 @@ var skillRequestApprovalParamsSchema = z.object({
   itemId: z.string(),
   skillName: z.string()
 }).passthrough();
+var mcpServerElicitationRequestParamsSchema = z.object({
+  threadId: z.string(),
+  turnId: z.string().nullable().optional(),
+  serverName: z.string(),
+  mode: z.string().optional(),
+  message: z.string().optional(),
+  requestedSchema: z.unknown().optional(),
+  url: z.string().optional(),
+  elicitationId: z.string().optional(),
+  _meta: z.record(z.string(), z.unknown()).nullable().optional()
+}).passthrough();
 var dynamicToolCallParamsSchema = z.object({
   threadId: z.string(),
   turnId: z.string(),
@@ -4382,6 +4406,7 @@ var serverRequestParamSchemas = {
   "item/commandExecution/requestApproval": commandExecutionRequestApprovalParamsSchema,
   "item/fileChange/requestApproval": fileChangeRequestApprovalParamsSchema,
   "item/tool/requestUserInput": toolRequestUserInputParamsSchema,
+  "mcpServer/elicitation/request": mcpServerElicitationRequestParamsSchema,
   "skill/requestApproval": skillRequestApprovalParamsSchema,
   "item/tool/call": dynamicToolCallParamsSchema,
   "account/chatgptAuthTokens/refresh": chatgptAuthTokensRefreshParamsSchema
@@ -4405,6 +4430,11 @@ var serverRequestSchema = z.discriminatedUnion("method", [
     method: z.literal("item/tool/requestUserInput"),
     params: toolRequestUserInputParamsSchema
   }).passthrough(),
+  z.object({
+    id: jsonRpcIdSchema,
+    method: z.literal("mcpServer/elicitation/request"),
+    params: mcpServerElicitationRequestParamsSchema
+  }).passthrough(),
   z.object({
     id: jsonRpcIdSchema,
     method: z.literal("skill/requestApproval"),
@@ -5090,6 +5120,30 @@ var AppServerRpcClient = class extends EventEmitter {
         await sendResult({ decision: autoApprove ? "approve" : "decline" });
         return;
       }
+      case "mcpServer/elicitation/request": {
+        const handled = await runHandler(
+          () => handlers.onMcpElicitation?.(normalized)
+        );
+        if (handled !== void 0) {
+          await sendResult(handled);
+          return;
+        }
+        const fallback = await runHandler(
+          () => handlers.onUnhandled?.(normalized)
+        );
+        if (fallback !== void 0) {
+          await sendResult(fallback);
+          return;
+        }
+        const meta = normalized.params._meta;
+        const isToolCallApproval = meta?.codex_approval_kind === "mcp_tool_call";
+        if (isToolCallApproval && autoApprove) {
+          await sendResult({ action: "accept", content: {} });
+        } else {
+          await sendResult({ action: "decline", content: null });
+        }
+        return;
+      }
       case "item/tool/requestUserInput": {
         const handled = await runHandler(
           () => handlers.onToolRequestUserInput?.(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ai-sdk-provider-codex-cli",
-  "version": "1.2.0",
+  "version": "1.2.2",
   "description": "AI SDK v6 provider for OpenAI Codex CLI (use ChatGPT Plus/Pro subscription)",
   "keywords": [
     "ai-sdk",