opencode-kiro 0.1.0 → 0.1.2

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

@@ -33,10 +33,11 @@ function sumSessionCredits(messages, partsByMessage) {
       if (!hit) return acc;
       return {
         total: acc.total + hit.credits,
-        unit: hit.unit ?? acc.unit
+        unit: hit.unit ?? acc.unit,
+        present: true
       };
     },
-    { total: 0, unit: void 0 }
+    { total: 0, unit: void 0, present: false }
   );
 }
 var creditsAmount = new Intl.NumberFormat("en-US", { maximumFractionDigits: 2 });

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

@@ -1,11 +1,12 @@
 import {
   formatCredits,
   sumSessionCredits
-} from "./chunk-JO7U4OSF.js";
+} from "./chunk-JHCHA2UV.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));
@@ -27,6 +28,7 @@ function createContextView(api, sessionID) {
     };
   });
   const credits = createMemo(() => sumSessionCredits(messages(), (messageID) => api.state.part(messageID)));
+  const cost = createMemo(() => api.state.session.get(sessionID)?.cost ?? 0);
   const root = createElement("box");
   insertNode(root, headerLine(theme));
   insertNode(
@@ -39,7 +41,10 @@ function createContextView(api, sessionID) {
   );
   insertNode(
     root,
-    mutedLine(theme, () => formatCredits(credits().total, credits().unit))
+    mutedLine(
+      theme,
+      () => credits().present ? formatCredits(credits().total, credits().unit) : `${money.format(cost())} spent`
+    )
   );
   return root;
 }

package/dist/credits-chip-view-SKNVCWRO.js

@@ -0,0 +1,20 @@
+import {
+  formatCredits,
+  sumSessionCredits
+} from "./chunk-JHCHA2UV.js";
+
+// src/tui/credits-chip-view.ts
+import { createElement, effect, insert, setProp } from "@opentui/solid";
+import { createMemo } from "solid-js";
+function createCreditsChipView(api, sessionID) {
+  const messages = createMemo(() => api.state.session.messages(sessionID));
+  const credits = createMemo(() => sumSessionCredits(messages(), (messageID) => api.state.part(messageID)));
+  const chip = createElement("text");
+  effect(() => setProp(chip, "fg", api.theme.current.textMuted));
+  setProp(chip, "wrapMode", "none");
+  insert(chip, () => credits().present ? formatCredits(credits().total, credits().unit) : "");
+  return chip;
+}
+export {
+  createCreditsChipView
+};

package/dist/server.d.ts

@@ -1,8 +1,19 @@
-import { PluginInput, Hooks } from '@opencode-ai/plugin';
+import { Plugin, PluginInput, Hooks } from '@opencode-ai/plugin';
 
+declare function kiroTokenPath(): string;
+declare function readToken(tokenPath: string | undefined): Promise<{
+    type: "success";
+    refresh: string;
+    access: string;
+    expires: number;
+} | {
+    type: "failed";
+}>;
+declare function notifyIfTokenExpired(client: PluginInput["client"] | undefined, tokenPath: string): Promise<void>;
+declare const KiroAuthPlugin: Plugin;
 declare const _default: {
     id: string;
     server: (input: PluginInput) => Promise<Hooks>;
 };
 
-export { _default as default };
+export { KiroAuthPlugin, _default as default, kiroTokenPath, notifyIfTokenExpired, readToken };

package/dist/server.js

@@ -1,91 +1,214 @@
 // src/server.ts
