@slkiser/opencode-quota 3.11.1 → 4.0.0

package/dist/tui.js

@@ -11,7 +11,7 @@ import { createElement as _$createElement } from "@opentui/solid";
 import { Show, createEffect, createSignal, onCleanup } from "solid-js";
 import { getCompactStatusText, getHomeBottomAnnouncementText, getSidebarPanelLines, getSidebarPanelLinesExpanded, shouldRenderCompactStatus, shouldRenderHomeBottom, shouldRenderSidebarPanel } 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 { createTuiQuotaClient, getTuiRuntimeRootHints, getTuiSessionModelMeta, loadTuiHomeBottomStatus, loadTuiSessionQuotaSurfaces, normalizeTuiSessionID, resolveTuiSurfaceRegistration, writeTuiQuotaExportIfEnabled } from "./lib/tui-runtime.js";
 import { QUOTA_DIALOG_COMMANDS, buildQuotaDialogCommandOutput } from "./lib/quota-dialog-commands.js";
 const id = "@slkiser/opencode-quota";
 // Place Quota near the top so variable-height built-in sections
@@ -140,11 +140,13 @@ function acquireSessionQuotaResource(api, sessionID) {
   resources.set(sessionID, next);
   return next;
 }
-function createHomeBottomResource(api) {
+function createHomeBottomResource(api, compactHomeBottomEnabled) {
   const [bottom, setBottom] = createSignal({
     status: "loading",
-    compact: {
+    compact: compactHomeBottomEnabled ? {
       status: "loading"
+    } : {
+      status: "disabled"
     }
   });
   let refCount = 0;
@@ -221,10 +223,10 @@ function createHomeBottomResource(api) {
   reload();
   return resource;
 }
-function acquireHomeBottomResource(api) {
+function acquireHomeBottomResource(api, compactHomeBottomEnabled) {
   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;
 }
@@ -396,51 +398,60 @@ function SessionPromptWithCompactStatus(props) {
   })();
 }
 function HomeBottomView(props) {
-  const resource = acquireHomeBottomResource(props.api);
+  const resource = acquireHomeBottomResource(props.api, props.compactHomeBottomEnabled);
   onCleanup(() => resource.release());
   const announcement = () => getHomeBottomAnnouncementText(resource.bottom());
   const compact = () => resource.bottom().compact;
-  return _$createComponent(Show, {
-    get when() {
-      return shouldRenderHomeBottom(resource.bottom());
-    },
-    get children() {
-      var _el$14 = _$createElement("box"),
-        _el$15 = _$createElement("text");
-      _$insertNode(_el$14, _el$15);
-      _$setProp(_el$14, "gap", 0);
-      _$insertNode(_el$15, _$createTextNode(` `));
-      _$insert(_el$14, _$createComponent(Show, {
-        get when() {
-          return announcement();
-        },
-        get children() {
-          var _el$17 = _$createElement("box"),
-            _el$18 = _$createElement("text");
-          _$insertNode(_el$17, _el$18);
-          _$setProp(_el$17, "flexDirection", "row");
-          _$setProp(_el$17, "justifyContent", "center");
-          _$setProp(_el$18, "wrapMode", "none");
-          _$insert(_el$18, announcement);
-          _$effect(_$p => _$setProp(_el$18, "fg", props.api.theme.current.textMuted, _$p));
-          return _el$17;
-        }
-      }), null);
-      _$insert(_el$14, _$createComponent(CompactStatusLine, {
-        get api() {
-          return props.api;
-        },
-        panel: compact,
-        justifyContent: "center"
-      }), null);
-      return _el$14;
-    }
-  });
+  const visible = () => shouldRenderHomeBottom(resource.bottom());
+  return (() => {
+    var _el$14 = _$createElement("box");
+    _$setProp(_el$14, "gap", 0);
+    _$insert(_el$14, _$createComponent(Show, {
+      get when() {
+        return visible();
+      },
+      get children() {
+        var _el$15 = _$createElement("text");
+        _$insertNode(_el$15, _$createTextNode(` `));
+        return _el$15;
+      }
+    }), null);
+    _$insert(_el$14, _$createComponent(Show, {
+      get when() {
+        return _$memo(() => !!visible())() && announcement();
+      },
+      get children() {
+        var _el$17 = _$createElement("box"),
+          _el$18 = _$createElement("text");
+        _$insertNode(_el$17, _el$18);
+        _$setProp(_el$17, "flexDirection", "row");
+        _$setProp(_el$17, "justifyContent", "center");
+        _$setProp(_el$18, "wrapMode", "none");
+        _$insert(_el$18, announcement);
+        _$effect(_$p => _$setProp(_el$18, "fg", props.api.theme.current.textMuted, _$p));
+        return _el$17;
+      }
+    }), null);
+    _$insert(_el$14, _$createComponent(Show, {
+      get when() {
+        return visible();
+      },
+      get children() {
+        return _$createComponent(CompactStatusLine, {
+          get api() {
+            return props.api;
+          },
+          panel: compact,
+          justifyContent: "center"
+        });
+      }
+    }), null);
+    return _el$14;
+  })();
 }
 function getActiveTuiSessionID(api) {
-  const route = api.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) {
   if (!input || typeof input !== "object") return undefined;
@@ -460,6 +471,9 @@ function CommandLoadingDialog(props) {
     _$insertNode(_el$19, _el$20);
     _$insertNode(_el$19, _el$22);
     _$setProp(_el$19, "gap", 1);
+    _$setProp(_el$19, "paddingLeft", 2);
+    _$setProp(_el$19, "paddingRight", 2);
+    _$setProp(_el$19, "paddingBottom", 1);
     _$insertNode(_el$20, _el$21);
     _$insert(_el$21, () => props.title);
     _$insertNode(_el$22, _$createTextNode(`Loading deterministic local output…`));
@@ -543,6 +557,9 @@ function CommandErrorDialog(props) {
     _$insertNode(_el$32, _el$37);
     _$insertNode(_el$32, _el$38);
     _$setProp(_el$32, "gap", 1);
+    _$setProp(_el$32, "paddingLeft", 2);
+    _$setProp(_el$32, "paddingRight", 2);
+    _$setProp(_el$32, "paddingBottom", 1);
     _$insertNode(_el$33, _el$34);
     _$insert(_el$34, () => props.title);
     _$insertNode(_el$35, _$createTextNode(`OpenCode Quota command failed.`));
@@ -568,81 +585,80 @@ function CommandErrorDialog(props) {
     return _el$32;
   })();
 }
-function TokensBetweenPromptDialog(props) {
-  const DialogPrompt = props.api.ui?.DialogPrompt;
-  if (DialogPrompt) {
-    return _$createComponent(DialogPrompt, {
-      title: "OpenCode Quota Token Range",
-      placeholder: "YYYY-MM-DD YYYY-MM-DD",
-      description: () => (() => {
-        var _el$40 = _$createElement("text");
-        _$insertNode(_el$40, _$createTextNode(`Enter start and end dates, for example: 2026-01-01 2026-01-15`));
-        _$setProp(_el$40, "wrapMode", "none");
-        _$effect(_$p => _$setProp(_el$40, "fg", props.api.theme.current.textMuted, _$p));
-        return _el$40;
-      })(),
-      get onConfirm() {
-        return props.onConfirm;
-      },
-      get onCancel() {
-        return props.onCancel;
-      }
-    });
+function getCommandPromptCopy(spec) {
+  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 _$createComponent(CommandOutputDialog, {
-    get api() {
-      return 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, size, render) {
-  const dialog = api.ui?.dialog;
-  dialog?.replace?.(render);
-  // OpenCode's dialog.replace() resets size to medium; xlarge is the widest supported dialog.
-  dialog?.setSize?.(size);
+  api.ui.dialog.replace(render);
+  // OpenCode dialog.replace() resets size to medium.
+  api.ui.dialog.setSize(size);
 }
-function clearDialog(api) {
-  api.ui?.dialog?.clear?.();
-}
-async function runQuotaDialogCommandAsync(api, command, rawInput, state) {
+async function runQuotaDialogCommandAsync(api, command, commandDisplay, rawInput, state) {
   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) {
-    replaceDialog(api, "medium", () => _$createComponent(TokensBetweenPromptDialog, {
-      api: api,
-      onCancel: () => clearDialog(api),
+  if (spec.acceptsArguments && rawInput === undefined) {
+    const prompt = getCommandPromptCopy(spec);
+    replaceDialog(api, "medium", () => _$createComponent(api.ui.DialogPrompt, {
+      get title() {
+        return prompt.title;
+      },
+      get placeholder() {
+        return prompt.placeholder;
+      },
+      description: () => (() => {
+        var _el$40 = _$createElement("text");
+        _$setProp(_el$40, "wrapMode", "word");
+        _$insert(_el$40, () => prompt.description);
+        _$effect(_$p => _$setProp(_el$40, "fg", api.theme.current.textMuted, _$p));
+        return _el$40;
+      })(),
+      onCancel: () => api.ui.dialog.clear(),
       onConfirm: value => {
-        const nextArgs = value.trim();
-        if (!nextArgs) {
-          replaceDialog(api, "large", () => _$createComponent(CommandOutputDialog, {
-            api: api,
-            get title() {
-              return 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
+        void runQuotaDialogCommandAsync(api, command, commandDisplay, {
+          arguments: value.trim()
         }, state);
       }
     }));
     return;
   }
-  replaceDialog(api, spec.dialogSize, () => _$createComponent(CommandLoadingDialog, {
-    api: api,
-    get title() {
-      return spec.title;
-    }
-  }));
+  const destination = commandDisplay === "inline" && sessionID ? {
+    type: "inline",
+    sessionID
+  } : {
+    type: "dialog"
+  };
+  if (destination.type === "dialog") {
+    replaceDialog(api, spec.dialogSize, () => _$createComponent(CommandLoadingDialog, {
+      api: api,
+      get title() {
+        return spec.title;
+      }
+    }));
+  }
   try {
     const result = await buildQuotaDialogCommandOutput({
       command,
-      arguments: args,
+      arguments: argumentsText,
       client: createTuiQuotaClient(api),
       roots: getTuiRuntimeRootHints(api),
       sessionID,
@@ -652,7 +668,7 @@ async function runQuotaDialogCommandAsync(api, command, rawInput, state) {
         state.lastSessionTokenError = error;
       } : undefined,
       log: async (message, extra) => {
-        await api.client?.app?.log?.({
+        await api.client.app.log({
           body: {
             service: "quota-toast",
             level: "debug",
@@ -663,7 +679,19 @@ async function runQuotaDialogCommandAsync(api, command, rawInput, state) {
       }
     });
     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;
     }
     replaceDialog(api, result.dialogSize, () => _$createComponent(CommandOutputDialog, {
@@ -683,20 +711,15 @@ async function runQuotaDialogCommandAsync(api, command, rawInput, state) {
       },
       error: error
     }));
-    api.ui?.toast?.({
+    api.ui.toast({
       variant: "error",
       message: "OpenCode Quota command failed"
     });
   }
 }
-function runQuotaDialogCommand(api, command, rawInput, state) {
-  void runQuotaDialogCommandAsync(api, command, rawInput, state);
-}
-function registerQuotaDialogCommands(api) {
-  const keymap = api.keymap;
-  if (!keymap?.registerLayer) return;
+function registerQuotaDialogCommands(api, commandDisplay) {
   const commandState = {};
-  const dispose = keymap.registerLayer({
+  const dispose = api.keymap.registerLayer({
     commands: QUOTA_DIALOG_COMMANDS.map(spec => ({
       namespace: "palette",
       name: `opencode-quota.${spec.id}`,
@@ -705,13 +728,12 @@ function registerQuotaDialogCommands(api) {
       category: "OpenCode Quota",
       slashName: spec.slashName,
       run(input) {
-        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) {
   api.slots.register({
@@ -729,14 +751,15 @@ function registerSidebarSlots(api) {
   });
 }
 const tui = 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);
   }
@@ -765,7 +788,10 @@ const tui = async api => {
   }
   if (surfaceRegistration.homeBottom) {
     compactSlots.home_bottom = () => _$createComponent(HomeBottomView, {
-      api: api
+      api: api,
+      get compactHomeBottomEnabled() {
+        return surfaceRegistration.compact.homeBottom;
+      }
     });
   }
   if (Object.keys(compactSlots).length > 0) {