@janole/ai-sdk-provider-codex-asp 0.4.2 → 0.4.4

package/dist/index.d.cts

@@ -69,24 +69,6 @@ type AdditionalFileSystemPermissions = {
     write: Array<AbsolutePathBuf> | null;
 };
 
-type MacOsAutomationPermission = "none" | "all" | {
-    "bundle_ids": Array<string>;
-};
-
-type MacOsContactsPermission = "none" | "read_only" | "read_write";
-
-type MacOsPreferencesPermission = "none" | "read_only" | "read_write";
-
-type AdditionalMacOsPermissions = {
-    preferences: MacOsPreferencesPermission;
-    automations: MacOsAutomationPermission;
-    launchServices: boolean;
-    accessibility: boolean;
-    calendar: boolean;
-    reminders: boolean;
-    contacts: MacOsContactsPermission;
-};
-
 type AdditionalNetworkPermissions = {
     enabled: boolean | null;
 };
@@ -94,7 +76,6 @@ type AdditionalNetworkPermissions = {
 type AdditionalPermissionProfile = {
     network: AdditionalNetworkPermissions | null;
     fileSystem: AdditionalFileSystemPermissions | null;
-    macos: AdditionalMacOsPermissions | null;
 };
 
 type CommandAction = {
@@ -116,10 +97,6 @@ type CommandAction = {
     command: string;
 };
 
-type CommandExecutionRequestApprovalSkillMetadata = {
-    pathToSkillsMd: string;
-};
-
 type NetworkApprovalProtocol = "http" | "https" | "socks5Tcp" | "socks5Udp";
 
 type NetworkApprovalContext = {
@@ -165,10 +142,6 @@ 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.
      */
@@ -262,6 +235,8 @@ type CollabAgentTool = "spawnAgent" | "sendInput" | "resumeAgent" | "wait" | "cl
 
 type CollabAgentToolCallStatus = "inProgress" | "completed" | "failed";
 
+type CommandExecutionSource = "agent" | "userShell" | "unifiedExecStartup" | "unifiedExecInteraction";
+
 type CommandExecutionStatus = "inProgress" | "completed" | "failed" | "declined";
 
 type DynamicToolCallOutputContentItem = {
@@ -289,6 +264,11 @@ type FileUpdateChange = {
     diff: string;
 };
 
+type HookPromptFragment = {
+    text: string;
+    hookRunId: string;
+};
+
 type McpToolCallError = {
     message: string;
 };
@@ -372,6 +352,10 @@ type ThreadItem = {
     "type": "userMessage";
     id: string;
     content: Array<UserInput>;
+} | {
+    "type": "hookPrompt";
+    id: string;
+    fragments: Array<HookPromptFragment>;
 } | {
     "type": "agentMessage";
     id: string;
@@ -402,6 +386,7 @@ type ThreadItem = {
      * Identifier for the underlying PTY process (when available).
      */
     processId: string | null;
+    source: CommandExecutionSource;
     status: CommandExecutionStatus;
     /**
      * A best-effort parsing of the command to understand the action(s) it will perform.
@@ -507,6 +492,7 @@ type ThreadItem = {
     status: string;
     revisedPrompt: string | null;
     result: string;
+    savedPath?: string;
 } | {
     "type": "enteredReviewMode";
     id: string;
@@ -735,12 +721,15 @@ type GitInfo = {
     originUrl: string | null;
 };
 
+type AgentPath = string;
+
 type ThreadId = string;
 
 type SubAgentSource = "review" | "compact" | {
     "thread_spawn": {
         parent_thread_id: ThreadId;
         depth: number;
+        agent_path: AgentPath | null;
         agent_nickname: string | null;
         agent_role: string | null;
     };
@@ -767,6 +756,8 @@ type ThreadStatus = {
     activeFlags: Array<ThreadActiveFlag>;
 };
 
+type NonSteerableTurnKind = "review" | "compact";
+
 /**
  * This translation layer make sure that we expose codex error code in camel case.
  *
@@ -789,6 +780,10 @@ type CodexErrorInfo = "contextWindowExceeded" | "usageLimitExceeded" | "serverOv
     "responseTooManyFailedAttempts": {
         httpStatusCode: number | null;
     };
+} | {
+    "activeTurnNotSteerable": {
+        turnKind: NonSteerableTurnKind;
+    };
 } | "other";
 
 type TurnError = {
@@ -1468,6 +1463,11 @@ interface CodexCallOptions {
     sandboxPolicy?: SandboxPolicy;
     /** Controls turn summary generation. */
     summary?: "auto" | "concise" | "detailed" | "none";
+    /** Approval callbacks for this call; falls back to provider-level `approvals`. */
+    approvals?: {
+        onCommandApproval?: CommandApprovalHandler;
+        onFileChangeApproval?: FileChangeApprovalHandler;
+    };
 }
 interface CodexCompactionSettings {
     /**
@@ -1562,7 +1562,7 @@ interface CodexProviderSettings {
     persistent?: {
         /** Number of worker processes to keep in the pool. */
         poolSize?: number;
-        /** Time (ms) before an idle worker is shut down. */
+        /** Time (ms) before an idle worker is shut down. Set to `0` to disable (worker stays alive indefinitely). */
         idleTimeoutMs?: number;
         /** `"provider"` = pool per provider instance; `"global"` = shared across all instances. */
         scope?: "provider" | "global";

package/dist/index.d.ts

@@ -69,24 +69,6 @@ type AdditionalFileSystemPermissions = {
     write: Array<AbsolutePathBuf> | null;
 };
 
-type MacOsAutomationPermission = "none" | "all" | {
-    "bundle_ids": Array<string>;
-};
-
-type MacOsContactsPermission = "none" | "read_only" | "read_write";
-
-type MacOsPreferencesPermission = "none" | "read_only" | "read_write";
-
-type AdditionalMacOsPermissions = {
-    preferences: MacOsPreferencesPermission;
-    automations: MacOsAutomationPermission;
-    launchServices: boolean;
-    accessibility: boolean;
-    calendar: boolean;
-    reminders: boolean;
-    contacts: MacOsContactsPermission;
-};
-
 type AdditionalNetworkPermissions = {
     enabled: boolean | null;
 };
@@ -94,7 +76,6 @@ type AdditionalNetworkPermissions = {
 type AdditionalPermissionProfile = {
     network: AdditionalNetworkPermissions | null;
     fileSystem: AdditionalFileSystemPermissions | null;
-    macos: AdditionalMacOsPermissions | null;
 };
 
 type CommandAction = {
@@ -116,10 +97,6 @@ type CommandAction = {
     command: string;
 };
 
-type CommandExecutionRequestApprovalSkillMetadata = {
-    pathToSkillsMd: string;
-};
-
 type NetworkApprovalProtocol = "http" | "https" | "socks5Tcp" | "socks5Udp";
 
 type NetworkApprovalContext = {
@@ -165,10 +142,6 @@ 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.
      */
@@ -262,6 +235,8 @@ type CollabAgentTool = "spawnAgent" | "sendInput" | "resumeAgent" | "wait" | "cl
 
 type CollabAgentToolCallStatus = "inProgress" | "completed" | "failed";
 
+type CommandExecutionSource = "agent" | "userShell" | "unifiedExecStartup" | "unifiedExecInteraction";
+
 type CommandExecutionStatus = "inProgress" | "completed" | "failed" | "declined";
 
 type DynamicToolCallOutputContentItem = {
@@ -289,6 +264,11 @@ type FileUpdateChange = {
     diff: string;
 };
 
+type HookPromptFragment = {
+    text: string;
+    hookRunId: string;
+};
+
 type McpToolCallError = {
     message: string;
 };
@@ -372,6 +352,10 @@ type ThreadItem = {
     "type": "userMessage";
     id: string;
     content: Array<UserInput>;
+} | {
+    "type": "hookPrompt";
+    id: string;
+    fragments: Array<HookPromptFragment>;
 } | {
     "type": "agentMessage";
     id: string;
@@ -402,6 +386,7 @@ type ThreadItem = {
      * Identifier for the underlying PTY process (when available).
      */
     processId: string | null;
+    source: CommandExecutionSource;
     status: CommandExecutionStatus;
     /**
      * A best-effort parsing of the command to understand the action(s) it will perform.
@@ -507,6 +492,7 @@ type ThreadItem = {
     status: string;
     revisedPrompt: string | null;
     result: string;
+    savedPath?: string;
 } | {
     "type": "enteredReviewMode";
     id: string;
@@ -735,12 +721,15 @@ type GitInfo = {
     originUrl: string | null;
 };
 
+type AgentPath = string;
+
 type ThreadId = string;
 
 type SubAgentSource = "review" | "compact" | {
     "thread_spawn": {
         parent_thread_id: ThreadId;
         depth: number;
+        agent_path: AgentPath | null;
         agent_nickname: string | null;
         agent_role: string | null;
     };
@@ -767,6 +756,8 @@ type ThreadStatus = {
     activeFlags: Array<ThreadActiveFlag>;
 };
 
+type NonSteerableTurnKind = "review" | "compact";
+
 /**
  * This translation layer make sure that we expose codex error code in camel case.
  *
@@ -789,6 +780,10 @@ type CodexErrorInfo = "contextWindowExceeded" | "usageLimitExceeded" | "serverOv
     "responseTooManyFailedAttempts": {
         httpStatusCode: number | null;
     };
+} | {
+    "activeTurnNotSteerable": {
+        turnKind: NonSteerableTurnKind;
+    };
 } | "other";
 
 type TurnError = {
@@ -1468,6 +1463,11 @@ interface CodexCallOptions {
     sandboxPolicy?: SandboxPolicy;
     /** Controls turn summary generation. */
     summary?: "auto" | "concise" | "detailed" | "none";
+    /** Approval callbacks for this call; falls back to provider-level `approvals`. */
+    approvals?: {
+        onCommandApproval?: CommandApprovalHandler;
+        onFileChangeApproval?: FileChangeApprovalHandler;
+    };
 }
 interface CodexCompactionSettings {
     /**
@@ -1562,7 +1562,7 @@ interface CodexProviderSettings {
     persistent?: {
         /** Number of worker processes to keep in the pool. */
         poolSize?: number;
-        /** Time (ms) before an idle worker is shut down. */
+        /** Time (ms) before an idle worker is shut down. Set to `0` to disable (worker stays alive indefinitely). */
         idleTimeoutMs?: number;
         /** `"provider"` = pool per provider instance; `"global"` = shared across all instances. */
         scope?: "provider" | "global";

package/dist/index.js

@@ -933,7 +933,7 @@ var DynamicToolsDispatcher = class {
 // package.json
 var package_default = {
   name: "@janole/ai-sdk-provider-codex-asp",
-  version: "0.4.2"};
+  version: "0.4.4"};
 
 // src/package-info.ts
 var PACKAGE_NAME = package_default.name;
@@ -1767,6 +1767,12 @@ function sdkToolsToCodexDynamicTools(tools) {
     inputSchema: t.inputSchema
   }));
 }
+function resolveApprovalHandlers(providerSettings, callOptions) {
+  return stripUndefined({
+    onCommandApproval: callOptions?.approvals?.onCommandApproval ?? providerSettings.approvals?.onCommandApproval,
+    onFileChangeApproval: callOptions?.approvals?.onFileChangeApproval ?? providerSettings.approvals?.onFileChangeApproval
+  });
+}
 function isPassThroughContentPart(part) {
   switch (part.type) {
     case "tool-call":
@@ -1922,6 +1928,8 @@ var CodexLanguageModel = class {
     let activeThreadId;
     let activeTurnId;
     let session;
+    let detachApprovals;
+    let detachDynamicTools;
     const interruptTimeoutMs = this.config.providerSettings.interruptTimeoutMs ?? 1e4;
     const interruptTurnIfPossible = async () => {
       if (!activeThreadId || !activeTurnId) {
@@ -1948,6 +1956,10 @@ var CodexLanguageModel = class {
           try {
             controller.close();
           } finally {
+            detachDynamicTools?.();
+            detachDynamicTools = void 0;
+            detachApprovals?.();
+            detachApprovals = void 0;
             await fileResolver.cleanup();
             await client.disconnect();
           }
@@ -1961,6 +1973,10 @@ var CodexLanguageModel = class {
           try {
             controller.close();
           } finally {
+            detachDynamicTools?.();
+            detachDynamicTools = void 0;
+            detachApprovals?.();
+            detachApprovals = void 0;
             await fileResolver.cleanup();
             await client.disconnect();
           }
@@ -2022,11 +2038,10 @@ var CodexLanguageModel = class {
                 pendingToolCall.threadId,
                 closeSuccessfully
               );
-              const approvalsDispatcher2 = new ApprovalsDispatcher(stripUndefined({
-                onCommandApproval: this.config.providerSettings.approvals?.onCommandApproval,
-                onFileChangeApproval: this.config.providerSettings.approvals?.onFileChangeApproval
-              }));
-              approvalsDispatcher2.attach(client);
+              const approvalsDispatcher2 = new ApprovalsDispatcher(
+                resolveApprovalHandlers(this.config.providerSettings, callOptions)
+              );
+              detachApprovals = approvalsDispatcher2.attach(client);
               const result = toolResult ?? {
                 success: false,
                 contentItems: [{
@@ -2054,13 +2069,12 @@ var CodexLanguageModel = class {
                 timeoutMs: this.config.providerSettings.toolTimeoutMs,
                 onDebugEvent: toolLogger
               }));
-              dispatcher.attach(client);
+              detachDynamicTools = dispatcher.attach(client);
             }
-            const approvalsDispatcher = new ApprovalsDispatcher(stripUndefined({
-              onCommandApproval: this.config.providerSettings.approvals?.onCommandApproval,
-              onFileChangeApproval: this.config.providerSettings.approvals?.onFileChangeApproval
-            }));
-            approvalsDispatcher.attach(client);
+            const approvalsDispatcher = new ApprovalsDispatcher(
+              resolveApprovalHandlers(this.config.providerSettings, callOptions)
+            );
+            detachApprovals = approvalsDispatcher.attach(client);
             client.onAnyNotification((method, params) => {
               const parts = mapper.map({ method, params });
               const mappedTurnId = mapper.getTurnId();