merge origin/main into zhipu provider

Author: slkiser

.github/workflows/publish-npm.yml

@@ -22,9 +22,8 @@ jobs:
       - name: Setup Node.js
         uses: actions/setup-node@v6
         with:
-          node-version: 20
+          node-version: 24
           registry-url: https://registry.npmjs.org/
-          cache: npm
 
       - name: Sync package.json version from release tag
         if: github.event_name == 'release'
@@ -60,13 +59,7 @@ jobs:
         run: npm test
 
       - name: Publish
-        env:
-          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
-          NPM_CONFIG_PROVENANCE_SOURCE_REPOSITORY: https://github.com/${{ github.repository }}
-          NPM_CONFIG_PROVENANCE_SOURCE_REPOSITORY_REF: ${{ github.ref }}
-          NPM_CONFIG_PROVENANCE_SOURCE_REPOSITORY_COMMIT: ${{ github.sha }}
-          NPM_CONFIG_PROVENANCE_SOURCE_REPOSITORY_URL: https://github.com/${{ github.repository }}
-        run: npm publish --access public --provenance
+        run: npm publish --access public
 
       - name: Commit synced version back to repository
         if: github.event_name == 'release'

.gitignore

@@ -31,3 +31,4 @@ AGENTS.md
 /images
 /.agents
 /prompt-exports
+/opencode-quota

README.md