-var server = async (input) => ({
-  auth: {
-    provider: "kiro",
-    // Returned options are forwarded into createKiroAcp({...}). Relays each
-    // catalog model's limit.context into contextWindows keyed by api.id;
-    // zero/missing limits are skipped (SDK falls back to 1M).
-    loader: async (_getAuth, provider) => ({
-      cwd: input.directory ?? input.worktree,
-      agent: "opencode",
-      trustAllTools: true,
-      mcpTimeout: 45,
-      contextWindows: Object.fromEntries(
-        Object.values(provider.models).filter((m) => (m.limit?.context ?? 0) > 0).map((m) => [m.api.id, m.limit.context])
-      )
-    }),
-    methods: [
-      {
-        type: "oauth",
-        label: "Kiro CLI Login",
-        async authorize() {
-          const { verifyAuth } = await import("kiro-acp-ai-provider");
-          const status = verifyAuth();
-          if (!status.installed)
-            throw new Error(
-              "kiro-cli is not installed. Install it from https://kiro.dev/docs/cli/"
-            );
-          if (status.authenticated) {
+import { homedir } from "os";
+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());
+  const tuiPath = tuiConfigPath();
+  const alreadyConfigured = isSidebarConfigured(await readTuiConfig(tuiPath));
+  const prompts = alreadyConfigured ? [] : [
+    {
+      type: "select",
+      key: "sidebar",
+      message: "Enable the Kiro credits sidebar?",
+      options: [
+        { label: "Yes", value: "yes", hint: "writes tui.json; restart to apply" },
+        { label: "No", value: "no" }
+      ]
+    }
+  ];
+  return {
+    auth: {
+      provider: "kiro",
+      // Returned options are forwarded into createKiroAcp({...}). Relays each
+      // catalog model's limit.context into contextWindows keyed by api.id;
+      // zero/missing limits are skipped (SDK falls back to 1M).
+      loader: async (_getAuth, provider) => ({
+        cwd: input.directory ?? input.worktree,
+        agent: "opencode",
+        trustAllTools: true,
+        mcpTimeout: 45,
+        contextWindows: Object.fromEntries(
+          Object.values(provider.models).filter((m) => (m.limit?.context ?? 0) > 0).map((m) => [m.api.id, m.limit.context])
+        )
+      }),
+      methods: [
+        {
+          type: "oauth",
+          label: "Kiro CLI Login",
+          prompts,
+          async authorize(inputs) {
+            const { verifyAuth } = await import("kiro-acp-ai-provider");
+            const status = verifyAuth();
+            if (!status.installed)
+              throw new Error(
+                "kiro-cli is not installed. Install it from https://kiro.dev/docs/cli/"
+              );
+            const enableSidebar = !alreadyConfigured && inputs?.sidebar === "yes";
+            const onSuccess = async () => {
+              if (enableSidebar) await enableSidebarConfig(tuiPath, input);
+            };
+            if (status.authenticated) {
+              return {
+                url: "",
+                instructions: "",
+                method: "auto",
+                async callback() {
+                  const result = await readToken(status.tokenPath);
+                  if (result.type === "success") await onSuccess();
+                  return result;
+                }
+              };
+            }
+            const { execFile } = await import("child_process");
+            const child = execFile("kiro-cli", ["login"]);
             return {
               url: "",
-              instructions: "",
+              instructions: "Complete Kiro authentication in the browser window that just opened. Waiting for login...",
               method: "auto",
               async callback() {
-                return readToken(status.tokenPath);
+                const maxWait = 12e4;
+                const start = Date.now();
+                while (Date.now() - start < maxWait) {
+                  await new Promise((r) => setTimeout(r, 2e3));
+                  const check = verifyAuth();
+                  if (check.authenticated) {
+                    child.kill();
+                    const result = await readToken(check.tokenPath);
+                    if (result.type === "success") await onSuccess();
+                    return result;
+                  }
+                }
+                child.kill();
+                throw new Error(
+                  "Kiro authentication timed out. Run `kiro-cli auth login` manually."
+                );
               }
             };
           }
-          const { execFile } = await import("child_process");
-          const child = execFile("kiro-cli", ["login"]);
-          return {
-            url: "",
-            instructions: "Complete Kiro authentication in the browser window that just opened. Waiting for login...",
-            method: "auto",
-            async callback() {
-              const maxWait = 12e4;
-              const start = Date.now();
-              while (Date.now() - start < maxWait) {
-                await new Promise((r) => setTimeout(r, 2e3));
-                const check = verifyAuth();
-                if (check.authenticated) {
-                  child.kill();
-                  return readToken(check.tokenPath);
-                }
-              }
-              child.kill();
-              throw new Error(
-                "Kiro authentication timed out. Run `kiro-cli auth login` manually."
-              );
-            }
-          };
         }
-      }
-    ]
+      ]
+    }
+  };
+};
+function kiroTokenPath() {
+  return join(homedir(), ".aws", "sso", "cache", "kiro-auth-token.json");
+}
+async function readKiroTokenFile(tokenPath) {
+  try {
+    const { readFile } = await import("fs/promises");
+    const parsed = JSON.parse(await readFile(tokenPath, "utf8"));
+    return typeof parsed === "object" && parsed !== null && !Array.isArray(parsed) ? parsed : void 0;
+  } catch {
+    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) {
-    try {
-      const { readFileSync } = await import("fs");
-      const raw = JSON.parse(readFileSync(tokenPath, "utf8"));
-      return {
-        type: "success",
-        refresh: "",
-        access: raw.accessToken || "authenticated",
-        expires: raw.expiresAt ? new Date(raw.expiresAt).getTime() : Date.now() + 36e5
-      };
-    } catch {
-      return { type: "failed" };
-    }
+  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 : "";
   return {
     type: "success",
-    refresh: "",
-    access: "authenticated",
-    expires: Date.now() + 36e5
+    refresh,
+    // REAL refresh token from the file, no longer the hardcoded ""
+    access: access || "authenticated",
+    expires: expiresAtMs
   };
 }
+async function notifyIfTokenExpired(client, tokenPath) {
+  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.";
+    console.warn(message);
+    void client?.tui?.showToast?.({ body: { message, variant: "warning" } })?.catch(() => {
+    });
+  } catch {
+  }
+}
+function tuiConfigPath() {
+  const base = process.env.XDG_CONFIG_HOME || join(homedir(), ".config");
+  return join(base, "opencode", "tui.json");
+}
+async function readTuiConfig(path) {
+  try {
+    const { readFile } = await import("fs/promises");
+    const parsed = JSON.parse(await readFile(path, "utf8"));
+    return typeof parsed === "object" && parsed !== null && !Array.isArray(parsed) ? parsed : void 0;
+  } catch {
+    return void 0;
+  }
+}
+function isSidebarConfigured(config) {
+  if (!config) return false;
+  const plugin = config.plugin;
+  const enabled = config.plugin_enabled;
+  const hasPlugin = Array.isArray(plugin) && plugin.includes(KIRO_PLUGIN_NAME);
+  const sidebarOff = typeof enabled === "object" && enabled !== null && enabled[SIDEBAR_PLUGIN_ID] === false;
+  return hasPlugin && sidebarOff;
+}
+async function enableSidebarConfig(path, input) {
+  try {
+    const { readFile, writeFile, mkdir } = await import("fs/promises");
+    let raw;
+    try {
+      raw = await readFile(path, "utf8");
+    } catch {
+      raw = void 0;
+    }
+    let config;
+    if (raw === void 0) {
+      config = {};
+    } else {
+      try {
+        const parsed = JSON.parse(raw);
+        if (typeof parsed !== "object" || parsed === null || Array.isArray(parsed)) return;
+        config = parsed;
+      } catch {
+        return;
+      }
+    }
+    if (isSidebarConfigured(config)) return;
+    const plugin = Array.isArray(config.plugin) ? [...config.plugin] : [];
+    if (!plugin.includes(KIRO_PLUGIN_NAME)) plugin.push(KIRO_PLUGIN_NAME);
+    config.plugin = plugin;
+    const enabled = typeof config.plugin_enabled === "object" && config.plugin_enabled !== null && !Array.isArray(config.plugin_enabled) ? config.plugin_enabled : {};
+    enabled[SIDEBAR_PLUGIN_ID] = false;
+    config.plugin_enabled = enabled;
+    await mkdir(dirname(path), { recursive: true });
+    await writeFile(path, JSON.stringify(config, null, 2) + "\n", "utf8");
+    try {
+      await input.client.tui.showToast({
+        body: {
+          message: "Kiro credits sidebar enabled. Restart opencode to see it.",
+          variant: "success"
+        }
+      });
+    } catch {
+    }
+  } catch {
+  }
+}
+var KiroAuthPlugin = server;
 var server_default = { id: "kiro", server };
 export {
-  server_default as default
+  KiroAuthPlugin,
+  server_default as default,
+  kiroTokenPath,
+  notifyIfTokenExpired,
+  readToken
 };

package/dist/tui.d.ts

@@ -16,6 +16,13 @@ interface PartCredits {
 interface SessionCredits {
     total: number;
     unit?: string;
+    /**
+     * True once any assistant message carried kiro credit metadata. Lets the
+     * sidebar/footer pick the credits view over the builtin "$X spent" fallback,
+     * since a credits total of 0 (a real kiro turn) is indistinguishable from
+     * "no kiro metadata at all" by `total` alone.
+     */
+    present: boolean;
 }
 /** Read `{ kiro: { credits, creditsUnit } }` from a part; only finite numeric credits count. */
 declare function readPartCredits(part: CreditPart): PartCredits | undefined;

package/dist/tui.js

@@ -4,16 +4,20 @@ import {
   messageCredits,
   readPartCredits,
   sumSessionCredits
-} from "./chunk-JO7U4OSF.js";
+} from "./chunk-JHCHA2UV.js";
 
 // src/tui.ts
 var tui = async (api) => {
-  const { createContextView } = await import("./context-view-CGBZAYM5.js");
+  const { createContextView } = await import("./context-view-3MFY3ASR.js");
+  const { createCreditsChipView } = await import("./credits-chip-view-SKNVCWRO.js");
   api.slots.register({
     order: 100,
     slots: {
       sidebar_content(_ctx, props) {
         return createContextView(api, props.session_id);
+      },
+      session_prompt_right(_ctx, props) {
+        return createCreditsChipView(api, props.session_id);
       }
     }
   });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "opencode-kiro",
-  "version": "0.1.0",
+  "version": "0.1.2",
   "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.0"
+    "kiro-acp-ai-provider": "^2.0.1"
   },
   "devDependencies": {
     "@opencode-ai/plugin": "1.16.2",