opencode-kiro 0.1.2 → 0.1.4

package/README.md

@@ -157,9 +157,17 @@ image-capable models receive it as an attachment.
 ## Credits in the sidebar
 
 Kiro is subscription-metered: requests consume **credits**, and the dollar cost
-opencode normally displays is always $0.00. The plugin therefore registers a
-**full replacement** for the built-in sidebar context box, showing tokens, context
-percentage, and session credits.
+opencode normally displays for Kiro turns is always $0.00. The plugin therefore
+registers a **full replacement** for the built-in sidebar context box, showing
+tokens, context percentage, and a spend line.
+
+The spend line adapts to what the session actually used:
+
+- **Dollars only** (no Kiro turns): the builtin's exact `$X.XX spent` line, so
+  non-Kiro sessions look identical to the built-in box.
+- **Credits only** (Kiro turns, no dollar cost): a single `N credits` line.
+- **Both** (the session used a dollar-based model AND Kiro in one session): two
+  stacked lines, `$X.XX spent` then `N credits`, so neither figure is hidden.
 
 Disable the builtin box in `tui.json` so only the replacement renders:
 
@@ -174,19 +182,21 @@ one plus the plugin's). The credits value and its unit come from provider metada
 emitted by the SDK (kiro-cli reports the unit); nothing is hardcoded client-side.
 
 Trade-off: the replacement box applies to **every** session and disabling the builtin
-is global: mixed-provider users lose the builtin `$X.XX spent` line for non-Kiro
-sessions too; if you need dollar cost there, leave the builtin enabled at the cost of
-the duplicate box.
+is global. The replacement reproduces the builtin `$X.XX spent` line for non-Kiro
+sessions (and stacks it above credits when a session used both), so mixed-provider
+users keep dollar cost in the sidebar; if you prefer the original built-in box, leave
+it enabled at the cost of the duplicate box.
 
 ## Known limitation (read this)
 
-**Credits display is TUI-sidebar-only.** Every other cost surface (the prompt footer,
-ACP clients, the web app, desktop, web share pages, and CLI cost output) shows $0.00
-for Kiro sessions. The models.dev catalog declares Kiro's per-token `cost` as 0 (it is a
-subscription-metered provider with no per-token pricing), so opencode core computes $0.00
-everywhere it renders dollar cost. That is expected, not a defect. A cross-surface credits
-display would require opencode core changes and is intentionally out of scope for this
-plugin.
+**Credits render in the TUI only.** Two TUI surfaces show them: the sidebar context
+box (above) and the input/prompt meta row chip (`session_prompt_right`), which sits
+beside the host's `$` cost chip. Every other cost surface (ACP clients, the web app,
+desktop, web share pages, and CLI cost output) shows $0.00 for Kiro sessions. The
+models.dev catalog declares Kiro's per-token `cost` as 0 (it is a subscription-metered
+provider with no per-token pricing), so opencode core computes $0.00 everywhere it
+renders dollar cost. That is expected, not a defect. A cross-surface credits display
+would require opencode core changes and is intentionally out of scope for this plugin.
 
 ## How it works
 

package/dist/{chunk-JHCHA2UV.js → chunk-MQVMKLNA.js}

@@ -47,11 +47,24 @@ function formatCredits(value, unit) {
   const label = value === 1 || unit.endsWith("s") ? unit : `${unit}s`;
   return `${amount} ${label}`;
 }
+var money = new Intl.NumberFormat("en-US", { style: "currency", currency: "USD" });
+function spendLines(input) {
+  const { cost, credits } = input;
+  const dollars = money.format(Number.isFinite(cost) ? cost : 0);
+  if (credits.present && cost > 0) {
+    return [`${dollars} spent`, formatCredits(credits.total, credits.unit)];
+  }
+  if (credits.present) {
+    return [formatCredits(credits.total, credits.unit)];
+  }
+  return [`${dollars} spent`];
+}
 
 export {
   readPartCredits,
   messageCredits,
   creditsForMessage,
   sumSessionCredits,
-  formatCredits
+  formatCredits,
+  spendLines
 };

package/dist/{context-view-3MFY3ASR.js → context-view-2KKFHTQV.js}

@@ -1,12 +1,11 @@
 import {
-  formatCredits,
+  spendLines,
   sumSessionCredits
-} from "./chunk-JHCHA2UV.js";
+} from "./chunk-MQVMKLNA.js";
 
 // src/tui/context-view.ts
 import { createElement, effect, insert, insertNode, setProp } from "@opentui/solid";
 import { createMemo } from "solid-js";
