Merge remote-tracking branch 'origin/dev' into feat/core-command-registry

packages/core/package.json

@@ -55,7 +55,7 @@
   },
   "dependencies": {
     "@ai-sdk/alibaba": "1.0.17",
-    "@ai-sdk/amazon-bedrock": "4.0.107",
+    "@ai-sdk/amazon-bedrock": "4.0.112",
     "@ai-sdk/anthropic": "3.0.71",
     "@ai-sdk/azure": "3.0.49",
     "@ai-sdk/cerebras": "2.0.41",
@@ -74,7 +74,7 @@
     "@ai-sdk/togetherai": "2.0.41",
     "@ai-sdk/vercel": "2.0.39",
     "@ai-sdk/xai": "3.0.82",
-    "@aws-sdk/credential-providers": "3.993.0",
+    "@aws-sdk/credential-providers": "3.1057.0",
     "@effect/opentelemetry": "catalog:",
     "@effect/platform-node": "catalog:",
     "@effect/sql-sqlite-bun": "catalog:",

packages/core/src/aisdk.ts

@@ -82,7 +82,11 @@ function prepareOptions(model: ModelV2.Info, pkg: string) {
     if (abortSignals.length === 1) opts.signal = abortSignals[0]
     if (abortSignals.length > 1) opts.signal = AbortSignal.any(abortSignals)
 
-    if ((pkg === "@ai-sdk/openai" || pkg === "@ai-sdk/azure") && opts.body && opts.method === "POST") {
+    if (
+      (pkg === "@ai-sdk/openai" || pkg === "@ai-sdk/azure" || pkg === "@ai-sdk/amazon-bedrock/mantle") &&
+      opts.body &&
+      opts.method === "POST"
+    ) {
       const body = JSON.parse(opts.body as string)
       if (body.store !== true && Array.isArray(body.input)) {
         for (const item of body.input) {

packages/core/src/plugin/provider/amazon-bedrock.ts

@@ -1,7 +1,14 @@
 import { Effect } from "effect"
+import type { LanguageModelV3 } from "@ai-sdk/provider"
 import { PluginV2 } from "../../plugin"
 import { ProviderV2 } from "../../provider"
 
+type MantleSDK = {
+  languageModel: (modelID: string) => LanguageModelV3
+  chat: (modelID: string) => LanguageModelV3
+  responses: (modelID: string) => LanguageModelV3
+}
+
 // Bedrock cross-region inference profiles require regional prefixes only for
 // specific model/region combinations. Keep the mapping narrow and avoid
 // double-prefixing model IDs that models.dev already marks as global/us/eu/etc.
@@ -46,6 +53,12 @@ function resolveModelID(modelID: string, region: string | undefined) {
     : modelID
 }
 
+function selectMantleModel(sdk: MantleSDK, modelID: string) {
+  if (modelID === "openai.gpt-oss-safeguard-20b" || modelID === "openai.gpt-oss-safeguard-120b")
+    return sdk.chat(modelID)
+  return sdk.responses(modelID)
+}
+
 export const AmazonBedrockPlugin = PluginV2.define({
   id: PluginV2.ID.make("amazon-bedrock"),
   effect: Effect.gen(function* () {
@@ -65,7 +78,7 @@ export const AmazonBedrockPlugin = PluginV2.define({
         }
       }),
       "aisdk.sdk": Effect.fn(function* (evt) {
-        if (evt.package !== "@ai-sdk/amazon-bedrock") return
+        if (!["@ai-sdk/amazon-bedrock", "@ai-sdk/amazon-bedrock/mantle"].includes(evt.package)) return
         const options = { ...evt.options }
         const profile = typeof options.profile === "string" ? options.profile : process.env.AWS_PROFILE
         const region = typeof options.region === "string" ? options.region : (process.env.AWS_REGION ?? "us-east-1")
@@ -86,11 +99,21 @@ export const AmazonBedrockPlugin = PluginV2.define({
           options.credentialProvider = fromNodeProviderChain(profile ? { profile } : {})
         }
 
+        if (evt.package === "@ai-sdk/amazon-bedrock/mantle") {
+          const mod = yield* Effect.promise(() => import("@ai-sdk/amazon-bedrock/mantle"))
+          evt.sdk = mod.createBedrockMantle(options)
+          return
+        }
+
         const mod = yield* Effect.promise(() => import("@ai-sdk/amazon-bedrock"))
         evt.sdk = mod.createAmazonBedrock(options)
       }),
       "aisdk.language": Effect.fn(function* (evt) {
         if (evt.model.providerID !== ProviderV2.ID.amazonBedrock) return
+        if (evt.model.api.type === "aisdk" && evt.model.api.package === "@ai-sdk/amazon-bedrock/mantle") {
+          evt.language = selectMantleModel(evt.sdk, evt.model.api.id)
+          return
+        }
         const region = typeof evt.options.region === "string" ? evt.options.region : process.env.AWS_REGION
         evt.language = evt.sdk.languageModel(resolveModelID(evt.model.api.id, region))
       }),

packages/core/test/plugin/provider-amazon-bedrock.test.ts

@@ -18,6 +18,13 @@ function bedrockFetch(sdk: unknown, modelID = "anthropic.claude-sonnet-4-5") {
   ).config.fetch
 }
 
+function openAIUrl(language: unknown, path: string, modelId: string) {
+  return (language as { config: { url: (input: { path: string; modelId: string }) => string } }).config.url({
+    path,
+    modelId,
+  })
+}
+
 describe("AmazonBedrockPlugin", () => {
   it.effect("moves endpoint option to api URL", () =>
     Effect.gen(function* () {
@@ -242,6 +249,85 @@ describe("AmazonBedrockPlugin", () => {
     ),
   )
 
+  it.effect("creates Mantle SDK with GPT-5 OpenAI base path", () =>
+    withEnv({ AWS_BEARER_TOKEN_BEDROCK: undefined, AWS_PROFILE: undefined, AWS_ACCESS_KEY_ID: undefined }, () =>
+      Effect.gen(function* () {
+        const plugin = yield* PluginV2.Service
+        yield* plugin.add(AmazonBedrockPlugin)
+        const result = yield* plugin.trigger(
+          "aisdk.sdk",
+          {
+            model: model("amazon-bedrock", "openai.gpt-5.5", {
+              api: { type: "aisdk", package: "@ai-sdk/amazon-bedrock/mantle" },
+            }),
+            package: "@ai-sdk/amazon-bedrock/mantle",
+            options: {
+              name: "amazon-bedrock",
+              bearerToken: "token",
+              baseURL: "https://bedrock-mantle.us-east-2.api.aws/openai/v1",
+              region: "us-east-2",
+            },
+          },
+          {},
+        )
+        const language = result.sdk.responses("openai.gpt-5.5")
+        expect(openAIUrl(language, "/responses", "openai.gpt-5.5")).toBe(
+          "https://bedrock-mantle.us-east-2.api.aws/openai/v1/responses",
+        )
+      }),
+    ),
+  )
+
+  it.effect("selects Mantle APIs without Bedrock cross-region prefixes", () =>
+    Effect.gen(function* () {
+      const plugin = yield* PluginV2.Service
+      const calls: string[] = []
+      yield* plugin.add(AmazonBedrockPlugin)
+      yield* plugin.trigger(
+        "aisdk.language",
+        {
+          model: model("amazon-bedrock", "openai.gpt-5.5", {
+            api: { type: "aisdk", package: "@ai-sdk/amazon-bedrock/mantle" },
+          }),
+          sdk: fakeSelectorSdk(calls),
+          options: { baseURL: "https://bedrock-mantle.us-east-2.api.aws/openai/v1", region: "us-east-2" },
+        },
+        {},
+      )
+      yield* plugin.trigger(
+        "aisdk.language",
+        {
+          model: model("amazon-bedrock", "openai.gpt-oss-safeguard-120b", {
+            api: { type: "aisdk", package: "@ai-sdk/amazon-bedrock/mantle" },
+          }),
+          sdk: fakeSelectorSdk(calls),
+          options: { region: "us-east-1" },
+        },
+        {},
+      )
+      expect(calls).toEqual(["responses:openai.gpt-5.5", "chat:openai.gpt-oss-safeguard-120b"])
+    }),
+  )
+
+  it.effect("ignores other Bedrock provider subpaths", () =>
+    Effect.gen(function* () {
+      const plugin = yield* PluginV2.Service
+      yield* plugin.add(AmazonBedrockPlugin)
+      const result = yield* plugin.trigger(
+        "aisdk.sdk",
+        {
+          model: model("amazon-bedrock", "anthropic.claude-sonnet-4-5", {
+            api: { type: "aisdk", package: "@ai-sdk/amazon-bedrock/anthropic" },
+          }),
+          package: "@ai-sdk/amazon-bedrock/anthropic",
+          options: { name: "amazon-bedrock" },
+        },
+        {},
+      )
+      expect(result.sdk).toBeUndefined()
+    }),
+  )
+
   it.effect("uses SigV4 credential env when bearer token is absent", () =>
     withEnv(
       {