ns-omp-provider-kiro 0.3.1 → 0.3.3

package/README.md

@@ -49,7 +49,12 @@ upstream shows up without a release here.
 - Reasoning effort maps onto Kiro's own ladder per model — `xhigh` and `max`
   exist only where the model advertises them, and a request for more thinking
   than a model offers is clamped rather than rejected.
-- Usage (`/settings`) reports the account's Kiro credit balance.
+- Usage (`/settings`) reports the account's Kiro credit balance — the one the
+  host is signed in with, so run `/login kiro` after signing the machine into a
+  different account.
+- Sessions come from the machine: the kiro-cli store first, the Kiro IDE's token
+  file as a fallback. They can be different IdC users of the same Kiro profile,
+  so `KIRO_AUTH_SOURCE=ide` switches a machine over to the IDE's login instead.
 - `KIRO_API_KEY` is read as a fallback when no session is stored.
 - `KIRO_DEBUG=1` writes a full request/response trace to
   `~/.ns-kiro-provider/logs/kiro-debug.log`, with credentials redacted.

package/dist/index.js

@@ -307,14 +307,10 @@ import { homedir as homedir2, platform } from "node:os";
 import { join as join2 } from "node:path";
 function getKiroCliDbPath() {
   const p = platform();
-  let dbPath;
-  if (p === "win32")
-    dbPath = join2(process.env.APPDATA || join2(homedir2(), "AppData", "Roaming"), "kiro-cli", "data.sqlite3");
-  else if (p === "darwin")
-    dbPath = join2(homedir2(), "Library", "Application Support", "kiro-cli", "data.sqlite3");
-  else
-    dbPath = join2(homedir2(), ".local", "share", "kiro-cli", "data.sqlite3");
-  return existsSync(dbPath) ? dbPath : void 0;
+  const localAppData = process.env.LOCALAPPDATA || join2(homedir2(), "AppData", "Local");
+  const roamingAppData = process.env.APPDATA || join2(homedir2(), "AppData", "Roaming");
+  const candidates = p === "win32" ? [join2(localAppData, "Kiro-Cli", "data.sqlite3"), join2(roamingAppData, "kiro-cli", "data.sqlite3")] : p === "darwin" ? [join2(homedir2(), "Library", "Application Support", "kiro-cli", "data.sqlite3")] : [join2(homedir2(), ".local", "share", "kiro-cli", "data.sqlite3")];
+  return candidates.find((candidate) => existsSync(candidate));
 }
 function getKiroCliExternalIdpCredentials() {
   const dbPath = getKiroCliDbPath();
@@ -651,6 +647,9 @@ function readKiroIdeToken(allowExpired) {
 function getKiroIdeCredentials() {
   return readKiroIdeToken(false);
 }
+function getKiroIdeCredentialsAllowExpired() {
+  return readKiroIdeToken(true);
+}
 var SSO_CACHE_DIR, KIRO_IDE_TOKEN_PATH;
 var init_kiro_ide = __esm({
   "../kiro-core/dist/kiro-ide.js"() {
@@ -661,6 +660,15 @@ var init_kiro_ide = __esm({
 });
 
 // ../kiro-core/dist/oauth.js
+function resolveKiroAuthSource() {
+  const configured = process.env[AUTH_SOURCE_ENV]?.trim().toLowerCase();
+  if (!configured)
+    return "cli";
+  if (configured === "cli" || configured === "ide")
+    return configured;
+  console.warn(`[kiro-core] Ignoring ${AUTH_SOURCE_ENV}=${configured}: expected "cli" or "ide".`);
+  return "cli";
+}
 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`,
@@ -751,26 +759,27 @@ async function refreshKiroTokenInternal(credentials) {
   };
   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;
+  const cliSession = getValidCliCredentials();
+  const cliStaleSession = getExpiredCliCredentials();
+  const ideSession = credentialAuthMethod === "idc" ? getKiroIdeCredentials() : void 0;
+  const ideStaleSession = credentialAuthMethod === "idc" ? getKiroIdeCredentialsAllowExpired() : void 0;
+  const cliIsThisLogin = (cliSession ?? cliStaleSession)?.refresh === credentials.refresh;
+  const ideIsThisLogin = (ideSession ?? ideStaleSession)?.refresh === credentials.refresh;
+  const replacement = cliIsThisLogin ? cliSession : ideIsThisLogin ? ideSession : resolveKiroAuthSource() === "ide" ? ideSession ?? cliSession : cliSession ?? ideSession;
+  if (replacement)
+    return replacement;
   try {
     const refreshed = await refreshKiroTokenDirect(credentials);
-    saveKiroCliCredentials2(refreshed);
+    if (!ideIsThisLogin)
+      saveKiroCliCredentials2(refreshed);
     return refreshed;
   } catch (refreshError) {
     const retryCreds = getValidCliCredentials();
     if (retryCreds)
       return retryCreds;
-    const expiredCliCreds = getExpiredCliCredentials();
-    if (expiredCliCreds && expiredCliCreds.refresh !== credentials.refresh) {
+    if (cliStaleSession && cliStaleSession.refresh !== credentials.refresh) {
       try {
-        const refreshedFromCli = await refreshKiroTokenDirect(expiredCliCreds);
+        const refreshedFromCli = await refreshKiroTokenDirect(cliStaleSession);
         saveKiroCliCredentials2(refreshedFromCli);
         return refreshedFromCli;
       } catch {
@@ -875,15 +884,31 @@ async function refreshKiroTokenDirect(credentials) {
 }
 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);
+  const stores = resolveKiroAuthSource() === "ide" ? [
+    { fresh: getKiroIdeCredentials(), stale: getKiroIdeCredentialsAllowExpired() },
+    { fresh: getKiroCliCredentials2(), stale: getKiroCliCredentialsAllowExpired2() }
+  ] : [
+    { fresh: getKiroCliCredentials2(), stale: getKiroCliCredentialsAllowExpired2() },
+    { fresh: getKiroIdeCredentials(), stale: getKiroIdeCredentialsAllowExpired() }
+  ];
+  let lastFailure;
+  for (const { fresh, stale } of stores) {
+    if (fresh)
+      return fresh;
+    if (!stale)
+      continue;
+    try {
+      return await refreshKiroToken(stale);
+    } catch (error2) {
+      lastFailure = error2;
+      console.warn(`[kiro-core] Kiro session refresh failed: ${formatSafeError(error2)}`);
+    }
+  }
+  if (lastFailure)
+    throw lastFailure;
+  return void 0;
 }
-var KIRO_DESKTOP_REFRESH_URL, EXPIRES_BUFFER_MS, KIRO_DESKTOP_USER_AGENT;
+var KIRO_DESKTOP_REFRESH_URL, EXPIRES_BUFFER_MS, KIRO_DESKTOP_USER_AGENT, AUTH_SOURCE_ENV;
 var init_oauth = __esm({
   "../kiro-core/dist/oauth.js"() {
     "use strict";
@@ -893,6 +918,7 @@ var init_oauth = __esm({
     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)";
+    AUTH_SOURCE_ENV = "KIRO_AUTH_SOURCE";
   }
 });
 
@@ -2314,6 +2340,23 @@ function toKiroToolUseId(toolUseId) {
   const digest = createHash2("sha256").update(toolUseId).digest("base64url").slice(0, 32);
   return `pi_${digest}`;
 }
+var KIRO_TOOL_NAME_PATTERN = /^[a-zA-Z0-9_-]{1,64}$/;
+function toKiroToolName(name) {
+  if (KIRO_TOOL_NAME_PATTERN.test(name))
+    return name;
+  const clean = name.replace(/[^a-zA-Z0-9_-]/g, "_").slice(0, 55);
+  const digest = createHash2("sha256").update(name).digest("base64url").slice(0, 8);
+  return `${clean || "tool"}_${digest}`;
+}
+function kiroToolNameAliases(tools) {
+  const aliases = /* @__PURE__ */ new Map();
+  for (const tool of tools ?? []) {
+    const wire = toKiroToolName(tool.name);
+    if (wire !== tool.name)
+      aliases.set(wire, tool.name);
+  }
+  return aliases;
+}
 function normalizeMessages(messages) {
   return messages.filter((msg) => {
     if (msg.role !== "assistant")
@@ -2354,12 +2397,18 @@ function getContentText(msg) {
     return "";
   }).join("");
 }
+function toKiroInputSchema(parameters) {
+  if (parameters && typeof parameters === "object" && !Array.isArray(parameters)) {
+    return parameters.type === void 0 ? { type: "object", ...parameters } : parameters;
+  }
+  return { type: "object", properties: {} };
+}
 function convertToolsToKiro(tools) {
   return tools.map((tool) => ({
     toolSpecification: {
-      name: tool.name,
+      name: toKiroToolName(tool.name),
       description: tool.description,
-      inputSchema: { json: tool.parameters }
+      inputSchema: { json: toKiroInputSchema(tool.parameters) }
     }
   }));
 }
@@ -2425,7 +2474,7 @@ ${uim.content}` : prevUim.content || uim.content;
           armHadBlocks = true;
         } else if (block.type === "toolCall") {
           armToolUses.push({
-            name: block.name,
+            name: toKiroToolName(block.name),
             toolUseId: toKiroToolUseId(block.id),
             input: block.arguments
           });
@@ -3018,7 +3067,11 @@ function buildKiroRequest(params) {
       if (block.type === "text")
         armContent += block.text;
       else if (block.type === "toolCall") {
-        armToolUses.push({ name: block.name, toolUseId: toKiroToolUseId(block.id), input: block.arguments });
+        armToolUses.push({
+          name: toKiroToolName(block.name),
+          toolUseId: toKiroToolUseId(block.id),
+          input: block.arguments
+        });
       }
     }
     if (armContent || armToolUses.length > 0) {
@@ -3462,6 +3515,7 @@ var ECHO_NOISE_PATTERN = /^\s*(continue|\.+)\s*$/i;
 var KiroResponseAssembler = class {
   model;
   thinkingEnabled;
+  toolNameAliases;
   pending = [];
   blocks = new KiroBlockBuffer((event) => this.pending.push(event));
   usage = {
@@ -3484,9 +3538,13 @@ var KiroResponseAssembler = class {
   droppedToolCalls = [];
   currentToolCall = null;
   stopReason = "stop";
-  constructor(model, thinkingEnabled) {
+  constructor(model, thinkingEnabled, toolNameAliases) {
     this.model = model;
     this.thinkingEnabled = thinkingEnabled;
+    this.toolNameAliases = toolNameAliases;
+  }
+  originalToolName(name) {
+    return this.toolNameAliases?.get(name) ?? name;
   }
   /** Clear per-attempt state. Only block indexes are kept. */
   beginAttempt() {
@@ -3566,7 +3624,7 @@ var KiroResponseAssembler = class {
         this.sawAnyToolCalls = true;
         if (!this.currentToolCall || this.currentToolCall.toolUseId !== tc.toolUseId) {
           this.flushToolCall();
-          this.currentToolCall = { toolUseId: tc.toolUseId, name: tc.name, input: "" };
+          this.currentToolCall = { toolUseId: tc.toolUseId, name: this.originalToolName(tc.name), input: "" };
         }
         this.currentToolCall.input += tc.input || "";
         if (tc.input)
@@ -3750,10 +3808,14 @@ var KiroResponseAssembler = class {
     this.blocks.setText(this.textBlockIndex, text);
     this.sawAnyToolCalls = true;
     for (const call of recovered) {
-      if (this.emitToolCall({ toolUseId: call.toolUseId, name: call.name, input: JSON.stringify(call.arguments) })) {
+      if (this.emitToolCall({
+        toolUseId: call.toolUseId,
+        name: this.originalToolName(call.name),
+        input: JSON.stringify(call.arguments)
+      })) {
         this.emittedToolCalls++;
       } else {
-        this.droppedToolCalls.push(call.name);
+        this.droppedToolCalls.push(this.originalToolName(call.name));
       }
     }
   }
@@ -4849,7 +4911,7 @@ async function* streamKiro(request) {
     systemPrompt = `<thinking_mode>enabled</thinking_mode><max_thinking_length>${budget}</max_thinking_length>${systemPrompt ? `
 ${systemPrompt}` : ""}`;
   }
-  const assembler = new KiroResponseAssembler(model, thinkingEnabled);
+  const assembler = new KiroResponseAssembler(model, thinkingEnabled, kiroToolNameAliases(request.tools));
   const usageTracking = request.usageTracking ?? KIRO_USAGE_TRACKING_DISABLED;
   let retryCount = 0;
   const maxRetries = 3;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ns-omp-provider-kiro",
-  "version": "0.3.1",
+  "version": "0.3.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,7 +37,7 @@
     "README.md"
   ],
   "dependencies": {
-    "ns-kiro-core": "0.3.1"
+    "ns-kiro-core": "0.3.3"
   },
   "peerDependencies": {
     "@oh-my-pi/pi-ai": ">=18.2.0",