-var money = new Intl.NumberFormat("en-US", { style: "currency", currency: "USD" });
 function createContextView(api, sessionID) {
   const theme = () => api.theme.current;
   const messages = createMemo(() => api.state.session.messages(sessionID));
@@ -39,12 +38,10 @@ function createContextView(api, sessionID) {
     root,
     mutedLine(theme, () => `${usage().percent ?? 0}% used`)
   );
-  insertNode(
+  const costLines = createMemo(() => spendLines({ cost: cost(), credits: credits() }));
+  insert(
     root,
-    mutedLine(
-      theme,
-      () => credits().present ? formatCredits(credits().total, credits().unit) : `${money.format(cost())} spent`
-    )
+    () => costLines().map((line) => mutedLine(theme, () => line))
   );
   return root;
 }

package/dist/{credits-chip-view-SKNVCWRO.js → credits-chip-view-RL5JAEZ5.js}

@@ -1,7 +1,7 @@
 import {
   formatCredits,
   sumSessionCredits
-} from "./chunk-JHCHA2UV.js";
+} from "./chunk-MQVMKLNA.js";
 
 // src/tui/credits-chip-view.ts
 import { createElement, effect, insert, setProp } from "@opentui/solid";

package/dist/server.d.ts

@@ -9,7 +9,7 @@ declare function readToken(tokenPath: string | undefined): Promise<{
 } | {
     type: "failed";
 }>;
