@janole/ai-sdk-provider-codex-asp 0.3.0 → 0.3.2

package/dist/index.d.cts

@@ -1210,6 +1210,7 @@ interface CodexWorkerPoolSettings {
     idleTimeoutMs?: number;
 }
 interface AcquireOptions {
+    threadId?: string;
     signal?: AbortSignal;
 }
 declare class CodexWorkerPool {
@@ -1228,10 +1229,12 @@ declare class CodexWorkerPool {
 interface PersistentTransportSettings {
     pool: CodexWorkerPool;
     signal?: AbortSignal;
+    threadId?: string;
 }
 declare class PersistentTransport implements CodexTransport {
     private readonly pool;
     private readonly signal;
+    private readonly threadId;
     private worker;
     private pendingInitializeId;
     private initializeIntercepted;
@@ -1392,7 +1395,7 @@ interface CodexProviderSettings {
     defaultThreadSettings?: CodexThreadDefaults;
     defaultTurnSettings?: CodexTurnDefaults;
     compaction?: CodexCompactionSettings;
-    transportFactory?: (signal?: AbortSignal) => CodexTransport;
+    transportFactory?: (signal?: AbortSignal, threadId?: string) => 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

@@ -1210,6 +1210,7 @@ interface CodexWorkerPoolSettings {
     idleTimeoutMs?: number;
 }
 interface AcquireOptions {
+    threadId?: string;
     signal?: AbortSignal;
 }
 declare class CodexWorkerPool {
@@ -1228,10 +1229,12 @@ declare class CodexWorkerPool {
 interface PersistentTransportSettings {
     pool: CodexWorkerPool;
     signal?: AbortSignal;
+    threadId?: string;
 }
 declare class PersistentTransport implements CodexTransport {
     private readonly pool;
     private readonly signal;
+    private readonly threadId;
     private worker;
     private pendingInitializeId;
     private initializeIntercepted;
@@ -1392,7 +1395,7 @@ interface CodexProviderSettings {
     defaultThreadSettings?: CodexThreadDefaults;
     defaultTurnSettings?: CodexTurnDefaults;
     compaction?: CodexCompactionSettings;
-    transportFactory?: (signal?: AbortSignal) => CodexTransport;
+    transportFactory?: (signal?: AbortSignal, threadId?: string) => 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

@@ -278,6 +278,7 @@ var AppServerClient = class {
 var PersistentTransport = class {
   pool;
   signal;
+  threadId;
   worker = null;
   pendingInitializeId = null;
   initializeIntercepted = false;
@@ -287,9 +288,10 @@ var PersistentTransport = class {
   constructor(settings) {
     this.pool = settings.pool;
     this.signal = settings.signal;
+    this.threadId = settings.threadId;
   }
   async connect() {
-    this.worker = await this.pool.acquire(stripUndefined({ signal: this.signal }));
+    this.worker = await this.pool.acquire(stripUndefined({ signal: this.signal, threadId: this.threadId }));
     await this.worker.ensureConnected();
   }
   disconnect() {
@@ -661,6 +663,7 @@ var CodexWorker = class {
     await this.inner.connect();
   }
   acquire() {
+    this.clearSessionListeners();
     if (this.idleTimer) {
       clearTimeout(this.idleTimer);
       this.idleTimer = null;
@@ -745,8 +748,17 @@ var CodexWorkerPool = class {
     if (this.shutdownCalled) {
       throw new CodexProviderError("Worker pool has been shut down.");
     }
+    if (options?.threadId) {
+      const reserved = this.workers.find(
+        (w) => (w.state === "idle" || w.state === "disconnected") && w.pendingToolCall?.threadId === options.threadId
+      );
+      if (reserved) {
+        reserved.acquire();
+        return reserved;
+      }
+    }
     const worker = this.workers.find(
-      (w) => w.state === "idle" || w.state === "disconnected"
+      (w) => (w.state === "idle" || w.state === "disconnected") && !w.pendingToolCall
     );
     if (!worker) {
       if (options?.signal?.aborted) {
@@ -754,6 +766,7 @@ var CodexWorkerPool = class {
       }
       return new Promise((resolve, reject) => {
         const waiter = {
+          threadId: options?.threadId,
           resolve,
           reject,
           signal: options?.signal,
@@ -773,6 +786,16 @@ var CodexWorkerPool = class {
     return worker;
   }
   release(worker) {
+    worker.clearSessionListeners();
+    if (worker.pendingToolCall) {
+      const idx = this.waiters.findIndex((w) => w.threadId === worker.pendingToolCall?.threadId);
+      if (idx >= 0) {
+        const [waiter2] = this.waiters.splice(idx, 1);
+        this.clearWaiterAbortHandler(waiter2);
+        waiter2.resolve(worker);
+        return;
+      }
+    }
     const waiter = this.waiters.shift();
     if (waiter) {
       this.clearWaiterAbortHandler(waiter);
@@ -933,7 +956,7 @@ var DynamicToolsDispatcher = class {
 // package.json
 var package_default = {
   name: "@janole/ai-sdk-provider-codex-asp",
-  version: "0.3.0"};
+  version: "0.3.2"};
 
 // src/package-info.ts
 var PACKAGE_NAME = package_default.name;
@@ -1768,10 +1791,11 @@ var CodexLanguageModel = class {
       if (text.length === 0) {
         return null;
       }
-      return {
+      return stripUndefined({
         type: "text",
-        text
-      };
+        text,
+        providerMetadata
+      });
     }).filter((part) => part !== null);
     return stripUndefined({
       content: [...textContent, ...passThroughContent],
@@ -1812,7 +1836,8 @@ var CodexLanguageModel = class {
     });
   }
   doStream(options) {
-    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 resumeThreadId = extractResumeThreadId(options.prompt);
+    const transport = this.config.providerSettings.transportFactory ? this.config.providerSettings.transportFactory(options.abortSignal, resumeThreadId) : 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);
@@ -2015,7 +2040,6 @@ var CodexLanguageModel = class {
             await client.request("initialize", initializeParams);
             await client.notification("initialized");
             debugLog?.("inbound", "prompt", options.prompt);
-            const resumeThreadId = extractResumeThreadId(options.prompt);
             debugLog?.("inbound", "extractResumeThreadId", { resumeThreadId });
             const developerInstructions = mapSystemPrompt(options.prompt);
             let threadId;
@@ -2230,6 +2254,12 @@ function acquirePersistentPool(settings) {
 }
 
 // src/provider.ts
+var poolHandleCleanup = new FinalizationRegistry(
+  (handle) => {
+    void handle.release().catch(() => {
+    });
+  }
+);
 function createNoSuchModelError(modelId, modelType) {
   return new NoSuchModelError({ modelId, modelType });
 }
@@ -2250,7 +2280,7 @@ function createCodexAppServer(settings = {}) {
     });
   }
   const persistentPool = persistentPoolHandle?.pool ?? null;
-  const effectiveTransportFactory = persistentPool ? (signal) => new PersistentTransport(stripUndefined({ pool: persistentPool, signal })) : baseTransportFactory;
+  const effectiveTransportFactory = persistentPool ? (signal, threadId) => new PersistentTransport(stripUndefined({ pool: persistentPool, signal, threadId })) : baseTransportFactory;
   const resolvedSettings = Object.freeze(stripUndefined({
     defaultModel: settings.defaultModel,
     experimentalApi: settings.experimentalApi,
@@ -2327,11 +2357,15 @@ function createCodexAppServer(settings = {}) {
       if (!persistentPoolHandle) {
         return;
       }
+      poolHandleCleanup.unregister(provider);
       const handle = persistentPoolHandle;
       persistentPoolHandle = null;
       await handle.release();
     }
   });
+  if (persistentPoolHandle) {
+    poolHandleCleanup.register(provider, persistentPoolHandle, provider);
+  }
   return provider;
 }
 var codexAppServer = createCodexAppServer();