@inferhub/opencode-usage 0.1.1 → 0.1.3

package/dist/index.d.ts

@@ -1,31 +1,9 @@
+import { type Plugin } from "@opencode-ai/plugin";
 import { type AccountUsage } from "@inferhub/usage";
-type Opts = {
-    apiKey?: string;
-    baseUrl?: string;
-    window?: "day" | "24h" | "7d" | "30d";
-    lowBalanceUsd?: number;
-};
-type PluginCtx = {
-    client?: {
-        app?: {
-            log?: (input: {
-                body: Record<string, unknown>;
-            }) => Promise<void> | void;
-        };
-    };
-};
-type PluginHooks = {
-    tool?: Record<string, {
-        description: string;
-        args?: Record<string, unknown>;
-        execute: (...args: unknown[]) => Promise<string> | string;
-    }>;
-    event?: (input: {
-        event: {
-            type: string;
-        };
-    }) => Promise<void> | void;
-};
 export declare function getLastUsage(): AccountUsage | null;
-export declare function InferHubUsagePlugin(ctx: PluginCtx, options?: Opts): Promise<PluginHooks>;
+/**
+ * OpenCode server plugin — registers `inferhub_usage` tool + idle refresh.
+ * Export both default and named Plugin so either load path works.
+ */
+export declare const InferHubUsagePlugin: Plugin;
 export default InferHubUsagePlugin;

package/dist/index.js

