opencode-kiro 0.4.0 → 0.5.0-beta.2

package/dist/tui.d.ts

@@ -1,52 +1,5 @@
-import { TuiPlugin } from '@opencode-ai/plugin/tui';
+import { Plugin } from '@opencode-ai/plugin/tui';
 
-/** Any part-like object. `object` (not `{ metadata?: unknown }`) so metadata-less SDK Part variants stay assignable. */
-type CreditPart = object;
-/** Minimal message shape; SDK `Message` is assignable. */
-interface CreditMessage {
-    readonly id: string;
-    readonly role: string;
-}
-/** One part's credit metadata: the turn total plus the SDK-reported unit. */
-interface PartCredits {
-    credits: number;
-    unit?: string;
-}
-/** Session-wide rollup. `unit` stays undefined until metadata reports one. */
-interface SessionCredits {
-    total: number;
-    unit?: string;
-    /**
-     * True once any assistant message carried kiro credit metadata. Lets the view pick credits over the
-     * "$X spent" fallback, since a 0-credit kiro turn is indistinguishable from no metadata by `total` alone.
-     */
-    present: boolean;
-}
-/** Read `{ kiro: { credits, creditsUnit } }` from a part; only finite numeric credits count. */
-declare function readPartCredits(part: CreditPart): PartCredits | undefined;
-/** One message's credits, deduped by the last-carrier-wins rule (parts never summed); unit from the most recent carrier. */
-declare function messageCredits(parts: ReadonlyArray<CreditPart>): PartCredits | undefined;
-/** Per-message credit total, or undefined when no part carries credits. */
-declare function creditsForMessage(parts: ReadonlyArray<CreditPart>): number | undefined;
-/** Sum per-message totals across a session's assistant messages (one value each); unit from the most recent carrier. */
-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;
-/**
- * Muted cost lines as an array (one per rendered row). Three states:
- *   - both (credits present + non-zero cost): ["$X.XX spent", "N credits"]
- *   - credits only (cost 0): ["N credits"]
- *   - dollars only (no credits): ["$X.XX spent"] (also ["$0.00 spent"] when empty)
- * Keys off `credits.present` and `cost > 0`, never `credits.total` alone (a 0-credit kiro turn is present).
- */
-declare function spendLines(input: {
-    cost: number;
-    credits: SessionCredits;
-}): string[];
+declare const plugin: Plugin.Definition;
 
-declare const _default: {
-    id: string;
-    tui: TuiPlugin;
-};
-
-export { type CreditMessage, type CreditPart, type PartCredits, type SessionCredits, creditsForMessage, _default as default, formatCredits, messageCredits, readPartCredits, spendLines, sumSessionCredits };
+export { plugin as default };

package/dist/tui.js

@@ -1,35 +1,168 @@
 import {
-  creditsForMessage,
-  formatCredits,
   messageCredits,
-  readPartCredits,
-  spendLines,
-  sumSessionCredits
-} from "./chunk-MQVMKLNA.js";
+  readCreditState
+} from "./chunk-M7OUVABX.js";
+
+// src/tui/transient-credits.ts
+var SEPARATOR = "\0";
+function createTransientStore() {
+  return { entries: /* @__PURE__ */ new Map() };
+}
+function transientKey(...parts) {
+  const [sessionID, assistantMessageID, ordinal] = parts;
+  return `${sessionID}${SEPARATOR}${assistantMessageID}${SEPARATOR}${ordinal}`;
+}
+function parseKey(key) {
+  const parts = key.split(SEPARATOR);
+  if (parts.length !== 3) return void 0;
+  return [parts[0], parts[1], Number(parts[2])];
+}
+function isValidKeyPart(value) {
+  return typeof value === "string" && value.length > 0 && !value.includes(SEPARATOR);
+}
+function recordTextEnded(store, event) {
+  const data = event?.data;
+  if (typeof data !== "object" || data === null) return;
+  const { sessionID, assistantMessageID, ordinal, state } = data;
+  if (!isValidKeyPart(sessionID) || !isValidKeyPart(assistantMessageID)) return;
+  if (typeof ordinal !== "number" || !Number.isInteger(ordinal) || ordinal < 0) return;
+  const credits = readCreditState(state);
+  if (!credits) return;
+  store.entries.set(transientKey(sessionID, assistantMessageID, ordinal), credits);
+}
+function transientForMessage(store, sessionID, assistantMessageID) {
+  let best;
+  let bestOrdinal = -1;
+  for (const [key, value] of store.entries) {
+    const parsed = parseKey(key);
+    if (!parsed || parsed[0] !== sessionID || parsed[1] !== assistantMessageID) continue;
+    if (parsed[2] > bestOrdinal) {
+      bestOrdinal = parsed[2];
+      best = value;
+    }
+  }
+  return best;
+}
+function mergedMessageCredits(store, sessionID, durableMessages) {
+  return durableMessages.filter((message) => message.type === "assistant").reduce(
+    (acc, message) => {
+      const durable = messageCredits(message.content ?? []);
+      const hit = durable ?? transientForMessage(store, sessionID, message.id);
+      if (!hit) return acc;
+      return {
+        total: acc.total + hit.credits,
+        unit: hit.unit ?? acc.unit,
+        present: true
+      };
+    },
+    { total: 0, unit: void 0, present: false }
+  );
+}
+function reconcile(store, sessionID, durableMessages) {
+  const byID = new Map(durableMessages.map((message) => [message.id, message]));
+  for (const key of [...store.entries.keys()]) {
+    const parsed = parseKey(key);
+    if (!parsed || parsed[0] !== sessionID) continue;
+    const message = byID.get(parsed[1]);
+    if (!message) {
+      store.entries.delete(key);
+      continue;
+    }
+    if (messageCredits(message.content ?? []) !== void 0) store.entries.delete(key);
+  }
+}
+function clear(store) {
+  store.entries.clear();
+}
 
 // src/tui.ts
