ns-omp-provider-kiro 0.2.3 → 0.3.0

package/dist/index.js

@@ -245,6 +245,12 @@ function getKiroEndpoints(region) {
     runtime: `https://runtime.${region}.kiro.dev/`
   };
 }
+function getKiroRegionFromProfileArn(profileArn) {
+  if (!profileArn)
+    return void 0;
+  const region = profileArn.split(":")[3];
+  return region && /^[a-z]{2}(?:-[a-z]+)+-\d$/.test(region) ? region : void 0;
+}
 function getKiroRegionFromEndpoint(endpoint) {
   try {
     const [service, region, ...suffix] = new URL(endpoint).hostname.split(".");
@@ -267,6 +273,7 @@ var init_endpoints = __esm({
       "ap-southeast-1": "us-east-1",
       "ap-southeast-2": "us-east-1",
       "ap-northeast-1": "us-east-1",
+      "ap-northeast-2": "us-east-1",
       "ap-south-1": "us-east-1",
       "eu-west-1": "eu-central-1",
       "eu-west-2": "eu-central-1",
@@ -642,803 +649,337 @@ var init_kiro_ide = __esm({
   }
 });
 
-// ../kiro-core/dist/models.js
-var models_exports = {};
-__export(models_exports, {
-  KIRO_MANAGEMENT_CACHE_PATH: () => KIRO_MANAGEMENT_CACHE_PATH,
-  KIRO_MANAGEMENT_CACHE_SOURCE: () => KIRO_MANAGEMENT_CACHE_SOURCE,
-  KIRO_MANAGEMENT_CACHE_VERSION: () => KIRO_MANAGEMENT_CACHE_VERSION,
-  KIRO_MODEL_IDS: () => KIRO_MODEL_IDS,
-  applyEffortLadder: () => applyEffortLadder,
-  getCachedModels: () => getCachedModels,
-  isCacheStale: () => isCacheStale,
-  kiroModels: () => kiroModels,
-  loadCachedModelIds: () => loadCachedModelIds,
-  mapKiroCatalogModels: () => mapKiroCatalogModels,
-  resolveApiRegion: () => resolveApiRegion,
-  resolveKiroModel: () => resolveKiroModel,
-  updateKiroModelsCache: () => updateKiroModelsCache
-});
-import { randomUUID } from "node:crypto";
-import { existsSync as existsSync3, readFileSync as readFileSync2, renameSync, rmSync, writeFileSync } from "node:fs";
-import { homedir as homedir4 } from "node:os";
-import { join as join4 } from "node:path";
-function isRecord2(value) {
-  return typeof value === "object" && value !== null && !Array.isArray(value);
-}
-function isPositiveNumber(value) {
-  return typeof value === "number" && Number.isFinite(value) && value > 0;
-}
-function isEffortList(value) {
-  return Array.isArray(value) && value.length > 0 && value.every((effort) => KIRO_EFFORT_ORDER.includes(effort));
+// ../kiro-core/dist/oauth.js
+function kiroUserAgent(service, sdkVersion) {
+  return {
+    "User-Agent": `aws-sdk-js/3.714.0 os/macos/24.3.0 lang/js md/nodejs/22.14.0 api/${service}/3.714.0 exec-env/kiro-cli/2.7.0 m/E`,
+    "amz-sdk-invocation-id": "00000000-0000-0000-0000-000000000000",
+    "amz-sdk-request": `attempt=1; max=${sdkVersion}`
+  };
 }
-function isEffortMap(value) {
-  return isRecord2(value) && Object.values(value).every((mapped) => typeof mapped === "string");
+function kiroAuthHeaders(token) {
+  const headers = { Authorization: `Bearer ${token}` };
+  if (isApiKey(token))
+    headers.tokentype = "API_KEY";
+  return headers;
 }
-function isCachedKiroModel(value) {
-  if (!isRecord2(value))
-    return false;
-  const cost = value.cost;
-  const input = value.input;
-  const schema = value.additionalModelRequestFieldsSchema;
-  const tokenLimits = value.tokenLimits;
-  return typeof value.id === "string" && value.id.length > 0 && typeof value.kiroModelId === "string" && value.kiroModelId.length > 0 && typeof value.name === "string" && value.name.length > 0 && typeof value.reasoning === "boolean" && Array.isArray(input) && input.length > 0 && input.every((modality) => modality === "text" || modality === "image") && isRecord2(cost) && typeof cost.input === "number" && typeof cost.output === "number" && typeof cost.cacheRead === "number" && typeof cost.cacheWrite === "number" && isPositiveNumber(value.contextWindow) && isPositiveNumber(value.maxTokens) && (value.efforts === void 0 || isEffortList(value.efforts)) && (value.effortMap === void 0 || isEffortMap(value.effortMap)) && (schema === void 0 || isRecord2(schema)) && (tokenLimits === void 0 || isRecord2(tokenLimits)) && (value.firstTokenTimeout === void 0 || isPositiveNumber(value.firstTokenTimeout)) && (value.rateMultiplier === void 0 || isPositiveNumber(value.rateMultiplier)) && (value.rateUnit === void 0 || typeof value.rateUnit === "string");
+function isApiKey(token) {
+  return token.startsWith("ksk_");
 }
-function parseManagementCache(raw) {
-  let value;
-  try {
-    value = JSON.parse(raw);
-  } catch {
-    return void 0;
-  }
-  if (!isRecord2(value) || value.version !== KIRO_MANAGEMENT_CACHE_VERSION || value.source !== KIRO_MANAGEMENT_CACHE_SOURCE || !isRecord2(value.regions)) {
-    return void 0;
+async function loginKiroWithApiKey(apiKey, onProgress) {
+  if (!apiKey.startsWith("ksk_")) {
+    throw new Error("Invalid API key format. Kiro API keys start with 'ksk_'.");
   }
-  const regions = {};
-  for (const [region, rawEntry] of Object.entries(value.regions)) {
-    if (!isRecord2(rawEntry) || rawEntry.region !== region || !isPositiveNumber(rawEntry.fetchedAt) || !Array.isArray(rawEntry.models) || rawEntry.models.length === 0 || !rawEntry.models.every(isCachedKiroModel)) {
-      return void 0;
+  onProgress?.("Validating API key...");
+  const region = "us-east-1";
+  const managementUrl = `https://management.${resolveApiRegion(region)}.kiro.dev/`;
+  const response = await fetch(managementUrl, {
+    method: "POST",
+    headers: {
+      "Content-Type": "application/x-amz-json-1.0",
+      "X-Amz-Target": "AmazonCodeWhispererService.GetProfile",
+      ...kiroAuthHeaders(apiKey),
+      ...kiroUserAgent("codewhispererruntime", "F,C")
+    },
+    body: "{}"
+  });
+  if (!response.ok) {
+    let detail = "";
+    try {
+      detail = await response.text();
+    } catch {
+      detail = "";
     }
-    const modelIds = /* @__PURE__ */ new Set();
-    for (const model of rawEntry.models) {
-      if (modelIds.has(model.id))
-        return void 0;
-      modelIds.add(model.id);
+    if (response.status === 401 || response.status === 403 || /Invalid token/i.test(detail)) {
+      throw new Error("API key was rejected by Kiro. Check that the key is valid and not expired.");
     }
-    regions[region] = rawEntry;
+    throw new Error(`Kiro GetProfile failed: ${response.status} ${response.statusText} ${detail}`.trim());
   }
+  const data = await response.json();
+  const profileArn = data.profile?.arn;
   return {
-    version: KIRO_MANAGEMENT_CACHE_VERSION,
-    source: KIRO_MANAGEMENT_CACHE_SOURCE,
-    regions
+    access: apiKey,
+    refresh: `${apiKey}|apikey`,
+    expires: Date.now() + 365 * 24 * 60 * 60 * 1e3,
+    clientId: "",
+    clientSecret: "",
+    region,
+    authMethod: "apikey",
+    ...profileArn ? { profileArn } : {}
   };
 }
-function readManagementCache() {
-  if (!existsSync3(KIRO_MANAGEMENT_CACHE_PATH))
-    return void 0;
-  try {
-    return parseManagementCache(readFileSync2(KIRO_MANAGEMENT_CACHE_PATH, "utf-8"));
-  } catch {
-    return void 0;
+async function refreshKiroToken(credentials) {
+  const refreshed = await refreshKiroTokenInternal(credentials);
+  if (!process.env.VITEST) {
+    try {
+      const { updateKiroModelsCache: updateKiroModelsCache2 } = await Promise.resolve().then(() => (init_models(), models_exports));
+      const region = resolveApiRegion(refreshed.region);
+      updateKiroModelsCache2(refreshed.access, region, refreshed.profileArn).catch((error2) => {
+        console.warn(`[kiro-core] Failed to refresh Kiro model catalog in ${region}: ${formatSafeError(error2)}`);
+      });
+    } catch (error2) {
+      console.warn(`[kiro-core] Failed to start Kiro model catalog refresh: ${formatSafeError(error2)}`);
+    }
   }
+  return refreshed;
 }
-function writeManagementCache(cache) {
-  const temporaryPath = `${KIRO_MANAGEMENT_CACHE_PATH}.${process.pid}.${randomUUID()}.tmp`;
+async function refreshKiroTokenInternal(credentials) {
+  const { getKiroCliCredentials: getKiroCliCredentials2, getKiroCliCredentialsAllowExpired: getKiroCliCredentialsAllowExpired2, saveKiroCliCredentials: saveKiroCliCredentials2, getKiroCliSocialToken: getKiroCliSocialToken2, getKiroCliSocialTokenAllowExpired: getKiroCliSocialTokenAllowExpired2 } = await Promise.resolve().then(() => (init_kiro_cli(), kiro_cli_exports));
+  const credentialAuthMethod = credentials.authMethod ?? (credentials.refresh.split("|").at(-1) === "desktop" ? "desktop" : "idc");
+  const getValidCliCredentials = () => {
+    if (credentialAuthMethod === "desktop")
+      return getKiroCliSocialToken2();
+    const cliCreds = getKiroCliCredentials2();
+    return cliCreds?.authMethod === "idc" ? cliCreds : void 0;
+  };
+  const getExpiredCliCredentials = () => {
+    if (credentialAuthMethod === "desktop")
+      return getKiroCliSocialTokenAllowExpired2();
+    const cliCreds = getKiroCliCredentialsAllowExpired2();
+    return cliCreds?.authMethod === "idc" ? cliCreds : void 0;
+  };
+  if (credentials.authMethod === "apikey" || isApiKey(credentials.access))
+    return credentials;
+  if (credentialAuthMethod === "idc") {
+    const ideCreds = getKiroIdeCredentials();
+    if (ideCreds)
+      return ideCreds;
+  }
+  const preCheckCreds = getValidCliCredentials();
+  if (preCheckCreds)
+    return preCheckCreds;
   try {
-    writeFileSync(temporaryPath, JSON.stringify(cache, null, 2), "utf-8");
-    renameSync(temporaryPath, KIRO_MANAGEMENT_CACHE_PATH);
-  } finally {
-    rmSync(temporaryPath, { force: true });
+    const refreshed = await refreshKiroTokenDirect(credentials);
+    saveKiroCliCredentials2(refreshed);
+    return refreshed;
+  } catch (refreshError) {
+    const retryCreds = getValidCliCredentials();
+    if (retryCreds)
+      return retryCreds;
+    const expiredCliCreds = getExpiredCliCredentials();
+    if (expiredCliCreds && expiredCliCreds.refresh !== credentials.refresh) {
+      try {
+        const refreshedFromCli = await refreshKiroTokenDirect(expiredCliCreds);
+        saveKiroCliCredentials2(refreshedFromCli);
+        return refreshedFromCli;
+      } catch {
+      }
+    }
+    const actualExpiry = credentials.expires + EXPIRES_BUFFER_MS;
+    if (credentials.access && Date.now() < actualExpiry) {
+      return { ...credentials, expires: actualExpiry };
+    }
+    throw refreshError;
   }
 }
-function toLocalModelId(kiroModelId) {
-  return kiroModelId.replace(/(\d)\.(\d)/g, "$1-$2");
-}
-function humanizeModelId(modelId) {
-  return modelId.split("-").map((word) => word.charAt(0).toUpperCase() + word.slice(1)).join(" ");
-}
-function applyEffortLadder(config) {
-  if (!config || config.values.length === 0)
-    return {};
-  const efforts = KIRO_EFFORT_ORDER.filter((effort) => config.values.includes(effort));
-  if (efforts.length === 0)
-    return {};
-  return { efforts, ...config.summarizedThinking ? { supportsSummarizedThinking: true } : {} };
-}
-function hasReasoningFamilyFallback(modelId) {
-  const normalizedId = modelId.toLowerCase();
-  return normalizedId === "auto" || REASONING_FAMILY_MARKERS.some((marker) => normalizedId.includes(marker));
-}
-function hasVerifiedImageInput(kiroModelId) {
-  return kiroModelId.startsWith("claude-") || VERIFIED_IMAGE_MODEL_IDS.has(kiroModelId.toLowerCase());
-}
-function applyVerifiedCapabilities(model) {
-  if (!hasVerifiedImageInput(model.kiroModelId) || model.input.includes("image"))
-    return model;
-  return { ...model, input: ["text", "image"] };
-}
-function validateCatalogMetadata(model) {
-  const rawSchema = model.additionalModelRequestFieldsSchema;
-  const schema = rawSchema ?? void 0;
-  if (schema !== void 0 && !isRecord2(schema)) {
-    throw new Error(`Kiro management catalog model ${model.modelId} has an invalid request-fields schema`);
-  }
-  const tokenLimits = model.tokenLimits;
-  if (tokenLimits !== void 0 && !isRecord2(tokenLimits)) {
-    throw new Error(`Kiro management catalog model ${model.modelId} has invalid token limits`);
-  }
-  if (tokenLimits && (tokenLimits.maxInputTokens !== void 0 && !isPositiveNumber(tokenLimits.maxInputTokens) || tokenLimits.maxOutputTokens !== void 0 && !isPositiveNumber(tokenLimits.maxOutputTokens))) {
-    throw new Error(`Kiro management catalog model ${model.modelId} has invalid token limits`);
+async function refreshKiroTokenDirect(credentials) {
+  const parts = credentials.refresh.split("|");
+  const refreshToken = parts[0] ?? "";
+  const authMethod = parts[parts.length - 1] ?? "idc";
+  const region = credentials.region || "us-east-1";
+  if (authMethod === "apikey")
+    return credentials;
+  if (authMethod === "desktop") {
+    const url = KIRO_DESKTOP_REFRESH_URL.replace("{region}", region);
+    const response2 = await fetch(url, {
+      method: "POST",
+      headers: { "Content-Type": "application/json", "User-Agent": KIRO_DESKTOP_USER_AGENT },
+      body: JSON.stringify({ refreshToken })
+    });
+    if (!response2.ok)
+      throw new Error(`Desktop token refresh failed: ${response2.status}`);
+    const data2 = await response2.json();
+    if (!data2.accessToken)
+      throw new Error("Desktop token refresh: missing accessToken");
+    return {
+      refresh: `${data2.refreshToken || refreshToken}|desktop`,
+      access: data2.accessToken,
+      expires: Date.now() + data2.expiresIn * 1e3 - EXPIRES_BUFFER_MS,
+      clientId: "",
+      clientSecret: "",
+      region,
+      authMethod: "desktop",
+      profileArn: data2.profileArn || credentials.profileArn,
+      startUrl: credentials.startUrl
+    };
   }
-  return { schema, tokenLimits };
-}
-function mapKiroCatalogModels(catalogModels, region, rates) {
-  if (catalogModels.length === 0) {
-    throw new Error(`Kiro management catalog returned no models in ${region}`);
-  }
-  const seenIds = /* @__PURE__ */ new Set();
-  return catalogModels.map((catalogModel) => {
-    const kiroModelId = catalogModel.modelId;
-    if (!kiroModelId || kiroModelId.trim() !== kiroModelId) {
-      throw new Error(`Kiro management catalog returned an invalid model ID in ${region}`);
-    }
-    const id = toLocalModelId(kiroModelId);
-    if (seenIds.has(id)) {
-      throw new Error(`Kiro management catalog contains conflicting model ID ${id} in ${region}`);
-    }
-    seenIds.add(id);
-    const existing = kiroModels.find((model) => model.id === id);
-    const rate = rates?.get(kiroModelId);
-    const { schema, tokenLimits } = validateCatalogMetadata(catalogModel);
-    const effortConfig = getKiroEffortConfig(schema, kiroModelId);
-    const catalogName = typeof catalogModel.displayName === "string" && catalogModel.displayName.length > 0 ? catalogModel.displayName : void 0;
+  if (authMethod === "external-idp") {
+    const idpClientId = parts[1] ?? "";
+    const tokenEndpoint = parts[2] ?? "";
+    if (!tokenEndpoint)
+      throw new Error("External IdP token refresh: missing token endpoint");
+    const response2 = await fetch(tokenEndpoint, {
+      method: "POST",
+      headers: {
+        "Content-Type": "application/x-www-form-urlencoded",
+        Accept: "application/json",
+        "User-Agent": "kiro-core"
+      },
+      body: new URLSearchParams({
+        grant_type: "refresh_token",
+        client_id: idpClientId,
+        refresh_token: refreshToken
+      }).toString()
+    });
+    if (!response2.ok)
+      throw new Error(`External IdP token refresh failed: ${response2.status}`);
+    const data2 = await response2.json();
+    if (!data2.access_token)
+      throw new Error("External IdP token refresh: missing access_token");
+    const expiresIn = typeof data2.expires_in === "number" ? data2.expires_in : 3600;
     return {
-      id,
-      kiroModelId,
-      name: catalogName ?? existing?.name ?? humanizeModelId(id),
+      refresh: `${data2.refresh_token || refreshToken}|${idpClientId}|${tokenEndpoint}|external-idp`,
+      access: data2.access_token,
+      expires: Date.now() + expiresIn * 1e3 - EXPIRES_BUFFER_MS,
+      clientId: idpClientId,
+      clientSecret: "",
       region,
-      // Deliberately schema-only: when a schema exists the resolver returns
-      // `deriveKiroEffort(schema)`, and when it does not the family-marker guess
-      // decides. The fallback tier feeds the ladders, not this flag.
-      reasoning: schema !== void 0 && effortConfig !== void 0 || schema === void 0 && hasReasoningFamilyFallback(id),
-      ...applyEffortLadder(effortConfig),
-      input: existing ? [...existing.input] : hasVerifiedImageInput(kiroModelId) ? ["text", "image"] : ["text"],
-      ...id.startsWith("claude-") ? { recoverTextToolCalls: false } : {},
-      cost: ZERO_COST,
-      ...rate ? { rateMultiplier: rate.multiplier, ...rate.unit ? { rateUnit: rate.unit } : {} } : {},
-      contextWindow: tokenLimits?.maxInputTokens ?? DEFAULT_CONTEXT_WINDOW,
-      maxTokens: tokenLimits?.maxOutputTokens ?? DEFAULT_MAX_TOKENS,
-      ...existing?.firstTokenTimeout ? { firstTokenTimeout: existing.firstTokenTimeout } : {},
-      ...schema ? { additionalModelRequestFieldsSchema: schema } : {},
-      ...tokenLimits ? { tokenLimits } : {}
+      authMethod: "external-idp",
+      profileArn: credentials.profileArn
     };
+  }
+  const clientId = parts[1] ?? "";
+  const clientSecret = parts[2] ?? "";
+  const ssoEndpoint = `https://oidc.${region}.amazonaws.com`;
+  const response = await fetch(`${ssoEndpoint}/token`, {
+    method: "POST",
+    headers: { "Content-Type": "application/json", ...kiroUserAgent("ssooidc", "E") },
+    body: JSON.stringify({ clientId, clientSecret, refreshToken, grantType: "refresh_token" })
   });
+  if (!response.ok)
+    throw new Error(`Token refresh failed: ${response.status}`);
+  const data = await response.json();
+  return {
+    refresh: `${data.refreshToken}|${clientId}|${clientSecret}|idc`,
+    access: data.accessToken,
+    expires: Date.now() + data.expiresIn * 1e3 - EXPIRES_BUFFER_MS,
+    clientId,
+    clientSecret,
+    region,
+    authMethod: "idc",
+    profileArn: credentials.profileArn,
+    startUrl: credentials.startUrl,
+    isEnterprise: credentials.isEnterprise
+  };
 }
-function refreshKnownModelIds(cache) {
-  KIRO_MODEL_IDS.clear();
-  for (const modelId of BOOTSTRAP_KIRO_MODEL_IDS)
-    KIRO_MODEL_IDS.add(modelId);
-  if (!cache)
-    return;
-  for (const entry of Object.values(cache.regions)) {
-    for (const model of entry.models)
-      KIRO_MODEL_IDS.add(model.kiroModelId);
-  }
+async function resolveKiroCredentials() {
+  const { getKiroCliCredentials: getKiroCliCredentials2, getKiroCliCredentialsAllowExpired: getKiroCliCredentialsAllowExpired2 } = await Promise.resolve().then(() => (init_kiro_cli(), kiro_cli_exports));
+  const fresh = getKiroCliCredentials2() ?? getKiroIdeCredentials();
+  if (fresh)
+    return fresh;
+  const stale = getKiroCliCredentialsAllowExpired2();
+  if (!stale)
+    return void 0;
+  return refreshKiroToken(stale);
 }
-function loadCachedModelIds() {
-  refreshKnownModelIds(readManagementCache());
+var KIRO_DESKTOP_REFRESH_URL, EXPIRES_BUFFER_MS, KIRO_DESKTOP_USER_AGENT;
+var init_oauth = __esm({
+  "../kiro-core/dist/oauth.js"() {
+    "use strict";
+    init_debug();
+    init_endpoints();
+    init_kiro_ide();
+    KIRO_DESKTOP_REFRESH_URL = "https://prod.{region}.auth.desktop.kiro.dev/refreshToken";
+    EXPIRES_BUFFER_MS = 5 * 60 * 1e3;
+    KIRO_DESKTOP_USER_AGENT = "Kiro-Desktop/0.2.13 (darwin; arm64)";
+  }
+});
+
+// ../kiro-core/dist/token-type.js
+function isExternalIdpAccessToken(accessToken) {
+  if (typeof accessToken !== "string")
+    return false;
+  const segments = accessToken.split(".");
+  if (segments.length !== 3)
+    return false;
+  const payloadSegment = segments[1];
+  if (!payloadSegment)
+    return false;
+  try {
+    const payload = JSON.parse(Buffer.from(payloadSegment.replace(/-/g, "+").replace(/_/g, "/"), "base64").toString("utf-8"));
+    return payload.aud === EXTERNAL_IDP_AUDIENCE;
+  } catch {
+    return false;
+  }
 }
-function getCachedModels(region) {
-  const cache = readManagementCache();
-  refreshKnownModelIds(cache);
-  const models = cache?.regions[region]?.models ?? kiroModels;
-  let changed = false;
-  const corrected = models.map((model) => {
-    const result = applyVerifiedCapabilities(model);
-    if (result !== model)
-      changed = true;
-    return result;
-  });
-  return changed ? corrected : models;
+function kiroTokenTypeHeaders(accessToken) {
+  return isExternalIdpAccessToken(accessToken) ? { tokentype: "EXTERNAL_IDP" } : {};
 }
-function isCacheStale(region) {
-  const entry = readManagementCache()?.regions[region];
-  return !entry || Date.now() - entry.fetchedAt > CACHE_MAX_AGE_MS;
+var EXTERNAL_IDP_AUDIENCE;
+var init_token_type = __esm({
+  "../kiro-core/dist/token-type.js"() {
+    "use strict";
+    EXTERNAL_IDP_AUDIENCE = "api://kiro";
+  }
+});
+
+// ../kiro-core/dist/management.js
+import { createHash } from "node:crypto";
+function candidateManagementRegions(primary) {
+  const seen = /* @__PURE__ */ new Set([primary]);
+  const candidates = [primary];
+  for (const region of CANONICAL_MANAGEMENT_REGIONS) {
+    if (!seen.has(region)) {
+      seen.add(region);
+      candidates.push(region);
+    }
+  }
+  return candidates;
 }
-async function updateKiroModelsCache(accessToken, region, profileArn) {
-  const response = await fetchKiroModelCatalog({ accessToken, region }, profileArn);
-  const models = mapKiroCatalogModels(response.models, region, getKiroCliModelRates());
-  const cache = readManagementCache() ?? {
-    version: KIRO_MANAGEMENT_CACHE_VERSION,
-    source: KIRO_MANAGEMENT_CACHE_SOURCE,
-    regions: {}
+async function requestManagement(auth, operation, path, method, body) {
+  const url = new URL(path, getKiroEndpoints(auth.region).management);
+  const request = {
+    method,
+    headers: {
+      Accept: "application/json",
+      ...kiroAuthHeaders(auth.accessToken),
+      ...kiroTokenTypeHeaders(auth.accessToken)
+    }
   };
-  cache.regions[region] = { region, fetchedAt: Date.now(), models };
-  writeManagementCache(cache);
-  refreshKnownModelIds(cache);
+  if (method === "GET") {
+    for (const [name, value] of Object.entries(body)) {
+      if (value !== void 0)
+        url.searchParams.set(name, String(value));
+    }
+  } else {
+    request.headers = { ...request.headers, "Content-Type": "application/json" };
+    request.body = JSON.stringify(body);
+  }
+  let response;
+  try {
+    response = await fetch(url.toString(), request);
+  } catch (error2) {
+    throw new Error(`Kiro management ${operation} request failed in ${auth.region}`, { cause: error2 });
+  }
+  return parseManagementResponse(response, operation, auth.region);
 }
-function resolveKiroModel(modelId, exactKiroModelId) {
-  if (exactKiroModelId)
-    return exactKiroModelId;
-  const cachedModel = Object.values(readManagementCache()?.regions ?? {}).flatMap((entry) => entry.models).find((model) => model.id === modelId);
-  if (cachedModel) {
-    KIRO_MODEL_IDS.add(cachedModel.kiroModelId);
-    return cachedModel.kiroModelId;
+function profileCacheKey(auth) {
+  const tokenHash = createHash("sha256").update(auth.accessToken).digest("base64url");
+  return `${auth.region}:${tokenHash}`;
+}
+async function getApiKeyProfileArn(accessToken) {
+  const operation = "GetProfile";
+  let response;
+  try {
+    response = await fetch(getKiroEndpoints(API_KEY_REGION).management, {
+      method: "POST",
+      headers: {
+        "Content-Type": "application/x-amz-json-1.0",
+        "X-Amz-Target": GET_PROFILE_TARGET,
+        ...kiroAuthHeaders(accessToken),
+        ...kiroUserAgent("codewhispererruntime", "F,C")
+      },
+      body: "{}"
+    });
+  } catch (error2) {
+    throw new Error(`Kiro management ${operation} request failed in ${API_KEY_REGION}`, { cause: error2 });
   }
-  const bootstrapModel = kiroModels.find((model) => model.id === modelId);
-  if (bootstrapModel)
-    return bootstrapModel.kiroModelId;
-  const normalizedId = modelId.replace(/(\d)-(\d)/g, "$1.$2");
-  loadCachedModelIds();
-  if (!KIRO_MODEL_IDS.has(normalizedId)) {
-    throw new Error(`Unknown Kiro model ID: ${modelId}`);
+  const parsed = await parseManagementResponse(response, operation, API_KEY_REGION);
+  const arn = parsed.profile?.arn;
+  if (!arn) {
+    throw new Error(`Kiro management ${operation} returned no profile in ${API_KEY_REGION}`);
   }
-  return normalizedId;
-}
-var KIRO_MANAGEMENT_CACHE_VERSION, KIRO_MANAGEMENT_CACHE_SOURCE, KIRO_MANAGEMENT_CACHE_PATH, CACHE_MAX_AGE_MS, DEFAULT_CONTEXT_WINDOW, DEFAULT_MAX_TOKENS, ZERO_COST, REASONING_FAMILY_MARKERS, VERIFIED_IMAGE_MODEL_IDS, bootstrapKiroModels, kiroModels, BOOTSTRAP_KIRO_MODEL_IDS, KIRO_MODEL_IDS;
-var init_models = __esm({
-  "../kiro-core/dist/models.js"() {
-    "use strict";
-    init_effort();
-    init_kiro_cli();
-    init_management();
-    init_types();
-    init_endpoints();
-    KIRO_MANAGEMENT_CACHE_VERSION = 1;
-    KIRO_MANAGEMENT_CACHE_SOURCE = "ns-kiro-provider-management";
-    KIRO_MANAGEMENT_CACHE_PATH = join4(homedir4(), ".ns-kiro-provider-models-cache.json");
-    CACHE_MAX_AGE_MS = 36e5;
-    DEFAULT_CONTEXT_WINDOW = 2e5;
-    DEFAULT_MAX_TOKENS = 8192;
-    ZERO_COST = Object.freeze({ input: 0, output: 0, cacheRead: 0, cacheWrite: 0 });
-    REASONING_FAMILY_MARKERS = ["opus", "sonnet", "fable", "coder", "deepseek", "gpt", "glm", "qwen"];
-    VERIFIED_IMAGE_MODEL_IDS = /* @__PURE__ */ new Set(["gpt-5.6-luna"]);
-    bootstrapKiroModels = [
-      {
-        id: "claude-opus-5",
-        kiroModelId: "claude-opus-5",
-        name: "Claude Opus 5",
-        reasoning: true,
-        input: ["text", "image"],
-        cost: ZERO_COST,
-        contextWindow: 1e6,
-        maxTokens: 128e3,
-        firstTokenTimeout: 18e4
-      },
-      {
-        id: "claude-opus-4-8",
-        kiroModelId: "claude-opus-4.8",
-        name: "Claude Opus 4.8",
-        reasoning: true,
-        input: ["text", "image"],
-        cost: ZERO_COST,
-        contextWindow: 1e6,
-        maxTokens: 128e3,
-        firstTokenTimeout: 18e4
-      },
-      {
-        id: "claude-opus-4-7",
-        kiroModelId: "claude-opus-4.7",
-        name: "Claude Opus 4.7",
-        reasoning: true,
-        input: ["text", "image"],
-        cost: ZERO_COST,
-        contextWindow: 1e6,
-        maxTokens: 128e3,
-        firstTokenTimeout: 18e4
-      },
-      {
-        id: "claude-opus-4-6",
-        kiroModelId: "claude-opus-4.6",
-        name: "Claude Opus 4.6",
-        reasoning: true,
-        input: ["text", "image"],
-        cost: ZERO_COST,
-        contextWindow: 1e6,
-        maxTokens: 32768
-      },
-      {
-        id: "claude-opus-4-5",
-        kiroModelId: "claude-opus-4.5",
-        name: "Claude Opus 4.5",
-        reasoning: true,
-        input: ["text", "image"],
-        cost: ZERO_COST,
-        contextWindow: 2e5,
-        maxTokens: 64e3
-      },
-      {
-        id: "claude-sonnet-5",
-        kiroModelId: "claude-sonnet-5",
-        name: "Claude Sonnet 5",
-        reasoning: true,
-        input: ["text", "image"],
-        cost: ZERO_COST,
-        contextWindow: 1e6,
-        maxTokens: 65536
-      },
-      {
-        id: "claude-sonnet-4-6",
-        kiroModelId: "claude-sonnet-4.6",
-        name: "Claude Sonnet 4.6",
-        reasoning: true,
-        input: ["text", "image"],
-        cost: ZERO_COST,
-        contextWindow: 1e6,
-        maxTokens: 65536
-      },
-      {
-        id: "claude-sonnet-4-5",
-        kiroModelId: "claude-sonnet-4.5",
-        name: "Claude Sonnet 4.5",
-        reasoning: true,
-        input: ["text", "image"],
-        cost: ZERO_COST,
-        contextWindow: 2e5,
-        maxTokens: 65536
-      },
-      {
-        id: "claude-sonnet-4",
-        kiroModelId: "claude-sonnet-4",
-        name: "Claude Sonnet 4",
-        reasoning: true,
-        input: ["text", "image"],
-        cost: ZERO_COST,
-        contextWindow: 2e5,
-        maxTokens: 65536
-      },
-      {
-        id: "claude-haiku-4-5",
-        kiroModelId: "claude-haiku-4.5",
-        name: "Claude Haiku 4.5",
-        reasoning: false,
-        input: ["text", "image"],
-        cost: ZERO_COST,
-        contextWindow: 2e5,
-        maxTokens: 65536
-      },
-      {
-        id: "claude-fable-5",
-        kiroModelId: "claude-fable-5",
-        name: "Claude Fable 5",
-        reasoning: true,
-        input: ["text", "image"],
-        cost: ZERO_COST,
-        contextWindow: 1e6,
-        maxTokens: 65536
-      },
-      {
-        id: "gpt-5-6-luna",
-        kiroModelId: "gpt-5.6-luna",
-        name: "GPT-5.6 Luna",
-        reasoning: true,
-        input: ["text", "image"],
-        cost: ZERO_COST,
-        contextWindow: 272e3,
-        maxTokens: 128e3
-      },
-      {
-        id: "gpt-5-6-sol",
-        kiroModelId: "gpt-5.6-sol",
-        name: "GPT-5.6 Sol",
-        reasoning: true,
-        input: ["text"],
-        cost: ZERO_COST,
-        contextWindow: 272e3,
-        maxTokens: 128e3
-      },
-      {
-        id: "gpt-5-6-terra",
-        kiroModelId: "gpt-5.6-terra",
-        name: "GPT-5.6 Terra",
-        reasoning: true,
-        input: ["text"],
-        cost: ZERO_COST,
-        contextWindow: 272e3,
-        maxTokens: 128e3
-      },
-      {
-        id: "deepseek-3-2",
-        kiroModelId: "deepseek-3.2",
-        name: "DeepSeek 3.2",
-        reasoning: true,
-        input: ["text"],
-        cost: ZERO_COST,
-        contextWindow: 164e3,
-        maxTokens: 8192
-      },
-      {
-        id: "minimax-m2-5",
-        kiroModelId: "minimax-m2.5",
-        name: "MiniMax M2.5",
-        reasoning: false,
-        input: ["text"],
-        cost: ZERO_COST,
-        contextWindow: 196e3,
-        maxTokens: 8192
-      },
-      {
-        id: "minimax-m2-1",
-        kiroModelId: "minimax-m2.1",
-        name: "MiniMax M2.1",
-        reasoning: false,
-        input: ["text"],
-        cost: ZERO_COST,
-        contextWindow: 196e3,
-        maxTokens: 8192
-      },
-      {
-        id: "glm-5",
-        kiroModelId: "glm-5",
-        name: "GLM 5",
-        reasoning: true,
-        input: ["text"],
-        cost: ZERO_COST,
-        contextWindow: 2e5,
-        maxTokens: 8192
-      },
-      {
-        id: "qwen3-coder-next",
-        kiroModelId: "qwen3-coder-next",
-        name: "Qwen3 Coder Next",
-        reasoning: true,
-        input: ["text"],
-        cost: ZERO_COST,
-        contextWindow: 256e3,
-        maxTokens: 8192
-      },
-      {
-        id: "auto",
-        kiroModelId: "auto",
-        name: "Auto",
-        reasoning: true,
-        input: ["text", "image"],
-        cost: ZERO_COST,
-        contextWindow: 1e6,
-        maxTokens: 65536
-      }
-    ];
-    kiroModels = bootstrapKiroModels.map((model) => ({
-      ...model,
-      ...applyEffortLadder(model.reasoning ? getKiroEffortConfig(model.additionalModelRequestFieldsSchema, model.kiroModelId) : void 0),
-      ...model.id.startsWith("claude-") ? { recoverTextToolCalls: false } : {}
-    }));
-    BOOTSTRAP_KIRO_MODEL_IDS = kiroModels.map((model) => model.kiroModelId);
-    KIRO_MODEL_IDS = new Set(BOOTSTRAP_KIRO_MODEL_IDS);
-  }
-});
-
-// ../kiro-core/dist/oauth.js
-function kiroUserAgent(service, sdkVersion) {
-  return {
-    "User-Agent": `aws-sdk-js/3.714.0 os/macos/24.3.0 lang/js md/nodejs/22.14.0 api/${service}/3.714.0 exec-env/kiro-cli/2.7.0 m/E`,
-    "amz-sdk-invocation-id": "00000000-0000-0000-0000-000000000000",
-    "amz-sdk-request": `attempt=1; max=${sdkVersion}`
-  };
-}
-function kiroAuthHeaders(token) {
-  const headers = { Authorization: `Bearer ${token}` };
-  if (isApiKey(token))
-    headers.tokentype = "API_KEY";
-  return headers;
-}
-function isApiKey(token) {
-  return token.startsWith("ksk_");
-}
-async function loginKiroWithApiKey(apiKey, onProgress) {
-  if (!apiKey.startsWith("ksk_")) {
-    throw new Error("Invalid API key format. Kiro API keys start with 'ksk_'.");
-  }
-  onProgress?.("Validating API key...");
-  const region = "us-east-1";
-  const managementUrl = `https://management.${resolveApiRegion(region)}.kiro.dev/`;
-  const response = await fetch(managementUrl, {
-    method: "POST",
-    headers: {
-      "Content-Type": "application/x-amz-json-1.0",
-      "X-Amz-Target": "AmazonCodeWhispererService.GetProfile",
-      ...kiroAuthHeaders(apiKey),
-      ...kiroUserAgent("codewhispererruntime", "F,C")
-    },
-    body: "{}"
-  });
-  if (!response.ok) {
-    let detail = "";
-    try {
-      detail = await response.text();
-    } catch {
-      detail = "";
-    }
-    if (response.status === 401 || response.status === 403 || /Invalid token/i.test(detail)) {
-      throw new Error("API key was rejected by Kiro. Check that the key is valid and not expired.");
-    }
-    throw new Error(`Kiro GetProfile failed: ${response.status} ${response.statusText} ${detail}`.trim());
-  }
-  const data = await response.json();
-  const profileArn = data.profile?.arn;
-  return {
-    access: apiKey,
-    refresh: `${apiKey}|apikey`,
-    expires: Date.now() + 365 * 24 * 60 * 60 * 1e3,
-    clientId: "",
-    clientSecret: "",
-    region,
-    authMethod: "apikey",
-    ...profileArn ? { profileArn } : {}
-  };
-}
-async function refreshKiroToken(credentials) {
-  const refreshed = await refreshKiroTokenInternal(credentials);
-  if (!process.env.VITEST) {
-    try {
-      const { updateKiroModelsCache: updateKiroModelsCache2 } = await Promise.resolve().then(() => (init_models(), models_exports));
-      const region = resolveApiRegion(refreshed.region);
-      updateKiroModelsCache2(refreshed.access, region, refreshed.profileArn).catch((error2) => {
-        console.warn(`[kiro-core] Failed to refresh Kiro model catalog in ${region}: ${formatSafeError(error2)}`);
-      });
-    } catch (error2) {
-      console.warn(`[kiro-core] Failed to start Kiro model catalog refresh: ${formatSafeError(error2)}`);
-    }
-  }
-  return refreshed;
-}
-async function refreshKiroTokenInternal(credentials) {
-  const { getKiroCliCredentials: getKiroCliCredentials2, getKiroCliCredentialsAllowExpired: getKiroCliCredentialsAllowExpired2, saveKiroCliCredentials: saveKiroCliCredentials2, getKiroCliSocialToken: getKiroCliSocialToken2, getKiroCliSocialTokenAllowExpired: getKiroCliSocialTokenAllowExpired2 } = await Promise.resolve().then(() => (init_kiro_cli(), kiro_cli_exports));
-  const credentialAuthMethod = credentials.authMethod ?? (credentials.refresh.split("|").at(-1) === "desktop" ? "desktop" : "idc");
-  const getValidCliCredentials = () => {
-    if (credentialAuthMethod === "desktop")
-      return getKiroCliSocialToken2();
-    const cliCreds = getKiroCliCredentials2();
-    return cliCreds?.authMethod === "idc" ? cliCreds : void 0;
-  };
-  const getExpiredCliCredentials = () => {
-    if (credentialAuthMethod === "desktop")
-      return getKiroCliSocialTokenAllowExpired2();
-    const cliCreds = getKiroCliCredentialsAllowExpired2();
-    return cliCreds?.authMethod === "idc" ? cliCreds : void 0;
-  };
-  if (credentials.authMethod === "apikey" || isApiKey(credentials.access))
-    return credentials;
-  if (credentialAuthMethod === "idc") {
-    const ideCreds = getKiroIdeCredentials();
-    if (ideCreds)
-      return ideCreds;
-  }
-  const preCheckCreds = getValidCliCredentials();
-  if (preCheckCreds)
-    return preCheckCreds;
-  try {
-    const refreshed = await refreshKiroTokenDirect(credentials);
-    saveKiroCliCredentials2(refreshed);
-    return refreshed;
-  } catch (refreshError) {
-    const retryCreds = getValidCliCredentials();
-    if (retryCreds)
-      return retryCreds;
-    const expiredCliCreds = getExpiredCliCredentials();
-    if (expiredCliCreds && expiredCliCreds.refresh !== credentials.refresh) {
-      try {
-        const refreshedFromCli = await refreshKiroTokenDirect(expiredCliCreds);
-        saveKiroCliCredentials2(refreshedFromCli);
-        return refreshedFromCli;
-      } catch {
-      }
-    }
-    const actualExpiry = credentials.expires + EXPIRES_BUFFER_MS;
-    if (credentials.access && Date.now() < actualExpiry) {
-      return { ...credentials, expires: actualExpiry };
-    }
-    throw refreshError;
-  }
-}
-async function refreshKiroTokenDirect(credentials) {
-  const parts = credentials.refresh.split("|");
-  const refreshToken = parts[0] ?? "";
-  const authMethod = parts[parts.length - 1] ?? "idc";
-  const region = credentials.region || "us-east-1";
-  if (authMethod === "apikey")
-    return credentials;
-  if (authMethod === "desktop") {
-    const url = KIRO_DESKTOP_REFRESH_URL.replace("{region}", region);
-    const response2 = await fetch(url, {
-      method: "POST",
-      headers: { "Content-Type": "application/json", "User-Agent": KIRO_DESKTOP_USER_AGENT },
-      body: JSON.stringify({ refreshToken })
-    });
-    if (!response2.ok)
-      throw new Error(`Desktop token refresh failed: ${response2.status}`);
-    const data2 = await response2.json();
-    if (!data2.accessToken)
-      throw new Error("Desktop token refresh: missing accessToken");
-    return {
-      refresh: `${data2.refreshToken || refreshToken}|desktop`,
-      access: data2.accessToken,
-      expires: Date.now() + data2.expiresIn * 1e3 - EXPIRES_BUFFER_MS,
-      clientId: "",
-      clientSecret: "",
-      region,
-      authMethod: "desktop",
-      profileArn: data2.profileArn || credentials.profileArn,
-      startUrl: credentials.startUrl
-    };
-  }
-  if (authMethod === "external-idp") {
-    const idpClientId = parts[1] ?? "";
-    const tokenEndpoint = parts[2] ?? "";
-    if (!tokenEndpoint)
-      throw new Error("External IdP token refresh: missing token endpoint");
-    const response2 = await fetch(tokenEndpoint, {
-      method: "POST",
-      headers: {
-        "Content-Type": "application/x-www-form-urlencoded",
-        Accept: "application/json",
-        "User-Agent": "kiro-core"
-      },
-      body: new URLSearchParams({
-        grant_type: "refresh_token",
-        client_id: idpClientId,
-        refresh_token: refreshToken
-      }).toString()
-    });
-    if (!response2.ok)
-      throw new Error(`External IdP token refresh failed: ${response2.status}`);
-    const data2 = await response2.json();
-    if (!data2.access_token)
-      throw new Error("External IdP token refresh: missing access_token");
-    const expiresIn = typeof data2.expires_in === "number" ? data2.expires_in : 3600;
-    return {
-      refresh: `${data2.refresh_token || refreshToken}|${idpClientId}|${tokenEndpoint}|external-idp`,
-      access: data2.access_token,
-      expires: Date.now() + expiresIn * 1e3 - EXPIRES_BUFFER_MS,
-      clientId: idpClientId,
-      clientSecret: "",
-      region,
-      authMethod: "external-idp",
-      profileArn: credentials.profileArn
-    };
-  }
-  const clientId = parts[1] ?? "";
-  const clientSecret = parts[2] ?? "";
-  const ssoEndpoint = `https://oidc.${region}.amazonaws.com`;
-  const response = await fetch(`${ssoEndpoint}/token`, {
-    method: "POST",
-    headers: { "Content-Type": "application/json", ...kiroUserAgent("ssooidc", "E") },
-    body: JSON.stringify({ clientId, clientSecret, refreshToken, grantType: "refresh_token" })
-  });
-  if (!response.ok)
-    throw new Error(`Token refresh failed: ${response.status}`);
-  const data = await response.json();
-  return {
-    refresh: `${data.refreshToken}|${clientId}|${clientSecret}|idc`,
-    access: data.accessToken,
-    expires: Date.now() + data.expiresIn * 1e3 - EXPIRES_BUFFER_MS,
-    clientId,
-    clientSecret,
-    region,
-    authMethod: "idc",
-    profileArn: credentials.profileArn,
-    startUrl: credentials.startUrl,
-    isEnterprise: credentials.isEnterprise
-  };
-}
-async function resolveKiroCredentials() {
-  const { getKiroCliCredentials: getKiroCliCredentials2, getKiroCliCredentialsAllowExpired: getKiroCliCredentialsAllowExpired2 } = await Promise.resolve().then(() => (init_kiro_cli(), kiro_cli_exports));
-  const fresh = getKiroCliCredentials2() ?? getKiroIdeCredentials();
-  if (fresh)
-    return fresh;
-  const stale = getKiroCliCredentialsAllowExpired2();
-  if (!stale)
-    return void 0;
-  return refreshKiroToken(stale);
-}
-var KIRO_DESKTOP_REFRESH_URL, EXPIRES_BUFFER_MS, KIRO_DESKTOP_USER_AGENT;
-var init_oauth = __esm({
-  "../kiro-core/dist/oauth.js"() {
-    "use strict";
-    init_debug();
-    init_endpoints();
-    init_kiro_ide();
-    KIRO_DESKTOP_REFRESH_URL = "https://prod.{region}.auth.desktop.kiro.dev/refreshToken";
-    EXPIRES_BUFFER_MS = 5 * 60 * 1e3;
-    KIRO_DESKTOP_USER_AGENT = "Kiro-Desktop/0.2.13 (darwin; arm64)";
-  }
-});
-
-// ../kiro-core/dist/token-type.js
-function isExternalIdpAccessToken(accessToken) {
-  if (typeof accessToken !== "string")
-    return false;
-  const segments = accessToken.split(".");
-  if (segments.length !== 3)
-    return false;
-  const payloadSegment = segments[1];
-  if (!payloadSegment)
-    return false;
-  try {
-    const payload = JSON.parse(Buffer.from(payloadSegment.replace(/-/g, "+").replace(/_/g, "/"), "base64").toString("utf-8"));
-    return payload.aud === EXTERNAL_IDP_AUDIENCE;
-  } catch {
-    return false;
-  }
-}
-function kiroTokenTypeHeaders(accessToken) {
-  return isExternalIdpAccessToken(accessToken) ? { tokentype: "EXTERNAL_IDP" } : {};
-}
-var EXTERNAL_IDP_AUDIENCE;
-var init_token_type = __esm({
-  "../kiro-core/dist/token-type.js"() {
-    "use strict";
-    EXTERNAL_IDP_AUDIENCE = "api://kiro";
-  }
-});
-
-// ../kiro-core/dist/management.js
-import { createHash as createHash2 } from "node:crypto";
-function candidateManagementRegions(primary) {
-  const seen = /* @__PURE__ */ new Set([primary]);
-  const candidates = [primary];
-  for (const region of CANONICAL_MANAGEMENT_REGIONS) {
-    if (!seen.has(region)) {
-      seen.add(region);
-      candidates.push(region);
-    }
-  }
-  return candidates;
-}
-async function requestManagement(auth, operation, path, method, body) {
-  const url = new URL(path, getKiroEndpoints(auth.region).management);
-  const request = {
-    method,
-    headers: {
-      Accept: "application/json",
-      ...kiroAuthHeaders(auth.accessToken),
-      ...kiroTokenTypeHeaders(auth.accessToken)
-    }
-  };
-  if (method === "GET") {
-    for (const [name, value] of Object.entries(body)) {
-      if (value !== void 0)
-        url.searchParams.set(name, String(value));
-    }
-  } else {
-    request.headers = { ...request.headers, "Content-Type": "application/json" };
-    request.body = JSON.stringify(body);
-  }
-  let response;
-  try {
-    response = await fetch(url.toString(), request);
-  } catch (error2) {
-    throw new Error(`Kiro management ${operation} request failed in ${auth.region}`, { cause: error2 });
-  }
-  return parseManagementResponse(response, operation, auth.region);
-}
-function profileCacheKey(auth) {
-  const tokenHash = createHash2("sha256").update(auth.accessToken).digest("base64url");
-  return `${auth.region}:${tokenHash}`;
-}
-async function getApiKeyProfileArn(accessToken) {
-  const operation = "GetProfile";
-  let response;
-  try {
-    response = await fetch(getKiroEndpoints(API_KEY_REGION).management, {
-      method: "POST",
-      headers: {
-        "Content-Type": "application/x-amz-json-1.0",
-        "X-Amz-Target": GET_PROFILE_TARGET,
-        ...kiroAuthHeaders(accessToken),
-        ...kiroUserAgent("codewhispererruntime", "F,C")
-      },
-      body: "{}"
-    });
-  } catch (error2) {
-    throw new Error(`Kiro management ${operation} request failed in ${API_KEY_REGION}`, { cause: error2 });
-  }
-  const parsed = await parseManagementResponse(response, operation, API_KEY_REGION);
-  const arn = parsed.profile?.arn;
-  if (!arn) {
-    throw new Error(`Kiro management ${operation} returned no profile in ${API_KEY_REGION}`);
-  }
-  return arn;
+  return arn;
 }
 async function parseManagementResponse(response, operation, region) {
   if (!response.ok) {
@@ -1517,75 +1058,544 @@ async function resolveKiroProfileArn(auth, providedArn) {
       pendingProfileRequests.delete(key);
   }
 }
-async function listAvailableModels(auth, profileArn) {
-  const response = await requestManagement(auth, "ListAvailableModels", LIST_MODELS_PATH, "GET", {
-    origin: "KIRO_CLI",
-    profileArn
-  });
-  if (!Array.isArray(response.models) || response.models.length === 0) {
-    throw new Error(`Kiro management ListAvailableModels returned no models in ${auth.region}`);
+async function listAvailableModels(auth, profileArn) {
+  const response = await requestManagement(auth, "ListAvailableModels", LIST_MODELS_PATH, "GET", {
+    origin: "KIRO_CLI",
+    profileArn
+  });
+  if (!Array.isArray(response.models) || response.models.length === 0) {
+    throw new Error(`Kiro management ListAvailableModels returned no models in ${auth.region}`);
+  }
+  if (response.models.some((model) => !model || typeof model.modelId !== "string" || !model.modelId)) {
+    throw new Error(`Kiro management ListAvailableModels returned an invalid catalog in ${auth.region}`);
+  }
+  return response;
+}
+async function fetchKiroModelCatalog(auth, providedProfileArn) {
+  const profileArn = await resolveKiroProfileArn(auth, providedProfileArn);
+  const region = isApiKey(auth.accessToken) ? API_KEY_REGION : profileRegionCache.get(profileCacheKey(auth)) ?? auth.region;
+  if (region !== auth.region) {
+    return listAvailableModels({ ...auth, region }, profileArn);
+  }
+  return listAvailableModels(auth, profileArn);
+}
+async function getUsageLimits(auth, request) {
+  const operation = "GetUsageLimits";
+  const url = new URL("Get-Usage-Limits", getKiroEndpoints(auth.region).management);
+  for (const [name, value] of Object.entries(request)) {
+    if (value !== void 0)
+      url.searchParams.set(name, String(value));
+  }
+  let response;
+  try {
+    response = await fetch(url.toString(), {
+      method: "GET",
+      headers: {
+        Accept: "application/json",
+        ...kiroAuthHeaders(auth.accessToken),
+        ...kiroTokenTypeHeaders(auth.accessToken),
+        "User-Agent": "ns-kiro-provider"
+      }
+    });
+  } catch (error2) {
+    throw new Error(`Kiro management ${operation} request failed in ${auth.region}`, { cause: error2 });
+  }
+  return parseManagementResponse(response, operation, auth.region);
+}
+var LIST_PROFILES_PATH, LIST_MODELS_PATH, GET_PROFILE_TARGET, API_KEY_REGION, profileArnCache, pendingProfileRequests, profileRegionCache, CANONICAL_MANAGEMENT_REGIONS, ENV_PROFILE_ARN, KiroManagementHttpError;
+var init_management = __esm({
+  "../kiro-core/dist/management.js"() {
+    "use strict";
+    init_debug();
+    init_endpoints();
+    init_oauth();
+    init_token_type();
+    LIST_PROFILES_PATH = "List-Available-Profiles";
+    LIST_MODELS_PATH = "List-Available-Models";
+    GET_PROFILE_TARGET = "AmazonCodeWhispererService.GetProfile";
+    API_KEY_REGION = "us-east-1";
+    profileArnCache = /* @__PURE__ */ new Map();
+    pendingProfileRequests = /* @__PURE__ */ new Map();
+    profileRegionCache = /* @__PURE__ */ new Map();
+    CANONICAL_MANAGEMENT_REGIONS = ["us-east-1", "eu-central-1"];
+    ENV_PROFILE_ARN = "KIRO_PROFILE_ARN";
+    KiroManagementHttpError = class extends Error {
+      status;
+      constructor(message, status) {
+        super(message);
+        this.status = status;
+        this.name = "KiroManagementHttpError";
+      }
+    };
+  }
+});
+
+// ../kiro-core/dist/models.js
+var models_exports = {};
+__export(models_exports, {
+  KIRO_MANAGEMENT_CACHE_PATH: () => KIRO_MANAGEMENT_CACHE_PATH,
+  KIRO_MANAGEMENT_CACHE_SOURCE: () => KIRO_MANAGEMENT_CACHE_SOURCE,
+  KIRO_MANAGEMENT_CACHE_VERSION: () => KIRO_MANAGEMENT_CACHE_VERSION,
+  KIRO_MODEL_IDS: () => KIRO_MODEL_IDS,
+  applyEffortLadder: () => applyEffortLadder,
+  getCachedModels: () => getCachedModels,
+  isCacheStale: () => isCacheStale,
+  kiroModels: () => kiroModels,
+  loadCachedModelIds: () => loadCachedModelIds,
+  mapKiroCatalogModels: () => mapKiroCatalogModels,
+  resolveApiRegion: () => resolveApiRegion,
+  resolveKiroModel: () => resolveKiroModel,
+  updateKiroModelsCache: () => updateKiroModelsCache
+});
+import { randomUUID } from "node:crypto";
+import { existsSync as existsSync3, readFileSync as readFileSync2, renameSync, rmSync, writeFileSync } from "node:fs";
+import { homedir as homedir4 } from "node:os";
+import { join as join4 } from "node:path";
+function isRecord2(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+function isPositiveNumber(value) {
+  return typeof value === "number" && Number.isFinite(value) && value > 0;
+}
+function isEffortList(value) {
+  return Array.isArray(value) && value.length > 0 && value.every((effort) => KIRO_EFFORT_ORDER.includes(effort));
+}
+function isEffortMap(value) {
+  return isRecord2(value) && Object.values(value).every((mapped) => typeof mapped === "string");
+}
+function isCachedKiroModel(value) {
+  if (!isRecord2(value))
+    return false;
+  const cost = value.cost;
+  const input = value.input;
+  const schema = value.additionalModelRequestFieldsSchema;
+  const tokenLimits = value.tokenLimits;
+  return typeof value.id === "string" && value.id.length > 0 && typeof value.kiroModelId === "string" && value.kiroModelId.length > 0 && typeof value.name === "string" && value.name.length > 0 && typeof value.reasoning === "boolean" && Array.isArray(input) && input.length > 0 && input.every((modality) => modality === "text" || modality === "image") && isRecord2(cost) && typeof cost.input === "number" && typeof cost.output === "number" && typeof cost.cacheRead === "number" && typeof cost.cacheWrite === "number" && isPositiveNumber(value.contextWindow) && isPositiveNumber(value.maxTokens) && (value.efforts === void 0 || isEffortList(value.efforts)) && (value.effortMap === void 0 || isEffortMap(value.effortMap)) && (schema === void 0 || isRecord2(schema)) && (tokenLimits === void 0 || isRecord2(tokenLimits)) && (value.firstTokenTimeout === void 0 || isPositiveNumber(value.firstTokenTimeout)) && (value.rateMultiplier === void 0 || isPositiveNumber(value.rateMultiplier)) && (value.rateUnit === void 0 || typeof value.rateUnit === "string");
+}
+function parseManagementCache(raw) {
+  let value;
+  try {
+    value = JSON.parse(raw);
+  } catch {
+    return void 0;
+  }
+  if (!isRecord2(value) || value.version !== KIRO_MANAGEMENT_CACHE_VERSION || value.source !== KIRO_MANAGEMENT_CACHE_SOURCE || !isRecord2(value.regions)) {
+    return void 0;
+  }
+  const regions = {};
+  for (const [region, rawEntry] of Object.entries(value.regions)) {
+    if (!isRecord2(rawEntry) || rawEntry.region !== region || !isPositiveNumber(rawEntry.fetchedAt) || !Array.isArray(rawEntry.models) || rawEntry.models.length === 0 || !rawEntry.models.every(isCachedKiroModel)) {
+      return void 0;
+    }
+    const modelIds = /* @__PURE__ */ new Set();
+    for (const model of rawEntry.models) {
+      if (modelIds.has(model.id))
+        return void 0;
+      modelIds.add(model.id);
+    }
+    regions[region] = rawEntry;
+  }
+  return {
+    version: KIRO_MANAGEMENT_CACHE_VERSION,
+    source: KIRO_MANAGEMENT_CACHE_SOURCE,
+    regions
+  };
+}
+function readManagementCache() {
+  if (!existsSync3(KIRO_MANAGEMENT_CACHE_PATH))
+    return void 0;
+  try {
+    return parseManagementCache(readFileSync2(KIRO_MANAGEMENT_CACHE_PATH, "utf-8"));
+  } catch {
+    return void 0;
+  }
+}
+function writeManagementCache(cache) {
+  const temporaryPath = `${KIRO_MANAGEMENT_CACHE_PATH}.${process.pid}.${randomUUID()}.tmp`;
+  try {
+    writeFileSync(temporaryPath, JSON.stringify(cache, null, 2), "utf-8");
+    renameSync(temporaryPath, KIRO_MANAGEMENT_CACHE_PATH);
+  } finally {
+    rmSync(temporaryPath, { force: true });
+  }
+}
+function toLocalModelId(kiroModelId) {
+  return kiroModelId.replace(/(\d)\.(\d)/g, "$1-$2");
+}
+function humanizeModelId(modelId) {
+  return modelId.split("-").map((word) => word.charAt(0).toUpperCase() + word.slice(1)).join(" ");
+}
+function applyEffortLadder(config) {
+  if (!config || config.values.length === 0)
+    return {};
+  const efforts = KIRO_EFFORT_ORDER.filter((effort) => config.values.includes(effort));
+  if (efforts.length === 0)
+    return {};
+  return { efforts, ...config.summarizedThinking ? { supportsSummarizedThinking: true } : {} };
+}
+function hasReasoningFamilyFallback(modelId) {
+  const normalizedId = modelId.toLowerCase();
+  return normalizedId === "auto" || REASONING_FAMILY_MARKERS.some((marker) => normalizedId.includes(marker));
+}
+function hasVerifiedImageInput(kiroModelId) {
+  return kiroModelId.startsWith("claude-") || VERIFIED_IMAGE_MODEL_IDS.has(kiroModelId.toLowerCase());
+}
+function applyVerifiedCapabilities(model) {
+  if (!hasVerifiedImageInput(model.kiroModelId) || model.input.includes("image"))
+    return model;
+  return { ...model, input: ["text", "image"] };
+}
+function validateCatalogMetadata(model) {
+  const rawSchema = model.additionalModelRequestFieldsSchema;
+  const schema = rawSchema ?? void 0;
+  if (schema !== void 0 && !isRecord2(schema)) {
+    throw new Error(`Kiro management catalog model ${model.modelId} has an invalid request-fields schema`);
   }
-  if (response.models.some((model) => !model || typeof model.modelId !== "string" || !model.modelId)) {
-    throw new Error(`Kiro management ListAvailableModels returned an invalid catalog in ${auth.region}`);
+  const tokenLimits = model.tokenLimits;
+  if (tokenLimits !== void 0 && !isRecord2(tokenLimits)) {
+    throw new Error(`Kiro management catalog model ${model.modelId} has invalid token limits`);
   }
-  return response;
+  if (tokenLimits && (tokenLimits.maxInputTokens !== void 0 && !isPositiveNumber(tokenLimits.maxInputTokens) || tokenLimits.maxOutputTokens !== void 0 && !isPositiveNumber(tokenLimits.maxOutputTokens))) {
+    throw new Error(`Kiro management catalog model ${model.modelId} has invalid token limits`);
+  }
+  return { schema, tokenLimits };
 }
-async function fetchKiroModelCatalog(auth, providedProfileArn) {
-  const profileArn = await resolveKiroProfileArn(auth, providedProfileArn);
-  const region = isApiKey(auth.accessToken) ? API_KEY_REGION : profileRegionCache.get(profileCacheKey(auth)) ?? auth.region;
-  if (region !== auth.region) {
-    return listAvailableModels({ ...auth, region }, profileArn);
+function mapKiroCatalogModels(catalogModels, region, rates) {
+  if (catalogModels.length === 0) {
+    throw new Error(`Kiro management catalog returned no models in ${region}`);
   }
-  return listAvailableModels(auth, profileArn);
+  const seenIds = /* @__PURE__ */ new Set();
+  return catalogModels.map((catalogModel) => {
+    const kiroModelId = catalogModel.modelId;
+    if (!kiroModelId || kiroModelId.trim() !== kiroModelId) {
+      throw new Error(`Kiro management catalog returned an invalid model ID in ${region}`);
+    }
+    const id = toLocalModelId(kiroModelId);
+    if (seenIds.has(id)) {
+      throw new Error(`Kiro management catalog contains conflicting model ID ${id} in ${region}`);
+    }
+    seenIds.add(id);
+    const existing = kiroModels.find((model) => model.id === id);
+    const rate = rates?.get(kiroModelId);
+    const { schema, tokenLimits } = validateCatalogMetadata(catalogModel);
+    const effortConfig = getKiroEffortConfig(schema, kiroModelId);
+    const catalogName = typeof catalogModel.displayName === "string" && catalogModel.displayName.length > 0 ? catalogModel.displayName : void 0;
+    return {
+      id,
+      kiroModelId,
+      // Humanize the wire id, not the local one: `toLocalModelId` rewrites
+      // `5.1` as `5-1`, and a display name derived from it loses the dot —
+      // "Claude Fable 5 1" instead of "Claude Fable 5.1".
+      name: catalogName ?? existing?.name ?? humanizeModelId(kiroModelId),
+      region,
+      // Deliberately schema-only: when a schema exists the resolver returns
+      // `deriveKiroEffort(schema)`, and when it does not the family-marker guess
+      // decides. The fallback tier feeds the ladders, not this flag.
+      reasoning: schema !== void 0 && effortConfig !== void 0 || schema === void 0 && hasReasoningFamilyFallback(id),
+      ...applyEffortLadder(effortConfig),
+      input: existing ? [...existing.input] : hasVerifiedImageInput(kiroModelId) ? ["text", "image"] : ["text"],
+      ...id.startsWith("claude-") ? { recoverTextToolCalls: false } : {},
+      cost: ZERO_COST,
+      ...rate ? { rateMultiplier: rate.multiplier, ...rate.unit ? { rateUnit: rate.unit } : {} } : {},
+      contextWindow: tokenLimits?.maxInputTokens ?? DEFAULT_CONTEXT_WINDOW,
+      maxTokens: tokenLimits?.maxOutputTokens ?? DEFAULT_MAX_TOKENS,
+      ...existing?.firstTokenTimeout ? { firstTokenTimeout: existing.firstTokenTimeout } : {},
+      ...schema ? { additionalModelRequestFieldsSchema: schema } : {},
+      ...tokenLimits ? { tokenLimits } : {}
+    };
+  });
 }
-async function getUsageLimits(auth, request) {
-  const operation = "GetUsageLimits";
-  const url = new URL("Get-Usage-Limits", getKiroEndpoints(auth.region).management);
-  for (const [name, value] of Object.entries(request)) {
-    if (value !== void 0)
-      url.searchParams.set(name, String(value));
+function refreshKnownModelIds(cache) {
+  KIRO_MODEL_IDS.clear();
+  for (const modelId of BOOTSTRAP_KIRO_MODEL_IDS)
+    KIRO_MODEL_IDS.add(modelId);
+  if (!cache)
+    return;
+  for (const entry of Object.values(cache.regions)) {
+    for (const model of entry.models)
+      KIRO_MODEL_IDS.add(model.kiroModelId);
   }
-  let response;
-  try {
-    response = await fetch(url.toString(), {
-      method: "GET",
-      headers: {
-        Accept: "application/json",
-        ...kiroAuthHeaders(auth.accessToken),
-        ...kiroTokenTypeHeaders(auth.accessToken),
-        "User-Agent": "ns-kiro-provider"
-      }
-    });
-  } catch (error2) {
-    throw new Error(`Kiro management ${operation} request failed in ${auth.region}`, { cause: error2 });
+}
+function loadCachedModelIds() {
+  refreshKnownModelIds(readManagementCache());
+}
+function getCachedModels(region) {
+  const cache = readManagementCache();
+  refreshKnownModelIds(cache);
+  const models = cache?.regions[region]?.models ?? kiroModels;
+  let changed = false;
+  const corrected = models.map((model) => {
+    const result = applyVerifiedCapabilities(model);
+    if (result !== model)
+      changed = true;
+    return result;
+  });
+  return changed ? corrected : models;
+}
+function isCacheStale(region) {
+  const entry = readManagementCache()?.regions[region];
+  return !entry || Date.now() - entry.fetchedAt > CACHE_MAX_AGE_MS;
+}
+async function updateKiroModelsCache(accessToken, region, profileArn) {
+  const response = await fetchKiroModelCatalog({ accessToken, region }, profileArn);
+  const models = mapKiroCatalogModels(response.models, region, getKiroCliModelRates());
+  const cache = readManagementCache() ?? {
+    version: KIRO_MANAGEMENT_CACHE_VERSION,
+    source: KIRO_MANAGEMENT_CACHE_SOURCE,
+    regions: {}
+  };
+  cache.regions[region] = { region, fetchedAt: Date.now(), models };
+  writeManagementCache(cache);
+  refreshKnownModelIds(cache);
+}
+function resolveKiroModel(modelId, exactKiroModelId) {
+  if (exactKiroModelId)
+    return exactKiroModelId;
+  const cachedModel = Object.values(readManagementCache()?.regions ?? {}).flatMap((entry) => entry.models).find((model) => model.id === modelId);
+  if (cachedModel) {
+    KIRO_MODEL_IDS.add(cachedModel.kiroModelId);
+    return cachedModel.kiroModelId;
   }
-  return parseManagementResponse(response, operation, auth.region);
+  const bootstrapModel = kiroModels.find((model) => model.id === modelId);
+  if (bootstrapModel)
+    return bootstrapModel.kiroModelId;
+  const normalizedId = modelId.replace(/(\d)-(\d)/g, "$1.$2");
+  loadCachedModelIds();
+  if (!KIRO_MODEL_IDS.has(normalizedId)) {
+    throw new Error(`Unknown Kiro model ID: ${modelId}`);
+  }
+  return normalizedId;
 }
-var LIST_PROFILES_PATH, LIST_MODELS_PATH, GET_PROFILE_TARGET, API_KEY_REGION, profileArnCache, pendingProfileRequests, profileRegionCache, CANONICAL_MANAGEMENT_REGIONS, ENV_PROFILE_ARN, KiroManagementHttpError;
-var init_management = __esm({
-  "../kiro-core/dist/management.js"() {
+var KIRO_MANAGEMENT_CACHE_VERSION, KIRO_MANAGEMENT_CACHE_SOURCE, KIRO_MANAGEMENT_CACHE_PATH, CACHE_MAX_AGE_MS, DEFAULT_CONTEXT_WINDOW, DEFAULT_MAX_TOKENS, ZERO_COST, REASONING_FAMILY_MARKERS, VERIFIED_IMAGE_MODEL_IDS, bootstrapKiroModels, kiroModels, BOOTSTRAP_KIRO_MODEL_IDS, KIRO_MODEL_IDS;
+var init_models = __esm({
+  "../kiro-core/dist/models.js"() {
     "use strict";
-    init_debug();
+    init_effort();
+    init_kiro_cli();
+    init_management();
+    init_types();
     init_endpoints();
-    init_oauth();
-    init_token_type();
-    LIST_PROFILES_PATH = "List-Available-Profiles";
-    LIST_MODELS_PATH = "List-Available-Models";
-    GET_PROFILE_TARGET = "AmazonCodeWhispererService.GetProfile";
-    API_KEY_REGION = "us-east-1";
-    profileArnCache = /* @__PURE__ */ new Map();
-    pendingProfileRequests = /* @__PURE__ */ new Map();
-    profileRegionCache = /* @__PURE__ */ new Map();
-    CANONICAL_MANAGEMENT_REGIONS = ["us-east-1", "eu-central-1"];
-    ENV_PROFILE_ARN = "KIRO_PROFILE_ARN";
-    KiroManagementHttpError = class extends Error {
-      status;
-      constructor(message, status) {
-        super(message);
-        this.status = status;
-        this.name = "KiroManagementHttpError";
+    KIRO_MANAGEMENT_CACHE_VERSION = 1;
+    KIRO_MANAGEMENT_CACHE_SOURCE = "ns-kiro-provider-management";
+    KIRO_MANAGEMENT_CACHE_PATH = join4(homedir4(), ".ns-kiro-provider-models-cache.json");
+    CACHE_MAX_AGE_MS = 36e5;
+    DEFAULT_CONTEXT_WINDOW = 2e5;
+    DEFAULT_MAX_TOKENS = 8192;
+    ZERO_COST = Object.freeze({ input: 0, output: 0, cacheRead: 0, cacheWrite: 0 });
+    REASONING_FAMILY_MARKERS = ["opus", "sonnet", "fable", "coder", "deepseek", "gpt", "glm", "qwen"];
+    VERIFIED_IMAGE_MODEL_IDS = /* @__PURE__ */ new Set(["gpt-5.6-luna"]);
+    bootstrapKiroModels = [
+      {
+        id: "claude-opus-5",
+        kiroModelId: "claude-opus-5",
+        name: "Claude Opus 5",
+        reasoning: true,
+        input: ["text", "image"],
+        cost: ZERO_COST,
+        contextWindow: 1e6,
+        maxTokens: 128e3,
+        firstTokenTimeout: 18e4
+      },
+      {
+        id: "claude-opus-4-8",
+        kiroModelId: "claude-opus-4.8",
+        name: "Claude Opus 4.8",
+        reasoning: true,
+        input: ["text", "image"],
+        cost: ZERO_COST,
+        contextWindow: 1e6,
+        maxTokens: 128e3,
+        firstTokenTimeout: 18e4
+      },
+      {
+        id: "claude-opus-4-7",
+        kiroModelId: "claude-opus-4.7",
+        name: "Claude Opus 4.7",
+        reasoning: true,
+        input: ["text", "image"],
+        cost: ZERO_COST,
+        contextWindow: 1e6,
+        maxTokens: 128e3,
+        firstTokenTimeout: 18e4
+      },
+      {
+        id: "claude-opus-4-6",
+        kiroModelId: "claude-opus-4.6",
+        name: "Claude Opus 4.6",
+        reasoning: true,
+        input: ["text", "image"],
+        cost: ZERO_COST,
+        contextWindow: 1e6,
+        maxTokens: 32768
+      },
+      {
+        id: "claude-opus-4-5",
+        kiroModelId: "claude-opus-4.5",
+        name: "Claude Opus 4.5",
+        reasoning: true,
+        input: ["text", "image"],
+        cost: ZERO_COST,
+        contextWindow: 2e5,
+        maxTokens: 64e3
+      },
+      {
+        id: "claude-sonnet-5",
+        kiroModelId: "claude-sonnet-5",
+        name: "Claude Sonnet 5",
+        reasoning: true,
+        input: ["text", "image"],
+        cost: ZERO_COST,
+        contextWindow: 1e6,
+        maxTokens: 65536
+      },
+      {
+        id: "claude-sonnet-4-6",
+        kiroModelId: "claude-sonnet-4.6",
+        name: "Claude Sonnet 4.6",
+        reasoning: true,
+        input: ["text", "image"],
+        cost: ZERO_COST,
+        contextWindow: 1e6,
+        maxTokens: 65536
+      },
+      {
+        id: "claude-sonnet-4-5",
+        kiroModelId: "claude-sonnet-4.5",
+        name: "Claude Sonnet 4.5",
+        reasoning: true,
+        input: ["text", "image"],
+        cost: ZERO_COST,
+        contextWindow: 2e5,
+        maxTokens: 65536
+      },
+      {
+        id: "claude-sonnet-4",
+        kiroModelId: "claude-sonnet-4",
+        name: "Claude Sonnet 4",
+        reasoning: true,
+        input: ["text", "image"],
+        cost: ZERO_COST,
+        contextWindow: 2e5,
+        maxTokens: 65536
+      },
+      {
+        id: "claude-haiku-4-5",
+        kiroModelId: "claude-haiku-4.5",
+        name: "Claude Haiku 4.5",
+        reasoning: false,
+        input: ["text", "image"],
+        cost: ZERO_COST,
+        contextWindow: 2e5,
+        maxTokens: 65536
+      },
+      {
+        id: "claude-fable-5",
+        kiroModelId: "claude-fable-5",
+        name: "Claude Fable 5",
+        reasoning: true,
+        input: ["text", "image"],
+        cost: ZERO_COST,
+        contextWindow: 1e6,
+        maxTokens: 65536
+      },
+      {
+        id: "gpt-5-6-luna",
+        kiroModelId: "gpt-5.6-luna",
+        name: "GPT-5.6 Luna",
+        reasoning: true,
+        input: ["text", "image"],
+        cost: ZERO_COST,
+        contextWindow: 272e3,
+        maxTokens: 128e3
+      },
+      {
+        id: "gpt-5-6-sol",
+        kiroModelId: "gpt-5.6-sol",
+        name: "GPT-5.6 Sol",
+        reasoning: true,
+        input: ["text"],
+        cost: ZERO_COST,
+        contextWindow: 272e3,
+        maxTokens: 128e3
+      },
+      {
+        id: "gpt-5-6-terra",
+        kiroModelId: "gpt-5.6-terra",
+        name: "GPT-5.6 Terra",
+        reasoning: true,
+        input: ["text"],
+        cost: ZERO_COST,
+        contextWindow: 272e3,
+        maxTokens: 128e3
+      },
+      {
+        id: "deepseek-3-2",
+        kiroModelId: "deepseek-3.2",
+        name: "DeepSeek 3.2",
+        reasoning: true,
+        input: ["text"],
+        cost: ZERO_COST,
+        contextWindow: 164e3,
+        maxTokens: 8192
+      },
+      {
+        id: "minimax-m2-5",
+        kiroModelId: "minimax-m2.5",
+        name: "MiniMax M2.5",
+        reasoning: false,
+        input: ["text"],
+        cost: ZERO_COST,
+        contextWindow: 196e3,
+        maxTokens: 8192
+      },
+      {
+        id: "minimax-m2-1",
+        kiroModelId: "minimax-m2.1",
+        name: "MiniMax M2.1",
+        reasoning: false,
+        input: ["text"],
+        cost: ZERO_COST,
+        contextWindow: 196e3,
+        maxTokens: 8192
+      },
+      {
+        id: "glm-5",
+        kiroModelId: "glm-5",
+        name: "GLM 5",
+        reasoning: true,
+        input: ["text"],
+        cost: ZERO_COST,
+        contextWindow: 2e5,
+        maxTokens: 8192
+      },
+      {
+        id: "qwen3-coder-next",
+        kiroModelId: "qwen3-coder-next",
+        name: "Qwen3 Coder Next",
+        reasoning: true,
+        input: ["text"],
+        cost: ZERO_COST,
+        contextWindow: 256e3,
+        maxTokens: 8192
+      },
+      {
+        id: "auto",
+        kiroModelId: "auto",
+        name: "Auto",
+        reasoning: true,
+        input: ["text", "image"],
+        cost: ZERO_COST,
+        contextWindow: 1e6,
+        maxTokens: 65536
       }
-    };
+    ];
+    kiroModels = bootstrapKiroModels.map((model) => ({
+      ...model,
+      ...applyEffortLadder(model.reasoning ? getKiroEffortConfig(model.additionalModelRequestFieldsSchema, model.kiroModelId) : void 0),
+      ...model.id.startsWith("claude-") ? { recoverTextToolCalls: false } : {}
+    }));
+    BOOTSTRAP_KIRO_MODEL_IDS = kiroModels.map((model) => model.kiroModelId);
+    KIRO_MODEL_IDS = new Set(BOOTSTRAP_KIRO_MODEL_IDS);
   }
 });
 
@@ -1653,8 +1663,8 @@ var require_base64_js = __commonJS({
       }
       return arr;
     }
-    function tripletToBase64(num) {
-      return lookup[num >> 18 & 63] + lookup[num >> 12 & 63] + lookup[num >> 6 & 63] + lookup[num & 63];
+    function tripletToBase64(num2) {
+      return lookup[num2 >> 18 & 63] + lookup[num2 >> 12 & 63] + lookup[num2 >> 6 & 63] + lookup[num2 & 63];
     }
     function encodeChunk(uint8, start, end) {
       var tmp;
@@ -1747,6 +1757,10 @@ var KiroBlockBuffer = class {
   getText(index) {
     return this.blocks.get(index)?.text ?? "";
   }
+  /** Kinds of the live blocks, in allocation order. */
+  kinds() {
+    return [...this.blocks.values()].map((block) => block.kind);
+  }
   /**
    * Rewrite one accumulated block before it is closed. Used by the recovery
    * passes that lift tool calls out of text and by echo-noise stripping, both
@@ -1836,23 +1850,262 @@ function parseBracketToolCalls(text) {
   }
   return { toolCalls, cleanedText };
 }
-
-// ../kiro-core/dist/cost.js
-var PER_MILLION = 1e6;
-function calculateKiroCost(cost, usage) {
-  const input = usage.input * cost.input / PER_MILLION;
-  const output = usage.output * cost.output / PER_MILLION;
-  const cacheRead = (usage.cacheRead ?? 0) * cost.cacheRead / PER_MILLION;
-  const cacheWrite = (usage.cacheWrite ?? 0) * cost.cacheWrite / PER_MILLION;
-  return { input, output, cacheRead, cacheWrite, total: input + output + cacheRead + cacheWrite };
+
+// ../kiro-core/dist/cache-estimator.js
+var stateByConversation = /* @__PURE__ */ new Map();
+var MAX_TRACKED_CONVERSATIONS = 128;
+var warnedWireCacheCounters = false;
+function applyCacheEstimate(conversationId, usage, wireUsage, config, now = Date.now()) {
+  const previous = stateByConversation.get(conversationId);
+  const promptTokens = usage.input + (usage.cacheRead ?? 0) + (usage.cacheWrite ?? 0) + usage.output;
+  const wireReportedCache = wireUsage?.cacheReadInputTokens !== void 0 || wireUsage?.cacheWriteInputTokens !== void 0;
+  if (wireReportedCache) {
+    if (config.estimateCacheUsage && !warnedWireCacheCounters) {
+      warnedWireCacheCounters = true;
+      console.warn("[kiro-core] Kiro now reports cache token counters; cache estimation was skipped and may be disabled.");
+    }
+    noteSuccessfulTurn(conversationId, promptTokens, usage.input, now);
+    return 0;
+  }
+  if (!config.estimateCacheUsage || usage.input <= 0)
+    return 0;
+  if (!previous) {
+    noteSuccessfulTurn(conversationId, promptTokens, usage.input, now);
+    return 0;
+  }
+  const expired = config.estimatedCacheTimeout > 0 && now - previous.turnTimestamp > config.estimatedCacheTimeout;
+  const contextShrank = usage.input < previous.promptTokens * 0.6;
+  if (expired || contextShrank) {
+    noteSuccessfulTurn(conversationId, promptTokens, usage.input, now);
+    return 0;
+  }
+  const estimatedRead = Math.min(previous.promptTokens, usage.input);
+  if (estimatedRead > 0) {
+    usage.input -= estimatedRead;
+    usage.cacheRead = (usage.cacheRead ?? 0) + estimatedRead;
+    usage.cacheEstimated = true;
+  }
+  noteSuccessfulTurn(conversationId, promptTokens, promptTokens, now);
+  return estimatedRead;
+}
+function noteSuccessfulTurn(conversationId, promptTokens, input, now) {
+  if (input <= 0 || promptTokens <= 0)
+    return;
+  stateByConversation.delete(conversationId);
+  stateByConversation.set(conversationId, { promptTokens, turnTimestamp: now });
+  if (stateByConversation.size > MAX_TRACKED_CONVERSATIONS) {
+    const oldest = stateByConversation.keys().next().value;
+    if (oldest !== void 0)
+      stateByConversation.delete(oldest);
+  }
+}
+
+// ../kiro-core/dist/cost.js
+var PER_MILLION = 1e6;
+function calculateKiroCost(cost, usage) {
+  const input = usage.input * cost.input / PER_MILLION;
+  const output = usage.output * cost.output / PER_MILLION;
+  const cacheRead = (usage.cacheRead ?? 0) * cost.cacheRead / PER_MILLION;
+  const cacheWrite = (usage.cacheWrite ?? 0) * cost.cacheWrite / PER_MILLION;
+  return { input, output, cacheRead, cacheWrite, total: input + output + cacheRead + cacheWrite };
+}
+
+// ../kiro-core/dist/index.js
+init_debug();
+init_effort();
+init_endpoints();
+
+// ../kiro-core/dist/retry.js
+init_models();
+var FIRST_TOKEN_TIMEOUT = 9e4;
+var REQUEST_HEADER_TIMEOUT = 9e4;
+function firstTokenTimeoutForModel(modelId) {
+  if (retryConfig.firstTokenTimeoutMs !== FIRST_TOKEN_TIMEOUT) {
+    return retryConfig.firstTokenTimeoutMs;
+  }
+  const model = kiroModels.find((m) => m.id === modelId);
+  return model?.firstTokenTimeout ?? FIRST_TOKEN_TIMEOUT;
+}
+var retryConfig = {
+  firstTokenTimeoutMs: FIRST_TOKEN_TIMEOUT,
+  requestHeaderTimeoutMs: REQUEST_HEADER_TIMEOUT
+};
+function exponentialBackoff(attempt, baseMs, maxMs) {
+  return Math.min(baseMs * 2 ** attempt, maxMs);
+}
+var MAX_RETRY_DELAY = 1e4;
+var REQUEST_RATE_FALLBACK_DELAY_MS = 1e4;
+function extractKiroReason(errorText) {
+  if (!errorText)
+    return void 0;
+  try {
+    const parsed = JSON.parse(errorText);
+    if (!parsed || typeof parsed !== "object" || Array.isArray(parsed))
+      return void 0;
+    const reason = parsed.reason;
+    return typeof reason === "string" && reason.length > 0 ? reason : void 0;
+  } catch {
+    return void 0;
+  }
+}
+function parseRetryAfterMs(headers, nowMs = Date.now()) {
+  const get = headers?.get?.bind(headers);
+  if (!get)
+    return void 0;
+  const milliseconds = nonNegativeNumber(get("retry-after-ms"));
+  if (milliseconds !== void 0)
+    return Math.round(milliseconds);
+  const retryAfter = get("retry-after");
+  if (retryAfter !== null && retryAfter.trim() !== "") {
+    const seconds = Number(retryAfter);
+    if (Number.isFinite(seconds)) {
+      if (seconds >= 0) {
+        const delayMs = seconds * 1e3;
+        if (Number.isFinite(delayMs))
+          return Math.round(delayMs);
+      }
+    } else {
+      const dateMs = Date.parse(retryAfter);
+      if (!Number.isNaN(dateMs))
+        return Math.max(0, dateMs - nowMs);
+    }
+  }
+  const resetAfterSeconds = nonNegativeNumber(get("x-ratelimit-reset-after"));
+  if (resetAfterSeconds !== void 0) {
+    const delayMs = resetAfterSeconds * 1e3;
+    if (Number.isFinite(delayMs))
+      return Math.round(delayMs);
+  }
+  return void 0;
+}
+function resolveRequestRateRetryDelay(headers, nowMs = Date.now()) {
+  const advertisedDelayMs = parseRetryAfterMs(headers, nowMs);
+  const requestedDelayMs = advertisedDelayMs ?? REQUEST_RATE_FALLBACK_DELAY_MS;
+  return {
+    delayMs: Math.min(requestedDelayMs, MAX_RETRY_DELAY),
+    ...advertisedDelayMs !== void 0 ? { advertisedDelayMs } : {},
+    capped: requestedDelayMs > MAX_RETRY_DELAY
+  };
+}
+function nonNegativeNumber(value) {
+  if (value === null || value.trim() === "")
+    return void 0;
+  const parsed = Number(value);
+  return Number.isFinite(parsed) && parsed >= 0 ? parsed : void 0;
+}
+var KIRO_REASON_CODES = Object.freeze({
+  /** Request body exceeded the service's size threshold. */
+  CONTENT_LENGTH_EXCEEDS_THRESHOLD: "CONTENT_LENGTH_EXCEEDS_THRESHOLD",
+  /** Prose-only size rejection; the service sends no reason code for this one. */
+  INPUT_TOO_LONG: "Input is too long",
+  /** Monthly request quota exhausted — hard limit, not transient. */
+  MONTHLY_REQUEST_COUNT: "MONTHLY_REQUEST_COUNT",
+  /** Model capacity temporarily unavailable — transient, worth retrying. */
+  INSUFFICIENT_MODEL_CAPACITY: "INSUFFICIENT_MODEL_CAPACITY",
+  /** Short-window request throttle — retry only within the provider budget. */
+  USER_REQUEST_RATE_EXCEEDED: "USER_REQUEST_RATE_EXCEEDED",
+  /**
+   * Generic request-validation rejection, returned for a malformed body of any
+   * size (empty `content`, history referencing tools absent from the catalog).
+   * Not a size signal: classifying it as "too big" makes the caller compact a
+   * history that was never the problem, a loop it can never satisfy.
+   */
+  REQUEST_BODY_INVALID: "REQUEST_BODY_INVALID"
+});
+var TOO_BIG_PATTERNS = Object.freeze([
+  KIRO_REASON_CODES.CONTENT_LENGTH_EXCEEDS_THRESHOLD,
+  KIRO_REASON_CODES.INPUT_TOO_LONG
+]);
+var NON_RETRYABLE_BODY_PATTERNS = Object.freeze([KIRO_REASON_CODES.MONTHLY_REQUEST_COUNT]);
+var CAPACITY_PATTERN = KIRO_REASON_CODES.INSUFFICIENT_MODEL_CAPACITY;
+var CAPACITY_MAX_RETRIES = 3;
+var CAPACITY_BASE_DELAY_MS = 5e3;
+var capacityRetryConfig = {
+  maxRetries: CAPACITY_MAX_RETRIES,
+  baseDelayMs: CAPACITY_BASE_DELAY_MS
+};
+function isTooBigError(status, errorText) {
+  return status === 413 || status === 400 && TOO_BIG_PATTERNS.some((p) => errorText.includes(p));
+}
+function isNonRetryableBodyError(errorText) {
+  return NON_RETRYABLE_BODY_PATTERNS.some((p) => errorText.includes(p));
+}
+function isCapacityError(errorText) {
+  return errorText.includes(CAPACITY_PATTERN);
 }
 
-// ../kiro-core/dist/index.js
-init_debug();
-init_effort();
-init_endpoints();
+// ../kiro-core/dist/errors.js
+var REASON_CODE_MARKERS = [
+  KIRO_REASON_CODES.CONTENT_LENGTH_EXCEEDS_THRESHOLD,
+  KIRO_REASON_CODES.MONTHLY_REQUEST_COUNT,
+  KIRO_REASON_CODES.INSUFFICIENT_MODEL_CAPACITY,
+  KIRO_REASON_CODES.REQUEST_BODY_INVALID
+];
+var KiroApiError = class extends Error {
+  status;
+  reasonCode;
+  retryAfterMs;
+  providerAttempts;
+  constructor(message, status, reasonCode, retryAfterMs, providerAttempts) {
+    super(message);
+    this.status = status;
+    this.reasonCode = reasonCode;
+    this.retryAfterMs = retryAfterMs;
+    this.providerAttempts = providerAttempts;
+    this.name = "KiroApiError";
+  }
+};
+function extractKiroReasonCode(errorText) {
+  if (!errorText)
+    return void 0;
+  const trimmed = errorText.trim();
+  if (trimmed.startsWith("{")) {
+    try {
+      const parsed = JSON.parse(trimmed);
+      const reason = parsed.reason ?? parsed.reasonCode;
+      if (typeof reason === "string" && reason.length > 0)
+        return reason;
+    } catch {
+    }
+  }
+  return REASON_CODE_MARKERS.find((code) => errorText.includes(code));
+}
 
 // ../kiro-core/dist/event-parser.js
+var KIRO_EVENT_KEYS = [
+  "assistantResponseEvent",
+  "codeReferenceEvent",
+  "contextUsageEvent",
+  "documentCitationEvent",
+  "error",
+  "metadataEvent",
+  "meteringEvent",
+  "reasoningContentEvent",
+  "serviceUnavailableError",
+  "throttlingError",
+  "toolResultEvent",
+  "toolUseEvent",
+  "validationError"
+];
+var KIRO_EVENT_KEY_SET = new Set(KIRO_EVENT_KEYS);
+var KIRO_ERROR_MEMBERS = {
+  error: { kind: "internalServer", exception: "InternalServerException" },
+  throttlingError: { kind: "throttling", exception: "ThrottlingException" },
+  validationError: { kind: "validation", exception: "ValidationException" },
+  serviceUnavailableError: { kind: "serviceUnavailable", exception: "ServiceUnavailableException" }
+};
+var KIRO_ERROR_TOKENS = {
+  ...KIRO_ERROR_MEMBERS,
+  InternalServerException: KIRO_ERROR_MEMBERS.error,
+  ThrottlingException: KIRO_ERROR_MEMBERS.throttlingError,
+  ValidationException: KIRO_ERROR_MEMBERS.validationError,
+  ServiceUnavailableException: KIRO_ERROR_MEMBERS.serviceUnavailableError
+};
+function lookupKiroErrorMember(key) {
+  return Object.hasOwn(KIRO_ERROR_TOKENS, key) ? KIRO_ERROR_TOKENS[key] : void 0;
+}
+var num = (v) => typeof v === "number" ? v : void 0;
+var str = (v) => typeof v === "string" ? v : void 0;
 function tokenCount(value) {
   return typeof value === "number" && Number.isFinite(value) && value >= 0 ? value : void 0;
 }
@@ -1871,30 +2124,136 @@ var CACHE_WRITE_KEYS = [
   "cacheCreationInputTokens",
   "cacheWriteTokens"
 ];
-function parseKiroEvent(parsed) {
-  if (parsed.content !== void 0)
-    return { type: "content", data: parsed.content };
-  if (typeof parsed.text === "string")
-    return { type: "thinkingText", data: parsed.text };
-  if (typeof parsed.signature === "string")
-    return { type: "thinkingSignature", data: parsed.signature };
+function toolInput(raw) {
+  if (typeof raw === "string")
+    return raw;
+  if (raw && typeof raw === "object" && Object.keys(raw).length > 0) {
+    return JSON.stringify(raw);
+  }
+  return "";
+}
+function parseToolUse(parsed) {
   if (parsed.name && parsed.toolUseId) {
-    const input = typeof parsed.input === "string" ? parsed.input : parsed.input && typeof parsed.input === "object" && Object.keys(parsed.input).length > 0 ? JSON.stringify(parsed.input) : "";
     return {
       type: "toolUse",
       data: {
         name: parsed.name,
         toolUseId: parsed.toolUseId,
-        input,
+        input: toolInput(parsed.input),
         stop: parsed.stop
       }
     };
   }
+  if (parsed.input !== void 0) {
+    return { type: "toolUseInput", data: { input: toolInput(parsed.input) } };
+  }
+  if (parsed.stop !== void 0)
+    return { type: "toolUseStop", data: { stop: parsed.stop } };
+  return null;
+}
+function parseMetadata(parsed) {
+  const tu = parsed.tokenUsage ?? {};
+  const data = {
+    inputTokens: tokenCount(tu.uncachedInputTokens) ?? tokenCount(tu.inputTokens),
+    outputTokens: tokenCount(tu.outputTokens),
+    totalTokens: tokenCount(tu.totalTokens),
+    cacheReadInputTokens: firstTokenCount(tu, CACHE_READ_KEYS),
+    cacheWriteInputTokens: firstTokenCount(tu, CACHE_WRITE_KEYS),
+    contextUsagePercentage: num(tu.contextUsagePercentage),
+    normalizedTokenUsage: num(tu.normalizedTokenUsage),
+    rawStopReason: str(parsed.stopReason),
+    stopDetails: parsed.stopDetails && typeof parsed.stopDetails === "object" ? parsed.stopDetails : void 0
+  };
+  for (const k of Object.keys(data)) {
+    if (data[k] === void 0)
+      delete data[k];
+  }
+  return Object.keys(data).length > 0 ? { type: "usage", data } : null;
+}
+function parseError(parsed, kind, fallbackName) {
+  const rawError = parsed.error ?? parsed.Error;
+  const error2 = typeof rawError === "string" ? rawError : rawError !== void 0 ? JSON.stringify(rawError) : str(parsed.name) ?? fallbackName;
+  const message = parsed.message ?? parsed.Message ?? parsed.reason;
+  const data = { error: error2, kind };
+  if (typeof message === "string")
+    data.message = message;
+  const reason = str(parsed.reason);
+  if (reason !== void 0)
+    data.reason = reason;
+  const retryAfterMilliseconds = num(parsed.retryAfterMilliseconds);
+  if (retryAfterMilliseconds !== void 0)
+    data.retryAfterMilliseconds = retryAfterMilliseconds;
+  return { type: "error", data };
+}
+function parseKiroEvent(key, parsed) {
+  switch (key) {
+    case "assistantResponseEvent": {
+      const content = str(parsed.content);
+      return content !== void 0 ? { type: "content", data: content } : null;
+    }
+    case "reasoningContentEvent": {
+      const text = str(parsed.text);
+      if (text !== void 0)
+        return { type: "thinkingText", data: text };
+      const signature = str(parsed.signature);
+      if (signature !== void 0)
+        return { type: "thinkingSignature", data: signature };
+      return { type: "ignored", data: { key } };
+    }
+    case "toolUseEvent":
+      return parseToolUse(parsed);
+    case "contextUsageEvent": {
+      const pct = num(parsed.contextUsagePercentage);
+      return pct !== void 0 ? { type: "contextUsage", data: { contextUsagePercentage: pct } } : null;
+    }
+    case "metadataEvent":
+      return parseMetadata(parsed);
+    case "meteringEvent":
+      return {
+        type: "metering",
+        data: { credits: tokenCount(parsed.usage), unit: str(parsed.unit), unitPlural: str(parsed.unitPlural) }
+      };
+    // Reachable when a member that models an exception is delivered as an
+    // ordinary event frame. The real wire uses exception framing, handled by
+    // parseKiroExceptionFrame, but both routes must agree.
+    case "error":
+    case "throttlingError":
+    case "validationError":
+    case "serviceUnavailableError": {
+      const member = lookupKiroErrorMember(key);
+      return parseError(parsed, member.kind, member.exception);
+    }
+    // Known members with no consumer yet: explicitly ignored, not unparseable.
+    case "codeReferenceEvent":
+    case "documentCitationEvent":
+    case "toolResultEvent":
+      return { type: "ignored", data: { key } };
+    default: {
+      const member = lookupKiroErrorMember(key);
+      if (member)
+        return parseError(parsed, member.kind, member.exception);
+      return parseKiroEventByShape(parsed);
+    }
+  }
+}
+function parseKiroExceptionFrame(key, parsed) {
+  const member = lookupKiroErrorMember(key);
+  if (!member)
+    return null;
+  const event = parseError(parsed, member.kind, member.exception);
+  return event.data;
+}
+function parseKiroEventByShape(parsed) {
+  if (parsed.content !== void 0)
+    return { type: "content", data: parsed.content };
+  if (typeof parsed.text === "string")
+    return { type: "thinkingText", data: parsed.text };
+  if (typeof parsed.signature === "string")
+    return { type: "thinkingSignature", data: parsed.signature };
+  if (parsed.name && parsed.toolUseId)
+    return parseToolUse(parsed);
   if (parsed.input !== void 0 && !parsed.name) {
-    return {
-      type: "toolUseInput",
-      data: { input: typeof parsed.input === "string" ? parsed.input : JSON.stringify(parsed.input) }
-    };
+    return { type: "toolUseInput", data: { input: toolInput(parsed.input) } };
   }
   if (parsed.stop !== void 0 && parsed.contextUsagePercentage === void 0)
     return { type: "toolUseStop", data: { stop: parsed.stop } };
@@ -1902,42 +2261,23 @@ function parseKiroEvent(parsed) {
     return { type: "contextUsage", data: { contextUsagePercentage: parsed.contextUsagePercentage } };
   if (parsed.followupPrompt !== void 0)
     return { type: "followupPrompt", data: parsed.followupPrompt };
+  if (parsed.tokenUsage !== void 0 || parsed.stopReason !== void 0 || parsed.stopDetails !== void 0) {
+    return parseMetadata(parsed);
+  }
   if (parsed.error !== void 0 || parsed.Error !== void 0) {
-    const error2 = parsed.error || parsed.Error || "unknown";
-    const message = parsed.message || parsed.Message || parsed.reason;
-    return { type: "error", data: { error: typeof error2 === "string" ? error2 : JSON.stringify(error2), message } };
-  }
-  if (parsed.usage !== void 0) {
-    if (typeof parsed.usage === "number") {
-      const credits = tokenCount(parsed.usage);
-      if (credits === void 0)
-        return null;
-      return {
-        type: "usage",
-        data: {
-          credits,
-          ...typeof parsed.unit === "string" && parsed.unit ? { creditUnit: parsed.unit } : {}
-        }
-      };
-    }
-    const u = parsed.usage;
-    const cacheReadTokens = firstTokenCount(u, CACHE_READ_KEYS);
-    const cacheWriteTokens = firstTokenCount(u, CACHE_WRITE_KEYS);
+    return parseError(parsed, "unknown", "unknown");
+  }
+  if (typeof parsed.usage === "number") {
     return {
-      type: "usage",
-      data: {
-        inputTokens: tokenCount(u.inputTokens),
-        outputTokens: tokenCount(u.outputTokens),
-        ...cacheReadTokens !== void 0 ? { cacheReadTokens } : {},
-        ...cacheWriteTokens !== void 0 ? { cacheWriteTokens } : {}
-      }
+      type: "metering",
+      data: { credits: tokenCount(parsed.usage), unit: str(parsed.unit), unitPlural: str(parsed.unitPlural) }
     };
   }
   return null;
 }
 
 // ../kiro-core/dist/transform.js
-import { createHash } from "node:crypto";
+import { createHash as createHash2 } from "node:crypto";
 var TOOL_RESULT_LIMIT = 25e4;
 var EMPTY_CONTENT_PLACEHOLDER = "Please proceed with the task.";
 function sanitizeSurrogates(text) {
@@ -1955,7 +2295,7 @@ var KIRO_TOOL_USE_ID_PATTERN = /^[a-zA-Z0-9_.:-]{1,64}$/;
 function toKiroToolUseId(toolUseId) {
   if (KIRO_TOOL_USE_ID_PATTERN.test(toolUseId))
     return toolUseId;
-  const digest = createHash("sha256").update(toolUseId).digest("base64url").slice(0, 32);
+  const digest = createHash2("sha256").update(toolUseId).digest("base64url").slice(0, 32);
   return `pi_${digest}`;
 }
 function normalizeMessages(messages) {
@@ -2969,8 +3309,8 @@ function bytePairEncode(piece, ranks) {
     return [ranks.get(piece.join(","))];
   return bytePairMerge(piece, ranks).map((p) => ranks.get(piece.slice(p.start, p.end).join(","))).filter((x) => x != null);
 }
-function escapeRegex(str) {
-  return str.replace(/[\\^$*+?.()|[\]{}]/g, "\\$&");
+function escapeRegex(str2) {
+  return str2.replace(/[\\^$*+?.()|[\]{}]/g, "\\$&");
 }
 var _Tiktoken = class {
   /** @internal */
@@ -3117,6 +3457,7 @@ var KiroResponseAssembler = class {
   totalContent = "";
   lastContentData = "";
   usageEvent = null;
+  meteringEvent = null;
   receivedContextUsage = false;
   thinkingParser = null;
   nativeThinkingBlockIndex = null;
@@ -3124,16 +3465,19 @@ var KiroResponseAssembler = class {
   textBlockIndex = null;
   emittedToolCalls = 0;
   sawAnyToolCalls = false;
+  droppedToolCalls = [];
   currentToolCall = null;
+  stopReason = "stop";
   constructor(model, thinkingEnabled) {
     this.model = model;
     this.thinkingEnabled = thinkingEnabled;
   }
-  /** Clear per-attempt state. Block indexes and accumulated usage are kept. */
+  /** Clear per-attempt state. Only block indexes are kept. */
   beginAttempt() {
     this.totalContent = "";
     this.lastContentData = "";
     this.usageEvent = null;
+    this.meteringEvent = null;
     this.receivedContextUsage = false;
     this.thinkingParser = this.thinkingEnabled ? new ThinkingTagParser(this.blocks) : null;
     this.nativeThinkingBlockIndex = null;
@@ -3141,7 +3485,17 @@ var KiroResponseAssembler = class {
     this.textBlockIndex = null;
     this.emittedToolCalls = 0;
     this.sawAnyToolCalls = false;
+    this.droppedToolCalls = [];
     this.currentToolCall = null;
+    this.usage.input = 0;
+    this.usage.output = 0;
+    this.usage.totalTokens = 0;
+    this.usage.cost = { input: 0, output: 0, cacheRead: 0, cacheWrite: 0, total: 0 };
+    delete this.usage.cacheRead;
+    delete this.usage.cacheWrite;
+    delete this.usage.contextPercent;
+    delete this.usage.credits;
+    delete this.usage.creditUnit;
   }
   /** Hand over the events buffered so far. */
   takeEvents() {
@@ -3218,11 +3572,17 @@ var KiroResponseAssembler = class {
         break;
       }
       case "usage": {
-        this.usageEvent = event.data;
+        this.usageEvent = { ...this.usageEvent ?? {}, ...event.data };
         if (debugEnabled())
           debugLog("response.usageRaw", payload);
         break;
       }
+      case "metering": {
+        this.meteringEvent = event.data;
+        if (debugEnabled())
+          debugLog("stream.metering", [event.data]);
+        break;
+      }
     }
   }
   /**
@@ -3230,8 +3590,12 @@ var KiroResponseAssembler = class {
    * text-dialect recovery and echo-stripping passes.
    */
   endTurn() {
-    if (this.currentToolCall && this.emitToolCall(this.currentToolCall))
-      this.emittedToolCalls++;
+    if (this.currentToolCall) {
+      if (this.emitToolCall(this.currentToolCall))
+        this.emittedToolCalls++;
+      else
+        this.droppedToolCalls.push(this.currentToolCall.name);
+    }
     this.currentToolCall = null;
     this.endNativeThinking();
     if (this.thinkingParser) {
@@ -3242,13 +3606,16 @@ var KiroResponseAssembler = class {
     this.stripEchoNoise();
     const responseText = this.textBlockIndex === null ? "" : this.blocks.getText(this.textBlockIndex);
     const hasText2 = responseText.length > 0;
+    this.stopReason = !this.receivedContextUsage && this.emittedToolCalls === 0 ? "length" : this.emittedToolCalls > 0 ? "toolUse" : "stop";
     return {
       responseText,
       hasText: hasText2,
       sawAnyToolCalls: this.sawAnyToolCalls,
       emittedToolCalls: this.emittedToolCalls,
       isEchoLoop: hasText2 && !this.sawAnyToolCalls && ECHO_NOISE_PATTERN.test(responseText),
-      isEmpty: !hasText2 && !this.sawAnyToolCalls
+      isEmpty: !hasText2 && !this.sawAnyToolCalls,
+      stopReason: this.stopReason,
+      droppedToolCalls: this.droppedToolCalls
     };
   }
   /** Drop an echo the caller decided not to retry, so it is not read as a continuation signal. */
@@ -3256,6 +3623,10 @@ var KiroResponseAssembler = class {
     if (this.textBlockIndex !== null)
       this.blocks.setText(this.textBlockIndex, "");
   }
+  /** Kinds of the blocks this attempt produced, for the exhaustion diagnostic. */
+  contentKinds() {
+    return this.blocks.kinds();
+  }
   /** Close the text block and settle usage and the stop reason. */
   complete() {
     if (this.textBlockIndex !== null)
@@ -3263,17 +3634,17 @@ var KiroResponseAssembler = class {
     if (this.usageEvent?.inputTokens !== void 0)
       this.usage.input = this.usageEvent.inputTokens;
     this.usage.output = this.usageEvent?.outputTokens ?? countTokens(this.totalContent);
-    this.usage.totalTokens = this.usage.input + this.usage.output;
-    if (this.usageEvent?.cacheReadTokens !== void 0)
-      this.usage.cacheRead = this.usageEvent.cacheReadTokens;
-    if (this.usageEvent?.cacheWriteTokens !== void 0)
-      this.usage.cacheWrite = this.usageEvent.cacheWriteTokens;
-    if (this.usageEvent?.credits !== void 0)
-      this.usage.credits = this.usageEvent.credits;
-    if (this.usageEvent?.creditUnit !== void 0)
-      this.usage.creditUnit = this.usageEvent.creditUnit;
+    this.usage.totalTokens = this.usageEvent?.totalTokens ?? this.usage.input + (this.usageEvent?.cacheReadInputTokens ?? 0) + (this.usageEvent?.cacheWriteInputTokens ?? 0) + this.usage.output;
+    if (this.usageEvent?.cacheReadInputTokens !== void 0)
+      this.usage.cacheRead = this.usageEvent.cacheReadInputTokens;
+    if (this.usageEvent?.cacheWriteInputTokens !== void 0)
+      this.usage.cacheWrite = this.usageEvent.cacheWriteInputTokens;
+    if (this.meteringEvent?.credits !== void 0)
+      this.usage.credits = this.meteringEvent.credits;
+    if (this.meteringEvent?.unit !== void 0)
+      this.usage.creditUnit = this.meteringEvent.unit;
     this.usage.cost = calculateKiroCost(this.model.cost, this.usage);
-    const stopReason = !this.receivedContextUsage && this.emittedToolCalls === 0 ? "length" : this.emittedToolCalls > 0 ? "toolUse" : "stop";
+    const stopReason = this.stopReason;
     debugLog("response.done", {
       stopReason,
       receivedContextUsage: this.receivedContextUsage,
@@ -3282,7 +3653,12 @@ var KiroResponseAssembler = class {
       textLen: this.textBlockIndex === null ? 0 : this.blocks.getText(this.textBlockIndex).length,
       usage: this.usage
     });
-    return { stopReason, usage: this.usage };
+    return {
+      stopReason,
+      usage: this.usage,
+      wireUsage: this.usageEvent,
+      metering: this.meteringEvent
+    };
   }
   ensureNativeThinkingBlock() {
     if (this.nativeThinkingBlockIndex === null)
@@ -3317,6 +3693,8 @@ var KiroResponseAssembler = class {
       return;
     if (this.emitToolCall(this.currentToolCall))
       this.emittedToolCalls++;
+    else
+      this.droppedToolCalls.push(this.currentToolCall.name);
     this.currentToolCall = null;
   }
   /**
@@ -3358,6 +3736,8 @@ var KiroResponseAssembler = class {
     for (const call of recovered) {
       if (this.emitToolCall({ toolUseId: call.toolUseId, name: call.name, input: JSON.stringify(call.arguments) })) {
         this.emittedToolCalls++;
+      } else {
+        this.droppedToolCalls.push(call.name);
       }
     }
   }
@@ -4117,6 +4497,7 @@ function readKiroEventStream(body, options) {
   const outcome = { firstTokenTimedOut: false, idleTimedOut: false, error: null };
   const idleTimeoutMs = options.idleTimeoutMs ?? IDLE_TIMEOUT;
   const bodyReader = body.getReader();
+  const callerSignal = options.signal;
   async function* frames() {
     let idleTimer = null;
     const resetIdle = () => {
@@ -4128,6 +4509,14 @@ function readKiroEventStream(body, options) {
         });
       }, idleTimeoutMs);
     };
+    const onCallerStreamAbort = () => {
+      void bodyReader.cancel().catch(() => {
+      });
+    };
+    if (callerSignal?.aborted)
+      onCallerStreamAbort();
+    else
+      callerSignal?.addEventListener("abort", onCallerStreamAbort, { once: true });
     const bodyIterable = {
       async *[Symbol.asyncIterator]() {
         try {
@@ -4148,6 +4537,26 @@ function readKiroEventStream(body, options) {
       if (!entry)
         throw new Error("Received an empty event stream message");
       const [key, msg] = entry;
+      if (msg.headers[":message-type"]?.value === "exception") {
+        let parsedException = {};
+        try {
+          const decoded = JSON.parse(utf8Decoder.decode(msg.body));
+          if (decoded && typeof decoded === "object")
+            parsedException = decoded;
+        } catch {
+        }
+        const data = parseKiroExceptionFrame(key, parsedException) ?? {
+          error: key,
+          kind: "unknown",
+          ...typeof parsedException.message === "string" ? { message: parsedException.message } : {},
+          ...typeof parsedException.reason === "string" ? { reason: parsedException.reason } : {},
+          ...typeof parsedException.retryAfterMilliseconds === "number" ? { retryAfterMilliseconds: parsedException.retryAfterMilliseconds } : {}
+        };
+        const error2 = new Error(data.message ? `${data.error}: ${data.message}` : data.error);
+        error2.name = data.error;
+        error2.kiroError = data;
+        return { [key]: error2 };
+      }
       const parsed = JSON.parse(utf8Decoder.decode(msg.body));
       return { [key]: parsed };
     });
@@ -4156,29 +4565,43 @@ function readKiroEventStream(body, options) {
     const FIRST_TOKEN_SENTINEL = /* @__PURE__ */ Symbol("firstTokenTimeout");
     try {
       while (true) {
+        if (callerSignal?.aborted) {
+          throw callerSignal.reason ?? new Error("Request aborted");
+        }
         let iterResult;
         try {
           if (!gotFirstToken) {
             const readPromise = iterator.next();
-            const result = await Promise.race([
-              readPromise,
-              new Promise((resolve) => setTimeout(() => resolve(FIRST_TOKEN_SENTINEL), options.firstTokenTimeoutMs))
-            ]);
-            if (result === FIRST_TOKEN_SENTINEL) {
-              readPromise.catch(() => {
-              });
-              void bodyReader.cancel().catch(() => {
-              });
-              outcome.firstTokenTimedOut = true;
-              return;
+            let firstTokenTimer;
+            try {
+              const result = await Promise.race([
+                readPromise,
+                new Promise((resolve) => {
+                  firstTokenTimer = setTimeout(() => resolve(FIRST_TOKEN_SENTINEL), options.firstTokenTimeoutMs);
+                })
+              ]);
+              if (result === FIRST_TOKEN_SENTINEL) {
+                readPromise.catch(() => {
+                });
+                void bodyReader.cancel().catch(() => {
+                });
+                outcome.firstTokenTimedOut = true;
+                return;
+              }
+              iterResult = result;
+              gotFirstToken = true;
+              resetIdle();
+            } finally {
+              if (firstTokenTimer !== void 0)
+                clearTimeout(firstTokenTimer);
             }
-            iterResult = result;
-            gotFirstToken = true;
-            resetIdle();
           } else {
             iterResult = await iterator.next();
           }
         } catch (e) {
+          const kiroError = e?.kiroError;
+          if (kiroError)
+            outcome.errorData = kiroError;
           outcome.error = e instanceof Error ? e.message : (typeof e === "object" && e !== null ? JSON.stringify(e) : String(e)) || "Unknown stream error";
           return;
         }
@@ -4186,148 +4609,40 @@ function readKiroEventStream(body, options) {
         if (done)
           return;
         resetIdle();
-        const payload = Object.values(value)[0];
-        const event = parseKiroEvent(payload);
+        const frameEntry = Object.entries(value)[0];
+        if (!frameEntry)
+          continue;
+        const [frameKey, framePayload] = frameEntry;
+        const event = parseKiroEvent(frameKey, framePayload ?? {});
         if (!event)
           continue;
+        if (event.type === "ignored") {
+          if (debugEnabled())
+            debugLog("stream.events.ignored", [event.data.key]);
+          continue;
+        }
         if (debugEnabled())
           debugLog("stream.events", [event]);
         if (event.type === "error") {
           outcome.error = event.data.message ? `${event.data.error}: ${event.data.message}` : event.data.error;
+          outcome.errorData = event.data;
           void bodyReader.cancel().catch(() => {
           });
           return;
         }
-        yield { event, payload };
+        yield { event, payload: framePayload };
       }
     } finally {
       if (idleTimer)
         clearTimeout(idleTimer);
+      callerSignal?.removeEventListener("abort", onCallerStreamAbort);
     }
   }
   return { frames: frames(), outcome };
 }
 
-// ../kiro-core/dist/retry.js
-init_models();
-var FIRST_TOKEN_TIMEOUT = 9e4;
-var REQUEST_HEADER_TIMEOUT = 9e4;
-function firstTokenTimeoutForModel(modelId) {
-  if (retryConfig.firstTokenTimeoutMs !== FIRST_TOKEN_TIMEOUT) {
-    return retryConfig.firstTokenTimeoutMs;
-  }
-  const model = kiroModels.find((m) => m.id === modelId);
-  return model?.firstTokenTimeout ?? FIRST_TOKEN_TIMEOUT;
-}
-var retryConfig = {
-  firstTokenTimeoutMs: FIRST_TOKEN_TIMEOUT,
-  requestHeaderTimeoutMs: REQUEST_HEADER_TIMEOUT
-};
-function exponentialBackoff(attempt, baseMs, maxMs) {
-  return Math.min(baseMs * 2 ** attempt, maxMs);
-}
-var MAX_RETRY_DELAY = 1e4;
-var REQUEST_RATE_FALLBACK_DELAY_MS = 1e4;
-function extractKiroReason(errorText) {
-  if (!errorText)
-    return void 0;
-  try {
-    const parsed = JSON.parse(errorText);
-    if (!parsed || typeof parsed !== "object" || Array.isArray(parsed))
-      return void 0;
-    const reason = parsed.reason;
-    return typeof reason === "string" && reason.length > 0 ? reason : void 0;
-  } catch {
-    return void 0;
-  }
-}
-function parseRetryAfterMs(headers, nowMs = Date.now()) {
-  const get = headers?.get?.bind(headers);
-  if (!get)
-    return void 0;
-  const milliseconds = nonNegativeNumber(get("retry-after-ms"));
-  if (milliseconds !== void 0)
-    return Math.round(milliseconds);
-  const retryAfter = get("retry-after");
-  if (retryAfter !== null && retryAfter.trim() !== "") {
-    const seconds = Number(retryAfter);
-    if (Number.isFinite(seconds)) {
-      if (seconds >= 0) {
-        const delayMs = seconds * 1e3;
-        if (Number.isFinite(delayMs))
-          return Math.round(delayMs);
-      }
-    } else {
-      const dateMs = Date.parse(retryAfter);
-      if (!Number.isNaN(dateMs))
-        return Math.max(0, dateMs - nowMs);
-    }
-  }
-  const resetAfterSeconds = nonNegativeNumber(get("x-ratelimit-reset-after"));
-  if (resetAfterSeconds !== void 0) {
-    const delayMs = resetAfterSeconds * 1e3;
-    if (Number.isFinite(delayMs))
-      return Math.round(delayMs);
-  }
-  return void 0;
-}
-function resolveRequestRateRetryDelay(headers, nowMs = Date.now()) {
-  const advertisedDelayMs = parseRetryAfterMs(headers, nowMs);
-  const requestedDelayMs = advertisedDelayMs ?? REQUEST_RATE_FALLBACK_DELAY_MS;
-  return {
-    delayMs: Math.min(requestedDelayMs, MAX_RETRY_DELAY),
-    ...advertisedDelayMs !== void 0 ? { advertisedDelayMs } : {},
-    capped: requestedDelayMs > MAX_RETRY_DELAY
-  };
-}
-function nonNegativeNumber(value) {
-  if (value === null || value.trim() === "")
-    return void 0;
-  const parsed = Number(value);
-  return Number.isFinite(parsed) && parsed >= 0 ? parsed : void 0;
-}
-var KIRO_REASON_CODES = Object.freeze({
-  /** Request body exceeded the service's size threshold. */
-  CONTENT_LENGTH_EXCEEDS_THRESHOLD: "CONTENT_LENGTH_EXCEEDS_THRESHOLD",
-  /** Prose-only size rejection; the service sends no reason code for this one. */
-  INPUT_TOO_LONG: "Input is too long",
-  /** Monthly request quota exhausted — hard limit, not transient. */
-  MONTHLY_REQUEST_COUNT: "MONTHLY_REQUEST_COUNT",
-  /** Model capacity temporarily unavailable — transient, worth retrying. */
-  INSUFFICIENT_MODEL_CAPACITY: "INSUFFICIENT_MODEL_CAPACITY",
-  /** Short-window request throttle — retry only within the provider budget. */
-  USER_REQUEST_RATE_EXCEEDED: "USER_REQUEST_RATE_EXCEEDED",
-  /**
-   * Generic request-validation rejection, returned for a malformed body of any
-   * size (empty `content`, history referencing tools absent from the catalog).
-   * Not a size signal: classifying it as "too big" makes the caller compact a
-   * history that was never the problem, a loop it can never satisfy.
-   */
-  REQUEST_BODY_INVALID: "REQUEST_BODY_INVALID"
-});
-var TOO_BIG_PATTERNS = Object.freeze([
-  KIRO_REASON_CODES.CONTENT_LENGTH_EXCEEDS_THRESHOLD,
-  KIRO_REASON_CODES.INPUT_TOO_LONG
-]);
-var NON_RETRYABLE_BODY_PATTERNS = Object.freeze([KIRO_REASON_CODES.MONTHLY_REQUEST_COUNT]);
-var CAPACITY_PATTERN = KIRO_REASON_CODES.INSUFFICIENT_MODEL_CAPACITY;
-var CAPACITY_MAX_RETRIES = 3;
-var CAPACITY_BASE_DELAY_MS = 5e3;
-var capacityRetryConfig = {
-  maxRetries: CAPACITY_MAX_RETRIES,
-  baseDelayMs: CAPACITY_BASE_DELAY_MS
-};
-function isTooBigError(status, errorText) {
-  return status === 413 || status === 400 && TOO_BIG_PATTERNS.some((p) => errorText.includes(p));
-}
-function isNonRetryableBodyError(errorText) {
-  return NON_RETRYABLE_BODY_PATTERNS.some((p) => errorText.includes(p));
-}
-function isCapacityError(errorText) {
-  return errorText.includes(CAPACITY_PATTERN);
-}
-
 // ../kiro-core/dist/stream.js
+import { createHash as createHash3 } from "node:crypto";
 init_debug();
 init_effort();
 init_endpoints();
@@ -4400,7 +4715,64 @@ function createResponseHeaderDeadline(callerSignal, timeoutMs) {
   };
 }
 
+// ../kiro-core/dist/usage-tracking.js
+var DEFAULT_USD_PER_CREDIT = 0.04;
+var DEFAULT_ESTIMATED_CACHE_TIMEOUT_MS = 5 * 60 * 1e3;
+var KIRO_USAGE_TRACKING_DISABLED = Object.freeze({
+  estimateDollarValue: false,
+  usdPerCredit: DEFAULT_USD_PER_CREDIT,
+  estimateCacheUsage: false,
+  estimatedCacheTimeout: DEFAULT_ESTIMATED_CACHE_TIMEOUT_MS
+});
+var CREDIT_UNITS = /* @__PURE__ */ new Set(["credit", "credits"]);
+function estimateKiroCreditCost(tracking, metering) {
+  if (!tracking.estimateDollarValue || !metering)
+    return void 0;
+  if (typeof metering.unit !== "string" || !CREDIT_UNITS.has(metering.unit.toLowerCase()))
+    return void 0;
+  const { credits } = metering;
+  if (typeof credits !== "number" || !Number.isFinite(credits) || credits < 0)
+    return void 0;
+  return credits * tracking.usdPerCredit;
+}
+
 // ../kiro-core/dist/stream.js
+function describeAttempts(count) {
+  return count === 1 ? "1 attempt" : `${count} attempts`;
+}
+var DIAGNOSTIC_QUOTE_LIMIT = 200;
+function clampForDiagnostic(text) {
+  return text.length <= DIAGNOSTIC_QUOTE_LIMIT ? text : `${text.slice(0, DIAGNOSTIC_QUOTE_LIMIT)}\u2026 (truncated)`;
+}
+function encodeBytesForDiagnostic(bytes) {
+  let encoded = "";
+  for (const byte of bytes) {
+    encoded += String.fromCharCode(65 + (byte >> 4), 65 + (byte & 15));
+  }
+  return encoded;
+}
+function encodeToolNameForDiagnostic(name) {
+  const identity = typeof name === "string" ? name : `${typeof name}:${JSON.stringify(name)}`;
+  let encoded = "";
+  for (let i = 0; i < identity.length; i++) {
+    const codeUnit = identity.charCodeAt(i);
+    encoded += String.fromCharCode(65 + (codeUnit >> 12), 65 + (codeUnit >> 8 & 15), 65 + (codeUnit >> 4 & 15), 65 + (codeUnit & 15));
+  }
+  return encoded;
+}
+function describeDroppedToolNames(names) {
+  const encoded = names.map((name) => `A-P:${encodeToolNameForDiagnostic(name)}`).join(", ");
+  if (encoded.length <= DIAGNOSTIC_QUOTE_LIMIT)
+    return encoded;
+  const digest = createHash3("sha256").update(JSON.stringify(names)).digest();
+  return `A-P-DIGEST:${encodeBytesForDiagnostic(digest)} (tool identities fingerprinted)`;
+}
+function describeReturnedContent(kinds) {
+  const unique = [...new Set(kinds)].sort();
+  if (unique.length === 0)
+    return "returning empty content";
+  return `returning only ${unique.join(" and ")} content`;
+}
 var skipProfileResolutionForTests = false;
 var TEST_PROFILE_ARN = "arn:aws:codewhisperer:us-east-1:000000000000:profile/test";
 async function* streamKiro(request) {
@@ -4411,7 +4783,6 @@ async function* streamKiro(request) {
   }
   let accessToken = initialAccessToken;
   const region = model.region ?? "us-east-1";
-  const endpoint = new URL("generateAssistantResponse", getKiroEndpoints(region).runtime).toString();
   let managementAuth = { accessToken, region };
   const cliCreds = getKiroCliCredentials() ?? getKiroCliCredentialsAllowExpired();
   const cliProfileArn = cliCreds?.access === accessToken ? cliCreds.profileArn : void 0;
@@ -4430,9 +4801,11 @@ async function* streamKiro(request) {
     managementAuth = { accessToken, region };
     profileArn = freshCreds.profileArn || (skipProfileResolutionForTests ? TEST_PROFILE_ARN : await resolveKiroProfileArn(managementAuth));
   }
-  if (!process.env.VITEST && isCacheStale(region)) {
-    updateKiroModelsCache(accessToken, region, profileArn).catch((error2) => {
-      console.warn(`[kiro-core] Failed to refresh Kiro model catalog in ${region}: ${formatSafeError(error2)}`);
+  let runtimeRegion = getKiroRegionFromProfileArn(profileArn) ?? region;
+  let endpoint = new URL("generateAssistantResponse", getKiroEndpoints(runtimeRegion).runtime).toString();
+  if (!process.env.VITEST && isCacheStale(runtimeRegion)) {
+    updateKiroModelsCache(accessToken, runtimeRegion, profileArn).catch((error2) => {
+      console.warn(`[kiro-core] Failed to refresh Kiro model catalog in ${runtimeRegion}: ${formatSafeError(error2)}`);
     });
   }
   const kiroModelId = resolveKiroModel(model.id, model.kiroModelId);
@@ -4461,8 +4834,13 @@ async function* streamKiro(request) {
 ${systemPrompt}` : ""}`;
   }
   const assembler = new KiroResponseAssembler(model, thinkingEnabled);
+  const usageTracking = request.usageTracking ?? KIRO_USAGE_TRACKING_DISABLED;
   let retryCount = 0;
   const maxRetries = 3;
+  let emptyAttempts = 0;
+  let echoAttempts = 0;
+  let credentialRefreshTotal = 0;
+  let capacityRetryTotal = 0;
   const conversationId = request.sessionId ?? crypto.randomUUID();
   requestLoop: while (retryCount <= maxRetries) {
     if (signal?.aborted)
@@ -4545,6 +4923,7 @@ ${systemPrompt}` : ""}`;
         });
         if (isCapacityError(errText) && capacityRetryCount < capacityRetryConfig.maxRetries) {
           capacityRetryCount++;
+          capacityRetryTotal++;
           const delayMs = exponentialBackoff(capacityRetryCount - 1, capacityRetryConfig.baseDelayMs, 3e4);
           logCapacityEvent(`INSUFFICIENT_MODEL_CAPACITY \u2014 retrying in ${delayMs}ms (${capacityRetryCount}/${capacityRetryConfig.maxRetries})`);
           await abortableDelay(delayMs, signal);
@@ -4572,6 +4951,7 @@ ${systemPrompt}` : ""}`;
         }
         if (response.status === 403 && !isCapacityError(errText) && retryCount < maxRetries) {
           retryCount++;
+          credentialRefreshTotal++;
           invalidateKiroProfileArn(managementAuth);
           const rejectedAccessToken = accessToken;
           const rejectedProfileArn = profileArn;
@@ -4583,16 +4963,23 @@ ${systemPrompt}` : ""}`;
           managementAuth = { accessToken, region };
           const inheritedDesktopProfileArn = rejectedCliCreds?.authMethod === "desktop" && freshCreds?.authMethod === "desktop" ? rejectedProfileArn : void 0;
           profileArn = freshCreds?.profileArn || inheritedDesktopProfileArn || (skipProfileResolutionForTests ? TEST_PROFILE_ARN : await resolveKiroProfileArn(managementAuth));
+          runtimeRegion = getKiroRegionFromProfileArn(profileArn) ?? region;
+          endpoint = new URL("generateAssistantResponse", getKiroEndpoints(runtimeRegion).runtime).toString();
           await abortableDelay(exponentialBackoff(retryCount - 1, 500, MAX_RETRY_DELAY), signal);
           break;
         }
+        const errorMeta = {
+          reasonCode: extractKiroReasonCode(errText),
+          retryAfterMs: parseRetryAfterMs(response.headers),
+          providerAttempts: { credentialRefresh: credentialRefreshTotal, capacity: capacityRetryTotal }
+        };
         if (isNonRetryableBodyError(errText) || isCapacityError(errText)) {
-          throw new Error(`Kiro API error: ${errText || safeStatusText}`);
+          throw new KiroApiError(`Kiro API error: ${errText || safeStatusText}`, response.status, errorMeta.reasonCode, errorMeta.retryAfterMs, errorMeta.providerAttempts);
         }
         if (isTooBigError(response.status, errText)) {
-          throw new Error(`Kiro API error: context_length_exceeded (${response.status} ${errText})`);
+          throw new KiroApiError(`Kiro API error: context_length_exceeded (${response.status} ${errText})`, response.status, errorMeta.reasonCode, errorMeta.retryAfterMs, errorMeta.providerAttempts);
         }
-        throw new Error(`Kiro API error: ${response.status} ${safeStatusText} ${errText}`);
+        throw new KiroApiError(`Kiro API error: ${response.status} ${safeStatusText} ${errText}`, response.status, errorMeta.reasonCode, errorMeta.retryAfterMs, errorMeta.providerAttempts);
       }
       break;
     }
@@ -4606,7 +4993,8 @@ ${systemPrompt}` : ""}`;
       throw new Error("No response body");
     assembler.beginAttempt();
     const { frames, outcome } = readKiroEventStream(response.body, {
-      firstTokenTimeoutMs: model.firstTokenTimeout ?? firstTokenTimeoutForModel(model.id)
+      firstTokenTimeoutMs: model.firstTokenTimeout ?? firstTokenTimeoutForModel(model.id),
+      signal
     });
     for await (const frame of frames) {
       assembler.handle(frame);
@@ -4616,6 +5004,11 @@ ${systemPrompt}` : ""}`;
     if (outcome.firstTokenTimedOut || outcome.idleTimedOut || outcome.error) {
       if (retryCount < maxRetries) {
         retryCount++;
+        if (outcome.errorData && debugEnabled()) {
+          debugLog("stream.error.typed", [outcome.errorData]);
+        }
+        assembler.discard();
+        yield* assembler.takeEvents();
         await abortableDelay(exponentialBackoff(retryCount - 1, 1e3, MAX_RETRY_DELAY), signal);
         continue;
       }
@@ -4625,7 +5018,13 @@ ${systemPrompt}` : ""}`;
     }
     const summary = assembler.endTurn();
     yield* assembler.takeEvents();
-    if (summary.isEmpty || summary.isEchoLoop) {
+    const degenerate = summary.isEmpty || summary.isEchoLoop;
+    if (summary.isEchoLoop)
+      echoAttempts++;
+    else if (degenerate)
+      emptyAttempts++;
+    let errorMessage;
+    if (degenerate) {
       const mayRetry = retryCount < maxRetries && (!summary.isEchoLoop || request.canDiscardEmittedBlocks === true);
       if (mayRetry) {
         retryCount++;
@@ -4637,15 +5036,39 @@ ${systemPrompt}` : ""}`;
       }
       if (summary.isEchoLoop) {
         assembler.stripEcho();
-        console.warn(`[kiro-core] Echo loop \u2014 stripping "Continue" response`);
+        const alsoEmpty = emptyAttempts > 0 ? ` (plus ${describeAttempts(emptyAttempts)} with no text at all)` : "";
+        console.warn(`[kiro-core] Echo loop persisted across ${describeAttempts(echoAttempts)}${alsoEmpty} \u2014 stripping "Continue" response (${summary.responseText.length} chars)`);
+        errorMessage = `Kiro model echoed its own continuation prompt (${JSON.stringify(clampForDiagnostic(summary.responseText))}) on ${describeAttempts(echoAttempts)}${alsoEmpty} and emitted no tool calls; retry budget exhausted, text stripped, stopReason:"${summary.stopReason}"`;
       } else {
-        console.warn(`[kiro-core] Empty response after ${maxRetries} retries \u2014 giving up on this turn`);
+        const alsoEchoed = echoAttempts > 0 ? ` (plus ${describeAttempts(echoAttempts)} that echoed the continuation prompt)` : "";
+        console.warn(`[kiro-core] Empty response on ${describeAttempts(emptyAttempts)}${alsoEchoed}, retry budget exhausted \u2014 returning stopReason:"${summary.stopReason}" to avoid agent loop stall`);
+        errorMessage = `Kiro returned no text and no tool calls on ${describeAttempts(emptyAttempts)}${alsoEchoed}; retry budget exhausted, ${describeReturnedContent(assembler.contentKinds())} with stopReason:"${summary.stopReason}"`;
       }
     }
-    const { stopReason, usage } = assembler.complete();
+    if (summary.droppedToolCalls.length > 0) {
+      const names = describeDroppedToolNames(summary.droppedToolCalls);
+      const one = summary.droppedToolCalls.length === 1;
+      const dropDiagnostic = `Kiro sent ${one ? "a tool call" : "tool calls"} with unparseable arguments (${names}); ${one ? "it was" : "they were"} dropped and never reached the agent, stopReason:"${summary.stopReason}"`;
+      errorMessage = errorMessage ? `${errorMessage}. ${dropDiagnostic}` : dropDiagnostic;
+    }
+    const { stopReason, usage, wireUsage, metering } = assembler.complete();
     yield* assembler.takeEvents();
+    if (!errorMessage) {
+      const estimatedRead = applyCacheEstimate(conversationId, usage, wireUsage, usageTracking);
+      if (estimatedRead > 0) {
+        debugLog("usage.estimate", {
+          conversationId,
+          estimatedRead,
+          input: usage.input,
+          cacheRead: usage.cacheRead
+        });
+      }
+      const estimatedCost = estimateKiroCreditCost(usageTracking, metering);
+      if (estimatedCost !== void 0)
+        usage.cost.total = estimatedCost;
+    }
     yield { type: "usage", usage };
-    yield { type: "done", stopReason };
+    yield { type: "done", stopReason, ...errorMessage ? { errorMessage } : {} };
     return;
   }
 }
@@ -5023,10 +5446,20 @@ function streamKiroForOmp(model, context, options) {
             if (event.usage.contextPercent !== void 0) {
               output.usage.contextPercent = event.usage.contextPercent;
             }
+            if (event.usage.credits !== void 0) {
+              output.usage.credits = event.usage.credits;
+            }
+            if (event.usage.creditUnit !== void 0) {
+              output.usage.creditUnit = event.usage.creditUnit;
+            }
+            if (event.usage.cacheEstimated !== void 0) {
+              output.usage.cacheEstimated = event.usage.cacheEstimated;
+            }
             break;
           }
           case "done":
             output.stopReason = event.stopReason;
+            if (event.errorMessage) output.errorMessage = event.errorMessage;
             stream.push({ type: "done", reason: event.stopReason, message: output });
             break;
         }