@@ -1,6 +1,6 @@
 {
   "name": "@slkiser/opencode-quota",
-  "version": "3.6.2",
+  "version": "3.7.1",
   "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",

package-lock.json

@@ -53,6 +53,12 @@ export const QUOTA_TOAST_SETTING_SOURCE_KEYS = [
   "toastDurationMs",
   "onlyCurrentModel",
   "showSessionTokens",
+  "tuiSidebarPanel.enabled",
+  "tuiCompactStatus.enabled",
+  "tuiCompactStatus.homeBottom",
+  "tuiCompactStatus.sessionPrompt",
+  "tuiCompactStatus.suppressWhenNativeProviderQuota",
+  "tuiCompactStatus.maxWidth",
   "layout.maxWidth",
   "layout.narrowAt",
   "layout.tinyAt",
@@ -110,6 +116,8 @@ const NETWORK_SETTING_SOURCE_KEYS = [
 ] as const satisfies readonly QuotaToastSettingSourceKey[];
 
 type PricingSnapshotPatch = Partial<QuotaToastConfig["pricingSnapshot"]>;
+type TuiSidebarPanelPatch = Partial<QuotaToastConfig["tuiSidebarPanel"]>;
+type TuiCompactStatusPatch = Partial<QuotaToastConfig["tuiCompactStatus"]>;
 type LayoutPatch = Partial<QuotaToastConfig["layout"]>;
 
 type ValidatedQuotaToastPatch = {
@@ -137,6 +145,8 @@ type ValidatedQuotaToastPatch = {
   toastDurationMs?: number;
   onlyCurrentModel?: boolean;
   showSessionTokens?: boolean;
+  tuiSidebarPanel?: TuiSidebarPanelPatch;
+  tuiCompactStatus?: TuiCompactStatusPatch;
   layout?: LayoutPatch;
 };
 
@@ -257,6 +267,8 @@ function cloneConfig(config: QuotaToastConfig): QuotaToastConfig {
     googleModels: [...config.googleModels],
     opencodeGoWindows: [...config.opencodeGoWindows],
     pricingSnapshot: { ...config.pricingSnapshot },
+    tuiSidebarPanel: { ...config.tuiSidebarPanel },
+    tuiCompactStatus: { ...config.tuiCompactStatus },
     layout: { ...config.layout },
   };
 }
@@ -344,6 +356,53 @@ function extractPricingSnapshotPatch(value: unknown): PricingSnapshotPatch | und
   return Object.keys(patch).length > 0 ? patch : undefined;
 }
 
+function extractTuiSidebarPanelPatch(value: unknown): TuiSidebarPanelPatch | undefined {
+  if (!isPlainObject(value)) {
+    return undefined;
+  }
+
+  const patch: TuiSidebarPanelPatch = {};
+
+  if (hasOwnKey(value, "enabled") && typeof value.enabled === "boolean") {
+    patch.enabled = value.enabled;
+  }
+
+  return Object.keys(patch).length > 0 ? patch : undefined;
+}
+
+function extractTuiCompactStatusPatch(value: unknown): TuiCompactStatusPatch | undefined {
+  if (!isPlainObject(value)) {
+    return undefined;
+  }
+
+  const patch: TuiCompactStatusPatch = {};
+
+  if (hasOwnKey(value, "enabled") && typeof value.enabled === "boolean") {
+    patch.enabled = value.enabled;
+  }
+
+  if (hasOwnKey(value, "homeBottom") && typeof value.homeBottom === "boolean") {
+    patch.homeBottom = value.homeBottom;
+  }
+
+  if (hasOwnKey(value, "sessionPrompt") && typeof value.sessionPrompt === "boolean") {
+    patch.sessionPrompt = value.sessionPrompt;
+  }
+
+  if (
+    hasOwnKey(value, "suppressWhenNativeProviderQuota") &&
+    typeof value.suppressWhenNativeProviderQuota === "boolean"
+  ) {
+    patch.suppressWhenNativeProviderQuota = value.suppressWhenNativeProviderQuota;
+  }
+
+  if (hasOwnKey(value, "maxWidth") && isPositiveNumber(value.maxWidth)) {
+    patch.maxWidth = value.maxWidth;
+  }
+
+  return Object.keys(patch).length > 0 ? patch : undefined;
+}
+
 function extractLayoutPatch(value: unknown): LayoutPatch | undefined {
   if (!isPlainObject(value)) {
     return undefined;
@@ -522,6 +581,20 @@ function extractValidatedQuotaToastPatch(
     patch.showSessionTokens = quotaToastConfig.showSessionTokens;
   }
 
+  if (hasOwnKey(quotaToastConfig, "tuiSidebarPanel")) {
+    const tuiSidebarPanel = extractTuiSidebarPanelPatch(quotaToastConfig.tuiSidebarPanel);
+    if (tuiSidebarPanel) {
+      patch.tuiSidebarPanel = tuiSidebarPanel;
+    }
+  }
+
+  if (hasOwnKey(quotaToastConfig, "tuiCompactStatus")) {
+    const tuiCompactStatus = extractTuiCompactStatusPatch(quotaToastConfig.tuiCompactStatus);
+    if (tuiCompactStatus) {
+      patch.tuiCompactStatus = tuiCompactStatus;
+    }
+  }
+
   if (hasOwnKey(quotaToastConfig, "layout")) {
     const layout = extractLayoutPatch(quotaToastConfig.layout);
     if (layout) {
@@ -671,6 +744,45 @@ function applyValidatedQuotaToastPatch(
     applySettingSource(settingSources, "showSessionTokens", sourcePath);
   }
 
+  if (patch.tuiSidebarPanel) {
+    if (hasOwnKey(patch.tuiSidebarPanel, "enabled")) {
+      config.tuiSidebarPanel.enabled = patch.tuiSidebarPanel.enabled!;
+      applySettingSource(settingSources, "tuiSidebarPanel.enabled", sourcePath);
+    }
+  }
+
+  if (patch.tuiCompactStatus) {
+    if (hasOwnKey(patch.tuiCompactStatus, "enabled")) {
+      config.tuiCompactStatus.enabled = patch.tuiCompactStatus.enabled!;
+      applySettingSource(settingSources, "tuiCompactStatus.enabled", sourcePath);
+    }
+
+    if (hasOwnKey(patch.tuiCompactStatus, "homeBottom")) {
+      config.tuiCompactStatus.homeBottom = patch.tuiCompactStatus.homeBottom!;
+      applySettingSource(settingSources, "tuiCompactStatus.homeBottom", sourcePath);
+    }
+
+    if (hasOwnKey(patch.tuiCompactStatus, "sessionPrompt")) {
+      config.tuiCompactStatus.sessionPrompt = patch.tuiCompactStatus.sessionPrompt!;
+      applySettingSource(settingSources, "tuiCompactStatus.sessionPrompt", sourcePath);
+    }
+
+    if (hasOwnKey(patch.tuiCompactStatus, "suppressWhenNativeProviderQuota")) {
+      config.tuiCompactStatus.suppressWhenNativeProviderQuota =
+        patch.tuiCompactStatus.suppressWhenNativeProviderQuota!;
+      applySettingSource(
+        settingSources,
+        "tuiCompactStatus.suppressWhenNativeProviderQuota",
+        sourcePath,
+      );
+    }
+
+    if (hasOwnKey(patch.tuiCompactStatus, "maxWidth")) {
+      config.tuiCompactStatus.maxWidth = patch.tuiCompactStatus.maxWidth!;
+      applySettingSource(settingSources, "tuiCompactStatus.maxWidth", sourcePath);
+    }
+  }
+
   if (patch.layout) {
     if (hasOwnKey(patch.layout, "maxWidth")) {
       config.layout.maxWidth = patch.layout.maxWidth!;
@@ -933,5 +1045,5 @@ export async function loadConfig(
     meta.networkSettingSources = {};
     meta.configIssues = [];
   }
-  return DEFAULT_CONFIG;
+  return cloneDefaultConfig();
 }

package.json

@@ -21,48 +21,7 @@ import {
   renderSidebarSessionTokenSummaryLines,
 } from "./session-tokens-format.js";
 import { getQuotaFormatStyleDefinition } from "./quota-format-style.js";
-import { formatGroupedHeader } from "./grouped-header-format.js";
-
-function normalizeSingleWindowLabelText(value?: string): string {
-  return value?.trim().replace(/:+$/u, "").trim() ?? "";
-}
-
-function extractSingleWindowWindowLabel(text: string): string | null {
-  const lower = normalizeSingleWindowLabelText(text).toLowerCase();
-  if (!lower) return null;
-
-  if (/\b(?:rpm|per minute|minute|minutes)\b/u.test(lower)) return "RPM";
-  if (/\b(?:rolling|5h|5 h|5-hour|5 hour|five-hour|five hour)\b/u.test(lower)) return "5h";
-  if (/\b(?:hourly|1h|1 h|1-hour|1 hour|hour)\b/u.test(lower)) return "Hourly";
-  if (/\b(?:7d|7 d|7-day|7 day|weekly|week)\b/u.test(lower)) return "Weekly";
-  if (/\b(?:daily|1d|1 d|1-day|1 day|day)\b/u.test(lower)) return "Daily";
-  if (/\b(?:monthly|month)\b/u.test(lower)) return "Monthly";
-  if (/\b(?:yearly|annual|annually|year)\b/u.test(lower)) return "Yearly";
-  if (/\bmcp\b/u.test(lower)) return "MCP";
-  if (/\bcode review\b/u.test(lower)) return "Code Review";
-
-  return null;
-}
-
-function buildSingleWindowPercentName(entry: QuotaToastEntry): string {
-  const name = entry.name.trim();
-  const group = entry.group?.trim();
-  const windowLabel =
-    extractSingleWindowWindowLabel(entry.label ?? "") ??
-    extractSingleWindowWindowLabel(entry.name);
-
-  if (name.startsWith("[")) {
-    if (!windowLabel) return name;
-    return name.toLowerCase().includes(windowLabel.toLowerCase()) ? name : `${name} ${windowLabel}`;
-  }
-
-  if (group) {
-    const provider = formatGroupedHeader(group);
-    return windowLabel ? `${provider} ${windowLabel}` : provider;
-  }
-
-  return name;
-}
+import { buildSingleWindowPercentEntryDisplayName } from "./quota-entry-display.js";
 
 export function formatQuotaRows(params: {
   version: string;
@@ -204,7 +163,7 @@ export function formatQuotaRows(params: {
       addValueEntry(entry.name, entry.resetTimeIso, entry.value);
     } else {
       addPercentEntry(
-        buildSingleWindowPercentName(entry),
+        buildSingleWindowPercentEntryDisplayName(entry),
         entry.resetTimeIso,
         entry.percentRemaining,
         entry.right,