@opencode/ai 0.0.0-dev-20332 → 0.0.0-dev-20334

package/dist/providers/cloudflare-ai-gateway.js

@@ -7,13 +7,20 @@ export const authEnvVars = ["CLOUDFLARE_API_TOKEN", "CF_AIG_TOKEN"];
 export const baseURL = (input) => {
     if (input.baseURL)
         return input.baseURL;
-    if (!input.accountId)
-        throw new ProviderConfigurationError({
-            provider: id,
-            message: "CloudflareAIGateway.configure requires accountId unless baseURL is supplied",
-        });
-    return `https://api.cloudflare.com/client/v4/accounts/${encodeURIComponent(input.accountId)}/ai/v1`;
+    return `https://api.cloudflare.com/client/v4/accounts/${encodeURIComponent(requireAccountId(input))}/ai/v1`;
 };
+// Cloudflare's REST API rejects parts of the Anthropic Messages and OpenAI Responses request shapes, such as
+// system prompt blocks and `minimal` reasoning effort, so these models use the provider-native gateway endpoints.
+const passthroughURL = (input, provider) => `https://gateway.ai.cloudflare.com/v1/${encodeURIComponent(requireAccountId(input))}/${encodeURIComponent(gatewayId(input))}/${provider}`;
+const requireAccountId = (input) => {
+    if (input.accountId)
+        return input.accountId;
+    throw new ProviderConfigurationError({
+        provider: id,
+        message: "CloudflareAIGateway.configure requires accountId unless baseURL is supplied",
+    });
+};
+const gatewayId = (input) => input.gatewayId?.trim() || "default";
 export const responsesRoute = OpenAIResponses.route.with({
     id: "cloudflare-ai-gateway-responses",
     provider: id,
@@ -30,16 +37,10 @@ export const route = OpenAIChat.route.with({
     endpoint: { baseURL: undefined },
 });
 export const routes = [responsesRoute, messagesRoute, route];
-const auth = (input) => {
-    if ("auth" in input && input.auth)
-        return input.auth;
-    return Auth.optional(input.gatewayApiKey ?? ("apiKey" in input ? input.apiKey : undefined), "apiKey")
-        .orElse(Auth.config(authEnvVars[0]))
-        .orElse(Auth.config(authEnvVars[1]))
-        .bearer();
-};
+const credential = (input) => Auth.optional(input.gatewayApiKey ?? ("apiKey" in input ? input.apiKey : undefined), "apiKey")
+    .orElse(Auth.config(authEnvVars[0]))
+    .orElse(Auth.config(authEnvVars[1]));
 const headers = (input) => ({
-    ...(input.gatewayId === undefined ? {} : { "cf-aig-gateway-id": input.gatewayId.trim() || "default" }),
     ...(input.metadata === undefined
         ? {}
         : { "cf-aig-metadata": Schema.encodeSync(Schema.fromJsonString(Schema.Unknown))(input.metadata) }),
@@ -49,34 +50,41 @@ const headers = (input) => ({
     ...(input.collectLog === undefined ? {} : { "cf-aig-collect-log": String(input.collectLog) }),
     ...input.headers,
 });
-const modelID = (input) => {
-    const value = String(input);
-    if (value.startsWith("workers-ai/"))
-        return value.slice("workers-ai/".length);
-    if (value.startsWith("anthropic/"))
-        return `anthropic/${value.slice("anthropic/".length).replaceAll(".", "-")}`;
-    return value;
-};
 export const configure = (input) => {
-    const defaults = {
+    const custom = "auth" in input && input.auth ? input.auth : undefined;
+    const rest = {
         endpoint: { baseURL: baseURL(input) },
-        auth: auth(input),
-        headers: headers(input),
+        auth: custom ?? credential(input).bearer(),
+        headers: { "cf-aig-gateway-id": gatewayId(input), ...headers(input) },
         http: input.http,
         providerOptions: input.providerOptions,
     };
-    const responses = responsesRoute.with(defaults);
-    const messages = messagesRoute.with(defaults);
-    const chat = route.with(defaults);
+    // A custom baseURL stands in for the REST API, so every model keeps using it with gateway model IDs.
+    const native = input.baseURL === undefined;
+    const passthrough = (provider) => native
+        ? {
+            ...rest,
+            endpoint: { baseURL: passthroughURL(input, provider) },
+            auth: custom ?? Auth.bearerHeader("cf-aig-authorization", credential(input)),
+            headers: headers(input),
+        }
+        : rest;
+    const responses = responsesRoute.with(passthrough("openai"));
+    const messages = messagesRoute.with(passthrough("anthropic/v1"));
+    const chat = route.with(rest);
     return {
         id,
         model: (input) => {
-            const wire = modelID(input);
-            if (String(input).startsWith("openai/"))
-                return responses.model({ id: wire });
-            if (String(input).startsWith("anthropic/"))
-                return messages.model({ id: wire });
-            return chat.model({ id: wire });
+            const value = String(input);
+            if (value.startsWith("openai/"))
+                return responses.model({ id: native ? value.slice("openai/".length) : value });
+            if (value.startsWith("anthropic/"))
+                return messages.model({
+                    id: native ? value.slice("anthropic/".length).replaceAll(".", "-") : value,
+                });
+            if (value.startsWith("workers-ai/"))
+                return chat.model({ id: value.slice("workers-ai/".length) });
+            return chat.model({ id: value });
         },
         configure,
     };

package/package.json

@@ -1,6 +1,6 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
-  "version": "0.0.0-dev-20332",
+  "version": "0.0.0-dev-20334",
   "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-20332",
+    "@opencode/http-recorder": "0.0.0-dev-20334",
     "@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-20332",
+    "@opencode/schema": "0.0.0-dev-20334",
     "aws4fetch": "1.0.20",
     "effect": "4.0.0-rc.112",
     "google-auth-library": "10.5.0"