ns-omp-provider-kiro 0.2.2 → 0.2.3

package/dist/index.js

@@ -5,11 +5,20 @@ var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __esm = (fn, res) => function __init() {
-  return fn && (res = (0, fn[__getOwnPropNames(fn)[0]])(fn = 0)), res;
+var __esm = (fn, res, err) => function __init() {
+  if (err) throw err[0];
+  try {
+    return fn && (res = (0, fn[__getOwnPropNames(fn)[0]])(fn = 0)), res;
+  } catch (e) {
+    throw err = [e], e;
+  }
 };
 var __commonJS = (cb, mod) => function __require() {
-  return mod || (0, cb[__getOwnPropNames(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
+  try {
+    return mod || (0, cb[__getOwnPropNames(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
+  } catch (e) {
+    throw mod = 0, e;
+  }
 };
 var __export = (target, all) => {
   for (var name in all)
@@ -1407,6 +1416,30 @@ 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;
+}
 async function parseManagementResponse(response, operation, region) {
   if (!response.ok) {
     const statusText = response.statusText ? ` ${redactSensitiveText(response.statusText)}` : "";
@@ -1442,6 +1475,13 @@ async function resolveKiroProfileArn(auth, providedArn) {
   if (pending)
     return pending;
   const request = (async () => {
+    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 });
+      return arn;
+    }
     let lastResponse;
     let lastHttpError;
     for (const region of candidateManagementRegions(auth.region)) {
@@ -1492,7 +1532,7 @@ async function listAvailableModels(auth, profileArn) {
 }
 async function fetchKiroModelCatalog(auth, providedProfileArn) {
   const profileArn = await resolveKiroProfileArn(auth, providedProfileArn);
-  const region = profileRegionCache.get(profileCacheKey(auth)) ?? auth.region;
+  const region = isApiKey(auth.accessToken) ? API_KEY_REGION : profileRegionCache.get(profileCacheKey(auth)) ?? auth.region;
   if (region !== auth.region) {
     return listAvailableModels({ ...auth, region }, profileArn);
   }
@@ -1521,7 +1561,7 @@ async function getUsageLimits(auth, request) {
   }
   return parseManagementResponse(response, operation, auth.region);
 }
-var LIST_PROFILES_PATH, LIST_MODELS_PATH, profileArnCache, pendingProfileRequests, profileRegionCache, CANONICAL_MANAGEMENT_REGIONS, ENV_PROFILE_ARN, KiroManagementHttpError;
+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";
@@ -1531,6 +1571,8 @@ 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";
     profileArnCache = /* @__PURE__ */ new Map();
     pendingProfileRequests = /* @__PURE__ */ new Map();
     profileRegionCache = /* @__PURE__ */ new Map();
@@ -3334,13 +3376,13 @@ var KiroResponseAssembler = class {
   }
 };
 
-// ../../node_modules/.pnpm/@smithy+core@3.33.3/node_modules/@smithy/core/dist-es/submodules/serde/index.js
+// ../../node_modules/.pnpm/@smithy+core@3.34.1/node_modules/@smithy/core/dist-es/submodules/serde/index.js
 import { getRandomValues } from "node:crypto";
 
-// ../../node_modules/.pnpm/@smithy+core@3.33.3/node_modules/@smithy/core/dist-es/submodules/serde/is-array-buffer/is-array-buffer.js
+// ../../node_modules/.pnpm/@smithy+core@3.34.1/node_modules/@smithy/core/dist-es/submodules/serde/is-array-buffer/is-array-buffer.js
 var isArrayBuffer = (arg) => typeof ArrayBuffer === "function" && arg instanceof ArrayBuffer || Object.prototype.toString.call(arg) === "[object ArrayBuffer]";
 
-// ../../node_modules/.pnpm/@smithy+core@3.33.3/node_modules/@smithy/core/dist-es/submodules/serde/util-buffer-from/buffer-from.js
+// ../../node_modules/.pnpm/@smithy+core@3.34.1/node_modules/@smithy/core/dist-es/submodules/serde/util-buffer-from/buffer-from.js
 var fromArrayBuffer = (input, offset = 0, length = input.byteLength - offset) => {
   if (!isArrayBuffer(input)) {
     throw new TypeError(`The "input" argument must be ArrayBuffer. Received type ${typeof input} (${input})`);
@@ -3354,7 +3396,7 @@ var fromString = (input, encoding) => {
   return encoding ? Buffer.from(input, encoding) : Buffer.from(input);
 };
 
-// ../../node_modules/.pnpm/@smithy+core@3.33.3/node_modules/@smithy/core/dist-es/submodules/serde/util-base64/fromBase64.js
+// ../../node_modules/.pnpm/@smithy+core@3.34.1/node_modules/@smithy/core/dist-es/submodules/serde/util-base64/fromBase64.js
 var BASE64_REGEX = /^[A-Za-z0-9+/]*={0,2}$/;
 var fromBase64 = (input) => {
   if (input.length * 3 % 4 !== 0) {
@@ -3367,13 +3409,13 @@ var fromBase64 = (input) => {
   return new Uint8Array(buffer.buffer, buffer.byteOffset, buffer.byteLength);
 };
 
-// ../../node_modules/.pnpm/@smithy+core@3.33.3/node_modules/@smithy/core/dist-es/submodules/serde/util-utf8/fromUtf8.js
+// ../../node_modules/.pnpm/@smithy+core@3.34.1/node_modules/@smithy/core/dist-es/submodules/serde/util-utf8/fromUtf8.js
 var fromUtf8 = (input) => {
   const buf = fromString(input, "utf8");
   return new Uint8Array(buf.buffer, buf.byteOffset, buf.byteLength / Uint8Array.BYTES_PER_ELEMENT);
 };
 
-// ../../node_modules/.pnpm/@smithy+core@3.33.3/node_modules/@smithy/core/dist-es/submodules/serde/util-base64/toBase64.js
+// ../../node_modules/.pnpm/@smithy+core@3.34.1/node_modules/@smithy/core/dist-es/submodules/serde/util-base64/toBase64.js
 var toBase64 = (_input) => {
   let input;
   if (typeof _input === "string") {
@@ -3387,7 +3429,7 @@ var toBase64 = (_input) => {
   return fromArrayBuffer(input.buffer, input.byteOffset, input.byteLength).toString("base64");
 };
 
-// ../../node_modules/.pnpm/@smithy+core@3.33.3/node_modules/@smithy/core/dist-es/submodules/serde/util-stream/blob/Uint8ArrayBlobAdapter.js
+// ../../node_modules/.pnpm/@smithy+core@3.34.1/node_modules/@smithy/core/dist-es/submodules/serde/util-stream/blob/Uint8ArrayBlobAdapter.js
 function bindUint8ArrayBlobAdapter(toUtf82, fromUtf82, toBase642, fromBase642) {
   return class Uint8ArrayBlobAdapter2 extends Uint8Array {
     static fromString(source, encoding = "utf-8") {
@@ -3412,7 +3454,7 @@ function bindUint8ArrayBlobAdapter(toUtf82, fromUtf82, toBase642, fromBase642) {
   };
 }
 
-// ../../node_modules/.pnpm/@smithy+core@3.33.3/node_modules/@smithy/core/dist-es/submodules/serde/util-utf8/toUtf8.js
+// ../../node_modules/.pnpm/@smithy+core@3.34.1/node_modules/@smithy/core/dist-es/submodules/serde/util-utf8/toUtf8.js
 var toUtf8 = (input) => {
   if (typeof input === "string") {
     return input;
@@ -3423,7 +3465,7 @@ var toUtf8 = (input) => {
   return fromArrayBuffer(input.buffer, input.byteOffset, input.byteLength).toString("utf8");
 };
 
-// ../../node_modules/.pnpm/@smithy+core@3.33.3/node_modules/@smithy/core/dist-es/submodules/serde/uuid/v4.js
+// ../../node_modules/.pnpm/@smithy+core@3.34.1/node_modules/@smithy/core/dist-es/submodules/serde/uuid/v4.js
 var decimalToHex = Array.from({ length: 256 }, (_, i) => i.toString(16).padStart(2, "0"));
 function bindV4(getRandomValues2) {
   if (typeof crypto !== "undefined" && typeof crypto.randomUUID === "function") {
@@ -3438,12 +3480,12 @@ function bindV4(getRandomValues2) {
   };
 }
 
-// ../../node_modules/.pnpm/@smithy+core@3.33.3/node_modules/@smithy/core/dist-es/submodules/transport/hasOwn.js
+// ../../node_modules/.pnpm/@smithy+core@3.34.1/node_modules/@smithy/core/dist-es/submodules/transport/hasOwn.js
 function hasOwn(o, k) {
   return Object.prototype.hasOwnProperty.call(o, k);
 }
 
-// ../../node_modules/.pnpm/@smithy+core@3.33.3/node_modules/@smithy/core/dist-es/submodules/serde/util-hex-encoding/hex-encoding.js
+// ../../node_modules/.pnpm/@smithy+core@3.34.1/node_modules/@smithy/core/dist-es/submodules/serde/util-hex-encoding/hex-encoding.js
 var SHORT_TO_HEX = {};
 var HEX_TO_SHORT = {};
 for (let i = 0; i < 256; i++) {
@@ -3477,13 +3519,13 @@ function toHex(bytes) {
   return out;
 }
 
-// ../../node_modules/.pnpm/@smithy+core@3.33.3/node_modules/@smithy/core/dist-es/submodules/serde/index.js
+// ../../node_modules/.pnpm/@smithy+core@3.34.1/node_modules/@smithy/core/dist-es/submodules/serde/index.js
 var Uint8ArrayBlobAdapter = class extends bindUint8ArrayBlobAdapter(toUtf8, fromUtf8, toBase64, fromBase64) {
 };
 var _getRandomValues = getRandomValues;
 var v4 = bindV4(_getRandomValues);
 
-// ../../node_modules/.pnpm/@smithy+core@3.33.3/node_modules/@smithy/core/dist-es/submodules/checksum/crc32/Crc32Js.js
+// ../../node_modules/.pnpm/@smithy+core@3.34.1/node_modules/@smithy/core/dist-es/submodules/checksum/crc32/Crc32Js.js
 var CRC32_TABLE = new Uint32Array(256);
 for (let i = 0; i < 256; ++i) {
   let c = i;
@@ -3515,7 +3557,7 @@ var Crc32Js = class {
   }
 };
 
-// ../../node_modules/.pnpm/@smithy+core@3.33.3/node_modules/@smithy/core/dist-es/submodules/checksum/crc32/Crc32Node.js
+// ../../node_modules/.pnpm/@smithy+core@3.34.1/node_modules/@smithy/core/dist-es/submodules/checksum/crc32/Crc32Node.js
 import * as zlib from "node:zlib";
 var zlibCrc32 = typeof zlib.crc32 === "function" ? zlib.crc32 : void 0;
 var Crc32Node = zlibCrc32 ? buildNativeClass(zlibCrc32) : Crc32Js;
@@ -3540,7 +3582,7 @@ function buildNativeClass(nativeCrc32) {
   };
 }
 
-// ../../node_modules/.pnpm/@smithy+core@3.33.3/node_modules/@smithy/core/dist-es/submodules/event-streams/eventstream-codec/Int64.js
+// ../../node_modules/.pnpm/@smithy+core@3.34.1/node_modules/@smithy/core/dist-es/submodules/event-streams/eventstream-codec/Int64.js
 var Int64 = class _Int64 {
   bytes;
   constructor(bytes) {
@@ -3585,7 +3627,7 @@ function negate(bytes) {
   }
 }
 
-// ../../node_modules/.pnpm/@smithy+core@3.33.3/node_modules/@smithy/core/dist-es/submodules/event-streams/eventstream-codec/HeaderMarshaller.js
+// ../../node_modules/.pnpm/@smithy+core@3.34.1/node_modules/@smithy/core/dist-es/submodules/event-streams/eventstream-codec/HeaderMarshaller.js
 var HeaderMarshaller = class {
   toUtf8;
   fromUtf8;
@@ -3771,7 +3813,7 @@ var TIMESTAMP_TAG = "timestamp";
 var UUID_TAG = "uuid";
 var UUID_PATTERN = /^[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}$/;
 
-// ../../node_modules/.pnpm/@smithy+core@3.33.3/node_modules/@smithy/core/dist-es/submodules/event-streams/eventstream-codec/splitMessage.js
+// ../../node_modules/.pnpm/@smithy+core@3.34.1/node_modules/@smithy/core/dist-es/submodules/event-streams/eventstream-codec/splitMessage.js
 var PRELUDE_MEMBER_LENGTH = 4;
 var PRELUDE_LENGTH = PRELUDE_MEMBER_LENGTH * 2;
 var CHECKSUM_LENGTH = 4;
@@ -3803,7 +3845,7 @@ function splitMessage({ byteLength, byteOffset, buffer }) {
   };
 }
 
-// ../../node_modules/.pnpm/@smithy+core@3.33.3/node_modules/@smithy/core/dist-es/submodules/event-streams/eventstream-codec/EventStreamCodec.js
+// ../../node_modules/.pnpm/@smithy+core@3.34.1/node_modules/@smithy/core/dist-es/submodules/event-streams/eventstream-codec/EventStreamCodec.js
 var EventStreamCodec = class {
   headerMarshaller;
   messageBuffer;
@@ -3869,7 +3911,7 @@ var EventStreamCodec = class {
   }
 };
 
-// ../../node_modules/.pnpm/@smithy+core@3.33.3/node_modules/@smithy/core/dist-es/submodules/event-streams/eventstream-codec/MessageDecoderStream.js
+// ../../node_modules/.pnpm/@smithy+core@3.34.1/node_modules/@smithy/core/dist-es/submodules/event-streams/eventstream-codec/MessageDecoderStream.js
 var MessageDecoderStream = class {
   options;
   constructor(options) {
@@ -3886,7 +3928,7 @@ var MessageDecoderStream = class {
   }
 };
 
-// ../../node_modules/.pnpm/@smithy+core@3.33.3/node_modules/@smithy/core/dist-es/submodules/event-streams/eventstream-codec/MessageEncoderStream.js
+// ../../node_modules/.pnpm/@smithy+core@3.34.1/node_modules/@smithy/core/dist-es/submodules/event-streams/eventstream-codec/MessageEncoderStream.js
 var MessageEncoderStream = class {
   options;
   constructor(options) {
@@ -3906,7 +3948,7 @@ var MessageEncoderStream = class {
   }
 };
 
-// ../../node_modules/.pnpm/@smithy+core@3.33.3/node_modules/@smithy/core/dist-es/submodules/event-streams/eventstream-codec/SmithyMessageDecoderStream.js
+// ../../node_modules/.pnpm/@smithy+core@3.34.1/node_modules/@smithy/core/dist-es/submodules/event-streams/eventstream-codec/SmithyMessageDecoderStream.js
 var SmithyMessageDecoderStream = class {
   options;
   constructor(options) {
@@ -3925,7 +3967,7 @@ var SmithyMessageDecoderStream = class {
   }
 };
 
-// ../../node_modules/.pnpm/@smithy+core@3.33.3/node_modules/@smithy/core/dist-es/submodules/event-streams/eventstream-codec/SmithyMessageEncoderStream.js
+// ../../node_modules/.pnpm/@smithy+core@3.34.1/node_modules/@smithy/core/dist-es/submodules/event-streams/eventstream-codec/SmithyMessageEncoderStream.js
 var SmithyMessageEncoderStream = class {
   options;
   constructor(options) {
@@ -3942,7 +3984,7 @@ var SmithyMessageEncoderStream = class {
   }
 };
 
-// ../../node_modules/.pnpm/@smithy+core@3.33.3/node_modules/@smithy/core/dist-es/submodules/event-streams/eventstream-serde-universal/getChunkedStream.js
+// ../../node_modules/.pnpm/@smithy+core@3.34.1/node_modules/@smithy/core/dist-es/submodules/event-streams/eventstream-serde-universal/getChunkedStream.js
 function getChunkedStream(source) {
   let currentMessageTotalLength = 0;
   let currentMessagePendingLength = 0;
@@ -4008,7 +4050,7 @@ function getChunkedStream(source) {
   };
 }
 
-// ../../node_modules/.pnpm/@smithy+core@3.33.3/node_modules/@smithy/core/dist-es/submodules/event-streams/eventstream-serde-universal/getUnmarshalledStream.js
+// ../../node_modules/.pnpm/@smithy+core@3.34.1/node_modules/@smithy/core/dist-es/submodules/event-streams/eventstream-serde-universal/getUnmarshalledStream.js
 function getMessageUnmarshaller(deserializer, toUtf82) {
   return async function(message) {
     const { value: messageType } = message.headers[":message-type"];
@@ -4040,7 +4082,7 @@ function getMessageUnmarshaller(deserializer, toUtf82) {
   };
 }
 
-// ../../node_modules/.pnpm/@smithy+core@3.33.3/node_modules/@smithy/core/dist-es/submodules/event-streams/eventstream-serde-universal/EventStreamMarshaller.js
+// ../../node_modules/.pnpm/@smithy+core@3.34.1/node_modules/@smithy/core/dist-es/submodules/event-streams/eventstream-serde-universal/EventStreamMarshaller.js
 var EventStreamMarshaller = class {
   eventStreamCodec;
   utfEncoder;
@@ -4111,7 +4153,7 @@ function readKiroEventStream(body, options) {
     });
     const iterator = eventStream[Symbol.asyncIterator]();
     let gotFirstToken = false;
-    const FIRST_TOKEN_SENTINEL = Symbol("firstTokenTimeout");
+    const FIRST_TOKEN_SENTINEL = /* @__PURE__ */ Symbol("firstTokenTimeout");
     try {
       while (true) {
         let iterResult;
@@ -4698,7 +4740,12 @@ async function loginKiro(callbacks) {
     return existing;
   }
   if (!callbacks.onPrompt) throw new Error(NO_SESSION_MESSAGE);
-  const apiKey = (await callbacks.onPrompt({ message: NO_SESSION_MESSAGE, placeholder: "ksk_\u2026", allowEmpty: true })).trim();
+  const apiKey = (await callbacks.onPrompt({
+    message: NO_SESSION_MESSAGE,
+    placeholder: "ksk_\u2026",
+    allowEmpty: true,
+    secret: true
+  })).trim();
   if (!apiKey) throw new Error(NO_SESSION_MESSAGE);
   return await loginKiroWithApiKey(apiKey, callbacks.onProgress);
 }
@@ -5065,7 +5112,7 @@ function toUsageReport(provider, usage, fetchedAt = Date.now()) {
 }
 var kiroUsageProvider = {
   id: "kiro",
-  async fetchUsage(params) {
+  async fetchUsage(params, _ctx) {
     const token = params.credential.accessToken ?? params.credential.apiKey;
     if (!token) return null;
     const usage = await fetchKiroUsage({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ns-omp-provider-kiro",
-  "version": "0.2.2",
+  "version": "0.2.3",
   "description": "OMP (oh-my-pi) provider plugin: adds Kiro (AWS CodeWhisperer/Q) models via your kiro-cli login",
   "type": "module",
   "main": "./dist/index.js",
@@ -37,11 +37,11 @@
     "README.md"
   ],
   "dependencies": {
-    "ns-kiro-core": "0.2.2"
+    "ns-kiro-core": "0.2.3"
   },
   "peerDependencies": {
-    "@oh-my-pi/pi-ai": ">=18.1.0",
-    "@oh-my-pi/pi-coding-agent": ">=18.1.0"
+    "@oh-my-pi/pi-ai": ">=18.2.0",
+    "@oh-my-pi/pi-coding-agent": ">=18.2.0"
   },
   "peerDependenciesMeta": {
     "@oh-my-pi/pi-ai": {
@@ -52,9 +52,9 @@
     }
   },
   "devDependencies": {
-    "@oh-my-pi/pi-ai": "18.1.13",
-    "@oh-my-pi/pi-coding-agent": "18.1.13",
-    "@types/node": "^22.10.0"
+    "@oh-my-pi/pi-ai": "18.2.7",
+    "@oh-my-pi/pi-coding-agent": "18.2.7",
+    "@types/node": "^22.20.4"
   },
   "scripts": {
     "build": "esbuild src/index.ts --bundle --platform=node --format=esm --outfile=dist/index.js --banner:js=\"import{createRequire as __kiroCreateRequire}from'node:module';const require=__kiroCreateRequire(import.meta.url);\" --external:@oh-my-pi/pi-ai --external:@oh-my-pi/pi-catalog --external:@oh-my-pi/pi-coding-agent --external:@oh-my-pi/pi-tui && tsc -p tsconfig.json --emitDeclarationOnly",