@opencode/ai 0.0.0-dev-20549 → 0.0.0-dev-20553

package/dist/protocols/anthropic-messages.js

@@ -675,9 +675,6 @@ const requireThinkingSignature = (request) => {
         return false;
     return true;
 };
-// Mid-conversation system messages became available with Opus 4.8 and version
-// 5 of the other supported Claude families. Treat later family versions as
-// compatible without assuming that every Anthropic Messages model is Claude.
 // Opus 4.8 and every Claude 5 model accept mid-conversation system messages; later versions inherit support.
 const supportsNativeSystemUpdates = (request) => {
     const version = claudeVersion(String(request.model.id));
@@ -687,23 +684,8 @@ const supportsNativeSystemUpdates = (request) => {
         return version.minor >= 8;
     return version.major >= 5;
 };
-const endsInServerToolUse = (message) => {
-    const last = message.content.at(-1);
-    return message.role === "assistant" && last?.type === "tool-call" && last.providerExecuted === true;
-};
-const canUseNativeSystemUpdate = (request, index) => {
-    const previous = request.messages[index - 1];
-    const next = request.messages[index + 1];
-    // Vertex currently rejects/404s for a system message after local tool results,
-    // so fold it into the user tool-result turn across continuations and history.
-    if (request.model.route.id === "google-vertex-messages" && previous?.role === "tool")
-        return false;
-    return (previous !== undefined &&
-        previous.role !== "system" &&
-        (previous.role === "user" || previous.role === "tool" || endsInServerToolUse(previous)) &&
-        next?.role !== "system" &&
-        (next === undefined || next.role === "assistant"));
-};
+// Native system messages must follow a user turn (tool results count) or a paused server-tool turn.
+const acceptsNativeSystemAfter = (message) => message?.role === "user" || (message?.role === "assistant" && message.content.at(-1)?.type === "server_tool_use");
 const splitsLocalToolResults = (messages, index) => {
     const pending = new Set();
     for (const message of messages.slice(0, index)) {
@@ -727,9 +709,33 @@ const lowerNativeSystemUpdate = Effect.fnUntraced(function* (message, breakpoint
         })),
     };
 });
+const lowerWrappedSystemUpdate = Effect.fnUntraced(function* (message, breakpoints) {
+    const part = yield* ProviderShared.wrappedSystemUpdate("Anthropic Messages", message);
+    return { type: "text", text: part.text, cache_control: cacheControl(breakpoints, part.cache) };
+});
+const appendToUserTurn = (messages, block) => {
+    const last = messages.at(-1);
+    if (last?.role === "user")
+        messages[messages.length - 1] = { role: "user", content: [...last.content, block] };
+    else
+        messages.push({ role: "user", content: [block] });
+};
 const lowerMessages = Effect.fnUntraced(function* (request, breakpoints) {
     const messages = [];
     const providerMetadataKey = request.model.route.providerMetadataKey ?? String(request.model.provider);
+    // Text updates stay where they are unless a user turn follows them; then they move after the latest
+    // user turn, the nearest spot where Anthropic accepts a native system message.
+    const holdUpdates = supportsNativeSystemUpdates(request);
+    const held = [];
+    const releaseHeld = Effect.fnUntraced(function* () {
+        const native = acceptsNativeSystemAfter(messages.findLast((message) => message.role !== "system"));
+        for (const update of held.splice(0)) {
+            if (native)
+                messages.push(yield* lowerNativeSystemUpdate(update, breakpoints));
+            else
+                appendToUserTurn(messages, yield* lowerWrappedSystemUpdate(update, breakpoints));
+        }
+    });
     for (const [index, message] of request.messages.entries()) {
         if (message.role === "system") {
             const update = effortUpdate(message);
@@ -740,17 +746,10 @@ const lowerMessages = Effect.fnUntraced(function* (request, breakpoints) {
             }
             if (splitsLocalToolResults(request.messages, index))
                 return yield* invalid("Anthropic Messages system updates cannot split a local tool call from its tool result");
-            if (supportsNativeSystemUpdates(request) && canUseNativeSystemUpdate(request, index)) {
-                messages.push(yield* lowerNativeSystemUpdate(message, breakpoints));
-                continue;
-            }
-            const part = yield* ProviderShared.wrappedSystemUpdate("Anthropic Messages", message);
-            const block = { type: "text", text: part.text, cache_control: cacheControl(breakpoints, part.cache) };
-            const previous = messages.at(-1);
-            if (previous?.role === "user")
-                messages[messages.length - 1] = { role: "user", content: [...previous.content, block] };
+            if (holdUpdates)
+                held.push(message);
             else
-                messages.push({ role: "user", content: [block] });
+                appendToUserTurn(messages, yield* lowerWrappedSystemUpdate(message, breakpoints));
             continue;
         }
         if (message.role === "user") {
@@ -826,8 +825,10 @@ const lowerMessages = Effect.fnUntraced(function* (request, breakpoints) {
                 }
                 return yield* invalid(`Anthropic Messages assistant messages only support text, reasoning, and tool-call content for now`);
             }
-            if (content.length > 0)
-                messages.push({ role: "assistant", content });
+            if (content.length === 0)
+                continue;
+            yield* releaseHeld();
+            messages.push({ role: "assistant", content });
             continue;
         }
         const content = [];
@@ -848,6 +849,7 @@ const lowerMessages = Effect.fnUntraced(function* (request, breakpoints) {
         else
             messages.push({ role: "user", content });
     }
+    yield* releaseHeld();
     return messages;
 });
 // TODO: Move per-model capability heuristics (`supportsEffortUpdates`, `supportsNativeSystemUpdates`,

package/package.json

@@ -1,6 +1,6 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
-  "version": "0.0.0-dev-20549",
+  "version": "0.0.0-dev-20553",
   "name": "@opencode/ai",
   "type": "module",
   "license": "MIT",
@@ -34,7 +34,7 @@
   "devDependencies": {
     "@clack/prompts": "1.0.0-alpha.1",
     "@effect/platform-node": "4.0.0-rc.112",
-    "@opencode/http-recorder": "0.0.0-dev-20549",
+    "@opencode/http-recorder": "0.0.0-dev-20553",
     "@tsconfig/bun": "1.0.9",
     "@types/bun": "1.4.0",
     "@typescript/native-preview": "7.0.0-dev.20251207.1",
@@ -44,7 +44,7 @@
     "@aws-sdk/credential-providers": "3.1057.0",
     "@smithy/eventstream-codec": "4.2.14",
     "@smithy/util-utf8": "4.2.2",
-    "@opencode/schema": "0.0.0-dev-20549",
+    "@opencode/schema": "0.0.0-dev-20553",
     "aws4fetch": "1.0.20",
     "effect": "4.0.0-rc.112",
     "google-auth-library": "10.5.0"