@opencode-ai/ai 0.0.0-next-15840 → 0.0.0-next-15845

package/dist/protocols/openai-chat.d.ts

@@ -165,8 +165,14 @@ export declare const OpenAIChatEvent: Schema.Struct<{
     }>>>;
 }>;
 export type OpenAIChatEvent = Schema.Schema.Type<typeof OpenAIChatEvent>;
+interface PendingToolDelta {
+    readonly id?: string;
+    readonly name?: string;
+    readonly input: string;
+}
 export interface ParserState {
     readonly tools: ToolStream.State<number>;
+    readonly pendingTools: Partial<Record<number, PendingToolDelta>>;
     readonly toolCallEvents: ReadonlyArray<LLMEvent>;
     readonly usage?: Usage;
     readonly finishReason?: FinishReason;

package/dist/protocols/openai-chat.js

@@ -368,6 +368,7 @@ const step = (state, event) => Effect.gen(function* () {
     const delta = choice?.delta;
     const toolDeltas = delta?.tool_calls ?? [];
     let tools = state.tools;
+    let pendingTools = state.pendingTools;
     let lifecycle = state.lifecycle;
     const reasoning = reasoningDelta(delta);
     const reasoningField = state.reasoningField ?? reasoning?.field;
@@ -382,7 +383,20 @@ const step = (state, event) => Effect.gen(function* () {
     if (toolDeltas.length)
         lifecycle = Lifecycle.reasoningEnd(lifecycle, events, "reasoning-0");
     for (const tool of toolDeltas) {
-        const result = ToolStream.appendOrStart(ADAPTER, tools, tool.index, { id: tool.id ?? undefined, name: tool.function?.name ?? undefined, text: tool.function?.arguments ?? "" }, "OpenAI Chat tool call delta is missing id or name");
+        const current = tools[tool.index];
+        const pending = pendingTools[tool.index];
+        const id = current?.id ?? pending?.id ?? (tool.id || undefined);
+        const name = current?.name ?? pending?.name ?? (tool.function?.name || undefined);
+        const text = `${pending?.input ?? ""}${tool.function?.arguments ?? ""}`;
+        if (!current && (!id || !name)) {
+            pendingTools = { ...pendingTools, [tool.index]: { id: id || undefined, name: name || undefined, input: text } };
+            continue;
+        }
+        if (pending) {
+            pendingTools = { ...pendingTools };
+            delete pendingTools[tool.index];
+        }
+        const result = ToolStream.appendOrStart(ADAPTER, tools, tool.index, { id: id || undefined, name: name || undefined, text }, "OpenAI Chat tool call delta is missing id or name");
         if (ToolStream.isError(result))
             return yield* result;
         tools = result.tools;
@@ -390,6 +404,8 @@ const step = (state, event) => Effect.gen(function* () {
             lifecycle = Lifecycle.stepStart(lifecycle, events);
         events.push(...result.events);
     }
+    if (finishReason !== undefined && state.finishReason === undefined && Object.keys(pendingTools).length > 0)
+        return yield* ProviderShared.eventError(ADAPTER, "OpenAI Chat tool call delta is missing id or name");
     // Finalize accumulated tool inputs eagerly when finish_reason arrives so
     // valid calls and malformed local calls settle independently.
     const finished = finishReason !== undefined && state.finishReason === undefined && Object.keys(tools).length > 0
@@ -398,6 +414,7 @@ const step = (state, event) => Effect.gen(function* () {
     return [
         {
             tools: finished?.tools ?? tools,
+            pendingTools,
             toolCallEvents: finished?.events ?? state.toolCallEvents,
             usage,
             finishReason,
@@ -436,6 +453,7 @@ export const protocol = Protocol.make({
         event: Protocol.jsonEvent(OpenAIChatEvent),
         initial: () => ({
             tools: ToolStream.empty(),
+            pendingTools: {},
             toolCallEvents: [],
             lifecycle: Lifecycle.initial(),
             reasoningField: undefined,

package/dist/protocols/utils/tool-stream.js

@@ -69,8 +69,8 @@ export const start = (tools, key, tool) => withTool(tools, key, { ...tool, input
  */
 export const appendOrStart = (route, tools, key, delta, missingToolMessage) => {
     const current = tools[key];
-    const id = delta.id ?? current?.id;
-    const name = delta.name ?? current?.name;
+    const id = current?.id ?? delta.id;
+    const name = current?.name ?? delta.name;
     if (!id || !name)
         return eventError(route, missingToolMessage);
     const tool = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
-  "version": "0.0.0-next-15840",
+  "version": "0.0.0-next-15845",
   "name": "@opencode-ai/ai",
   "type": "module",
   "license": "MIT",
@@ -26,7 +26,7 @@
   "devDependencies": {
     "@clack/prompts": "1.0.0-alpha.1",
     "@effect/platform-node": "4.0.0-beta.98",
-    "@opencode-ai/http-recorder": "0.0.0-next-15840",
+    "@opencode-ai/http-recorder": "0.0.0-next-15845",
     "@tsconfig/bun": "1.0.9",
     "@types/bun": "1.3.13",
     "@typescript/native-preview": "7.0.0-dev.20251207.1",
@@ -35,7 +35,7 @@
   "dependencies": {
     "@smithy/eventstream-codec": "4.2.14",
     "@smithy/util-utf8": "4.2.2",
-    "@opencode-ai/schema": "0.0.0-next-15840",
+    "@opencode-ai/schema": "0.0.0-next-15845",
     "aws4fetch": "1.0.20",
     "effect": "4.0.0-beta.98",
     "google-auth-library": "10.5.0"