@junctionpanel/server 0.1.31 → 0.1.33

package/dist/server/server/agent/providers/codex-app-server-agent.d.ts

@@ -1,6 +1,30 @@
-import type { AgentCapabilityFlags, AgentClient, AgentModelDefinition, AgentPromptInput, AgentSession, AgentSessionConfig, ToolCallTimelineItem, ListModelsOptions, ListPersistedAgentsOptions, PersistedAgentDescriptor } from "../agent-sdk-types.js";
+import type { AgentCapabilityFlags, AgentClient, AgentModelDefinition, AgentPermissionResponse, AgentPromptInput, AgentSession, AgentSessionConfig, ToolCallTimelineItem, ListModelsOptions, ListPersistedAgentsOptions, PersistedAgentDescriptor } from "../agent-sdk-types.js";
 import type { Logger } from "pino";
 import { type ProviderRuntimeSettings } from "../provider-launch-config.js";
+declare function parseUpdatedQuestionAnswers(updatedInput: unknown): Record<string, string[]>;
+type CodexQuestionOption = {
+    label?: string;
+    value?: string;
+    description?: string;
+};
+type CodexQuestionDescriptor = {
+    id: string;
+    header?: string;
+    question?: string;
+    isOther?: boolean;
+    isSecret?: boolean;
+    options?: CodexQuestionOption[];
+};
+declare function normalizeCodexQuestionDescriptors(value: unknown): CodexQuestionDescriptor[];
+declare function buildCodexPermissionsResponse(response: AgentPermissionResponse, requestedPermissions: unknown): {
+    permissions: Record<string, unknown>;
+    scope: "turn" | "session";
+};
+declare function buildCodexElicitationResponse(response: AgentPermissionResponse): {
+    action: "accept" | "decline" | "cancel";
+    content: unknown | null;
+    _meta: unknown | null;
+};
 declare function formatProposedPlanBlock(text: string): string;
 declare function supportsPlanCollaborationMode(response: unknown): boolean;
 declare function shouldRetryInitializeWithoutExperimentalApi(error: unknown): boolean;