@@ -1,8 +1,13 @@
+import { tool } from "@opencode-ai/plugin";
 import { fetchAccountUsage, formatReport, money, normalizeBaseUrl, resolveAuth, } from "@inferhub/usage";
 let lastUsage = null;
 async function loadUsage(opts = {}) {
     const auth = opts.apiKey
-        ? { apiKey: opts.apiKey, baseUrl: normalizeBaseUrl(opts.baseUrl), source: "options" }
+        ? {
+            apiKey: opts.apiKey,
+            baseUrl: normalizeBaseUrl(opts.baseUrl),
+            source: "options",
+        }
         : resolveAuth({ apiKey: opts.apiKey, baseUrl: opts.baseUrl });
     if (!auth) {
         throw new Error("No InferHub API key. Configure provider.inferhub in opencode.json or set INFERHUB_API_KEY.");
@@ -18,27 +23,37 @@ async function loadUsage(opts = {}) {
 export function getLastUsage() {
     return lastUsage;
 }
-export async function InferHubUsagePlugin(ctx, options) {
-    const opts = options ?? {};
+/**
+ * OpenCode server plugin — registers `inferhub_usage` tool + idle refresh.
+ * Export both default and named Plugin so either load path works.
+ */
+export const InferHubUsagePlugin = async (ctx, options) => {
+    const opts = (options ?? {});
     const low = opts.lowBalanceUsd ?? 0.5;
+    // Warm cache; never throw during plugin init.
     void loadUsage(opts).catch(() => { });
     return {
         tool: {
-            inferhub_usage: {
-                description: "Fetch InferHub account balance, day/all-time spend, and top used model for the current user",
+            inferhub_usage: tool({
+                description: "Show InferHub balance and session/today/all-time usage for the current account",
                 args: {},
                 async execute() {
-                    const usage = await loadUsage(opts);
-                    return formatReport(usage) + "\n\n" + JSON.stringify(usage, null, 2);
+                    try {
+                        const usage = await loadUsage({ ...opts });
+                        return formatReport(usage);
+                    }
+                    catch (e) {
+                        return `InferHub usage unavailable: ${e instanceof Error ? e.message : e}`;
+                    }
                 },
-            },
+            }),
         },
         event: async ({ event }) => {
             if (event.type === "session.idle" || event.type === "session.created") {
                 try {
                     const usage = await loadUsage(opts);
                     if (Number(usage.balance.amount_usdc) < low) {
-                        await ctx.client?.app?.log?.({
+                        await ctx.client.app.log({
                             body: {
                                 service: "inferhub-usage",
                                 level: "warn",
@@ -53,5 +68,5 @@ export async function InferHubUsagePlugin(ctx, options) {
             }
         },
     };
-}
+};
 export default InferHubUsagePlugin;

package/dist/tui.js

@@ -1,25 +1,36 @@
 /**
- * OpenCode TUI plugin — registers sidebar/home footer slots with InferHub usage.
+ * OpenCode TUI plugin — same InferHub status line as Claude Code.
  *
  * Install:
- *   opencode plugin opencode-inferhub-usage --global
- *   # or in opencode.json:
- *   { "plugin": ["opencode-inferhub-usage", "opencode-inferhub-usage/tui"] }
- *
- * Note: TUI plugins require OpenCode's TUI module export (`./tui`). If the
- * runtime version only supports server plugins, the server tool still works.
+ *   { "plugin": ["@inferhub/opencode-usage", "@inferhub/opencode-usage/tui"] }
  */
-import { fetchAccountUsageAuto, formatStatusLine, money, shortModel, } from "@inferhub/usage";
+import { fetchAccountUsageAuto, formatStatusLine, money, } from "@inferhub/usage";
 let cached = null;
-let sessionCost = null;
-let sessionModel = null;
+let openCodeSessionId = null;
+let model = null;
 async function refresh() {
     try {
-        const { usage } = await fetchAccountUsageAuto({ window: "day" });
-        cached = usage;
-        if (Number(usage.balance.amount_usdc) < 0.5) {
-            // toast if available
+        const { usage } = await fetchAccountUsageAuto({
+            window: "day",
+            // Prefer OpenCode's session id when known so sess matches Claude semantics
+            sessionId: openCodeSessionId || undefined,
+        });
+        // If we asked for a specific session and API returned something else / empty,
+        // strip mismatched session (same rule as Claude statusline).
+        if (openCodeSessionId) {
+            const got = usage.session?.id ? String(usage.session.id) : "";
+            if (got !== openCodeSessionId && !got.includes(openCodeSessionId)) {
+                usage.session = null;
+            }
+            else if (usage.session) {
+                usage.session.id = openCodeSessionId;
+            }
         }
+        else {
+            // No OpenCode session id → don't show account-latest sess (avoids jumping)
+            usage.session = null;
+        }
+        cached = usage;
         return usage;
     }
     catch {
@@ -28,55 +39,51 @@ async function refresh() {
 }
 function line() {
     if (!cached)
-        return "IH · loading…";
-    return formatStatusLine(cached, {
-        sessionCostUsd: sessionCost,
-        model: sessionModel,
-    });
+        return "InferHub · loading…";
+    return formatStatusLine(cached, { model });
 }
 export async function tui(api) {
     void refresh();
-    const timer = setInterval(() => void refresh(), 60_000);
+    const timer = setInterval(() => void refresh(), 30_000);
     const offIdle = api.event.on("session.idle", () => void refresh());
+    const offCreated = api.event.on("session.created", (ev) => {
+        const info = ev?.properties?.info ?? ev?.info ?? ev?.properties ?? {};
+        const id = info.id || info.sessionID || info.sessionId || ev?.properties?.sessionID;
+        if (typeof id === "string" && id)
+            openCodeSessionId = id;
+        void refresh();
+    });
     const offUpd = api.event.on("session.updated", (ev) => {
         const info = ev?.properties?.info ?? ev?.info ?? {};
-        if (typeof info.cost === "number")
-            sessionCost = info.cost;
+        const id = info.id || info.sessionID || info.sessionId;
+        if (typeof id === "string" && id)
+            openCodeSessionId = id;
         if (typeof info.model === "string")
-            sessionModel = info.model;
+            model = info.model;
         if (info.model?.id)
-            sessionModel = info.model.id;
+            model = info.model.id;
+        void refresh();
     });
     api.lifecycle.onDispose(() => {
         clearInterval(timer);
         offIdle();
+        offCreated();
         offUpd();
     });
-    // Prefer slots when the host supports Solid slot plugins.
     try {
         api.slots.register({
             name: "inferhub-usage",
-            // Hosts that accept render functions will display these; others ignore.
             slots: {
+                // Same string Claude shows, everywhere we can place it.
                 home_footer: () => line(),
-                sidebar_footer: () => {
-                    if (!cached)
-                        return "IH …";
-                    return `bal ${money(cached.balance.amount_usdc)} · all ${money(cached.all_time.spend_usdc)} · top ${shortModel(cached.top_model?.model)}`;
-                },
-                sidebar_content: () => {
-                    if (!cached)
-                        return "InferHub usage loading…";
-                    const sess = sessionCost != null ? money(sessionCost) : "—";
-                    return `IH session ${sess} · day ${money(cached.window.spend_usdc)} · ${cached.window.requests} req`;
-                },
+                sidebar_footer: () => line(),
+                sidebar_content: () => line(),
             },
         });
     }
     catch {
         // Slot API unavailable — server tool still works.
     }
-    // Toast on first successful load when balance is low.
     void refresh().then((u) => {
         if (u && Number(u.balance.amount_usdc) < 0.5) {
             try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@inferhub/opencode-usage",
-  "version": "0.1.1",
+  "version": "0.1.3",
   "description": "OpenCode plugin: InferHub balance, session/day/all-time usage, top model",
   "type": "module",
   "main": "./dist/index.js",
@@ -24,15 +24,8 @@
     "prepublishOnly": "npm run build"
   },
   "dependencies": {
-    "@inferhub/usage": "^0.1.0"
-  },
-  "peerDependencies": {
-    "@opencode-ai/plugin": ">=1.0.0"
-  },
-  "peerDependenciesMeta": {
-    "@opencode-ai/plugin": {
-      "optional": true
-    }
+    "@inferhub/usage": "^0.1.11",
+    "@opencode-ai/plugin": "^1.17.18"
   },
   "devDependencies": {
     "@types/node": "^22.15.0",