-declare function notifyIfTokenExpired(client: PluginInput["client"] | undefined, tokenPath: string): Promise<void>;
+declare function notifyIfTokenExpired(client: PluginInput["client"] | undefined): Promise<void>;
 declare const KiroAuthPlugin: Plugin;
 declare const _default: {
     id: string;

package/dist/server.js

@@ -4,7 +4,7 @@ import { dirname, join } from "path";
 var KIRO_PLUGIN_NAME = "opencode-kiro";
 var SIDEBAR_PLUGIN_ID = "internal:sidebar-context";
 var server = async (input) => {
-  await notifyIfTokenExpired(input.client, kiroTokenPath());
+  await notifyIfTokenExpired(input.client);
   const tuiPath = tuiConfigPath();
   const alreadyConfigured = isSidebarConfigured(await readTuiConfig(tuiPath));
   const prompts = alreadyConfigured ? [] : [
@@ -62,7 +62,9 @@ var server = async (input) => {
               };
             }
             const { execFile } = await import("child_process");
-            const child = execFile("kiro-cli", ["login"]);
+            const child = execFile("kiro-cli", ["login"], {
+              shell: process.platform === "win32"
+            });
             return {
               url: "",
               instructions: "Complete Kiro authentication in the browser window that just opened. Waiting for login...",
@@ -104,36 +106,28 @@ async function readKiroTokenFile(tokenPath) {
     return void 0;
   }
 }
-function tokenExpiresAtMs(token) {
-  const raw = token?.expiresAt;
-  if (typeof raw === "number") return raw;
-  if (typeof raw === "string") return Date.parse(raw);
-  return NaN;
-}
 async function readToken(tokenPath) {
-  if (!tokenPath) return { type: "failed" };
-  const token = await readKiroTokenFile(tokenPath);
-  if (!token) return { type: "failed" };
-  const expiresAtMs = tokenExpiresAtMs(token);
-  if (!Number.isFinite(expiresAtMs) || expiresAtMs <= Date.now()) {
-    return { type: "failed" };
-  }
-  const access = typeof token.accessToken === "string" ? token.accessToken : "";
-  const refresh = typeof token.refreshToken === "string" ? token.refreshToken : "";
+  const { verifyAuth } = await import("kiro-acp-ai-provider");
+  if (!verifyAuth().authenticated) return { type: "failed" };
+  const token = tokenPath ? await readKiroTokenFile(tokenPath) : void 0;
+  const access = typeof token?.accessToken === "string" ? token.accessToken : "";
+  const refresh = typeof token?.refreshToken === "string" ? token.refreshToken : "";
   return {
     type: "success",
     refresh,
-    // REAL refresh token from the file, no longer the hardcoded ""
+    // real refresh when present, else ""
     access: access || "authenticated",
-    expires: expiresAtMs
+    // cosmetic; opencode-core only needs presence
+    // FUTURE expiry, refreshed every startup (server() re-runs each session) so
+    // opencode-core does not flag a logged-in user as expired. NOT the file value.
+    expires: Date.now() + 8 * 60 * 60 * 1e3
   };
 }
-async function notifyIfTokenExpired(client, tokenPath) {
+async function notifyIfTokenExpired(client) {
   try {
-    const token = await readKiroTokenFile(tokenPath);
-    const expiresAtMs = tokenExpiresAtMs(token);
-    if (Number.isFinite(expiresAtMs) && expiresAtMs > Date.now()) return;
-    const message = "Kiro token expired or missing. Run 'kiro-cli login' to re-authenticate.";
+    const { verifyAuth } = await import("kiro-acp-ai-provider");
+    if (verifyAuth().authenticated) return;
+    const message = "Kiro is not logged in. Run 'kiro-cli login' to authenticate.";
     console.warn(message);
     void client?.tui?.showToast?.({ body: { message, variant: "warning" } })?.catch(() => {
     });

package/dist/tui.d.ts

@@ -34,10 +34,24 @@ declare function creditsForMessage(parts: ReadonlyArray<CreditPart>): number | u
 declare function sumSessionCredits(messages: ReadonlyArray<CreditMessage>, partsByMessage: (messageID: string) => ReadonlyArray<CreditPart>): SessionCredits;
 /** Render credits with the unit, e.g. "12.5 credits", "1 credit". Unit is naively pluralized unless it ends in "s"; with no unit, only the number renders. */
 declare function formatCredits(value: number, unit?: string): string;
+/**
+ * The sidebar's muted cost lines, returned as an ARRAY (one entry per rendered
+ * muted row). Three display states:
+ *   - BOTH (credits present AND a non-zero dollar cost): TWO stacked lines
+ *     ["$X.XX spent", "N credits"]
+ *   - credits only (credits present, dollar cost 0): ["N credits"] (Kiro-only)
+ *   - dollars only (no credits): ["$X.XX spent"] (also ["$0.00 spent"] when empty)
+ * The matrix keys off `credits.present` (a real 0-credit Kiro turn is present)
+ * and `cost > 0`, never off `credits.total` alone.
+ */
+declare function spendLines(input: {
+    cost: number;
+    credits: SessionCredits;
+}): string[];
 
 declare const _default: {
     id: string;
     tui: TuiPlugin;
 };
 
-export { type CreditMessage, type CreditPart, type PartCredits, type SessionCredits, creditsForMessage, _default as default, formatCredits, messageCredits, readPartCredits, sumSessionCredits };
+export { type CreditMessage, type CreditPart, type PartCredits, type SessionCredits, creditsForMessage, _default as default, formatCredits, messageCredits, readPartCredits, spendLines, sumSessionCredits };

package/dist/tui.js

@@ -3,13 +3,14 @@ import {
   formatCredits,
   messageCredits,
   readPartCredits,
+  spendLines,
   sumSessionCredits
-} from "./chunk-JHCHA2UV.js";
+} from "./chunk-MQVMKLNA.js";
 
 // src/tui.ts
 var tui = async (api) => {
-  const { createContextView } = await import("./context-view-3MFY3ASR.js");
-  const { createCreditsChipView } = await import("./credits-chip-view-SKNVCWRO.js");
+  const { createContextView } = await import("./context-view-2KKFHTQV.js");
+  const { createCreditsChipView } = await import("./credits-chip-view-RL5JAEZ5.js");
   api.slots.register({
     order: 100,
     slots: {
@@ -29,5 +30,6 @@ export {
   formatCredits,
   messageCredits,
   readPartCredits,
+  spendLines,
   sumSessionCredits
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "opencode-kiro",
-  "version": "0.1.2",
+  "version": "0.1.4",
   "description": "The ACP-compliant Kiro plugin for opencode: auth via the official kiro-cli login, 12 Kiro models through the Agent Client Protocol, and TUI credits display",
   "license": "MIT",
   "author": "Nacho F. Lizaur (https://github.com/NachoFLizaur)",
@@ -42,7 +42,7 @@
     "@opencode-ai/plugin": "*"
   },
   "dependencies": {
-    "kiro-acp-ai-provider": "^2.0.1"
+    "kiro-acp-ai-provider": "^2.0.2"
   },
   "devDependencies": {
     "@opencode-ai/plugin": "1.16.2",