@slkiser/opencode-quota 3.11.0 → 3.11.2

package/dist/tui.tsx

@@ -8,8 +8,11 @@ import type {
 } from "@opencode-ai/plugin/tui";
 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 {
+  CompactStatusState,
+  HomeBottomState,
+  SidebarPanelState,
+} from "./lib/tui-panel-state.js";
 
 import {
   getCompactStatusText,
@@ -22,20 +25,11 @@ import {
 } from "./lib/tui-panel-state.js";
 import { getSidebarBodyLineColor } from "./lib/tui-line-style.js";
 import {
-  createTuiQuotaClient,
-  getTuiRuntimeRootHints,
-  getTuiSessionModelMeta,
   loadTuiHomeBottomStatus,
-  normalizeTuiSessionID,
   loadTuiSessionQuotaSurfaces,
   resolveTuiSurfaceRegistration,
   writeTuiQuotaExportIfEnabled,
 } from "./lib/tui-runtime.js";
-import {
-  QUOTA_DIALOG_COMMANDS,
-  buildQuotaDialogCommandOutput,
-  type QuotaDialogCommandId,
-} from "./lib/quota-dialog-commands.js";
 
 const id = "@slkiser/opencode-quota";
 // Place Quota near the top so variable-height built-in sections
@@ -47,12 +41,6 @@ const EVENT_REFRESH_DELAYS_MS = [150, 600] as const;
 const MOUNT_RECOVERY_DELAYS_MS = [500, 1_500, 4_000] as const;
 
 type TuiPromptRefCallback = (ref: TuiPromptRef | undefined) => void;
-type DialogSize = "medium" | "large" | "xlarge";
-
-type QuotaDialogCommandState = {
-  lastSessionTokenError?: SessionTokenError;
-};
-
 type SessionQuotaResource = {
   sessionID: string;
   sidebar: () => SidebarPanelState;
@@ -471,233 +459,6 @@ function HomeBottomView(props: { api: TuiPluginApi }) {
   );
 }
 
-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,
-  );
-}
-
-function getTuiCommandArguments(input: unknown): string | undefined {
-  if (!input || typeof input !== "object") return undefined;
-  const record = input as Record<string, unknown>;
-  for (const key of ["arguments", "args", "query"] as const) {
-    const value = record[key];
-    if (typeof value === "string" && value.trim()) return value.trim();
-  }
-  return undefined;
-}
-
-function CommandLoadingDialog(props: { api: TuiPluginApi; title: string }) {
-  return (
-    <box gap={1}>
-      <text fg={props.api.theme.current.text}>
-        <b>{props.title}</b>
-      </text>
-      <text fg={props.api.theme.current.textMuted}>Loading deterministic local output…</text>
-    </box>
-  );
-}
-
-function CommandOutputDialog(props: { api: TuiPluginApi; title: string; output: string }) {
-  const lines = () => props.output.split("\n");
-  const bodyHeight = () => Math.min(28, Math.max(6, lines().length));
-  return (
-    <box gap={1} width="100%" flexGrow={1} paddingLeft={2} paddingRight={2} paddingBottom={1}>
-      <text fg={props.api.theme.current.text}>
-        <b>{props.title}</b>
-      </text>
-      <scrollbox width="100%" flexGrow={1} minHeight={bodyHeight()} maxHeight={28}>
-        <box gap={0} width="100%" minWidth={0}>
-          {lines().map((line) => (
-            <text fg={props.api.theme.current.text} wrapMode="word" width="100%">
-              {line || " "}
-            </text>
-          ))}
-        </box>
-      </scrollbox>
-      <text fg={props.api.theme.current.textMuted}>esc closes</text>
-    </box>
-  );
-}
-
-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}>
-      <text fg={props.api.theme.current.text}>
-        <b>{props.title}</b>
-      </text>
-      <text fg={props.api.theme.current.text}>OpenCode Quota command failed.</text>
-      <text fg={props.api.theme.current.textMuted} wrapMode="none">
-        {message || "Unknown error"}
-      </text>
-      <text fg={props.api.theme.current.textMuted}>esc closes</text>
-    </box>
-  );
-}
-
-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}
-      />
-    );
-  }
-
-  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?.();
-}
-
-async function runQuotaDialogCommandAsync(
-  api: TuiPluginApi,
-  command: QuotaDialogCommandId,
-  rawInput?: unknown,
-  state?: QuotaDialogCommandState,
-): Promise<void> {
-  const spec = QUOTA_DIALOG_COMMANDS.find((item) => item.id === command)!;
-  const args = getTuiCommandArguments(rawInput);
-  const sessionID = getActiveTuiSessionID(api);
-
-  if (command === "tokens_between" && !args) {
-    replaceDialog(api, "medium", () => (
-      <TokensBetweenPromptDialog
-        api={api}
-        onCancel={() => clearDialog(api)}
-        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);
-        }}
-      />
-    ));
-    return;
-  }
-
-  replaceDialog(api, spec.dialogSize, () => <CommandLoadingDialog api={api} title={spec.title} />);
-
-  try {
-    const result = await buildQuotaDialogCommandOutput({
-      command,
-      arguments: args,
-      client: createTuiQuotaClient(api),
-      roots: getTuiRuntimeRootHints(api),
-      sessionID,
-      resolveSessionMeta: (id) => getTuiSessionModelMeta(api, id),
-      lastSessionTokenError: state?.lastSessionTokenError,
-      setLastSessionTokenError: state
-        ? (error) => {
-            state.lastSessionTokenError = error;
-          }
-        : undefined,
-      log: async (message, extra) => {
-        await (api as any).client?.app?.log?.({
-          body: {
-            service: "quota-toast",
-            level: "debug",
-            message,
-            extra,
-          },
-        });
-      },
-    });
-
-    if (result.state === "noop") {
-      clearDialog(api);
-      return;
-    }
-
-    replaceDialog(api, result.dialogSize, () => (
-      <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?.({
-      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;
-
-  const commandState: QuotaDialogCommandState = {};
-  const dispose = keymap.registerLayer({
-    commands: QUOTA_DIALOG_COMMANDS.map((spec) => ({
-      namespace: "palette",
-      name: `opencode-quota.${spec.id}`,
-      title: spec.title,
-      desc: spec.description,
-      category: "OpenCode Quota",
-      slashName: spec.slashName,
-      run(input?: unknown) {
-        runQuotaDialogCommand(api, spec.id, input, commandState);
-      },
-    })),
-  });
-
-  if (typeof dispose === "function") {
-    api.lifecycle.onDispose(dispose);
-  }
-}
-
 function registerSidebarSlots(api: TuiPluginApi): void {
   api.slots.register({
     order: SIDEBAR_ORDER,
@@ -710,8 +471,6 @@ function registerSidebarSlots(api: TuiPluginApi): void {
 }
 
 const tui: TuiPlugin = async (api) => {
-  registerQuotaDialogCommands(api);
-
   let surfaceRegistration;
   try {
     surfaceRegistration = await resolveTuiSurfaceRegistration(api);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@slkiser/opencode-quota",
-  "version": "3.11.0",
+  "version": "3.11.2",
   "packageManager": "pnpm@11.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",
@@ -20,7 +20,7 @@
     },
     "./tui": {
       "types": "./dist/tui.d.ts",
-      "default": "./dist/tui.tsx"
+      "default": "./dist/tui.js"
     }
   },
   "oc-plugin": [
@@ -70,8 +70,11 @@
   },
   "homepage": "https://github.com/slkiser/opencode-quota#readme",
   "devDependencies": {
+    "@babel/core": "^7.28.0",
+    "@babel/preset-typescript": "^7.27.1",
     "@opencode-ai/plugin": "^1.4.3",
     "@types/node": "^22.0.0",
+    "babel-preset-solid": "^1.9.12",
     "husky": "^9.1.7",
     "lint-staged": "^16.2.7",
     "prettier": "^3.8.0",
@@ -80,9 +83,10 @@
   },
   "dependencies": {
     "@clack/prompts": "^1.2.0",
-    "@opentui/core": "^0.2.7",
-    "@opentui/solid": "^0.2.7",
+    "@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"
   },