-var tui = async (api) => {
-  const { createCreditsBoxView } = await import("./credits-box-view-BYKGQHSS.js");
-  const { createCreditsChipView } = await import("./credits-chip-view-RL5JAEZ5.js");
-  api.slots.register({
-    order: 150,
-    slots: {
-      sidebar_content(_ctx, props) {
-        return createCreditsBoxView(api, props.session_id);
-      },
-      session_prompt_right(_ctx, props) {
-        return createCreditsChipView(api, props.session_id);
+var EMPTY_CREDITS = { total: 0, unit: void 0, present: false };
+function readSessionID(props) {
+  const sessionID = props.sessionID;
+  return typeof sessionID === "string" && sessionID.length > 0 ? sessionID : void 0;
+}
+function readColorToken(value) {
+  if (typeof value === "string" && value.length > 0) return value;
+  if (typeof value === "object" && value !== null) return value;
+  return void 0;
+}
+function readThemeTokens(theme) {
+  if (typeof theme !== "object" || theme === null) return void 0;
+  const text = theme.text;
+  if (typeof text !== "object" || text === null) return void 0;
+  const tokens = text;
+  const defaultFg = readColorToken(tokens.default);
+  const subduedFg = readColorToken(tokens.subdued);
+  if (defaultFg === void 0 && subduedFg === void 0) return void 0;
+  return { default: defaultFg, subdued: subduedFg };
+}
+var plugin = {
+  // `id` is required for file-source installs (opencode rejects them without one);
+  // matching the package name keeps it identical across path and npm installs
+  id: "opencode-kiro",
+  async setup(context) {
+    const disposers = [];
+    let disposed = false;
+    const memoryStore = context.storage?.memory?.("transient-credits", {
+      initial: createTransientStore()
+    });
+    const store = memoryStore ? memoryStore[0] : createTransientStore();
+    if (!memoryStore) disposers.push(() => clear(store));
+    const [{ createCreditsBoxView }, { createCreditsChipView }, { createSignal }] = await Promise.all([
+      import("./credits-box-view-GLFJSV6M.js"),
+      import("./credits-chip-view-YP4RPX26.js"),
+      import("solid-js")
+    ]);
+    const [transientVersion, setTransientVersion] = createSignal(0);
+    const unsubscribeTextEnded = context.data.on("session.text.ended", (event) => {
+      try {
+        recordTextEnded(store, event);
+        setTransientVersion((version) => version + 1);
+      } catch {
       }
-    }
-  });
+    });
+    disposers.push(unsubscribeTextEnded);
+    const creditsFor = (sessionID) => () => {
+      if (!sessionID) return EMPTY_CREDITS;
+      transientVersion();
+      const messages = context.data.session.message.list(sessionID) ?? [];
+      reconcile(store, sessionID, messages);
+      return mergedMessageCredits(store, sessionID, messages);
+    };
+    const unregisterSidebar = context.ui.slot({
+      append: "sidebar.content",
+      render: (props) => {
+        const credits = creditsFor(readSessionID(props));
+        const view = createCreditsBoxView(credits, readThemeTokens(context.theme));
+        return (() => credits().present ? view : null);
+      }
+    });
+    disposers.push(unregisterSidebar);
+    const unregisterChip = context.ui.slot({
+      append: "prompt.footer.status",
+      render: (props) => {
+        const credits = creditsFor(readSessionID(props));
+        const view = createCreditsChipView(credits, readThemeTokens(context.theme));
+        return (() => credits().present ? view : null);
+      }
+    });
+    disposers.push(unregisterChip);
+    return async () => {
+      if (disposed) return;
+      disposed = true;
+      const errors = [];
+      for (const dispose of disposers.reverse()) {
+        try {
+          await dispose();
+        } catch (error) {
+          errors.push(error);
+        }
+      }
+      if (errors.length > 0) throw new AggregateError(errors, "opencode-kiro tui cleanup failures");
+    };
+  }
 };
-var tui_default = { id: "opencode-kiro", tui };
+var tui_default = plugin;
 export {
-  creditsForMessage,
-  tui_default as default,
-  formatCredits,
-  messageCredits,
-  readPartCredits,
-  spendLines,
-  sumSessionCredits
+  tui_default as default
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "opencode-kiro",
-  "version": "0.4.0",
+  "version": "0.5.0-beta.2",
   "description": "The ACP-compliant Kiro plugin for opencode: auth via the official kiro-cli login, the live Kiro model lineup through the Agent Client Protocol, and TUI credits display",
   "license": "MIT",
   "author": "Nacho F. Lizaur (https://github.com/NachoFLizaur)",
@@ -36,20 +36,19 @@
     "prepublishOnly": "npm run build"
   },
   "engines": {
-    "node": ">=20",
-    "opencode": ">=1.16.0"
+    "node": ">=20"
   },
   "peerDependencies": {
-    "@opencode-ai/plugin": "*"
+    "@opencode-ai/plugin": "0.0.0-dev-17968"
   },
   "dependencies": {
-    "kiro-acp-ai-provider": "3.0.0"
+    "@opentui/solid": "0.5.7",
+    "kiro-acp-ai-provider": "3.0.0",
+    "solid-js": "1.9.12"
   },
   "devDependencies": {
-    "@opencode-ai/plugin": "1.16.2",
-    "@opentui/solid": "^0.3.4",
+    "@opencode-ai/plugin": "0.0.0-dev-17968",
     "@types/node": "^20.19.42",
-    "solid-js": "^1.9.12",
     "tsup": "^8.0.0",
     "typescript": "^5.7.0",
     "vitest": "^4.1.8"

package/dist/chunk-MQVMKLNA.js

@@ -1,70 +0,0 @@
-// src/tui/credits.ts
-function isRecord(value) {
-  return typeof value === "object" && value !== null;
-}
-function readPartCredits(part) {
-  if (!isRecord(part)) return void 0;
-  const metadata = part.metadata;
-  if (!isRecord(metadata)) return void 0;
-  const kiro = metadata.kiro;
-  if (!isRecord(kiro)) return void 0;
-  if (typeof kiro.credits !== "number" || !Number.isFinite(kiro.credits)) return void 0;
-  return {
-    credits: kiro.credits,
-    unit: typeof kiro.creditsUnit === "string" && kiro.creditsUnit.length > 0 ? kiro.creditsUnit : void 0
-  };
-}
-function messageCredits(parts) {
-  const carriers = parts.map(readPartCredits).filter((value) => value !== void 0);
-  const last = carriers.at(-1);
-  if (!last) return void 0;
-  return {
-    credits: last.credits,
-    unit: last.unit ?? carriers.findLast((carrier) => carrier.unit !== void 0)?.unit
-  };
-}
-function creditsForMessage(parts) {
-  return messageCredits(parts)?.credits;
-}
-function sumSessionCredits(messages, partsByMessage) {
-  return messages.filter((message) => message.role === "assistant").reduce(
-    (acc, message) => {
-      const hit = messageCredits(partsByMessage(message.id));
-      if (!hit) return acc;
-      return {
-        total: acc.total + hit.credits,
-        unit: hit.unit ?? acc.unit,
-        present: true
-      };
-    },
-    { total: 0, unit: void 0, present: false }
-  );
-}
-var creditsAmount = new Intl.NumberFormat("en-US", { maximumFractionDigits: 2 });
-function formatCredits(value, unit) {
-  const amount = creditsAmount.format(Number.isFinite(value) ? value : 0);
-  if (!unit) return amount;
-  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,
-  spendLines
-};

package/dist/credits-box-view-BYKGQHSS.js

@@ -1,40 +0,0 @@
-import {
-  formatCredits,
-  sumSessionCredits
-} from "./chunk-MQVMKLNA.js";
-
-// src/tui/credits-box-view.ts
-import { createElement, effect, insert, insertNode, setProp } from "@opentui/solid";
-import { createMemo } from "solid-js";
-function createCreditsBoxView(api, sessionID) {
-  const theme = () => api.theme.current;
-  const messages = createMemo(() => api.state.session.messages(sessionID));
-  const credits = createMemo(() => sumSessionCredits(messages(), (messageID) => api.state.part(messageID)));
-  const root = createElement("box");
-  insertNode(
-    root,
-    headerLine(theme, () => credits().present ? "Kiro" : "")
-  );
-  insertNode(
-    root,
-    mutedLine(theme, () => credits().present ? formatCredits(credits().total, credits().unit) : "")
-  );
-  return root;
-}
-function headerLine(theme, content) {
-  const line = createElement("text");
-  effect(() => setProp(line, "fg", theme().text));
-  const bold = createElement("b");
-  insert(bold, content);
-  insertNode(line, bold);
-  return line;
-}
-function mutedLine(theme, content) {
-  const line = createElement("text");
-  effect(() => setProp(line, "fg", theme().textMuted));
-  insert(line, content);
-  return line;
-}
-export {
-  createCreditsBoxView
-};

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

@@ -1,20 +0,0 @@
-import {
-  formatCredits,
-  sumSessionCredits
-} from "./chunk-MQVMKLNA.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
-};