@janole/ai-sdk-provider-codex-asp 0.1.3 → 0.1.5

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` 0.104.0.
+Status: POC feature-complete for language model usage. Currently tested with [codex-cli](https://github.com/openai/codex/releases/tag/rust-v0.104.0) 0.104.0.
 
 - `LanguageModelV3` provider implementation
 - Streaming (`streamText`) and non-streaming (`generateText`)
@@ -115,6 +115,7 @@ const codex = createCodexAppServer({
   defaultThreadSettings?: { cwd?, approvalMode?, sandboxMode? },
   approvals?: { onCommandApproval?, onFileChangeApproval? },
   toolTimeoutMs?: number,                  // default: 30000
+  interruptTimeoutMs?: number,             // default: 10000
 });
 
 codex(modelId)                // returns a language model instance
@@ -150,6 +151,7 @@ npx tsx examples/stream-text.ts
   - Use Node.js 18+ with global WebSocket support, or use `stdio` transport.
 - Request timeouts:
   - Increase `toolTimeoutMs` for long-running dynamic tools.
+  - Increase `interruptTimeoutMs` if `turn/interrupt` acks are slow under heavy load.
 - Empty generated text:
   - Verify Codex emits `item/agentMessage/delta` and `turn/completed` notifications.
 
@@ -161,6 +163,18 @@ npm run build        # ESM + CJS + .d.ts via tsup
 npm run qa           # lint + typecheck + test (all-in-one)
 ```
 
+### Generated Protocol Types
+
+`src/protocol/app-server-protocol/` is gitignored, but selected generated files are intentionally tracked via `git add -f`.
+This keeps protocol diffs visible in PRs and local `git status` after regeneration.
+
+When protocol shapes change, clean and regenerate:
+
+```bash
+rm -rf src/protocol/app-server-protocol
+npm run codex:generate-types
+```
+
 ## License
 
 MIT

package/dist/index.cjs

@@ -823,14 +823,14 @@ var DynamicToolsDispatcher = class {
 // package.json
 var package_default = {
   name: "@janole/ai-sdk-provider-codex-asp",
-  version: "0.1.3"};
+  version: "0.1.5"};
 
 // src/package-info.ts
 var PACKAGE_NAME = package_default.name;
 var PACKAGE_VERSION = package_default.version;
 
 // src/protocol/provider-metadata.ts
-var CODEX_PROVIDER_ID = "codex-app-server";
+var CODEX_PROVIDER_ID = "@janole/ai-sdk-provider-codex-asp";
 function codexProviderMetadata(threadId) {
   if (!threadId) {
     return void 0;
@@ -1377,6 +1377,20 @@ var CodexLanguageModel = class {
       onPacket: packetLogger
     }));
     const mapper = new CodexEventMapper();
+    let activeThreadId;
+    let activeTurnId;
+    const interruptTimeoutMs = this.config.providerSettings.interruptTimeoutMs ?? 1e4;
+    const interruptTurnIfPossible = async () => {
+      if (!activeThreadId || !activeTurnId) {
+        return;
+      }
+      const interruptParams = {
+        threadId: activeThreadId,
+        turnId: activeTurnId
+      };
+      debugLog?.("outbound", "turn/interrupt", interruptParams);
+      await client.request("turn/interrupt", interruptParams, interruptTimeoutMs);
+    };
     const stream = new ReadableStream({
       start: (controller) => {
         let closed = false;
@@ -1404,7 +1418,13 @@ var CodexLanguageModel = class {
           }
         };
         const abortHandler = () => {
-          void closeWithError(new DOMException("Aborted", "AbortError"));
+          void (async () => {
+            try {
+              await interruptTurnIfPossible();
+            } catch {
+            }
+            await closeWithError(new DOMException("Aborted", "AbortError"));
+          })();
         };
         if (options.abortSignal) {
           if (options.abortSignal.aborted) {
@@ -1506,7 +1526,7 @@ var CodexLanguageModel = class {
                 "thread/resume",
                 resumeParams
               );
-              threadId = resumeResult.threadId ?? resumeResult.thread?.id ?? resumeThreadId;
+              threadId = resumeResult.thread.id;
             } else {
               const threadStartParams = stripUndefined({
                 model: this.config.providerSettings.defaultModel ?? this.modelId,
@@ -1523,6 +1543,7 @@ var CodexLanguageModel = class {
               );
               threadId = extractThreadId(threadStartResult);
             }
+            activeThreadId = threadId;
             mapper.setThreadId(threadId);
             if (hasSdkTools && persistentTransport) {
               this.registerCrossCallToolHandler(
@@ -1539,13 +1560,17 @@ var CodexLanguageModel = class {
               threadId,
               input: turnInput
             });
-            extractTurnId(turnStartResult);
+            activeTurnId = extractTurnId(turnStartResult);
           } catch (error) {
             await closeWithError(error);
           }
         })();
       },
       cancel: async () => {
+        try {
+          await interruptTurnIfPossible();
+        } catch {
+        }
         await client.disconnect();
       }
     });
@@ -1637,7 +1662,6 @@ function acquirePersistentPool(settings) {
 }
 
 // src/provider.ts
-var PROVIDER_ID = "codex-app-server";
 function createNoSuchModelError(modelId, modelType) {
   return new provider.NoSuchModelError({ modelId, modelType });
 }
@@ -1677,11 +1701,12 @@ function createCodexAppServer(settings = {}) {
     tools: settings.tools ? { ...settings.tools } : void 0,
     toolHandlers: settings.toolHandlers ? { ...settings.toolHandlers } : void 0,
     toolTimeoutMs: settings.toolTimeoutMs,
+    interruptTimeoutMs: settings.interruptTimeoutMs,
     approvals: settings.approvals ? { ...settings.approvals } : void 0,
     debug: settings.debug ? { ...settings.debug } : void 0
   }));
   const createLanguageModel = (modelId, modelSettings = {}) => new CodexLanguageModel(modelId, modelSettings, {
-    provider: PROVIDER_ID,
+    provider: CODEX_PROVIDER_ID,
     providerSettings: resolvedSettings
   });
   const providerFn = ((modelId, modelSettings = {}) => createLanguageModel(modelId, modelSettings));