@opencode-ai/ai 0.0.0-next-17028 → 0.0.0-next-17030

package/dist/protocols/openai-chat.js

@@ -272,12 +272,13 @@ const lowerAssistantMessage = Effect.fn("OpenAIChat.lowerAssistantMessage")(func
         return text;
     })();
     const cached = message.content.findLast((part) => "cache" in part && part.cache !== undefined);
+    const cacheControl = options.cacheControl?.(cached && "cache" in cached ? cached.cache : undefined);
     const result = {
         role: "assistant",
-        content: content.length === 0 ? null : ProviderShared.joinText(content),
-        tool_calls: toolCalls.length === 0 ? undefined : toolCalls,
-        reasoning_details: details,
-        cache_control: options.cacheControl?.(cached && "cache" in cached ? cached.cache : undefined),
+        content: content.length > 0 ? content.map((part) => part.text).join("") : toolCalls.length > 0 ? null : "",
+        ...(toolCalls.length > 0 ? { tool_calls: toolCalls } : {}),
+        ...(details !== undefined ? { reasoning_details: details } : {}),
+        ...(cacheControl !== undefined ? { cache_control: cacheControl } : {}),
     };
     if (field === undefined || reasoningText === undefined)
         return result;
@@ -574,14 +575,14 @@ const step = (state, event) => Effect.gen(function* () {
             return yield* ProviderShared.eventError(ADAPTER, "OpenAI Chat received content after the finish reason");
         return [{ ...state, usage }, events];
     }
-    const reasoningField = state.reasoningField ?? (!state.lifecycle.text.has("text-0") ? reasoning?.field : undefined);
+    const reasoningField = state.reasoningField ?? reasoning?.field;
     const detailDelta = Array.isArray(delta?.reasoning_details) ? delta.reasoning_details : undefined;
     if (detailDelta !== undefined)
         appendReasoningDetails(state.reasoningDetails, detailDelta);
     const reasoningDetailsObserved = state.reasoningDetailsObserved || detailDelta !== undefined;
     const deltaMetadata = reasoningMetadata(reasoningField);
     const text = detailDelta?.length ? (detailText(detailDelta) ?? reasoning?.text) : reasoning?.text;
-    if (!state.lifecycle.text.has("text-0") && text !== undefined)
+    if (text !== undefined)
         lifecycle = Lifecycle.reasoningDelta(lifecycle, events, "reasoning-0", text, deltaMetadata);
     else if (reasoningDetailsObserved &&
         !lifecycle.reasoning.has("reasoning-0") &&
@@ -652,22 +653,24 @@ const step = (state, event) => Effect.gen(function* () {
 });
 const finishEvents = (state) => {
     const events = [];
-    const hasToolCalls = state.toolCallEvents.length > 0;
+    const toolCallEvents = state.finishReason === undefined && Object.keys(state.tools).length > 0
+        ? Effect.runSync(ToolStream.finishAll(ADAPTER, state.tools)).events
+        : state.toolCallEvents;
+    const hasToolCalls = toolCallEvents.length > 0;
     const reason = state.finishReason
         ? {
             ...state.finishReason,
             normalized: state.finishReason.normalized === "stop" && hasToolCalls ? "tool-calls" : state.finishReason.normalized,
         }
-        : undefined;
+        : { normalized: hasToolCalls ? "tool-calls" : "unknown" };
     const metadata = reasoningMetadata(state.reasoningField, state.reasoningDetailsObserved ? state.reasoningDetails : undefined);
     const started = state.reasoningDetailsObserved && !state.reasoningEmitted
         ? Lifecycle.reasoningStart(state.lifecycle, events, "reasoning-0", reasoningMetadata(state.reasoningField))
         : state.lifecycle;
     const ended = Lifecycle.reasoningEnd(started, events, "reasoning-0", metadata);
-    const lifecycle = state.toolCallEvents.length ? Lifecycle.stepStart(ended, events) : ended;
-    events.push(...state.toolCallEvents);
-    if (reason)
-        Lifecycle.finish(lifecycle, events, { reason, usage: state.usage });
+    const lifecycle = toolCallEvents.length ? Lifecycle.stepStart(ended, events) : ended;
+    events.push(...toolCallEvents);
+    Lifecycle.finish(lifecycle, events, { reason, usage: state.usage });
     return events;
 };
 // =============================================================================

package/package.json

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