feat(opencode): add multi-region support

NachoFLizaur · NachoFLizaur · commit ab2b89516e14 · 2026-04-10T19:30:08.000+02:00
diff --git a/packages/opencode/src/plugin/kiro.ts b/packages/opencode/src/plugin/kiro.ts
@@ -4,7 +4,7 @@ import { setTimeout as sleep } from "node:timers/promises"
 import path from "path"
 import os from "os"
 
-const OIDC_ENDPOINT = "https://oidc.us-east-1.amazonaws.com"
+const oidc = (region: string) => `https://oidc.${region}.amazonaws.com`
 const BUILDER_ID_URL = "https://view.awsapps.com/start"
 const SCOPES = [
   "codewhisperer:completions",
@@ -86,16 +86,27 @@ export async function KiroAuthPlugin(_input: PluginInput): Promise<Hooks> {
             {
               type: "text" as const,
               key: "startUrl",
-              message: "Enter your SSO start URL",
+              message: "Enter your SSO start URL (defaults to $AWS_SSO_START_URL if set)",
               placeholder: "https://d-xxxxxxxxxx.awsapps.com/start",
               when: { key: "authType", op: "eq" as const, value: "idc" },
             },
+            {
+              type: "text" as const,
+              key: "region",
+              message: "Enter your AWS SSO region (defaults to $AWS_SSO_REGION if set)",
+              placeholder: "us-east-1",
+              when: { key: "authType", op: "eq" as const, value: "idc" },
+            },
           ],
           async authorize(inputs = {} as Record<string, string>) {
             const url =
-              inputs.authType === "idc" ? inputs.startUrl : BUILDER_ID_URL
+              inputs.authType === "idc" ? (inputs.startUrl || process.env.AWS_SSO_START_URL) : BUILDER_ID_URL
+            const region =
+              inputs.authType === "idc"
+                ? (inputs.region || process.env.AWS_SSO_REGION || "us-east-1")
+                : "us-east-1"
 
-            const registration = await fetch(`${OIDC_ENDPOINT}/client/register`, {
+            const registration = await fetch(`${oidc(region)}/client/register`, {
               method: "POST",
               headers: {
                 "Content-Type": "application/json",
@@ -121,7 +132,7 @@ export async function KiroAuthPlugin(_input: PluginInput): Promise<Hooks> {
               clientSecretExpiresAt: number
             }
 
-            const device = await fetch(`${OIDC_ENDPOINT}/device_authorization`, {
+            const device = await fetch(`${oidc(region)}/device_authorization`, {
               method: "POST",
               headers: {
                 "Content-Type": "application/json",
@@ -155,7 +166,7 @@ export async function KiroAuthPlugin(_input: PluginInput): Promise<Hooks> {
                 const delay = { ms: auth.interval }
 
                 while (true) {
-                  const response = await fetch(`${OIDC_ENDPOINT}/token`, {
+                  const response = await fetch(`${oidc(region)}/token`, {
                     method: "POST",
                     headers: {
                       "Content-Type": "application/json",
@@ -185,7 +196,7 @@ export async function KiroAuthPlugin(_input: PluginInput): Promise<Hooks> {
                       accessToken: tokens.accessToken,
                       refreshToken: tokens.refreshToken,
                       expiresAt: expires.toISOString(),
-                      region: "us-east-1",
+                      region,
                       clientId: client.clientId,
                       clientSecret: client.clientSecret,
                     })
diff --git a/packages/opencode/src/provider/provider.ts b/packages/opencode/src/provider/provider.ts
@@ -52,7 +52,7 @@ import {
   isWorkflowModel,
   discoverWorkflowModels,
 } from "gitlab-ai-provider"
-import { hasToken } from "./sdk/kiro/kiro-auth"
+import { hasToken, getApiRegion } from "./sdk/kiro/kiro-auth"
 import { fromNodeProviderChain } from "@aws-sdk/credential-providers"
 import { GoogleAuth } from "google-auth-library"
 import { ProviderTransform } from "./transform"
@@ -822,12 +822,13 @@ export namespace Provider {
         Effect.promise(async () => {
           const found = await hasToken()
           if (!found) return { autoload: false }
+          const apiRegion = await getApiRegion()
           return {
             autoload: true,
             async getModel(sdk: ReturnType<typeof createKiro>, modelID: string, options?: Record<string, any>) {
               const ctx = options?.["context"] as number | undefined
-              if (!ctx) return sdk.languageModel(modelID)
-              return createKiro({ context: ctx }).languageModel(modelID)
+              if (!ctx) return createKiro({ region: apiRegion }).languageModel(modelID)
+              return createKiro({ context: ctx, region: apiRegion }).languageModel(modelID)
             },
           }
         }),
diff --git a/packages/opencode/src/provider/sdk/kiro/index.ts b/packages/opencode/src/provider/sdk/kiro/index.ts
@@ -1,3 +1,4 @@
 export { createKiro } from "./kiro-provider"
 export type { KiroProvider, KiroProviderSettings } from "./kiro-provider"
 export { getQuota } from "./kiro-quota"
+export { getApiRegion } from "./kiro-auth"
diff --git a/packages/opencode/src/provider/sdk/kiro/kiro-auth.ts b/packages/opencode/src/provider/sdk/kiro/kiro-auth.ts
@@ -114,3 +114,30 @@ export function getToken(): Promise<string | undefined> {
 export function hasToken(): Promise<boolean> {
   return Bun.file(TOKEN_PATH).exists()
 }
+
+const region: { api: string } = { api: "" }
+
+export function getApiRegion(): Promise<string> {
+  if (region.api) return Promise.resolve(region.api)
+  return getToken()
+    .then((token) => {
+      if (!token) return "us-east-1"
+      return fetch("https://q.us-east-1.amazonaws.com/ListAvailableModels?origin=AI_EDITOR", {
+        method: "GET",
+        headers: {
+          Authorization: `Bearer ${token}`,
+          "Content-Type": "application/json",
+          "User-Agent": "aws-sdk-js/1.0.27 ua/2.1 os/darwin lang/js api/codewhispererstreaming#1.0.27 m/E Kiro-opencode",
+          "x-amz-user-agent": "aws-sdk-js/1.0.27 Kiro-opencode",
+          "x-amzn-codewhisperer-optout": "true",
+        },
+      })
+        .then((r) => (r.ok ? "us-east-1" : "eu-central-1"))
+        .catch(() => "eu-central-1")
+    })
+    .catch(() => "us-east-1")
+    .then((result) => {
+      region.api = result
+      return result
+    })
+}
diff --git a/packages/opencode/src/provider/sdk/kiro/kiro-language-model.ts b/packages/opencode/src/provider/sdk/kiro/kiro-language-model.ts
@@ -12,8 +12,6 @@ import { decodeEventStream } from "./kiro-eventstream"
 import { KiroAuthError, KiroApiError } from "./kiro-error"
 import type { KiroStreamEvent, KiroToolSpec } from "./kiro-api-types"
 
-const ENDPOINT = "https://q.us-east-1.amazonaws.com"
-
 const THINKING_TOOL: KiroToolSpec = {
   toolSpecification: {
     name: "thinking",
@@ -177,6 +175,7 @@ export class KiroLanguageModel implements LanguageModelV3 {
       readonly provider: string
       readonly fetch?: typeof globalThis.fetch
       readonly context?: number
+      readonly region?: string
     },
   ) {
     this.provider = config.provider
@@ -187,8 +186,9 @@ export class KiroLanguageModel implements LanguageModelV3 {
     token: string,
     state: ReturnType<typeof translate>,
   ): Promise<Response> {
+    const endpoint = `https://q.${this.config.region ?? "us-east-1"}.amazonaws.com`
     return (this.config.fetch ?? globalThis.fetch)(
-      `${ENDPOINT}/generateAssistantResponse`,
+      `${endpoint}/generateAssistantResponse`,
       {
         method: "POST",
         headers: {
diff --git a/packages/opencode/src/provider/sdk/kiro/kiro-provider.ts b/packages/opencode/src/provider/sdk/kiro/kiro-provider.ts
@@ -4,6 +4,7 @@ import { KiroLanguageModel } from "./kiro-language-model"
 export interface KiroProviderSettings {
   readonly fetch?: typeof globalThis.fetch
   readonly context?: number
+  readonly region?: string
 }
 
 export interface KiroProvider {
@@ -17,6 +18,7 @@ export function createKiro(settings: KiroProviderSettings = {}): KiroProvider {
       provider: "kiro",
       fetch: settings.fetch,
       context: settings.context,
+      region: settings.region,
     })
 
   provider.languageModel = provider
diff --git a/packages/opencode/src/provider/sdk/kiro/kiro-quota.ts b/packages/opencode/src/provider/sdk/kiro/kiro-quota.ts
@@ -1,53 +1,53 @@
-import { getToken } from "./kiro-auth"
-
-const ENDPOINT = "https://q.us-east-1.amazonaws.com"
+import { getToken, getApiRegion } from "./kiro-auth"
 
 export function getQuota(): Promise<
   { currentUsage: number; usageLimit: number; subscriptionTitle: string } | undefined
 > {
   return getToken().then((token) => {
     if (!token) return undefined
-    return fetch(
-      `${ENDPOINT}/getUsageLimits?origin=AI_EDITOR&resourceType=AGENTIC_REQUEST`,
-      {
-        method: "GET",
-        headers: {
-          Authorization: `Bearer ${token}`,
-          "Content-Type": "application/json",
-          "User-Agent":
-            "aws-sdk-js/1.0.27 ua/2.1 os/darwin lang/js api/codewhispererstreaming#1.0.27 m/E Kiro-opencode",
-          "x-amz-user-agent": "aws-sdk-js/1.0.27 Kiro-opencode",
-          "x-amzn-codewhisperer-optout": "true",
-          "x-amzn-kiro-agent-mode": "vibe",
+    return getApiRegion().then((region) =>
+      fetch(
+        `https://q.${region}.amazonaws.com/getUsageLimits?origin=AI_EDITOR&resourceType=AGENTIC_REQUEST`,
+        {
+          method: "GET",
+          headers: {
+            Authorization: `Bearer ${token}`,
+            "Content-Type": "application/json",
+            "User-Agent":
+              "aws-sdk-js/1.0.27 ua/2.1 os/darwin lang/js api/codewhispererstreaming#1.0.27 m/E Kiro-opencode",
+            "x-amz-user-agent": "aws-sdk-js/1.0.27 Kiro-opencode",
+            "x-amzn-codewhisperer-optout": "true",
+            "x-amzn-kiro-agent-mode": "vibe",
+          },
         },
-      },
-    )
-      .then((response) => {
-        if (!response.ok) return undefined
-        return response.json() as Promise<{
-          subscriptionInfo: {
-            subscriptionTitle: string
-          }
-          usageBreakdownList: Array<{
-            currentUsage: number
-            currentUsageWithPrecision: number
-            usageLimit: number
-            usageLimitWithPrecision: number
+      )
+        .then((response) => {
+          if (!response.ok) return undefined
+          return response.json() as Promise<{
+            subscriptionInfo: {
+              subscriptionTitle: string
+            }
+            usageBreakdownList: Array<{
+              currentUsage: number
+              currentUsageWithPrecision: number
+              usageLimit: number
+              usageLimitWithPrecision: number
+            }>
           }>
-        }>
-      })
-      .then((body) => {
-        if (!body) return undefined
-        const item = body.usageBreakdownList[0]
-        if (!item) return undefined
-        return {
-          currentUsage: item.currentUsageWithPrecision ?? item.currentUsage,
-          usageLimit: item.usageLimitWithPrecision ?? item.usageLimit,
-          subscriptionTitle: body.subscriptionInfo.subscriptionTitle
-            .toLowerCase()
-            .replace(/\b\w/g, (c) => c.toUpperCase()),
-        }
-      })
-      .catch(() => undefined)
+        })
+        .then((body) => {
+          if (!body) return undefined
+          const item = body.usageBreakdownList[0]
+          if (!item) return undefined
+          return {
+            currentUsage: item.currentUsageWithPrecision ?? item.currentUsage,
+            usageLimit: item.usageLimitWithPrecision ?? item.usageLimit,
+            subscriptionTitle: body.subscriptionInfo.subscriptionTitle
+              .toLowerCase()
+              .replace(/\b\w/g, (c) => c.toUpperCase()),
+          }
+        })
+        .catch(() => undefined),
+    )
   })
 }
