ns-omp-provider 0.4.0 → 0.6.0

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## 0.5.0
+
+Bundles `@ngosangns/ns-pi-provider@0.4.0`.
+
+- Kiro and Devin calls run in the Go `ns-bridge` sidecar when a binary is installed, and
+  in-process otherwise (see the Pi adapter's changelog); `NS_BRIDGE_ENGINE=ts` opts out.
+
 ## 0.4.0
 
 Bundles `@ngosangns/ns-pi-provider@0.3.0`.

package/dist/index.js

@@ -1,4 +1,4 @@
-// ns-omp-provider 0.4.0 — bundles @ngosangns/ns-pi-provider@0.3.0 (MIT). See NOTICE.
+// ns-omp-provider 0.6.0 — bundles @ngosangns/ns-pi-provider@0.5.0 (MIT). See NOTICE.
 import { createRequire as __nsOmpCreateRequire } from 'node:module';
 const require = __nsOmpCreateRequire(import.meta.url);
 var __create = Object.create;
@@ -240,11 +240,18 @@ function resolveApiRegion(ssoRegion) {
     return "us-east-1";
   return API_REGION_MAP[ssoRegion] ?? ssoRegion;
 }
+function endpointOverride(name, region) {
+  const value = process.env[name]?.trim();
+  if (!value)
+    return void 0;
+  const url = value.replaceAll("{region}", region);
+  return url.endsWith("/") ? url : `${url}/`;
+}
 function getKiroEndpoints(region) {
   return {
     region,
-    management: `https://management.${region}.kiro.dev/`,
-    runtime: `https://runtime.${region}.kiro.dev/`
+    management: endpointOverride(KIRO_MANAGEMENT_ENDPOINT_ENV, region) ?? `https://management.${region}.kiro.dev/`,
+    runtime: endpointOverride(KIRO_RUNTIME_ENDPOINT_ENV, region) ?? `https://runtime.${region}.kiro.dev/`
   };
 }
 function getKiroRegionFromProfileArn(profileArn) {
@@ -264,7 +271,7 @@ function getKiroRegionFromEndpoint(endpoint) {
     return void 0;
   }
 }
-var API_REGION_MAP;
+var API_REGION_MAP, KIRO_RUNTIME_ENDPOINT_ENV, KIRO_MANAGEMENT_ENDPOINT_ENV;
 var init_endpoints = __esm({
   "../kiro-core/dist/endpoints.js"() {
     "use strict";
@@ -286,6 +293,8 @@ var init_endpoints = __esm({
       "eu-south-2": "eu-central-1",
       "eu-central-2": "eu-central-1"
     };
+    KIRO_RUNTIME_ENDPOINT_ENV = "KIRO_RUNTIME_ENDPOINT";
+    KIRO_MANAGEMENT_ENDPOINT_ENV = "KIRO_MANAGEMENT_ENDPOINT";
   }
 });
 
@@ -688,23 +697,28 @@ function kiroAuthHeaders(token) {
 function isApiKey(token) {
   return token.startsWith("ksk_");
 }
+async function fetchApiKeyGetProfile(accessToken) {
+  try {
+    return await fetch(getKiroEndpoints(API_KEY_REGION).management, {
+      method: "POST",
+      headers: {
+        "Content-Type": "application/x-amz-json-1.0",
+        "X-Amz-Target": "AmazonCodeWhispererService.GetProfile",
+        ...kiroAuthHeaders(accessToken),
+        ...kiroUserAgent("codewhispererruntime", "F,C")
+      },
+      body: "{}"
+    });
+  } catch (error2) {
+    throw new Error(`Kiro management GetProfile request failed in ${API_KEY_REGION}`, { cause: error2 });
+  }
+}
 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: "{}"
-  });
+  const response = await fetchApiKeyGetProfile(apiKey);
   if (!response.ok) {
     let detail = "";
     try {
@@ -725,7 +739,7 @@ async function loginKiroWithApiKey(apiKey, onProgress) {
     expires: Date.now() + 365 * 24 * 60 * 60 * 1e3,
     clientId: "",
     clientSecret: "",
-    region,
+    region: API_KEY_REGION,
     authMethod: "apikey",
     ...profileArn ? { profileArn } : {}
   };
@@ -796,6 +810,12 @@ async function refreshKiroTokenInternal(credentials) {
   }
 }
 async function refreshKiroTokenDirect(credentials) {
+  return refreshKiroTokenDirectInProcess(credentials);
+}
+function endpointFromEnv(name, fallback, region) {
+  return (process.env[name]?.trim() || fallback).replaceAll("{region}", region);
+}
+async function refreshKiroTokenDirectInProcess(credentials) {
   const parts = credentials.refresh.split("|");
   const refreshToken = parts[0] ?? "";
   const authMethod = parts[parts.length - 1] ?? "idc";
@@ -803,7 +823,7 @@ async function refreshKiroTokenDirect(credentials) {
   if (authMethod === "apikey")
     return credentials;
   if (authMethod === "desktop") {
-    const url = KIRO_DESKTOP_REFRESH_URL.replace("{region}", region);
+    const url = endpointFromEnv(KIRO_DESKTOP_REFRESH_ENDPOINT_ENV, KIRO_DESKTOP_REFRESH_URL, region);
     const response2 = await fetch(url, {
       method: "POST",
       headers: { "Content-Type": "application/json", "User-Agent": KIRO_DESKTOP_USER_AGENT },
@@ -863,7 +883,7 @@ async function refreshKiroTokenDirect(credentials) {
   }
   const clientId = parts[1] ?? "";
   const clientSecret = parts[2] ?? "";
-  const ssoEndpoint = `https://oidc.${region}.amazonaws.com`;
+  const ssoEndpoint = endpointFromEnv(KIRO_OIDC_ENDPOINT_ENV, "https://oidc.{region}.amazonaws.com", region);
   const response = await fetch(`${ssoEndpoint}/token`, {
     method: "POST",
     headers: { "Content-Type": "application/json", ...kiroUserAgent("ssooidc", "E") },
@@ -911,7 +931,7 @@ async function resolveKiroCredentials() {
     throw lastFailure;
   return void 0;
 }
-var KIRO_DESKTOP_REFRESH_URL, EXPIRES_BUFFER_MS, KIRO_DESKTOP_USER_AGENT, AUTH_SOURCE_ENV;
+var KIRO_DESKTOP_REFRESH_URL, EXPIRES_BUFFER_MS, KIRO_DESKTOP_USER_AGENT, AUTH_SOURCE_ENV, API_KEY_REGION, KIRO_DESKTOP_REFRESH_ENDPOINT_ENV, KIRO_OIDC_ENDPOINT_ENV;
 var init_oauth = __esm({
   "../kiro-core/dist/oauth.js"() {
     "use strict";
@@ -922,6 +942,9 @@ var init_oauth = __esm({
     EXPIRES_BUFFER_MS = 5 * 60 * 1e3;
     KIRO_DESKTOP_USER_AGENT = "Kiro-Desktop/0.2.13 (darwin; arm64)";
     AUTH_SOURCE_ENV = "KIRO_AUTH_SOURCE";
+    API_KEY_REGION = "us-east-1";
+    KIRO_DESKTOP_REFRESH_ENDPOINT_ENV = "KIRO_DESKTOP_REFRESH_ENDPOINT";
+    KIRO_OIDC_ENDPOINT_ENV = "KIRO_OIDC_ENDPOINT";
   }
 });
 
@@ -1004,25 +1027,11 @@ function profileCacheKey(auth) {
 }
 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 response = await fetchApiKeyGetProfile(accessToken);
+  const parsed = await parseManagementResponse(response, operation, API_KEY_REGION2);
   const arn = parsed.profile?.arn;
   if (!arn) {
-    throw new Error(`Kiro management ${operation} returned no profile in ${API_KEY_REGION}`);
+    throw new Error(`Kiro management ${operation} returned no profile in ${API_KEY_REGION2}`);
   }
   return arn;
 }
@@ -1064,8 +1073,8 @@ async function resolveKiroProfileArn(auth, providedArn) {
     if (isApiKey(auth.accessToken)) {
       const arn = await getApiKeyProfileArn(auth.accessToken);
       profileArnCache.set(key, arn);
-      profileRegionCache.set(key, API_KEY_REGION);
-      debugLog("profile.resolve", { source: "api-key", region: API_KEY_REGION, arn });
+      profileRegionCache.set(key, API_KEY_REGION2);
+      debugLog("profile.resolve", { source: "api-key", region: API_KEY_REGION2, arn });
       return arn;
     }
     let lastResponse;
@@ -1118,13 +1127,13 @@ async function listAvailableModels(auth, profileArn) {
 }
 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;
+  const region = isApiKey(auth.accessToken) ? API_KEY_REGION2 : profileRegionCache.get(profileCacheKey(auth)) ?? auth.region;
   if (region !== auth.region) {
     return listAvailableModels({ ...auth, region }, profileArn);
   }
   return listAvailableModels(auth, profileArn);
 }
-var LIST_PROFILES_PATH, LIST_MODELS_PATH, GET_PROFILE_TARGET, API_KEY_REGION, profileArnCache, pendingProfileRequests, profileRegionCache, CANONICAL_MANAGEMENT_REGIONS, ENV_PROFILE_ARN, KiroManagementHttpError;
+var LIST_PROFILES_PATH, LIST_MODELS_PATH, API_KEY_REGION2, profileArnCache, pendingProfileRequests, profileRegionCache, CANONICAL_MANAGEMENT_REGIONS, ENV_PROFILE_ARN, KiroManagementHttpError;
 var init_management = __esm({
   "../kiro-core/dist/management.js"() {
     "use strict";
@@ -1134,8 +1143,7 @@ var init_management = __esm({
     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";
+    API_KEY_REGION2 = "us-east-1";
     profileArnCache = /* @__PURE__ */ new Map();
     pendingProfileRequests = /* @__PURE__ */ new Map();
     profileRegionCache = /* @__PURE__ */ new Map();
@@ -1167,7 +1175,8 @@ __export(models_exports, {
   mapKiroCatalogModels: () => mapKiroCatalogModels,
   resolveApiRegion: () => resolveApiRegion,
   resolveKiroModel: () => resolveKiroModel,
-  updateKiroModelsCache: () => updateKiroModelsCache
+  updateKiroModelsCache: () => updateKiroModelsCache,
+  updateKiroModelsCacheInProcess: () => updateKiroModelsCacheInProcess
 });
 import { randomUUID } from "node:crypto";
 import { existsSync as existsSync3, readFileSync as readFileSync2, renameSync, rmSync, writeFileSync } from "node:fs";
@@ -1359,6 +1368,10 @@ function isCacheStale(region) {
   return !entry || Date.now() - entry.fetchedAt > CACHE_MAX_AGE_MS;
 }
 async function updateKiroModelsCache(accessToken, region, profileArn) {
+  await updateKiroModelsCacheInProcess(accessToken, region, profileArn);
+  refreshKnownModelIds(readManagementCache());
+}
+async function updateKiroModelsCacheInProcess(accessToken, region, profileArn) {
   const response = await fetchKiroModelCatalog({ accessToken, region }, profileArn);
   const models = mapKiroCatalogModels(response.models, region, getKiroCliModelRates());
   const cache = readManagementCache() ?? {
@@ -5522,6 +5535,9 @@ function throwOnTerminalWireStop(wireStopReason, stopDetails) {
   }
 }
 async function* streamKiro(request) {
+  yield* streamKiroInProcess(request);
+}
+async function* streamKiroInProcess(request) {
   const { model, signal } = request;
   const initialAccessToken = request.accessToken;
   if (!initialAccessToken) {
@@ -9086,7 +9102,10 @@ function calculateDevinCost(cost, usage) {
   const cacheWrite = per(usage.cacheWrite, cost.cacheWrite);
   return { input, output, cacheRead, cacheWrite, total: input + output + cacheRead + cacheWrite };
 }
-async function* streamDevin(request) {
+function streamDevin(request) {
+  return streamDevinInProcess(request);
+}
+async function* streamDevinInProcess(request) {
   const model = request.model;
   const fetchImpl = request.fetch ?? fetch;
   const baseUrl = (model.baseUrl || DEVIN_DEFAULT_BASE_URL).replace(/\/+$/, "");
@@ -9288,7 +9307,7 @@ async function* streamDevin(request) {
         };
         const totalTokens = usage.input + usage.output + usage.cacheRead + usage.cacheWrite;
         const credits = msg.creditCost || msg.committedCreditCost || msg.committedAcuCost;
-        const moved = responseUsage === void 0 ? totalTokens > 0 || credits !== 0 : totalTokens !== responseUsage.totalTokens || credits !== responseUsage.credits;
+        const moved = responseUsage === void 0 ? totalTokens > 0 || credits !== 0 : totalTokens !== responseUsage.totalTokens || credits !== (responseUsage.credits ?? 0);
         if (!moved)
           continue;
         responseUsage = {
@@ -9693,6 +9712,9 @@ function collectDevinFamilyLane(lanes, config, uid) {
   }
 }
 async function fetchDevinModels(options) {
+  return fetchDevinModelsInProcess(options);
+}
+async function fetchDevinModelsInProcess(options) {
   const timeoutMs = options.timeoutMs ?? 5e3;
   const resolvedBaseUrl = (options.baseUrl ?? DEVIN_DEFAULT_BASE_URL).replace(/\/+$/, "");
   const fetchImpl = options.fetch ?? fetch;
@@ -10085,6 +10107,9 @@ function buildDevinUsageReport(response) {
   };
 }
 async function fetchDevinUsage(options) {
+  return fetchDevinUsageInProcess(options);
+}
+async function fetchDevinUsageInProcess(options) {
   const token = options.apiKey?.trim();
   if (!token)
     return null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ns-omp-provider",
-  "version": "0.4.0",
+  "version": "0.6.0",
   "description": "OMP (oh-my-pi) plugin: Kiro, Devin, and Grok providers from @ngosangns/ns-pi-provider, wrapped for OMP's provider/extension API.",
   "type": "module",
   "license": "MIT",
@@ -63,12 +63,12 @@
     }
   },
   "devDependencies": {
-    "@ngosangns/ns-pi-provider": "0.3.0",
+    "@ngosangns/ns-pi-provider": "0.5.0",
     "@types/node": "^22.18.6",
     "esbuild": "^0.28.2",
     "typescript": "^5.9.2",
     "vitest": "^3.2.4",
-    "ns-bridge-core": "0.1.0"
+    "ns-bridge-core": "0.3.0"
   },
   "publishConfig": {
     "access": "public",