@janole/ai-sdk-provider-codex-asp 0.2.2 → 0.2.3

package/dist/index.d.cts

@@ -132,6 +132,10 @@ type CommandExecutionRequestApprovalParams = {
      * Optional proposed network policy amendments (allow/deny host) for future requests.
      */
     proposedNetworkPolicyAmendments?: Array<NetworkPolicyAmendment> | null;
+    /**
+     * Ordered list of decisions the client may present for this prompt.
+     */
+    availableDecisions?: Array<CommandExecutionApprovalDecision> | null;
 };
 
 type CommandExecutionRequestApprovalResponse = {
@@ -454,6 +458,16 @@ type CollabAgentToolCallStatus = "inProgress" | "completed" | "failed";
 
 type CommandExecutionStatus = "inProgress" | "completed" | "failed" | "declined";
 
+type DynamicToolCallOutputContentItem = {
+    "type": "inputText";
+    text: string;
+} | {
+    "type": "inputImage";
+    imageUrl: string;
+};
+
+type DynamicToolCallStatus = "inProgress" | "completed" | "failed";
+
 type PatchChangeKind = {
     "type": "add";
 } | {
@@ -606,6 +620,18 @@ type ThreadItem = {
      * The duration of the MCP tool call in milliseconds.
      */
     durationMs: number | null;
+} | {
+    "type": "dynamicToolCall";
+    id: string;
+    tool: string;
+    arguments: JsonValue;
+    status: DynamicToolCallStatus;
+    contentItems: Array<DynamicToolCallOutputContentItem> | null;
+    success: boolean | null;
+    /**
+     * The duration of the dynamic tool call in milliseconds.
+     */
+    durationMs: number | null;
 } | {
     "type": "collabAgentToolCall";
     /**
@@ -1129,20 +1155,29 @@ interface CodexWorkerPoolSettings {
     transportFactory: () => CodexTransport;
     idleTimeoutMs?: number;
 }
+interface AcquireOptions {
+    signal?: AbortSignal;
+}
 declare class CodexWorkerPool {
     private readonly workers;
     private shutdownCalled;
+    private readonly waiters;
     constructor(settings: CodexWorkerPoolSettings);
-    acquire(): CodexWorker;
+    acquire(options?: AcquireOptions): Promise<CodexWorker>;
     release(worker: CodexWorker): void;
     shutdown(): Promise<void>;
+    private removeWaiter;
+    /** Remove the abort listener so it doesn't fire after the waiter is already served. */
+    private clearWaiterAbortHandler;
 }
 
 interface PersistentTransportSettings {
     pool: CodexWorkerPool;
+    signal?: AbortSignal;
 }
 declare class PersistentTransport implements CodexTransport {
     private readonly pool;
+    private readonly signal;
     private worker;
     private pendingInitializeId;
     private initializeIntercepted;
@@ -1281,7 +1316,7 @@ interface CodexProviderSettings {
     defaultThreadSettings?: CodexThreadDefaults;
     defaultTurnSettings?: CodexTurnDefaults;
     compaction?: CodexCompactionSettings;
-    transportFactory?: () => CodexTransport;
+    transportFactory?: (signal?: AbortSignal) => CodexTransport;
     /** Tools with schema (description + inputSchema) advertised to Codex + local handlers. */
     tools?: Record<string, DynamicToolDefinition>;
     /** Legacy: handler-only tools, not advertised to Codex. Use `tools` for full schema support. */

package/dist/index.d.ts

@@ -132,6 +132,10 @@ type CommandExecutionRequestApprovalParams = {
      * Optional proposed network policy amendments (allow/deny host) for future requests.
      */
     proposedNetworkPolicyAmendments?: Array<NetworkPolicyAmendment> | null;
+    /**
+     * Ordered list of decisions the client may present for this prompt.
+     */
+    availableDecisions?: Array<CommandExecutionApprovalDecision> | null;
 };
 
 type CommandExecutionRequestApprovalResponse = {
@@ -454,6 +458,16 @@ type CollabAgentToolCallStatus = "inProgress" | "completed" | "failed";
 
 type CommandExecutionStatus = "inProgress" | "completed" | "failed" | "declined";
 
+type DynamicToolCallOutputContentItem = {
+    "type": "inputText";
+    text: string;
+} | {
+    "type": "inputImage";
+    imageUrl: string;
+};
+
+type DynamicToolCallStatus = "inProgress" | "completed" | "failed";
+
 type PatchChangeKind = {
     "type": "add";
 } | {
@@ -606,6 +620,18 @@ type ThreadItem = {
      * The duration of the MCP tool call in milliseconds.
      */
     durationMs: number | null;
+} | {
+    "type": "dynamicToolCall";
+    id: string;
+    tool: string;
+    arguments: JsonValue;
+    status: DynamicToolCallStatus;
+    contentItems: Array<DynamicToolCallOutputContentItem> | null;
+    success: boolean | null;
+    /**
+     * The duration of the dynamic tool call in milliseconds.
+     */
+    durationMs: number | null;
 } | {
     "type": "collabAgentToolCall";
     /**
@@ -1129,20 +1155,29 @@ interface CodexWorkerPoolSettings {
     transportFactory: () => CodexTransport;
     idleTimeoutMs?: number;
 }
+interface AcquireOptions {
+    signal?: AbortSignal;
+}
 declare class CodexWorkerPool {
     private readonly workers;
     private shutdownCalled;
+    private readonly waiters;
     constructor(settings: CodexWorkerPoolSettings);
-    acquire(): CodexWorker;
+    acquire(options?: AcquireOptions): Promise<CodexWorker>;
     release(worker: CodexWorker): void;
     shutdown(): Promise<void>;
+    private removeWaiter;
+    /** Remove the abort listener so it doesn't fire after the waiter is already served. */
+    private clearWaiterAbortHandler;
 }
 
 interface PersistentTransportSettings {
     pool: CodexWorkerPool;
+    signal?: AbortSignal;
 }
 declare class PersistentTransport implements CodexTransport {
     private readonly pool;
+    private readonly signal;
     private worker;
     private pendingInitializeId;
     private initializeIntercepted;
@@ -1281,7 +1316,7 @@ interface CodexProviderSettings {
     defaultThreadSettings?: CodexThreadDefaults;
     defaultTurnSettings?: CodexTurnDefaults;
     compaction?: CodexCompactionSettings;
-    transportFactory?: () => CodexTransport;
+    transportFactory?: (signal?: AbortSignal) => CodexTransport;
     /** Tools with schema (description + inputSchema) advertised to Codex + local handlers. */
     tools?: Record<string, DynamicToolDefinition>;
     /** Legacy: handler-only tools, not advertised to Codex. Use `tools` for full schema support. */

package/dist/index.js

@@ -272,6 +272,7 @@ var AppServerClient = class {
 // src/client/transport-persistent.ts
 var PersistentTransport = class {
   pool;
+  signal;
   worker = null;
   pendingInitializeId = null;
   initializeIntercepted = false;
@@ -280,9 +281,10 @@ var PersistentTransport = class {
   closeListeners = /* @__PURE__ */ new Set();
   constructor(settings) {
     this.pool = settings.pool;
+    this.signal = settings.signal;
   }
   async connect() {
-    this.worker = this.pool.acquire();
+    this.worker = await this.pool.acquire(stripUndefined({ signal: this.signal }));
     await this.worker.ensureConnected();
   }
   disconnect() {
@@ -722,6 +724,7 @@ var CodexWorker = class {
 var CodexWorkerPool = class {
   workers;
   shutdownCalled = false;
+  waiters = [];
   constructor(settings) {
     const size = settings.poolSize ?? 1;
     const idleTimeoutMs = settings.idleTimeoutMs ?? 3e5;
@@ -733,7 +736,7 @@ var CodexWorkerPool = class {
       })
     );
   }
-  acquire() {
+  async acquire(options) {
     if (this.shutdownCalled) {
       throw new CodexProviderError("Worker pool has been shut down.");
     }
@@ -741,20 +744,61 @@ var CodexWorkerPool = class {
       (w) => w.state === "idle" || w.state === "disconnected"
     );
     if (!worker) {
-      throw new CodexProviderError(
-        "All workers are busy. Try again later or increase poolSize."
-      );
+      if (options?.signal?.aborted) {
+        throw new CodexProviderError("Worker acquisition aborted while waiting.");
+      }
+      return new Promise((resolve, reject) => {
+        const waiter = {
+          resolve,
+          reject,
+          signal: options?.signal,
+          abortHandler: void 0
+        };
+        if (waiter.signal) {
+          waiter.abortHandler = () => {
+            this.removeWaiter(waiter);
+            waiter.reject(new CodexProviderError("Worker acquisition aborted while waiting."));
+          };
+          waiter.signal.addEventListener("abort", waiter.abortHandler, { once: true });
+        }
+        this.waiters.push(waiter);
+      });
     }
     worker.acquire();
     return worker;
   }
   release(worker) {
-    worker.release();
+    const waiter = this.waiters.shift();
+    if (waiter) {
+      this.clearWaiterAbortHandler(waiter);
+      waiter.resolve(worker);
+    } else {
+      worker.release();
+    }
   }
   async shutdown() {
     this.shutdownCalled = true;
+    while (this.waiters.length > 0) {
+      const waiter = this.waiters.shift();
+      this.clearWaiterAbortHandler(waiter);
+      waiter.reject(new CodexProviderError("Worker pool has been shut down."));
+    }
     await Promise.all(this.workers.map((w) => w.shutdown()));
   }
+  removeWaiter(target) {
+    const index = this.waiters.indexOf(target);
+    if (index >= 0) {
+      this.waiters.splice(index, 1);
+    }
+  }
+  /** Remove the abort listener so it doesn't fire after the waiter is already served. */
+  clearWaiterAbortHandler(waiter) {
+    if (!waiter.signal || !waiter.abortHandler) {
+      return;
+    }
+    waiter.signal.removeEventListener("abort", waiter.abortHandler);
+    waiter.abortHandler = void 0;
+  }
 };
 
 // src/dynamic-tools.ts
@@ -884,7 +928,7 @@ var DynamicToolsDispatcher = class {
 // package.json
 var package_default = {
   name: "@janole/ai-sdk-provider-codex-asp",
-  version: "0.2.2"};
+  version: "0.2.3"};
 
 // src/package-info.ts
 var PACKAGE_NAME = package_default.name;
@@ -1553,7 +1597,7 @@ var CodexLanguageModel = class {
     });
   }
   doStream(options) {
-    const transport = this.config.providerSettings.transportFactory ? this.config.providerSettings.transportFactory() : this.config.providerSettings.transport?.type === "websocket" ? new WebSocketTransport(this.config.providerSettings.transport.websocket) : new StdioTransport(this.config.providerSettings.transport?.stdio);
+    const transport = this.config.providerSettings.transportFactory ? this.config.providerSettings.transportFactory(options.abortSignal) : this.config.providerSettings.transport?.type === "websocket" ? new WebSocketTransport(this.config.providerSettings.transport.websocket) : new StdioTransport(this.config.providerSettings.transport?.stdio);
     const packetLogger = this.config.providerSettings.debug?.logPackets === true ? this.config.providerSettings.debug.logger ?? ((packet) => {
       if (packet.direction === "inbound") {
         console.debug("[codex packet]", packet.message);
@@ -1967,7 +2011,7 @@ function createCodexAppServer(settings = {}) {
     });
   }
   const persistentPool = persistentPoolHandle?.pool ?? null;
-  const effectiveTransportFactory = persistentPool ? () => new PersistentTransport({ pool: persistentPool }) : baseTransportFactory;
+  const effectiveTransportFactory = persistentPool ? (signal) => new PersistentTransport(stripUndefined({ pool: persistentPool, signal })) : baseTransportFactory;
   const resolvedSettings = Object.freeze(stripUndefined({
     defaultModel: settings.defaultModel,
     experimentalApi: settings.experimentalApi,