@slkiser/opencode-quota 3.11.1 → 4.0.0

package/dist/tui.tsx

@@ -9,7 +9,12 @@ import type {
 import { Show, createEffect, createSignal, onCleanup } from "solid-js";
 
 import type { SessionTokenError } from "./lib/quota-status.js";
-import type { CompactStatusState, HomeBottomState, SidebarPanelState } from "./lib/tui-panel-state.js";
+import type { TuiCommandDisplay } from "./lib/types.js";
+import type {
+  CompactStatusState,
+  HomeBottomState,
+  SidebarPanelState,
+} from "./lib/tui-panel-state.js";
 
 import {
   getCompactStatusText,
@@ -26,8 +31,8 @@ import {
   getTuiRuntimeRootHints,
   getTuiSessionModelMeta,
   loadTuiHomeBottomStatus,
-  normalizeTuiSessionID,
   loadTuiSessionQuotaSurfaces,
+  normalizeTuiSessionID,
   resolveTuiSurfaceRegistration,
   writeTuiQuotaExportIfEnabled,
 } from "./lib/tui-runtime.js";
@@ -35,6 +40,7 @@ import {
   QUOTA_DIALOG_COMMANDS,
   buildQuotaDialogCommandOutput,
   type QuotaDialogCommandId,
+  type QuotaDialogCommandSpec,
 } from "./lib/quota-dialog-commands.js";
 
 const id = "@slkiser/opencode-quota";
@@ -52,7 +58,6 @@ type DialogSize = "medium" | "large" | "xlarge";
 type QuotaDialogCommandState = {
   lastSessionTokenError?: SessionTokenError;
 };
-
 type SessionQuotaResource = {
   sessionID: string;
   sidebar: () => SidebarPanelState;
@@ -209,10 +214,13 @@ function acquireSessionQuotaResource(api: TuiPluginApi, sessionID: string): Sess
   return next;
 }
 
-function createHomeBottomResource(api: TuiPluginApi): HomeBottomResource {
+function createHomeBottomResource(
+  api: TuiPluginApi,
+  compactHomeBottomEnabled: boolean,
+): HomeBottomResource {
   const [bottom, setBottom] = createSignal<HomeBottomState>({
     status: "loading",
-    compact: { status: "loading" },
+    compact: compactHomeBottomEnabled ? { status: "loading" } : { status: "disabled" },
   });
 
   let refCount = 0;
@@ -307,11 +315,14 @@ function createHomeBottomResource(api: TuiPluginApi): HomeBottomResource {
   return resource;
 }
 
-function acquireHomeBottomResource(api: TuiPluginApi): HomeBottomResource {
+function acquireHomeBottomResource(
+  api: TuiPluginApi,
+  compactHomeBottomEnabled: boolean,
+): HomeBottomResource {
   const existing = homeResources.get(api);
   if (existing) return existing.retain();
 
-  const next = createHomeBottomResource(api).retain();
+  const next = createHomeBottomResource(api, compactHomeBottomEnabled).retain();
   homeResources.set(api, next);
   return next;
 }
@@ -447,37 +458,36 @@ function SessionPromptWithCompactStatus(props: {
   );
 }
 
-function HomeBottomView(props: { api: TuiPluginApi }) {
-  const resource = acquireHomeBottomResource(props.api);
+function HomeBottomView(props: { api: TuiPluginApi; compactHomeBottomEnabled: boolean }) {
+  const resource = acquireHomeBottomResource(props.api, props.compactHomeBottomEnabled);
   onCleanup(() => resource.release());
 
   const announcement = () => getHomeBottomAnnouncementText(resource.bottom());
   const compact = () => resource.bottom().compact;
+  const visible = () => shouldRenderHomeBottom(resource.bottom());
 
   return (
-    <Show when={shouldRenderHomeBottom(resource.bottom())}>
-      <box gap={0}>
+    <box gap={0}>
+      <Show when={visible()}>
         <text> </text>
-        <Show when={announcement()}>
-          <box flexDirection="row" justifyContent="center">
-            <text fg={props.api.theme.current.textMuted} wrapMode="none">
-              {announcement()}
-            </text>
-          </box>
-        </Show>
+      </Show>
+      <Show when={visible() && announcement()}>
+        <box flexDirection="row" justifyContent="center">
+          <text fg={props.api.theme.current.textMuted} wrapMode="none">
+            {announcement()}
+          </text>
+        </box>
+      </Show>
+      <Show when={visible()}>
         <CompactStatusLine api={props.api} panel={compact} justifyContent="center" />
-      </box>
-    </Show>
+      </Show>
+    </box>
   );
 }
 
 function getActiveTuiSessionID(api: TuiPluginApi): string | undefined {
-  const route = (api as any).route?.current;
-  if (route?.name !== "session" && route?.type !== "session") return undefined;
-
-  return normalizeTuiSessionID(
-    route.params?.sessionID ?? route.params?.session_id ?? route.params?.id ?? route.sessionID,
-  );
+  if (api.route.current.name !== "session") return undefined;
+  return normalizeTuiSessionID(api.route.current.params?.sessionID);
 }
 
 function getTuiCommandArguments(input: unknown): string | undefined {
@@ -492,7 +502,7 @@ function getTuiCommandArguments(input: unknown): string | undefined {
 
 function CommandLoadingDialog(props: { api: TuiPluginApi; title: string }) {
   return (
-    <box gap={1}>
+    <box gap={1} paddingLeft={2} paddingRight={2} paddingBottom={1}>
       <text fg={props.api.theme.current.text}>
         <b>{props.title}</b>
       </text>
@@ -526,7 +536,7 @@ function CommandOutputDialog(props: { api: TuiPluginApi; title: string; output:
 function CommandErrorDialog(props: { api: TuiPluginApi; title: string; error: unknown }) {
   const message = props.error instanceof Error ? props.error.message : String(props.error);
   return (
-    <box gap={1}>
+    <box gap={1} paddingLeft={2} paddingRight={2} paddingBottom={1}>
       <text fg={props.api.theme.current.text}>
         <b>{props.title}</b>
       </text>
@@ -539,93 +549,90 @@ function CommandErrorDialog(props: { api: TuiPluginApi; title: string; error: un
   );
 }
 
-function TokensBetweenPromptDialog(props: {
-  api: TuiPluginApi;
-  onConfirm: (value: string) => void;
-  onCancel: () => void;
-}) {
-  const DialogPrompt = (props.api as any).ui?.DialogPrompt;
-  if (DialogPrompt) {
-    return (
-      <DialogPrompt
-        title="OpenCode Quota Token Range"
-        placeholder="YYYY-MM-DD YYYY-MM-DD"
-        description={() => (
-          <text fg={props.api.theme.current.textMuted} wrapMode="none">
-            Enter start and end dates, for example: 2026-01-01 2026-01-15
-          </text>
-        )}
-        onConfirm={props.onConfirm}
-        onCancel={props.onCancel}
-      />
-    );
+function getCommandPromptCopy(spec: QuotaDialogCommandSpec): {
+  title: string;
+  placeholder: string;
+  description: string;
+} {
+  switch (spec.id) {
+    case "tokens_between":
+      return {
+        title: "OpenCode Quota Token Range",
+        placeholder: "YYYY-MM-DD YYYY-MM-DD",
+        description: "Enter start and end dates, for example: 2026-01-01 2026-01-15",
+      };
+    case "quota_status":
+      return {
+        title: "OpenCode Quota Status Options",
+        placeholder: 'Optional JSON, e.g. {"refreshGoogleTokens":true}',
+        description: "Leave blank for normal diagnostics, or enter one JSON options object.",
+      };
+    default:
+      return {
+        title: spec.title,
+        placeholder: "Optional arguments",
+        description: "Leave blank to run with no arguments.",
+      };
   }
-
-  return (
-    <CommandOutputDialog
-      api={props.api}
-      title="OpenCode Quota Token Range"
-      output={
-        "Missing arguments for /tokens_between\n\nExpected: /tokens_between YYYY-MM-DD YYYY-MM-DD\nExample: /tokens_between 2026-01-01 2026-01-15"
-      }
-    />
-  );
-}
-
-function replaceDialog(api: TuiPluginApi, size: DialogSize, render: () => JSX.Element) {
-  const dialog = (api as any).ui?.dialog;
-  dialog?.replace?.(render);
-  // OpenCode's dialog.replace() resets size to medium; xlarge is the widest supported dialog.
-  dialog?.setSize?.(size);
 }
 
-function clearDialog(api: TuiPluginApi): void {
-  (api as any).ui?.dialog?.clear?.();
+function replaceDialog(api: TuiPluginApi, size: DialogSize, render: () => JSX.Element): void {
+  api.ui.dialog.replace(render);
+  // OpenCode dialog.replace() resets size to medium.
+  api.ui.dialog.setSize(size);
 }
 
 async function runQuotaDialogCommandAsync(
   api: TuiPluginApi,
   command: QuotaDialogCommandId,
+  commandDisplay: TuiCommandDisplay,
   rawInput?: unknown,
   state?: QuotaDialogCommandState,
 ): Promise<void> {
   const spec = QUOTA_DIALOG_COMMANDS.find((item) => item.id === command)!;
-  const args = getTuiCommandArguments(rawInput);
+  const argumentsText = getTuiCommandArguments(rawInput);
   const sessionID = getActiveTuiSessionID(api);
 
-  if (command === "tokens_between" && !args) {
+  if (spec.acceptsArguments && rawInput === undefined) {
+    const prompt = getCommandPromptCopy(spec);
     replaceDialog(api, "medium", () => (
-      <TokensBetweenPromptDialog
-        api={api}
-        onCancel={() => clearDialog(api)}
+      <api.ui.DialogPrompt
+        title={prompt.title}
+        placeholder={prompt.placeholder}
+        description={() => (
+          <text fg={api.theme.current.textMuted} wrapMode="word">
+            {prompt.description}
+          </text>
+        )}
+        onCancel={() => api.ui.dialog.clear()}
         onConfirm={(value) => {
-          const nextArgs = value.trim();
-          if (!nextArgs) {
-            replaceDialog(api, "large", () => (
-              <CommandOutputDialog
-                api={api}
-                title={spec.title}
-                output={
-                  "Missing arguments for /tokens_between\n\nExpected: /tokens_between YYYY-MM-DD YYYY-MM-DD\nExample: /tokens_between 2026-01-01 2026-01-15"
-                }
-              />
-            ));
-            return;
-          }
-
-          runQuotaDialogCommand(api, command, { arguments: nextArgs }, state);
+          void runQuotaDialogCommandAsync(
+            api,
+            command,
+            commandDisplay,
+            { arguments: value.trim() },
+            state,
+          );
         }}
       />
     ));
     return;
   }
 
-  replaceDialog(api, spec.dialogSize, () => <CommandLoadingDialog api={api} title={spec.title} />);
+  const destination =
+    commandDisplay === "inline" && sessionID
+      ? { type: "inline" as const, sessionID }
+      : { type: "dialog" as const };
+  if (destination.type === "dialog") {
+    replaceDialog(api, spec.dialogSize, () => (
+      <CommandLoadingDialog api={api} title={spec.title} />
+    ));
+  }
 
   try {
     const result = await buildQuotaDialogCommandOutput({
       command,
-      arguments: args,
+      arguments: argumentsText,
       client: createTuiQuotaClient(api),
       roots: getTuiRuntimeRootHints(api),
       sessionID,
@@ -637,7 +644,7 @@ async function runQuotaDialogCommandAsync(
           }
         : undefined,
       log: async (message, extra) => {
-        await (api as any).client?.app?.log?.({
+        await api.client.app.log({
           body: {
             service: "quota-toast",
             level: "debug",
@@ -649,7 +656,16 @@ async function runQuotaDialogCommandAsync(
     });
 
     if (result.state === "noop") {
-      clearDialog(api);
+      if (destination.type === "dialog") api.ui.dialog.clear();
+      return;
+    }
+
+    if (destination.type === "inline") {
+      await api.client.session.prompt({
+        sessionID: destination.sessionID,
+        noReply: true,
+        parts: [{ type: "text", text: result.output, ignored: true }],
+      });
       return;
     }
 
@@ -657,29 +673,19 @@ async function runQuotaDialogCommandAsync(
       <CommandOutputDialog api={api} title={result.title} output={result.output} />
     ));
   } catch (error) {
-    replaceDialog(api, "large", () => <CommandErrorDialog api={api} title={spec.title} error={error} />);
-    (api as any).ui?.toast?.({
+    replaceDialog(api, "large", () => (
+      <CommandErrorDialog api={api} title={spec.title} error={error} />
+    ));
+    api.ui.toast({
       variant: "error",
       message: "OpenCode Quota command failed",
     });
   }
 }
 
-function runQuotaDialogCommand(
-  api: TuiPluginApi,
-  command: QuotaDialogCommandId,
-  rawInput?: unknown,
-  state?: QuotaDialogCommandState,
-): void {
-  void runQuotaDialogCommandAsync(api, command, rawInput, state);
-}
-
-function registerQuotaDialogCommands(api: TuiPluginApi): void {
-  const keymap = (api as any).keymap;
-  if (!keymap?.registerLayer) return;
-
+function registerQuotaDialogCommands(api: TuiPluginApi, commandDisplay: TuiCommandDisplay): void {
   const commandState: QuotaDialogCommandState = {};
-  const dispose = keymap.registerLayer({
+  const dispose = api.keymap.registerLayer({
     commands: QUOTA_DIALOG_COMMANDS.map((spec) => ({
       namespace: "palette",
       name: `opencode-quota.${spec.id}`,
@@ -688,14 +694,13 @@ function registerQuotaDialogCommands(api: TuiPluginApi): void {
       category: "OpenCode Quota",
       slashName: spec.slashName,
       run(input?: unknown) {
-        runQuotaDialogCommand(api, spec.id, input, commandState);
+        void runQuotaDialogCommandAsync(api, spec.id, commandDisplay, input, commandState);
       },
     })),
+    bindings: [],
   });
 
-  if (typeof dispose === "function") {
-    api.lifecycle.onDispose(dispose);
-  }
+  api.lifecycle.onDispose(dispose);
 }
 
 function registerSidebarSlots(api: TuiPluginApi): void {
@@ -710,16 +715,17 @@ function registerSidebarSlots(api: TuiPluginApi): void {
 }
 
 const tui: TuiPlugin = async (api) => {
-  registerQuotaDialogCommands(api);
-
   let surfaceRegistration;
   try {
     surfaceRegistration = await resolveTuiSurfaceRegistration(api);
   } catch {
+    registerQuotaDialogCommands(api, "inline");
     registerSidebarSlots(api);
     return;
   }
 
+  registerQuotaDialogCommands(api, surfaceRegistration.commandDisplay);
+
   if (surfaceRegistration.sidebar.enabled) {
     registerSidebarSlots(api);
   }
@@ -752,7 +758,9 @@ const tui: TuiPlugin = async (api) => {
   }
 
   if (surfaceRegistration.homeBottom) {
-    compactSlots.home_bottom = () => <HomeBottomView api={api} />;
+    compactSlots.home_bottom = () => (
+      <HomeBottomView api={api} compactHomeBottomEnabled={surfaceRegistration.compact.homeBottom} />
+    );
   }
 
   if (Object.keys(compactSlots).length > 0) {

package/package.json

@@ -1,7 +1,6 @@
 {
   "name": "@slkiser/opencode-quota",
-  "version": "3.11.1",
-  "packageManager": "pnpm@11.0.0",
+  "version": "4.0.0",
   "description": "OpenCode quota & tokens usage with zero context window pollution. Supports GitHub Copilot, OpenAI (Plus/Pro), Qwen Code, Chutes AI, Synthetic, Google Antigravity, Z.ai coding plan and more.",
   "type": "module",
   "main": "./dist/index.js",
@@ -32,21 +31,6 @@
     "README.md",
     "LICENSE"
   ],
-  "scripts": {
-    "build": "node scripts/clean-dist.mjs && tsc && node scripts/copy-data.mjs && node scripts/prepare-tui-dist.mjs",
-    "build:check": "pnpm run build && pnpm pack --dry-run",
-    "pricing:refresh": "node scripts/refresh-modelsdev-pricing.mjs",
-    "pricing:refresh:if-stale": "node scripts/refresh-modelsdev-pricing-if-stale.mjs",
-    "upstream:check": "node scripts/check-upstream-plugin-updates.mjs",
-    "upstream:prepare-review": "node scripts/prepare-upstream-plugin-review.mjs",
-    "upstream:sync": "node scripts/sync-upstream-plugin-references.mjs",
-    "verify:release-version": "node scripts/verify-release-version.mjs",
-    "typecheck": "tsc --noEmit",
-    "test": "vitest run",
-    "test:watch": "vitest",
-    "prepublishOnly": "pnpm run build",
-    "prepare": "husky"
-  },
   "keywords": [
     "opencode",
     "plugin",
@@ -72,20 +56,22 @@
   "devDependencies": {
     "@babel/core": "^7.28.0",
     "@babel/preset-typescript": "^7.27.1",
-    "@opencode-ai/plugin": "^1.4.3",
+    "@opencode-ai/plugin": "1.18.1",
     "@types/node": "^22.0.0",
     "babel-preset-solid": "^1.9.12",
     "husky": "^9.1.7",
     "lint-staged": "^16.2.7",
     "prettier": "^3.8.0",
     "typescript": "^5.9.3",
-    "vitest": "^4.0.17"
+    "vitest": "^4.0.17",
+    "yaml": "^2.8.3"
   },
   "dependencies": {
     "@clack/prompts": "^1.2.0",
     "@opentui/core": "^0.4.3",
     "@opentui/solid": "^0.4.3",
     "comment-json": "^5.0.0",
+    "jsonc-parser": "^3.3.1",
     "solid-js": "^1.9.12",
     "xdg-basedir": "^5.1.0"
   },
@@ -96,6 +82,28 @@
     "@opencode-ai/plugin": "^1.4.3"
   },
   "engines": {
-    "node": ">=20.0.0"
+    "node": ">=22.0.0"
+  },
+  "scripts": {
+    "build": "node scripts/clean-dist.mjs && tsc && node scripts/copy-data.mjs && node scripts/prepare-tui-dist.mjs",
+    "build:check": "pnpm run build && pnpm pack --dry-run",
+    "pack:release-package": "node scripts/pack-release-package.mjs",
+    "format:check": "node scripts/verify-v4-formatting.mjs",
+    "pricing:refresh": "node scripts/refresh-modelsdev-pricing.mjs",
+    "pricing:refresh:if-stale": "node scripts/refresh-modelsdev-pricing-if-stale.mjs",
+    "upstream:check": "node scripts/check-upstream-plugin-updates.mjs",
+    "upstream:prepare-review": "node scripts/prepare-upstream-plugin-review.mjs",
+    "upstream:sync": "node scripts/sync-upstream-plugin-references.mjs",
+    "release:check": "pnpm run format:check && pnpm run verify:typescript-version && pnpm run verify:v4-history && pnpm run typecheck && pnpm run build && pnpm test && pnpm run test:four-surfaces && pnpm run verify:release-package && pnpm run verify:release-version",
+    "smoke:package": "node scripts/smoke-packed-package.mjs",
+    "test:four-surfaces": "vitest run tests/v4-phase5-cross-surface.test.ts",
+    "verify:package-contents": "node scripts/verify-package-contents.mjs",
+    "verify:release-package": "node scripts/verify-release-package.mjs",
+    "verify:release-version": "node scripts/verify-release-version.mjs",
+    "verify:typescript-version": "node scripts/verify-typescript-version.mjs",
+    "verify:v4-history": "node scripts/verify-v4-history.mjs",
+    "typecheck": "tsc --noEmit",
+    "test": "vitest run",
+    "test:watch": "vitest"
   }
-}
+}