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

package/README.md

@@ -2,7 +2,7 @@
 
 `@janole/ai-sdk-provider-codex-asp` is a [Vercel AI SDK](https://ai-sdk.dev/) v6 custom provider for the Codex App Server Protocol.
 
-Status: POC feature-complete for language model usage. Currently tested with [codex-cli](https://github.com/openai/codex/releases/tag/rust-v0.105.0) 0.105.0.
+Status: POC feature-complete for language model usage. Currently tested with [codex-cli](https://github.com/openai/codex/releases/tag/rust-v0.106.0) 0.106.0.
 
 - `LanguageModelV3` provider implementation
 - Streaming (`streamText`) and non-streaming (`generateText`)

package/dist/index.cjs

@@ -1,6 +1,11 @@
 'use strict';
 
 var child_process = require('child_process');
+var crypto = require('crypto');
+var promises = require('fs/promises');
+var os = require('os');
+var path = require('path');
+var url = require('url');
 var provider = require('@ai-sdk/provider');
 
 // src/utils/object.ts
@@ -274,6 +279,7 @@ var AppServerClient = class {
 // src/client/transport-persistent.ts
 var PersistentTransport = class {
   pool;
+  signal;
   worker = null;
   pendingInitializeId = null;
   initializeIntercepted = false;
@@ -282,9 +288,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() {
@@ -724,6 +731,7 @@ var CodexWorker = class {
 var CodexWorkerPool = class {
   workers;
   shutdownCalled = false;
+  waiters = [];
   constructor(settings) {
     const size = settings.poolSize ?? 1;
     const idleTimeoutMs = settings.idleTimeoutMs ?? 3e5;
@@ -735,7 +743,7 @@ var CodexWorkerPool = class {
       })
     );
   }
-  acquire() {
+  async acquire(options) {
     if (this.shutdownCalled) {
       throw new CodexProviderError("Worker pool has been shut down.");
     }
@@ -743,20 +751,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
@@ -886,7 +935,7 @@ var DynamicToolsDispatcher = class {
 // package.json
 var package_default = {
   name: "@janole/ai-sdk-provider-codex-asp",
-  version: "0.2.2"};
+  version: "0.2.4"};
 
 // src/package-info.ts
 var PACKAGE_NAME = package_default.name;
@@ -1273,8 +1322,6 @@ var CodexEventMapper = class {
     return parts;
   }
 };
-
-// src/protocol/prompt-mapper.ts
 function mapSystemPrompt(prompt) {
   const chunks = [];
   for (const message of prompt) {
@@ -1287,8 +1334,111 @@ function mapSystemPrompt(prompt) {
   }
   return chunks.length > 0 ? chunks.join("\n\n") : void 0;
 }
-function mapPromptToTurnInput(prompt, isResume = false) {
-  if (isResume) {
+function textItem(text) {
+  return { type: "text", text, text_elements: [] };
+}
+var MEDIA_TYPE_TO_EXT = {
+  "image/png": ".png",
+  "image/jpeg": ".jpg",
+  "image/gif": ".gif",
+  "image/webp": ".webp",
+  "image/svg+xml": ".svg",
+  "image/bmp": ".bmp",
+  "image/tiff": ".tiff"
+};
+function extensionForMediaType(mediaType) {
+  return MEDIA_TYPE_TO_EXT[mediaType] ?? ".bin";
+}
+var LocalFileWriter = class {
+  async write(data, mediaType) {
+    const ext = extensionForMediaType(mediaType);
+    const filename = `codex-ai-sdk-${crypto.randomUUID()}${ext}`;
+    const filepath = path.join(os.tmpdir(), filename);
+    const buffer = typeof data === "string" ? Buffer.from(data, "base64") : data;
+    await promises.writeFile(filepath, buffer);
+    return url.pathToFileURL(filepath);
+  }
+  async cleanup(urls) {
+    await Promise.allSettled(
+      urls.filter((u) => u.protocol === "file:").map((u) => promises.unlink(u))
+    );
+  }
+};
+var PromptFileResolver = class {
+  writer;
+  written = [];
+  constructor(writer) {
+    this.writer = writer ?? new LocalFileWriter();
+  }
+  /**
+   * Resolve inline file data and map user content to Codex input items.
+   *
+   * - Inline image data (base64 / Uint8Array) is written via the
+   *   {@link FileWriter} and converted to `localImage` or `image` items.
+   * - URL-based image file parts are converted directly.
+   * - Inline text file data is decoded and inlined as text.
+   * - Unsupported media types are silently skipped.
+   *
+   * @param isResume - When true only the last user message is extracted.
+   *   When false (fresh thread) all user text is accumulated with images
+   *   flushing the text buffer to preserve ordering.
+   */
+  async resolve(prompt, isResume = false) {
+    if (isResume) {
+      return this.resolveResumed(prompt);
+    }
+    return this.resolveFresh(prompt);
+  }
+  /**
+   * Remove all files created by previous {@link resolve} calls.
+   * Best-effort — never throws.
+   */
+  async cleanup() {
+    const urls = this.written.splice(0);
+    if (urls.length > 0) {
+      await this.writer.cleanup(urls);
+    }
+  }
+  /**
+   * Convert a resolved image URL to a Codex input item.
+   */
+  mapImageUrl(mediaType, data) {
+    if (!mediaType.startsWith("image/")) {
+      return null;
+    }
+    if (data.protocol === "file:") {
+      return { type: "localImage", path: url.fileURLToPath(data) };
+    }
+    return { type: "image", url: data.href };
+  }
+  /**
+   * Resolve a single file part: write inline data via the writer, then
+   * convert to a Codex input item.  Text files are decoded and returned
+   * as text items.  Returns `null` for unsupported media types.
+   */
+  async resolveFilePart(part) {
+    const { mediaType, data } = part;
+    if (mediaType.startsWith("text/")) {
+      if (data instanceof URL) {
+        return textItem(data.href);
+      }
+      const text = typeof data === "string" ? Buffer.from(data, "base64").toString("utf-8") : new TextDecoder().decode(data);
+      return textItem(text);
+    }
+    if (mediaType.startsWith("image/") && !(data instanceof URL)) {
+      const url = await this.writer.write(data, mediaType);
+      this.written.push(url);
+      return this.mapImageUrl(mediaType, url);
+    }
+    if (data instanceof URL) {
+      return this.mapImageUrl(mediaType, data);
+    }
+    return null;
+  }
+  /**
+   * Resume path: extract parts from the last user message individually.
+   */
+  async resolveResumed(prompt) {
     for (let i = prompt.length - 1; i >= 0; i--) {
       const message = prompt[i];
       if (message?.role === "user") {
@@ -1297,7 +1447,12 @@ function mapPromptToTurnInput(prompt, isResume = false) {
           if (part.type === "text") {
             const text = part.text.trim();
             if (text.length > 0) {
-              items.push({ type: "text", text, text_elements: [] });
+              items.push(textItem(text));
+            }
+          } else if (part.type === "file") {
+            const mapped = await this.resolveFilePart(part);
+            if (mapped) {
+              items.push(mapped);
             }
           }
         }
@@ -1306,21 +1461,45 @@ function mapPromptToTurnInput(prompt, isResume = false) {
     }
     return [];
   }
-  const chunks = [];
-  for (const message of prompt) {
-    if (message.role === "user") {
-      for (const part of message.content) {
-        if (part.type === "text") {
-          const text = part.text.trim();
-          if (text.length > 0) {
-            chunks.push(text);
+  /**
+   * Fresh thread path: accumulate text chunks across all user messages,
+   * flushing before each image to preserve ordering.
+   */
+  async resolveFresh(prompt) {
+    const items = [];
+    const textChunks = [];
+    const flushText = () => {
+      if (textChunks.length > 0) {
+        items.push(textItem(textChunks.join("\n\n")));
+        textChunks.length = 0;
+      }
+    };
+    for (const message of prompt) {
+      if (message.role === "user") {
+        for (const part of message.content) {
+          if (part.type === "text") {
+            const text = part.text.trim();
+            if (text.length > 0) {
+              textChunks.push(text);
+            }
+          } else if (part.type === "file") {
+            const mapped = await this.resolveFilePart(part);
+            if (mapped) {
+              if (mapped.type === "text") {
+                textChunks.push(mapped.text);
+              } else {
+                flushText();
+                items.push(mapped);
+              }
+            }
           }
         }
       }
     }
+    flushText();
+    return items;
   }
-  return [{ type: "text", text: chunks.join("\n\n"), text_elements: [] }];
-}
+};
 
 // src/model.ts
 function createEmptyUsage() {
@@ -1555,7 +1734,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);
@@ -1587,6 +1766,7 @@ var CodexLanguageModel = class {
       debugLog?.("outbound", "turn/interrupt", interruptParams);
       await client.request("turn/interrupt", interruptParams, interruptTimeoutMs);
     };
+    const fileResolver = new PromptFileResolver();
     const stream = new ReadableStream({
       start: (controller) => {
         let closed = false;
@@ -1599,6 +1779,7 @@ var CodexLanguageModel = class {
           try {
             controller.close();
           } finally {
+            await fileResolver.cleanup();
             await client.disconnect();
           }
         };
@@ -1610,6 +1791,7 @@ var CodexLanguageModel = class {
           try {
             controller.close();
           } finally {
+            await fileResolver.cleanup();
             await client.disconnect();
           }
         };
@@ -1834,7 +2016,7 @@ var CodexLanguageModel = class {
                 closeSuccessfully
               );
             }
-            const turnInput = mapPromptToTurnInput(options.prompt, !!resumeThreadId);
+            const turnInput = await fileResolver.resolve(options.prompt, !!resumeThreadId);
             const turnStartParams = stripUndefined({
               threadId,
               input: turnInput,
@@ -1858,6 +2040,7 @@ var CodexLanguageModel = class {
           await interruptTurnIfPossible();
         } catch {
         }
+        await fileResolver.cleanup();
         await client.disconnect();
       }
     });
@@ -1969,7 +2152,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,
@@ -2039,16 +2222,17 @@ exports.CodexWorker = CodexWorker;
 exports.CodexWorkerPool = CodexWorkerPool;
 exports.DynamicToolsDispatcher = DynamicToolsDispatcher;
 exports.JsonRpcError = JsonRpcError;
+exports.LocalFileWriter = LocalFileWriter;
 exports.PACKAGE_NAME = PACKAGE_NAME;
 exports.PACKAGE_VERSION = PACKAGE_VERSION;
 exports.PersistentTransport = PersistentTransport;
+exports.PromptFileResolver = PromptFileResolver;
 exports.StdioTransport = StdioTransport;
 exports.WebSocketTransport = WebSocketTransport;
 exports.codexAppServer = codexAppServer;
 exports.codexProviderMetadata = codexProviderMetadata;
 exports.createCodexAppServer = createCodexAppServer;
 exports.createCodexProvider = createCodexProvider;
-exports.mapPromptToTurnInput = mapPromptToTurnInput;
 exports.mapSystemPrompt = mapSystemPrompt;
 exports.withProviderMetadata = withProviderMetadata;
 //# sourceMappingURL=index.cjs.map