@janole/ai-sdk-provider-codex-asp 0.3.3 → 0.3.5

package/dist/index.d.cts

@@ -19,6 +19,7 @@ type AskForApproval = "untrusted" | "on-failure" | "on-request" | {
     "reject": {
         sandbox_approval: boolean;
         rules: boolean;
+        request_permissions: boolean;
         mcp_elicitations: boolean;
     };
 } | "never";
@@ -58,15 +59,17 @@ type AdditionalFileSystemPermissions = {
     write: Array<AbsolutePathBuf> | null;
 };
 
-type MacOsAutomationValue = boolean | Array<string>;
+type MacOsAutomationPermission = "none" | "all" | {
+    "bundle_ids": Array<string>;
+};
 
-type MacOsPreferencesValue = boolean | string;
+type MacOsPreferencesPermission = "none" | "read_only" | "read_write";
 
 type AdditionalMacOsPermissions = {
-    preferences: MacOsPreferencesValue | null;
-    automations: MacOsAutomationValue | null;
-    accessibility: boolean | null;
-    calendar: boolean | null;
+    preferences: MacOsPreferencesPermission;
+    automations: MacOsAutomationPermission;
+    accessibility: boolean;
+    calendar: boolean;
 };
 
 type AdditionalNetworkPermissions = {
@@ -98,6 +101,10 @@ type CommandAction = {
     command: string;
 };
 
+type CommandExecutionRequestApprovalSkillMetadata = {
+    pathToSkillsMd: string;
+};
+
 type NetworkApprovalProtocol = "http" | "https" | "socks5Tcp" | "socks5Udp";
 
 type NetworkApprovalContext = {
@@ -143,6 +150,10 @@ type CommandExecutionRequestApprovalParams = {
      * Optional additional permissions requested for this command.
      */
     additionalPermissions?: AdditionalPermissionProfile | null;
+    /**
+     * Optional skill metadata when the approval was triggered by a skill script.
+     */
+    skillMetadata?: CommandExecutionRequestApprovalSkillMetadata | null;
     /**
      * Optional proposed execpolicy amendment to allow similar commands without prompting.
      */
@@ -900,7 +911,8 @@ type TurnStartParams = {
      */
     personality?: Personality | null;
     /**
-     * Optional JSON Schema used to constrain the final assistant message for this turn.
+     * Optional JSON Schema used to constrain the final assistant message for
+     * this turn.
      */
     outputSchema?: JsonValue | null;
     /**
@@ -1170,27 +1182,8 @@ declare class AppServerClient {
     private handleInboundRequest;
 }
 
-interface CodexCommandApprovalRequest {
-    threadId: string;
-    turnId: string;
-    itemId: string;
-    approvalId?: string | null;
-    reason?: string | null;
-    networkApprovalContext?: CommandExecutionRequestApprovalParams["networkApprovalContext"];
-    command?: string | null;
-    cwd?: string | null;
-    commandActions?: CommandExecutionRequestApprovalParams["commandActions"];
-    additionalPermissions?: CommandExecutionRequestApprovalParams["additionalPermissions"];
-    proposedExecpolicyAmendment?: CommandExecutionRequestApprovalParams["proposedExecpolicyAmendment"];
-    proposedNetworkPolicyAmendments?: CommandExecutionRequestApprovalParams["proposedNetworkPolicyAmendments"];
-}
-interface CodexFileChangeApprovalRequest {
-    threadId: string;
-    turnId: string;
-    itemId: string;
-    reason?: string | null;
-    grantRoot?: string | null;
-}
+type CodexCommandApprovalRequest = CommandExecutionRequestApprovalParams;
+type CodexFileChangeApprovalRequest = FileChangeRequestApprovalParams;
 type CommandApprovalHandler = (request: CodexCommandApprovalRequest) => CommandExecutionApprovalDecision | Promise<CommandExecutionApprovalDecision>;
 type FileChangeApprovalHandler = (request: CodexFileChangeApprovalRequest) => FileChangeApprovalDecision | Promise<FileChangeApprovalDecision>;
 interface ApprovalsDispatcherSettings {

package/dist/index.d.ts

@@ -19,6 +19,7 @@ type AskForApproval = "untrusted" | "on-failure" | "on-request" | {
     "reject": {
         sandbox_approval: boolean;
         rules: boolean;
+        request_permissions: boolean;
         mcp_elicitations: boolean;
     };
 } | "never";
@@ -58,15 +59,17 @@ type AdditionalFileSystemPermissions = {
     write: Array<AbsolutePathBuf> | null;
 };
 
-type MacOsAutomationValue = boolean | Array<string>;
+type MacOsAutomationPermission = "none" | "all" | {
+    "bundle_ids": Array<string>;
+};
 
-type MacOsPreferencesValue = boolean | string;
+type MacOsPreferencesPermission = "none" | "read_only" | "read_write";
 
 type AdditionalMacOsPermissions = {
-    preferences: MacOsPreferencesValue | null;
-    automations: MacOsAutomationValue | null;
-    accessibility: boolean | null;
-    calendar: boolean | null;
+    preferences: MacOsPreferencesPermission;
+    automations: MacOsAutomationPermission;
+    accessibility: boolean;
+    calendar: boolean;
 };
 
 type AdditionalNetworkPermissions = {
@@ -98,6 +101,10 @@ type CommandAction = {
     command: string;
 };
 
+type CommandExecutionRequestApprovalSkillMetadata = {
+    pathToSkillsMd: string;
+};
+
 type NetworkApprovalProtocol = "http" | "https" | "socks5Tcp" | "socks5Udp";
 
 type NetworkApprovalContext = {
@@ -143,6 +150,10 @@ type CommandExecutionRequestApprovalParams = {
      * Optional additional permissions requested for this command.
      */
     additionalPermissions?: AdditionalPermissionProfile | null;
+    /**
+     * Optional skill metadata when the approval was triggered by a skill script.
+     */
+    skillMetadata?: CommandExecutionRequestApprovalSkillMetadata | null;
     /**
      * Optional proposed execpolicy amendment to allow similar commands without prompting.
      */
@@ -900,7 +911,8 @@ type TurnStartParams = {
      */
     personality?: Personality | null;
     /**
-     * Optional JSON Schema used to constrain the final assistant message for this turn.
+     * Optional JSON Schema used to constrain the final assistant message for
+     * this turn.
      */
     outputSchema?: JsonValue | null;
     /**
@@ -1170,27 +1182,8 @@ declare class AppServerClient {
     private handleInboundRequest;
 }
 
-interface CodexCommandApprovalRequest {
-    threadId: string;
-    turnId: string;
-    itemId: string;
-    approvalId?: string | null;
-    reason?: string | null;
-    networkApprovalContext?: CommandExecutionRequestApprovalParams["networkApprovalContext"];
-    command?: string | null;
-    cwd?: string | null;
-    commandActions?: CommandExecutionRequestApprovalParams["commandActions"];
-    additionalPermissions?: CommandExecutionRequestApprovalParams["additionalPermissions"];
-    proposedExecpolicyAmendment?: CommandExecutionRequestApprovalParams["proposedExecpolicyAmendment"];
-    proposedNetworkPolicyAmendments?: CommandExecutionRequestApprovalParams["proposedNetworkPolicyAmendments"];
-}
-interface CodexFileChangeApprovalRequest {
-    threadId: string;
-    turnId: string;
-    itemId: string;
-    reason?: string | null;
-    grantRoot?: string | null;
-}
+type CodexCommandApprovalRequest = CommandExecutionRequestApprovalParams;
+type CodexFileChangeApprovalRequest = FileChangeRequestApprovalParams;
 type CommandApprovalHandler = (request: CodexCommandApprovalRequest) => CommandExecutionApprovalDecision | Promise<CommandExecutionApprovalDecision>;
 type FileChangeApprovalHandler = (request: CodexFileChangeApprovalRequest) => FileChangeApprovalDecision | Promise<FileChangeApprovalDecision>;
 interface ApprovalsDispatcherSettings {

package/dist/index.js

@@ -6,13 +6,6 @@ import { join } from 'path';
 import { fileURLToPath, pathToFileURL } from 'url';
 import { NoSuchModelError } from '@ai-sdk/provider';
 
-// src/utils/object.ts
-function stripUndefined(obj) {
-  return Object.fromEntries(
-    Object.entries(obj).filter(([, value]) => value !== void 0)
-  );
-}
-
 // src/approvals.ts
 var ApprovalsDispatcher = class {
   onCommandApproval;
@@ -25,37 +18,14 @@ var ApprovalsDispatcher = class {
     const unsubCommand = client.onRequest(
       "item/commandExecution/requestApproval",
       async (params, _request) => {
-        const p = params;
-        const request = stripUndefined({
-          threadId: p.threadId,
-          turnId: p.turnId,
-          itemId: p.itemId,
-          approvalId: p.approvalId,
-          reason: p.reason,
-          networkApprovalContext: p.networkApprovalContext,
-          command: p.command,
-          cwd: p.cwd,
-          commandActions: p.commandActions,
-          additionalPermissions: p.additionalPermissions,
-          proposedExecpolicyAmendment: p.proposedExecpolicyAmendment,
-          proposedNetworkPolicyAmendments: p.proposedNetworkPolicyAmendments
-        });
-        const decision = await this.onCommandApproval(request);
+        const decision = await this.onCommandApproval(params);
         return { decision };
       }
     );
     const unsubFileChange = client.onRequest(
       "item/fileChange/requestApproval",
       async (params, _request) => {
-        const p = params;
-        const request = stripUndefined({
-          threadId: p.threadId,
-          turnId: p.turnId,
-          itemId: p.itemId,
-          reason: p.reason,
-          grantRoot: p.grantRoot
-        });
-        const decision = await this.onFileChangeApproval(request);
+        const decision = await this.onFileChangeApproval(params);
         return { decision };
       }
     );
@@ -80,6 +50,13 @@ var CodexNotImplementedError = class extends CodexProviderError {
   }
 };
 
+// src/utils/object.ts
+function stripUndefined(obj) {
+  return Object.fromEntries(
+    Object.entries(obj).filter(([, value]) => value !== void 0)
+  );
+}
+
 // src/client/app-server-client.ts
 var JsonRpcError = class extends CodexProviderError {
   code;
@@ -956,7 +933,7 @@ var DynamicToolsDispatcher = class {
 // package.json
 var package_default = {
   name: "@janole/ai-sdk-provider-codex-asp",
-  version: "0.3.3"};
+  version: "0.3.5"};
 
 // src/package-info.ts
 var PACKAGE_NAME = package_default.name;
@@ -1859,16 +1836,28 @@ function extractToolResults(prompt, callId) {
           if (callId && part.toolCallId !== callId) {
             continue;
           }
-          if (part.output.type === "text") {
+          if (part.output.type === "text" || part.output.type === "error-text") {
             contentItems.push({ type: "inputText", text: part.output.value });
-          } else if (part.output.type === "json") {
+            if (part.output.type === "error-text") {
+              success = false;
+            }
+          } else if (part.output.type === "json" || part.output.type === "error-json") {
             contentItems.push({ type: "inputText", text: JSON.stringify(part.output.value) });
+            if (part.output.type === "error-json") {
+              success = false;
+            }
           } else if (part.output.type === "execution-denied") {
             success = false;
             contentItems.push({
               type: "inputText",
               text: part.output.reason ?? "Tool execution was denied."
             });
+          } else if (part.output.type === "content") {
+            for (const item of part.output.value) {
+              if (item.type === "text") {
+                contentItems.push({ type: "inputText", text: item.text });
+              }
+            }
           }
         }
       }