[artickc]

Summary

Kiro's model catalog is per-account / per-tier — free vs Pro vs Pro+ vs Power expose different models, and AWS IAM Identity Center (enterprise) orgs further restrict it to an admin-curated "approved models" list. But the provider models route returned only the static registry catalog for Kiro (source: "local_catalog"), so the list could never reflect what a given account actually has access to (and couldn't pick up newly released Kiro models without a registry update).

This adds live model discovery for Kiro using the same ListAvailableModels operation the Kiro IDE/CLI uses to populate its model picker.

How

GET https://q.{region}.amazonaws.com/ListAvailableModels?origin=AI_EDITOR with Authorization: Bearer <accessToken>, returning { models: [{ modelId, modelName?, tokenLimits? }] }.

Designed to work for both account types:

• Simple (Builder ID / social): origin=AI_EDITOR alone, on q.us-east-1.
• IAM Identity Center: region-matched endpoint (IdC tokens are region-bound, e.g. eu-central-1) with a us-east-1 fallback.
• profileArn is only sent as a retry for desktop-style accounts that have one — it's omitted by default because sending it for Builder ID can return 403.

Token handling:

• Uses the stored OAuth access token (kept fresh and persisted by the chat executor's refreshCredentials). It deliberately does not refresh here, to avoid rotating/invalidating the stored refresh token.
• Falls back to the static registry catalog when the token is missing/expired or the upstream is unavailable, so model import never breaks.

Changes

• open-sse/services/kiroModels.ts (new): parseKiroModels, resolveKiroRegion, buildKiroModelsEndpoints, fetchKiroAvailableModels.
• src/app/api/providers/[id]/models/route.ts: a provider === "kiro" discovery branch mirroring the existing GitHub Copilot / Antigravity branches (cache → auto-fetch gate → live discovery → static fallback).
• tests/unit/kiro-available-models.test.ts (new): parsing, region routing, Builder ID vs IdC endpoint selection, profileArn retry, and both fallback paths.

Testing

node --import tsx --import ./open-sse/utils/setupPolyfill.ts --test tests/unit/kiro-available-models.test.ts
# 8 pass, 0 fail

[gemini-code-assist]

Code Review

This pull request implements live model discovery for the Kiro (AWS CodeWhisperer / Amazon Q) provider by querying the ListAvailableModels API, with a fallback to the static catalog when unauthenticated or offline. It adds the kiroModels.ts service, integrates it into the provider models API route, and includes comprehensive unit tests. The feedback recommends enhancing the AWS region resolution regex to support non-standard AWS partitions (such as aws-cn and aws-us-gov) and adding corresponding test coverage for these partitions.

Important

The consumer version of Gemini Code Assist on GitHub is being sunset. Starting June 18, 2026, new organization installations will be blocked, and all code review activity will officially cease on July 17, 2026.
For more details on the timeline and next steps, please review the Help Documentation.

[gemini-code-assist]

The regular expression strictly expects the standard aws partition (arn:aws:codewhisperer:). If a user is using Amazon Q / CodeWhisperer in other AWS partitions (such as aws-cn in China or aws-us-gov in GovCloud), the partition name will differ (e.g., arn:aws-cn:codewhisperer:), causing the region extraction to fail and fall back to us-east-1. Updating the regex to support other partitions makes the region resolution more robust.

Suggested change

	const fromArn = profileArn
	? profileArn.toLowerCase().match(/^arn:aws:codewhisperer:([a-z0-9-]+):/)?.[1]
	: undefined;
	const fromArn = profileArn
	? profileArn.toLowerCase().match(/^arn:aws[a-z0-9-]*:codewhisperer:([a-z0-9-]+):/)?.[1]
	: undefined;

[gemini-code-assist]

Add a test case to verify that region resolution works correctly for non-standard AWS partitions (such as aws-cn).

  assert.equal(
    resolveKiroRegion({ profileArn: "arn:aws:codewhisperer:eu-central-1:123:profile/X" }),
    "eu-central-1"
  );
  assert.equal(
    resolveKiroRegion({ profileArn: "arn:aws-cn:codewhisperer:cn-north-1:123:profile/X" }),
    "cn-north-1"
  );

[diegosouzapw]

Merged into release/v3.8.25 🎉 — thanks @artickc! Live per-account discovery via CodeWhisperer ListAvailableModels (region-matched, profileArn-only-on-retry, with a safe static-catalog fallback) is exactly the right shape for Kiro's per-tier entitlements. Validated: 8/8 + typecheck clean. Ships in v3.8.25. 🙌