@@ -21,6 +45,11 @@ export declare const __codexAppServerInternals: {
     shouldRetryInitializeWithoutExperimentalApi: typeof shouldRetryInitializeWithoutExperimentalApi;
     shouldRetryTurnStartWithoutCollaborationMode: typeof shouldRetryTurnStartWithoutCollaborationMode;
     formatProposedPlanBlock: typeof formatProposedPlanBlock;
+    normalizeCodexQuestionDescriptors: typeof normalizeCodexQuestionDescriptors;
+    parseUpdatedQuestionAnswers: typeof parseUpdatedQuestionAnswers;
+    buildCodexPermissionsResponse: typeof buildCodexPermissionsResponse;
+    buildCodexElicitationResponse: typeof buildCodexElicitationResponse;
+    supportedRequestMethods: readonly ["item/commandExecution/requestApproval", "item/fileChange/requestApproval", "tool/requestUserInput", "item/tool/requestUserInput", "item/permissions/requestApproval", "mcpServer/elicitation/request"];
 };
 export declare class CodexAppServerAgentClient implements AgentClient {
     private readonly logger;

package/dist/server/server/agent/providers/codex-app-server-agent.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"codex-app-server-agent.d.ts","sourceRoot":"","sources":["../../../../../src/server/agent/providers/codex-app-server-agent.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,oBAAoB,EACpB,WAAW,EAEX,oBAAoB,EAKpB,gBAAgB,EAIhB,YAAY,EACZ,kBAAkB,EAIlB,oBAAoB,EAEpB,iBAAiB,EACjB,0BAA0B,EAC1B,wBAAwB,EACzB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAenC,OAAO,EAIL,KAAK,uBAAuB,EAC7B,MAAM,8BAA8B,CAAC;AAqsBtC,iBAAS,uBAAuB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAErD;AAwBD,iBAAS,6BAA6B,CAAC,QAAQ,EAAE,OAAO,GAAG,OAAO,CAiCjE;AAED,iBAAS,2CAA2C,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAS5E;AAED,iBAAS,4CAA4C,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAQ7E;AA6RD,iBAAS,mCAAmC,CAAC,MAAM,EAAE;IACnD,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,OAAO,EAAE,OAAO,CAAC;IACjB,GAAG,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACpB,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,OAAO,CAAC,EAAE,OAAO,GAAG,IAAI,CAAC;IACzB,OAAO,EAAE,OAAO,CAAC;CAClB,GAAG,oBAAoB,GAAG,IAAI,CAiD9B;AAqnBD,wBAAsB,iCAAiC,CACrD,MAAM,EAAE,gBAAgB,EACxB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,OAAO,EAAE,CAAC,CAkCpB;AAED,eAAO,MAAM,yBAAyB;;;;;;CAMrC,CAAC;AA81CF,qBAAa,yBAA0B,YAAW,WAAW;IAKzD,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAC;IALnC,QAAQ,CAAC,QAAQ,UAAkB;IACnC,QAAQ,CAAC,YAAY,uBAAiC;gBAGnC,MAAM,EAAE,MAAM,EACd,eAAe,CAAC,EAAE,uBAAuB,YAAA;IAG5D,OAAO,CAAC,cAAc;IAQhB,aAAa,CAAC,MAAM,EAAE,kBAAkB,GAAG,OAAO,CAAC,YAAY,CAAC;IAYhE,aAAa,CAAC,MAAM,EAAE;QAAE,SAAS,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;KAAE,EAAE,SAAS,CAAC,EAAE,OAAO,CAAC,kBAAkB,CAAC,GAAG,OAAO,CAAC,YAAY,CAAC;IAkBhJ,mBAAmB,CACvB,OAAO,CAAC,EAAE,0BAA0B,GACnC,OAAO,CAAC,wBAAwB,EAAE,CAAC;IA2EhC,UAAU,CAAC,QAAQ,CAAC,EAAE,iBAAiB,GAAG,OAAO,CAAC,oBAAoB,EAAE,CAAC;IA0FzE,WAAW,IAAI,OAAO,CAAC,OAAO,CAAC;CAGtC"}
+{"version":3,"file":"codex-app-server-agent.d.ts","sourceRoot":"","sources":["../../../../../src/server/agent/providers/codex-app-server-agent.ts"],"names":[],"mappings":"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"}

package/dist/server/server/agent/providers/codex-app-server-agent.js

@@ -7,6 +7,7 @@ import { z } from "zod";
 import { loadCodexPersistedTimeline } from "./codex-rollout-timeline.js";
 import { mapCodexRolloutToolCall, mapCodexToolCallFromThreadItem, } from "./codex/tool-call-mapper.js";
 import { applyProviderEnv, isProviderCommandAvailable, resolveProviderCommandPrefix, } from "../provider-launch-config.js";
+import { buildCodexRuntimeExtra, DEFAULT_CODEX_MODE_ID, isCodexPlanModeEnabled, normalizeCodexModeId, setCodexPlanModeEnabled, } from "../codex-config.js";
 import { writeImageAttachment } from "./image-attachments.js";
 const DEFAULT_TIMEOUT_MS = 14 * 24 * 60 * 60 * 1000;
 const TURN_START_TIMEOUT_MS = 90 * 1000;
@@ -21,39 +22,39 @@ const CODEX_APP_SERVER_CAPABILITIES = {
 };
 const CODEX_MODES = [
     {
-        id: "read-only",
-        label: "Read Only",
-        description: "Read files and answer questions. Manual approval required for edits, commands, or network ops.",
+        id: "default",
+        label: "Ask",
+        description: "Trusted commands run automatically; untrusted commands and edits require approval.",
     },
     {
-        id: "auto",
-        label: "Auto",
-        description: "Edit files and run commands but still request approval before escalating scope.",
+        id: "acceptEdits",
+        label: "Auto Edit",
+        description: "Workspace edits and commands run automatically without approval.",
     },
     {
-        id: "full-access",
-        label: "Full Access",
-        description: "Edit files, run commands, and access the network without additional prompts.",
+        id: "bypassPermissions",
+        label: "Bypass",
+        description: "Full disk and network access with no approval prompts.",
     },
 ];
-const DEFAULT_CODEX_MODE_ID = "auto";
 const MODE_PRESETS = {
-    "read-only": {
-        approvalPolicy: "on-request",
-        sandbox: "read-only",
+    default: {
+        approvalPolicy: "untrusted",
+        sandbox: "workspace-write",
     },
-    auto: {
-        approvalPolicy: "on-request",
+    acceptEdits: {
+        approvalPolicy: "never",
         sandbox: "workspace-write",
     },
-    "full-access": {
+    bypassPermissions: {
         approvalPolicy: "never",
         sandbox: "danger-full-access",
         networkAccess: true,
     },
 };
 function validateCodexMode(modeId) {
-    if (!(modeId in MODE_PRESETS)) {
+    const normalizedModeId = normalizeCodexModeId(modeId);
+    if (typeof normalizedModeId !== "string" || !(normalizedModeId in MODE_PRESETS)) {
         const validModes = Object.keys(MODE_PRESETS).join(", ");
         throw new Error(`Invalid Codex mode "${modeId}". Valid modes are: ${validModes}`);
     }
@@ -184,6 +185,13 @@ function toRecord(value) {
     }
     return value;
 }
+function toNonEmptyString(value) {
+    if (typeof value !== "string") {
+        return null;
+    }
+    const trimmed = value.trim();
+    return trimmed.length > 0 ? trimmed : null;
+}
 function parseUpdatedQuestionAnswers(updatedInput) {
     const parsed = {};
     const root = toRecord(updatedInput);
@@ -218,6 +226,95 @@ function parseUpdatedQuestionAnswers(updatedInput) {
     }
     return parsed;
 }
+function normalizeCodexQuestionOption(value) {
+    if (typeof value === "string") {
+        const label = value.trim();
+        return label ? { label, value: label } : null;
+    }
+    const record = toRecord(value);
+    if (!record) {
+        return null;
+    }
+    const label = toNonEmptyString(record.label) ?? toNonEmptyString(record.value);
+    if (!label) {
+        return null;
+    }
+    return {
+        label,
+        value: toNonEmptyString(record.value) ?? label,
+        description: toNonEmptyString(record.description) ?? undefined,
+    };
+}
+function normalizeCodexQuestionDescriptor(value, fallbackIndex) {
+    const record = toRecord(value);
+    if (!record) {
+        return null;
+    }
+    const id = toNonEmptyString(record.id) ??
+        toNonEmptyString(record.key) ??
+        `question_${fallbackIndex + 1}`;
+    const options = Array.isArray(record.options)
+        ? record.options
+            .map((option) => normalizeCodexQuestionOption(option))
+            .filter((option) => option !== null)
+        : [];
+    return {
+        id,
+        header: toNonEmptyString(record.header) ?? undefined,
+        question: toNonEmptyString(record.question) ??
+            toNonEmptyString(record.prompt) ??
+            toNonEmptyString(record.text) ??
+            undefined,
+        isOther: Boolean(record.isOther ?? record.is_other),
+        isSecret: Boolean(record.isSecret ?? record.is_secret),
+        options,
+    };
+}
+function normalizeCodexQuestionDescriptors(value) {
+    if (!Array.isArray(value)) {
+        return [];
+    }
+    return value
+        .map((question, index) => normalizeCodexQuestionDescriptor(question, index))
+        .filter((question) => question !== null);
+}
+function extractExplicitDecision(updatedInput) {
+    const root = toRecord(updatedInput);
+    if (!root || !Object.prototype.hasOwnProperty.call(root, "decision")) {
+        return null;
+    }
+    return root.decision ?? null;
+}
+function buildCodexPermissionsResponse(response, requestedPermissions) {
+    const root = toRecord(response.updatedInput);
+    const permissions = toRecord(root?.permissions);
+    const scope = root?.scope === "session" ? "session" : "turn";
+    if (permissions) {
+        return { permissions, scope };
+    }
+    if (response.behavior === "allow") {
+        return { permissions: toRecord(requestedPermissions) ?? {}, scope };
+    }
+    return { permissions: {}, scope };
+}
+function buildCodexElicitationResponse(response) {
+    const root = toRecord(response.updatedInput);
+    const explicitAction = root?.action === "accept" || root?.action === "decline" || root?.action === "cancel"
+        ? root.action
+        : null;
+    if (response.behavior === "allow") {
+        return {
+            action: explicitAction ?? "accept",
+            content: root?.content ?? null,
+            _meta: root?._meta ?? null,
+        };
+    }
+    return {
+        action: explicitAction ?? (response.interrupt ? "cancel" : "decline"),
+        content: null,
+        _meta: root?._meta ?? null,
+    };
+}
 function toPendingPermissionId(requestId) {
     return `permission-${String(requestId)}`;
 }
@@ -1395,6 +1492,18 @@ export const __codexAppServerInternals = {
     shouldRetryInitializeWithoutExperimentalApi,
     shouldRetryTurnStartWithoutCollaborationMode,
     formatProposedPlanBlock,
+    normalizeCodexQuestionDescriptors,
+    parseUpdatedQuestionAnswers,
+    buildCodexPermissionsResponse,
+    buildCodexElicitationResponse,
+    supportedRequestMethods: [
+        "item/commandExecution/requestApproval",
+        "item/fileChange/requestApproval",
+        "tool/requestUserInput",
+        "item/tool/requestUserInput",
+        "item/permissions/requestApproval",
+        "mcpServer/elicitation/request",
+    ],
 };
 class CodexAppServerAgentSession {
     constructor(config, resumeHandle, logger, spawnAppServer) {
@@ -1431,9 +1540,14 @@ class CodexAppServerAgentSession {
         if (config.modeId === undefined) {
             throw new Error("Codex agent requires modeId to be specified");
         }
-        validateCodexMode(config.modeId);
-        this.currentMode = config.modeId;
         this.config = config;
+        const normalizedModeId = normalizeCodexModeId(config.modeId);
+        if (typeof normalizedModeId !== "string") {
+            throw new Error("Codex agent requires a valid modeId");
+        }
+        validateCodexMode(normalizedModeId);
+        this.currentMode = normalizedModeId;
+        this.config.modeId = normalizedModeId;
         this.config.thinkingOptionId = normalizeCodexThinkingOptionId(this.config.thinkingOptionId);
         if (this.resumeHandle?.sessionId) {
             this.currentThreadId = this.resumeHandle.sessionId;
@@ -1469,6 +1583,7 @@ class CodexAppServerAgentSession {
             }
             await this.client.request("initialize", { clientInfo });
             this.nativePlanModeSupported = false;
+            setCodexPlanModeEnabled(this.config, false);
         }
         this.client.notify("initialized", {});
         await this.loadCollaborationModes();
@@ -1483,15 +1598,20 @@ class CodexAppServerAgentSession {
         if (!this.client)
             return;
         if (this.nativePlanModeSupported === false) {
+            setCodexPlanModeEnabled(this.config, false);
             return;
         }
         try {
             const response = await this.client.request("collaborationMode/list", {});
             this.nativePlanModeSupported = supportsPlanCollaborationMode(response);
+            if (this.nativePlanModeSupported === false) {
+                setCodexPlanModeEnabled(this.config, false);
+            }
         }
         catch (error) {
             this.logger.trace({ error }, "Failed to load collaboration modes");
             this.nativePlanModeSupported = false;
+            setCodexPlanModeEnabled(this.config, false);
         }
     }
     async loadSkills() {
@@ -1525,9 +1645,12 @@ class CodexAppServerAgentSession {
     registerRequestHandlers() {
         if (!this.client)
             return;
-        this.client.setRequestHandler("item/commandExecution/requestApproval", (params, requestId) => this.handleCommandApprovalRequest(params, requestId));
-        this.client.setRequestHandler("item/fileChange/requestApproval", (params, requestId) => this.handleFileChangeApprovalRequest(params, requestId));
-        this.client.setRequestHandler("tool/requestUserInput", (params, requestId) => this.handleToolApprovalRequest(params, requestId));
+        this.client.setRequestHandler("item/commandExecution/requestApproval", (params, requestId) => this.handleCommandApprovalRequest("item/commandExecution/requestApproval", params, requestId));
+        this.client.setRequestHandler("item/fileChange/requestApproval", (params, requestId) => this.handleFileChangeApprovalRequest("item/fileChange/requestApproval", params, requestId));
+        this.client.setRequestHandler("tool/requestUserInput", (params, requestId) => this.handleToolApprovalRequest("tool/requestUserInput", params, requestId));
+        this.client.setRequestHandler("item/tool/requestUserInput", (params, requestId) => this.handleToolApprovalRequest("item/tool/requestUserInput", params, requestId));
+        this.client.setRequestHandler("item/permissions/requestApproval", (params, requestId) => this.handlePermissionsApprovalRequest("item/permissions/requestApproval", params, requestId));
+        this.client.setRequestHandler("mcpServer/elicitation/request", (params, requestId) => this.handleMcpElicitationRequest("mcpServer/elicitation/request", params, requestId));
     }
     async loadPersistedHistory() {
         if (!this.client || !this.currentThreadId)
@@ -1725,7 +1848,10 @@ class CodexAppServerAgentSession {
             const preset = MODE_PRESETS[this.currentMode] ?? MODE_PRESETS[DEFAULT_CODEX_MODE_ID];
             const approvalPolicy = this.config.approvalPolicy ?? preset.approvalPolicy;
             const sandboxPolicyType = this.config.sandboxMode ?? preset.sandbox;
-            const planModeRequested = options?.extra?.codex?.planMode === true;
+            const explicitPlanMode = options?.extra?.codex?.planMode;
+            const planModeRequested = explicitPlanMode === undefined
+                ? isCodexPlanModeEnabled(this.config)
+                : explicitPlanMode === true;
             const thinkingOptionId = normalizeCodexThinkingOptionId(this.config.thinkingOptionId);
             const params = {
                 threadId: this.currentThreadId,
@@ -1772,6 +1898,7 @@ class CodexAppServerAgentSession {
                 }
                 delete params.collaborationMode;
                 this.nativePlanModeSupported = false;
+                setCodexPlanModeEnabled(this.config, false);
                 this.cachedRuntimeInfo = null;
                 downgradedFromPlanMode = planModeRequested;
                 await this.client.request("turn/start", params, TURN_START_TIMEOUT_MS);
@@ -1842,9 +1969,10 @@ class CodexAppServerAgentSession {
             model: this.config.model ?? null,
             thinkingOptionId: normalizeCodexThinkingOptionId(this.config.thinkingOptionId) ?? null,
             modeId: this.currentMode ?? null,
-            extra: this.nativePlanModeSupported === null
-                ? undefined
-                : { planModeSupported: this.nativePlanModeSupported },
+            extra: buildCodexRuntimeExtra({
+                planModeSupported: this.nativePlanModeSupported,
+                planModeEnabled: isCodexPlanModeEnabled(this.config),
+            }),
         };
         this.cachedRuntimeInfo = info;
         return { ...info };
@@ -1856,8 +1984,13 @@ class CodexAppServerAgentSession {
         return this.currentMode ?? null;
     }
     async setMode(modeId) {
-        validateCodexMode(modeId);
-        this.currentMode = modeId;
+        const normalizedModeId = normalizeCodexModeId(modeId);
+        if (typeof normalizedModeId !== "string") {
+            throw new Error(`Invalid Codex mode "${modeId}"`);
+        }
+        validateCodexMode(normalizedModeId);
+        this.currentMode = normalizedModeId;
+        this.config.modeId = normalizedModeId;
         this.cachedRuntimeInfo = null;
     }
     async setModel(modelId) {
@@ -1914,23 +2047,33 @@ class CodexAppServerAgentSession {
             resolution: response,
         });
         if (pending.kind === "command") {
-            const decision = response.behavior === "allow"
-                ? "accept"
-                : response.interrupt
-                    ? "cancel"
-                    : "decline";
+            const decision = extractExplicitDecision(response.updatedInput) ??
+                (response.behavior === "allow"
+                    ? "accept"
+                    : response.interrupt
+                        ? "cancel"
+                        : "decline");
             pending.resolve({ decision });
             return;
         }
         if (pending.kind === "file") {
-            const decision = response.behavior === "allow"
-                ? "accept"
-                : response.interrupt
-                    ? "cancel"
-                    : "decline";
+            const decision = extractExplicitDecision(response.updatedInput) ??
+                (response.behavior === "allow"
+                    ? "accept"
+                    : response.interrupt
+                        ? "cancel"
+                        : "decline");
             pending.resolve({ decision });
             return;
         }
+        if (pending.kind === "permissions") {
+            pending.resolve(buildCodexPermissionsResponse(response, pending.permissions));
+            return;
+        }
+        if (pending.kind === "elicitation") {
+            pending.resolve(buildCodexElicitationResponse(response));
+            return;
+        }
         // tool/requestUserInput
         const answers = {};
         const questions = pending.questions ?? [];
@@ -2091,7 +2234,8 @@ class CodexAppServerAgentSession {
             innerConfig.mcp_servers = mcpServers;
         }
         if (this.config.extra?.codex) {
-            Object.assign(innerConfig, this.config.extra.codex);
+            const { planModeEnabled: _planModeEnabled, ...codexExtra } = this.config.extra.codex;
+            Object.assign(innerConfig, codexExtra);
         }
         return Object.keys(innerConfig).length > 0 ? innerConfig : null;
     }
@@ -2480,7 +2624,7 @@ class CodexAppServerAgentSession {
             payload,
         }, "Codex edit tool call is missing diff/content fields");
     }
-    handleCommandApprovalRequest(params, rawRequestId) {
+    handleCommandApprovalRequest(requestMethod, params, rawRequestId) {
         const parsed = params;
         const commandPreview = mapCodexExecNotificationToToolCall({
             callId: parsed.itemId,
@@ -2488,8 +2632,12 @@ class CodexAppServerAgentSession {
             cwd: parsed.cwd ?? this.config.cwd ?? null,
             running: true,
         });
-        const requestId = toPendingPermissionId(rawRequestId ?? parsed.itemId);
-        const title = parsed.command ? `Run command: ${parsed.command}` : "Run command";
+        const requestId = toPendingPermissionId(rawRequestId ?? parsed.approvalId ?? parsed.itemId);
+        const title = parsed.command
+            ? `Run command: ${parsed.command}`
+            : parsed.networkApprovalContext
+                ? "Allow network access"
+                : "Run command";
         const request = {
             id: requestId,
             provider: CODEX_PROVIDER,
@@ -2510,9 +2658,18 @@ class CodexAppServerAgentSession {
                 output: null,
             },
             metadata: {
+                requestMethod,
                 itemId: parsed.itemId,
+                approvalId: parsed.approvalId ?? null,
                 threadId: parsed.threadId,
                 turnId: parsed.turnId,
+                commandActions: parsed.commandActions ?? null,
+                availableDecisions: parsed.availableDecisions ?? null,
+                additionalPermissions: parsed.additionalPermissions ?? null,
+                proposedExecpolicyAmendment: parsed.proposedExecpolicyAmendment ?? null,
+                proposedNetworkPolicyAmendments: parsed.proposedNetworkPolicyAmendments ?? null,
+                networkApprovalContext: parsed.networkApprovalContext ?? null,
+                skillMetadata: parsed.skillMetadata ?? null,
             },
         };
         this.pendingPermissions.set(requestId, request);
@@ -2521,7 +2678,7 @@ class CodexAppServerAgentSession {
             this.pendingPermissionHandlers.set(requestId, { resolve, kind: "command" });
         });
     }
-    handleFileChangeApprovalRequest(params, rawRequestId) {
+    handleFileChangeApprovalRequest(requestMethod, params, rawRequestId) {
         const parsed = params;
         const requestId = toPendingPermissionId(rawRequestId ?? parsed.itemId);
         const request = {
@@ -2535,13 +2692,16 @@ class CodexAppServerAgentSession {
                 type: "unknown",
                 input: {
                     reason: parsed.reason ?? null,
+                    grantRoot: parsed.grantRoot ?? null,
                 },
                 output: null,
             },
             metadata: {
+                requestMethod,
                 itemId: parsed.itemId,
                 threadId: parsed.threadId,
                 turnId: parsed.turnId,
+                grantRoot: parsed.grantRoot ?? null,
             },
         };
         this.pendingPermissions.set(requestId, request);
@@ -2550,9 +2710,10 @@ class CodexAppServerAgentSession {
             this.pendingPermissionHandlers.set(requestId, { resolve, kind: "file" });
         });
     }
-    handleToolApprovalRequest(params, rawRequestId) {
+    handleToolApprovalRequest(requestMethod, params, rawRequestId) {
         const parsed = params;
         const requestId = toPendingPermissionId(rawRequestId ?? parsed.itemId);
+        const questions = normalizeCodexQuestionDescriptors(parsed.questions);
         const request = {
             id: requestId,
             provider: CODEX_PROVIDER,
@@ -2561,20 +2722,21 @@ class CodexAppServerAgentSession {
             title: "Answer question",
             description: undefined,
             input: {
-                questions: Array.isArray(parsed.questions) ? parsed.questions : [],
+                questions,
             },
             detail: {
                 type: "unknown",
                 input: {
-                    questions: Array.isArray(parsed.questions) ? parsed.questions : [],
+                    questions,
                 },
                 output: null,
             },
             metadata: {
+                requestMethod,
                 itemId: parsed.itemId,
                 threadId: parsed.threadId,
                 turnId: parsed.turnId,
-                questions: parsed.questions,
+                questions,
             },
         };
         this.pendingPermissions.set(requestId, request);
@@ -2583,7 +2745,105 @@ class CodexAppServerAgentSession {
             this.pendingPermissionHandlers.set(requestId, {
                 resolve,
                 kind: "question",
-                questions: Array.isArray(parsed.questions) ? parsed.questions : [],
+                questions,
+            });
+        });
+    }
+    handlePermissionsApprovalRequest(requestMethod, params, rawRequestId) {
+        const parsed = params;
+        const requestId = toPendingPermissionId(rawRequestId ?? parsed.itemId);
+        const request = {
+            id: requestId,
+            provider: CODEX_PROVIDER,
+            name: "CodexPermissionProfile",
+            kind: "tool",
+            title: "Grant additional permissions",
+            description: parsed.reason ?? undefined,
+            input: {
+                permissions: parsed.permissions ?? null,
+            },
+            detail: {
+                type: "unknown",
+                input: {
+                    reason: parsed.reason ?? null,
+                    permissions: parsed.permissions ?? null,
+                },
+                output: null,
+            },
+            metadata: {
+                requestMethod,
+                itemId: parsed.itemId,
+                threadId: parsed.threadId,
+                turnId: parsed.turnId,
+                permissions: parsed.permissions ?? null,
+            },
+        };
+        this.pendingPermissions.set(requestId, request);
+        this.emitEvent({ type: "permission_requested", provider: CODEX_PROVIDER, request });
+        return new Promise((resolve) => {
+            this.pendingPermissionHandlers.set(requestId, {
+                resolve,
+                kind: "permissions",
+                permissions: parsed.permissions ?? null,
+            });
+        });
+    }
+    handleMcpElicitationRequest(requestMethod, params, rawRequestId) {
+        const parsed = params;
+        const baseRequestId = rawRequestId ??
+            parsed.elicitationId ??
+            `${parsed.threadId}:${parsed.turnId ?? "none"}:${parsed.serverName ?? "mcp"}`;
+        const requestId = toPendingPermissionId(baseRequestId);
+        const title = parsed.mode === "url"
+            ? "Open MCP authorization link"
+            : parsed.serverName
+                ? `Respond to ${parsed.serverName}`
+                : "Respond to MCP server";
+        const request = {
+            id: requestId,
+            provider: CODEX_PROVIDER,
+            name: "CodexMcpElicitation",
+            kind: "other",
+            title,
+            description: parsed.message ?? undefined,
+            input: {
+                mode: parsed.mode ?? null,
+                requestedSchema: parsed.requestedSchema ?? null,
+                url: parsed.url ?? null,
+            },
+            detail: {
+                type: "unknown",
+                input: {
+                    requestMethod,
+                    serverName: parsed.serverName ?? null,
+                    mode: parsed.mode ?? null,
+                    message: parsed.message ?? null,
+                    requestedSchema: parsed.requestedSchema ?? null,
+                    url: parsed.url ?? null,
+                    elicitationId: parsed.elicitationId ?? null,
+                    _meta: parsed._meta ?? null,
+                },
+                output: null,
+            },
+            metadata: {
+                requestMethod,
+                threadId: parsed.threadId,
+                turnId: parsed.turnId ?? null,
+                serverName: parsed.serverName ?? null,
+                mode: parsed.mode ?? null,
+                message: parsed.message ?? null,
+                requestedSchema: parsed.requestedSchema ?? null,
+                url: parsed.url ?? null,
+                elicitationId: parsed.elicitationId ?? null,
+                _meta: parsed._meta ?? null,
+            },
+        };
+        this.pendingPermissions.set(requestId, request);
+        this.emitEvent({ type: "permission_requested", provider: CODEX_PROVIDER, request });
+        return new Promise((resolve) => {
+            this.pendingPermissionHandlers.set(requestId, {
+                resolve,
+                kind: "elicitation",
             });
         });
     }
@@ -2763,7 +3023,7 @@ export class CodexAppServerAgentClient {
         }
     }
     async isAvailable() {
-        return isProviderCommandAvailable(this.runtimeSettings?.command, resolveCodexBinary);
+        return isProviderCommandAvailable(this.runtimeSettings?.command, resolveCodexBinary, applyProviderEnv(process.env, this.runtimeSettings));
     }
 }
 //# sourceMappingURL=codex-app-server-agent.js.map