@janole/ai-sdk-provider-codex-asp 0.3.6 → 0.4.1

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.3.6"};
+  version: "0.4.1"};
 
 // src/package-info.ts
 var PACKAGE_NAME = package_default.name;
@@ -947,12 +947,16 @@ function codexProviderMetadata(threadId, turnId) {
   }
   return { [CODEX_PROVIDER_ID]: stripUndefined({ threadId, turnId }) };
 }
+function codexCallOptions(options) {
+  return { [CODEX_PROVIDER_ID]: options };
+}
 function withProviderMetadata(part, threadId, turnId) {
   const meta = codexProviderMetadata(threadId, turnId);
   return meta ? { ...part, providerMetadata: meta } : part;
 }
 
 // src/protocol/event-mapper.ts
+var NATIVE_TOOL_RESULT_TYPES = /* @__PURE__ */ new Set(["commandExecution", "dynamicToolCall", "fileChange", "mcpToolCall", "webSearch"]);
 var EMPTY_USAGE = {
   inputTokens: {
     total: void 0,
@@ -979,7 +983,6 @@ function toFinishReason(status) {
   }
 }
 var NOOP = () => [];
-var DEFAULT_MAX_TOOL_RESULT_OUTPUT_CHARS = 32768;
 var CodexEventMapper = class {
   options;
   streamStarted = false;
@@ -994,8 +997,7 @@ var CodexEventMapper = class {
   handlers;
   constructor(options) {
     this.options = {
-      emitPlanUpdates: options?.emitPlanUpdates ?? true,
-      maxToolResultOutputChars: options?.maxToolResultOutputChars ?? DEFAULT_MAX_TOOL_RESULT_OUTPUT_CHARS
+      emitPlanUpdates: options?.emitPlanUpdates ?? true
     };
     this.handlers = {
       "turn/started": (p) => this.handleTurnStarted(p),
@@ -1005,12 +1007,8 @@ var CodexEventMapper = class {
       "item/reasoning/textDelta": (p) => this.handleReasoningDelta(p),
       "item/reasoning/summaryTextDelta": (p) => this.handleReasoningDelta(p),
       "item/plan/delta": (p) => this.handleReasoningDelta(p),
-      "item/fileChange/outputDelta": (p) => this.handleFileChangeOutputDelta(p),
       "item/reasoning/summaryPartAdded": (p) => this.handleSummaryPartAdded(p),
       "turn/plan/updated": (p) => this.handlePlanUpdated(p),
-      "item/commandExecution/outputDelta": (p) => this.handleCommandOutputDelta(p),
-      "codex/event/mcp_tool_call_begin": (p) => this.handleMcpToolCallBegin(p),
-      "codex/event/mcp_tool_call_end": (p) => this.handleMcpToolCallEnd(p),
       "item/mcpToolCall/progress": (p) => this.handleMcpToolCallProgress(p),
       "item/tool/callStarted": (p) => this.handleToolCallStarted(p),
       "item/tool/callDelta": (p) => this.handleToolCallDelta(p),
@@ -1022,10 +1020,15 @@ var CodexEventMapper = class {
       "codex/event/agent_reasoning": NOOP,
       "codex/event/agent_reasoning_section_break": NOOP,
       "codex/event/plan_update": NOOP,
-      // Intentionally ignored: web search wrappers mirror item events.
-      // We emit web-search reasoning only from item/started + item/completed.
+      // Intentionally ignored: web search and MCP wrappers mirror item events.
       "codex/event/web_search_begin": NOOP,
       "codex/event/web_search_end": NOOP,
+      "codex/event/mcp_tool_call_begin": NOOP,
+      "codex/event/mcp_tool_call_end": NOOP,
+      // Intentionally ignored: streaming output deltas — the full output arrives
+      // in item/completed (aggregatedOutput), making these redundant.
+      "item/commandExecution/outputDelta": NOOP,
+      "item/fileChange/outputDelta": NOOP,
       // Intentionally ignored: full diffs (often 50-100 KB) crash/freeze frontend renderers.
       // If these need to surface, they should use a dedicated part type with lazy rendering.
       "turn/diff/updated": NOOP,
@@ -1070,33 +1073,6 @@ var CodexEventMapper = class {
     this.planSequenceByTurnId.set(turnId, next);
     return next;
   }
-  applyOutputLimit(output) {
-    const limit = this.options.maxToolResultOutputChars;
-    if (limit <= 0) {
-      return { output, droppedChars: 0 };
-    }
-    if (output.length <= limit) {
-      return { output, droppedChars: 0 };
-    }
-    const droppedChars = output.length - limit;
-    return { output: output.slice(droppedChars), droppedChars };
-  }
-  appendTrackedOutput(tracked, delta) {
-    if (!delta) {
-      return;
-    }
-    const combined = tracked.output + delta;
-    const limited = this.applyOutputLimit(combined);
-    tracked.output = limited.output;
-    tracked.droppedChars += limited.droppedChars;
-  }
-  formatToolOutput(output, droppedChars) {
-    if (droppedChars <= 0) {
-      return output;
-    }
-    return `[output truncated: ${droppedChars} chars omitted]
-${output}`;
-  }
   // ── Handlers ─────────────────────────────────────────────────────────────
   // turn/started
   handleTurnStarted(params) {
@@ -1126,7 +1102,7 @@ ${output}`;
       case "commandExecution": {
         this.ensureStreamStarted(parts);
         const toolName = "codex_command_execution";
-        this.openToolCalls.set(item.id, { toolName, output: "", droppedChars: 0 });
+        this.openToolCalls.set(item.id, { toolName });
         parts.push(this.withMeta({
           type: "tool-call",
           toolCallId: item.id,
@@ -1144,7 +1120,7 @@ ${output}`;
       case "fileChange": {
         this.ensureStreamStarted(parts);
         const toolName = "codex_file_change";
-        this.openToolCalls.set(item.id, { toolName, output: "", droppedChars: 0 });
+        this.openToolCalls.set(item.id, { toolName });
         parts.push(this.withMeta({
           type: "tool-call",
           toolCallId: item.id,
@@ -1158,7 +1134,7 @@ ${output}`;
       case "webSearch": {
         this.ensureStreamStarted(parts);
         const toolName = "codex_web_search";
-        this.openToolCalls.set(item.id, { toolName, output: "", droppedChars: 0 });
+        this.openToolCalls.set(item.id, { toolName });
         parts.push(this.withMeta({
           type: "tool-call",
           toolCallId: item.id,
@@ -1169,9 +1145,22 @@ ${output}`;
         }));
         break;
       }
+      case "mcpToolCall": {
+        this.ensureStreamStarted(parts);
+        const toolName = `mcp:${item.server}/${item.tool}`;
+        this.openToolCalls.set(item.id, { toolName });
+        parts.push(this.withMeta({
+          type: "tool-call",
+          toolCallId: item.id,
+          toolName,
+          input: JSON.stringify(item.arguments ?? {}),
+          providerExecuted: true,
+          dynamic: true
+        }));
+        break;
+      }
       case "reasoning":
       case "plan":
-      case "mcpToolCall":
       case "collabAgentToolCall":
       case "imageView":
       case "contextCompaction":
@@ -1220,64 +1209,13 @@ ${output}`;
         parts.push(this.withMeta({ type: "text-end", id: item.id }));
         this.openTextParts.delete(item.id);
       }
-    } else if (item.type === "commandExecution" && this.openToolCalls.has(item.id)) {
+    } else if (NATIVE_TOOL_RESULT_TYPES.has(item.type) && this.openToolCalls.has(item.id)) {
       const tracked = this.openToolCalls.get(item.id);
-      const outputSource = item.aggregatedOutput ?? tracked.output;
-      const limitedOutput = this.applyOutputLimit(outputSource);
-      const output = this.formatToolOutput(
-        limitedOutput.output,
-        item.aggregatedOutput !== void 0 && item.aggregatedOutput !== null ? limitedOutput.droppedChars : tracked.droppedChars
-      );
-      const exitCode = item.exitCode;
-      const status = item.status;
       parts.push(this.withMeta({
         type: "tool-result",
         toolCallId: item.id,
         toolName: tracked.toolName,
-        result: { output, exitCode, status }
-      }));
-      this.openToolCalls.delete(item.id);
-    } else if (item.type === "dynamicToolCall") {
-      const dynamic = item;
-      const tracked = this.openToolCalls.get(item.id);
-      const toolName = tracked?.toolName ?? dynamic.tool ?? "dynamic_tool_call";
-      const rawOutput = this.stringifyDynamicToolResult(dynamic);
-      const limitedOutput = this.applyOutputLimit(rawOutput);
-      parts.push(this.withMeta({
-        type: "tool-result",
-        toolCallId: item.id,
-        toolName,
-        result: {
-          output: this.formatToolOutput(limitedOutput.output, limitedOutput.droppedChars),
-          success: dynamic.success ?? void 0
-        }
-      }));
-      this.openToolCalls.delete(item.id);
-    } else if (item.type === "fileChange" && this.openToolCalls.has(item.id)) {
-      const tracked = this.openToolCalls.get(item.id);
-      const toolName = tracked?.toolName ?? "codex_file_change";
-      const output = tracked ? this.formatToolOutput(tracked.output, tracked.droppedChars) : "";
-      parts.push(this.withMeta({
-        type: "tool-result",
-        toolCallId: item.id,
-        toolName,
-        result: { output, status: item.status, changes: item.changes }
-      }));
-      this.openToolCalls.delete(item.id);
-    } else if (item.type === "webSearch" && this.openToolCalls.has(item.id)) {
-      const webSearchSummary = this.formatWebSearchItemSummary(item);
-      const tracked = this.openToolCalls.get(item.id);
-      const toolName = tracked?.toolName ?? "codex_web_search";
-      parts.push(this.withMeta({
-        type: "tool-result",
-        toolCallId: item.id,
-        toolName,
-        result: {
-          output: webSearchSummary || "",
-          query: item.query,
-          action: item.action ?? void 0,
-          summary: webSearchSummary || void 0
-        }
+        result: { item }
       }));
       this.openToolCalls.delete(item.id);
     } else if (this.openReasoningParts.has(item.id)) {
@@ -1296,22 +1234,6 @@ ${output}`;
     this.emitReasoningDelta(parts, delta.itemId, delta.delta);
     return parts;
   }
-  // item/fileChange/outputDelta
-  handleFileChangeOutputDelta(params) {
-    const delta = params ?? {};
-    if (!delta.itemId || !delta.delta || !this.openToolCalls.has(delta.itemId)) {
-      return [];
-    }
-    const tracked = this.openToolCalls.get(delta.itemId);
-    this.appendTrackedOutput(tracked, delta.delta);
-    return [this.withMeta({
-      type: "tool-result",
-      toolCallId: delta.itemId,
-      toolName: tracked.toolName,
-      result: { output: this.formatToolOutput(tracked.output, tracked.droppedChars) },
-      preliminary: true
-    })];
-  }
   // item/reasoning/summaryPartAdded
   handleSummaryPartAdded(params) {
     const p = params ?? {};
@@ -1354,74 +1276,24 @@ ${output}`;
     }));
     return parts;
   }
-  // item/commandExecution/outputDelta
-  handleCommandOutputDelta(params) {
-    const delta = params ?? {};
-    if (!delta.itemId || !delta.delta || !this.openToolCalls.has(delta.itemId)) {
-      return [];
-    }
-    const tracked = this.openToolCalls.get(delta.itemId);
-    this.appendTrackedOutput(tracked, delta.delta);
-    return [this.withMeta({
-      type: "tool-result",
-      toolCallId: delta.itemId,
-      toolName: tracked.toolName,
-      result: { output: this.formatToolOutput(tracked.output, tracked.droppedChars) },
-      preliminary: true
-    })];
-  }
-  // codex/event/mcp_tool_call_begin
-  handleMcpToolCallBegin(params) {
+  // item/mcpToolCall/progress
+  handleMcpToolCallProgress(params) {
     const p = params ?? {};
-    const callId = p.msg?.call_id;
-    const inv = p.msg?.invocation;
-    if (!callId || !inv) {
+    if (!p.itemId || !p.message) {
       return [];
     }
-    const parts = [];
-    this.ensureStreamStarted(parts);
-    const toolName = `mcp:${inv.server}/${inv.tool}`;
-    this.openToolCalls.set(callId, { toolName, output: "", droppedChars: 0 });
-    parts.push(this.withMeta({
-      type: "tool-call",
-      toolCallId: callId,
-      toolName,
-      input: JSON.stringify(inv.arguments ?? {}),
-      providerExecuted: true,
-      dynamic: true
-    }));
-    return parts;
-  }
-  // codex/event/mcp_tool_call_end
-  handleMcpToolCallEnd(params) {
-    const p = params ?? {};
-    const callId = p.msg?.call_id;
-    if (!callId || !this.openToolCalls.has(callId)) {
+    const tracked = this.openToolCalls.get(p.itemId);
+    if (!tracked) {
       return [];
     }
-    const tracked = this.openToolCalls.get(callId);
-    const result = p.msg?.result;
-    const textParts = result?.Ok?.content?.filter((c) => c.type === "text").map((c) => c.text) ?? [];
-    const rawOutput = textParts.join("\n") || (result?.Err ? JSON.stringify(result.Err) : "");
-    const limitedOutput = this.applyOutputLimit(rawOutput);
-    this.openToolCalls.delete(callId);
     return [this.withMeta({
       type: "tool-result",
-      toolCallId: callId,
+      toolCallId: p.itemId,
       toolName: tracked.toolName,
-      result: { output: this.formatToolOutput(limitedOutput.output, limitedOutput.droppedChars) }
+      result: { output: p.message },
+      preliminary: true
     })];
   }
-  // item/mcpToolCall/progress
-  handleMcpToolCallProgress(params) {
-    const p = params ?? {};
-    if (!p.itemId || !p.message) {
-      return [];
-    }
-    const parts = [];
-    this.emitReasoningDelta(parts, p.itemId, p.message);
-    return parts;
-  }
   // item/tool/callStarted
   handleToolCallStarted(params) {
     const p = params ?? {};
@@ -1470,7 +1342,7 @@ ${output}`;
     }
     const parts = [];
     this.ensureStreamStarted(parts);
-    this.openToolCalls.set(item.id, { toolName: item.tool, output: "", droppedChars: 0 });
+    this.openToolCalls.set(item.id, { toolName: item.tool });
     parts.push(this.withMeta({
       type: "tool-call",
       toolCallId: item.id,
@@ -1481,50 +1353,6 @@ ${output}`;
     }));
     return parts;
   }
-  stringifyDynamicToolResult(item) {
-    const contentItems = item.contentItems ?? [];
-    if (!contentItems.length) {
-      return "";
-    }
-    const chunks = [];
-    for (const contentItem of contentItems) {
-      if (contentItem.type === "inputText" && contentItem.text) {
-        chunks.push(contentItem.text);
-        continue;
-      }
-      if (contentItem.type === "inputImage" && contentItem.imageUrl) {
-        chunks.push(`[image] ${contentItem.imageUrl}`);
-      }
-    }
-    return chunks.join("\n");
-  }
-  formatWebSearchItemSummary(item) {
-    const query = item.query?.trim();
-    const actionType = item.action?.type;
-    if (actionType === "search") {
-      if (query) {
-        return `Web search: ${query}`;
-      }
-      const actionQuery = item.action?.query?.trim();
-      return actionQuery ? `Web search: ${actionQuery}` : "Web search";
-    }
-    if (actionType === "openPage" || actionType === "open_page") {
-      const url = item.action?.url?.trim();
-      return url ? `Open page: ${url}` : "Open page";
-    }
-    if (actionType === "findInPage" || actionType === "find_in_page") {
-      const pattern = item.action?.pattern?.trim();
-      const url = item.action?.url?.trim();
-      if (pattern && url) {
-        return `Find in page: "${pattern}" (${url})`;
-      }
-      if (pattern) {
-        return `Find in page: "${pattern}"`;
-      }
-      return url ? `Find in page: ${url}` : "Find in page";
-    }
-    return query ? `Web search: ${query}` : "";
-  }
   // thread/tokenUsage/updated
   handleTokenUsageUpdated(params) {
     const p = params ?? {};
@@ -1563,7 +1391,8 @@ ${output}`;
         type: "tool-result",
         toolCallId: itemId,
         toolName: tracked.toolName,
-        result: { output: this.formatToolOutput(tracked.output, tracked.droppedChars) }
+        result: { error: "Tool call did not complete before turn ended" },
+        isError: true
       }));
     }
     this.openToolCalls.clear();
@@ -2071,6 +1900,7 @@ var CodexLanguageModel = class {
   }
   doStream(options) {
     const resumeThreadId = extractResumeThreadId(options.prompt);
+    const callOptions = options.providerOptions?.[CODEX_PROVIDER_ID];
     const transport = this.config.providerSettings.transportFactory ? this.config.providerSettings.transportFactory(stripUndefined({ signal: options.abortSignal, threadId: 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") {
@@ -2087,8 +1917,7 @@ var CodexLanguageModel = class {
       onPacket: packetLogger
     }));
     const mapper = new CodexEventMapper(stripUndefined({
-      emitPlanUpdates: this.config.providerSettings.emitPlanUpdates,
-      maxToolResultOutputChars: this.config.providerSettings.maxToolResultOutputChars
+      emitPlanUpdates: this.config.providerSettings.emitPlanUpdates
     }));
     let activeThreadId;
     let activeTurnId;
@@ -2282,7 +2111,11 @@ var CodexLanguageModel = class {
               const resumeParams = stripUndefined({
                 threadId: resumeThreadId,
                 persistExtendedHistory: false,
-                developerInstructions
+                developerInstructions,
+                cwd: callOptions?.cwd ?? this.config.providerSettings.defaultThreadSettings?.cwd,
+                approvalPolicy: callOptions?.approvalPolicy ?? this.config.providerSettings.defaultThreadSettings?.approvalPolicy,
+                sandbox: callOptions?.sandbox ?? this.config.providerSettings.defaultThreadSettings?.sandbox,
+                model: callOptions?.model ?? this.config.providerSettings.defaultModel
               });
               debugLog?.("outbound", "thread/resume", resumeParams);
               const resumeResult = await client.request(
@@ -2342,9 +2175,9 @@ var CodexLanguageModel = class {
                 dynamicTools,
                 developerInstructions,
                 config,
-                cwd: this.config.providerSettings.defaultThreadSettings?.cwd,
-                approvalPolicy: this.config.providerSettings.defaultThreadSettings?.approvalPolicy,
-                sandbox: this.config.providerSettings.defaultThreadSettings?.sandbox
+                cwd: callOptions?.cwd ?? this.config.providerSettings.defaultThreadSettings?.cwd,
+                approvalPolicy: callOptions?.approvalPolicy ?? this.config.providerSettings.defaultThreadSettings?.approvalPolicy,
+                sandbox: callOptions?.sandbox ?? this.config.providerSettings.defaultThreadSettings?.sandbox
               });
               debugLog?.("outbound", "thread/start", threadStartParams);
               const threadStartResult = await client.request(
@@ -2368,12 +2201,12 @@ var CodexLanguageModel = class {
             const turnStartParams = stripUndefined({
               threadId,
               input: turnInput,
-              cwd: this.config.providerSettings.defaultTurnSettings?.cwd,
-              approvalPolicy: this.config.providerSettings.defaultTurnSettings?.approvalPolicy,
-              sandboxPolicy: this.config.providerSettings.defaultTurnSettings?.sandboxPolicy,
-              model: this.config.providerSettings.defaultTurnSettings?.model,
-              effort: this.config.providerSettings.defaultTurnSettings?.effort,
-              summary: this.config.providerSettings.defaultTurnSettings?.summary,
+              cwd: callOptions?.cwd ?? this.config.providerSettings.defaultTurnSettings?.cwd,
+              approvalPolicy: callOptions?.approvalPolicy ?? this.config.providerSettings.defaultTurnSettings?.approvalPolicy,
+              sandboxPolicy: callOptions?.sandboxPolicy ?? this.config.providerSettings.defaultTurnSettings?.sandboxPolicy,
+              model: callOptions?.model ?? this.config.providerSettings.defaultTurnSettings?.model,
+              effort: callOptions?.effort ?? this.config.providerSettings.defaultTurnSettings?.effort,
+              summary: callOptions?.summary ?? this.config.providerSettings.defaultTurnSettings?.summary,
               outputSchema: options.responseFormat?.type === "json" ? options.responseFormat.schema : void 0
             });
             debugLog?.("outbound", "turn/start", turnStartParams);
@@ -2541,7 +2374,6 @@ function createCodexAppServer(settings = {}) {
     approvals: settings.approvals ? { ...settings.approvals } : void 0,
     debug: settings.debug ? { ...settings.debug } : void 0,
     emitPlanUpdates: settings.emitPlanUpdates,
-    maxToolResultOutputChars: settings.maxToolResultOutputChars,
     onSessionCreated: settings.onSessionCreated
   }));
   const createLanguageModel = (modelId, modelSettings = {}) => new CodexLanguageModel(modelId, modelSettings, {
@@ -2607,6 +2439,6 @@ function createCodexAppServer(settings = {}) {
 var codexAppServer = createCodexAppServer();
 var createCodexProvider = createCodexAppServer;
 
-export { AppServerClient, ApprovalsDispatcher, CODEX_PROVIDER_ID, CodexEventMapper, CodexLanguageModel, CodexNotImplementedError, CodexProviderError, CodexWorker, CodexWorkerPool, DynamicToolsDispatcher, JsonRpcError, LocalFileWriter, PACKAGE_NAME, PACKAGE_VERSION, PersistentTransport, PromptFileResolver, StdioTransport, WebSocketTransport, codexAppServer, codexProviderMetadata, createCodexAppServer, createCodexProvider, mapSystemPrompt, withProviderMetadata };
+export { AppServerClient, ApprovalsDispatcher, CODEX_PROVIDER_ID, CodexEventMapper, CodexLanguageModel, CodexNotImplementedError, CodexProviderError, CodexWorker, CodexWorkerPool, DynamicToolsDispatcher, JsonRpcError, LocalFileWriter, PACKAGE_NAME, PACKAGE_VERSION, PersistentTransport, PromptFileResolver, StdioTransport, WebSocketTransport, codexAppServer, codexCallOptions, codexProviderMetadata, createCodexAppServer, createCodexProvider, mapSystemPrompt, withProviderMetadata };
 //# sourceMappingURL=index.js.map
 //# sourceMappingURL=index.js.map