@leo000001/opencode-quota-sidebar 1.3.0 → 1.5.0

package/dist/format.js

@@ -127,9 +127,22 @@ function fitLine(value, width) {
         return truncateToCellWidth(safe, width);
     return `${head}~`;
 }
-function formatApiCostValue(value) {
+function formatCurrency(value, currency) {
     const safe = Number.isFinite(value) && value > 0 ? value : 0;
-    return `$${safe.toFixed(2)}`;
+    const prefix = typeof currency === 'string' && currency ? currency : '$';
+    if (safe === 0)
+        return `${prefix}0.00`;
+    if (safe < 10)
+        return `${prefix}${safe.toFixed(2)}`;
+    const one = safe.toFixed(1);
+    const trimmed = one.endsWith('.0') ? one.slice(0, -2) : one;
+    return `${prefix}${trimmed}`;
+}
+function formatUsd(value) {
+    return formatCurrency(value, '$');
+}
+function formatApiCostValue(value) {
+    return formatUsd(value);
 }
 function formatApiCostLine(value) {
     return `${formatApiCostValue(value)} as API cost`;
@@ -187,7 +200,10 @@ export function renderSidebarTitle(baseTitle, usage, quotas, config) {
             return Math.max(max, stringCellWidth(label));
         }, 0);
         const quotaItems = visibleQuotas
-            .flatMap((item) => compactQuotaWide(item, labelWidth))
+            .flatMap((item) => compactQuotaWide(item, labelWidth, {
+            width,
+            wrapLines: config.sidebar.wrapQuotaLines,
+        }))
             .filter((s) => Boolean(s));
         if (quotaItems.length > 0) {
             lines.push('');
@@ -200,14 +216,31 @@ export function renderSidebarTitle(baseTitle, usage, quotas, config) {
 }
 /**
  * Multi-window quota format for sidebar.
- * Single window:  "OpenAI 5h 80% Rst 16:20"
- * Multi window:   "OpenAI 5h 80% Rst 16:20" + indented next line
- * Copilot:        "Copilot Monthly 70% Rst 03-01"
+ *
+ * When wrapLines=false (or content fits):
+ *   "OpenAI 5h 80% Rst 16:20"
+ *   "       Weekly 70% Rst 03-01"
+ *
+ * When wrapLines=true and label+content overflows width:
+ *   "RC-openai"
+ *   "  Daily $349.66/$180 Exp+ 02-27"
+ *   "  Balance $108.88"
  */
-function compactQuotaWide(quota, labelWidth = 0) {
+function compactQuotaWide(quota, labelWidth = 0, options) {
     const label = sanitizeLine(quotaDisplayLabel(quota));
     const labelPadded = padEndCells(label, labelWidth);
+    const indent = ' '.repeat(labelWidth + 1);
+    const detailIndent = '  ';
     const withLabel = (content) => `${labelPadded} ${content}`;
+    const wrap = options?.wrapLines === true && (options?.width || 0) > 0;
+    const width = options?.width || 0;
+    /** If inline version overflows, break into label-line + indented detail lines. */
+    const maybeBreak = (inlineText, detailLines) => {
+        const inline = withLabel(inlineText);
+        if (!wrap || stringCellWidth(inline) <= width)
+            return [inline];
+        return [label, ...detailLines.map((d) => `${detailIndent}${d}`)];
+    };
     if (quota.status === 'error')
         return [withLabel('Remaining ?')];
     if (quota.status === 'unsupported')
@@ -217,7 +250,7 @@ function compactQuotaWide(quota, labelWidth = 0) {
     if (quota.status !== 'ok')
         return [];
     const balanceText = quota.balance
-        ? `Balance ${quota.balance.currency}${quota.balance.amount.toFixed(2)}`
+        ? `Balance ${formatCurrency(quota.balance.amount, quota.balance.currency)}`
         : undefined;
     const renderWindow = (win) => {
         const showPercent = win.showPercent !== false;
@@ -229,7 +262,7 @@ function compactQuotaWide(quota, labelWidth = 0) {
                 ? [sanitizeLine(win.label), pct]
                 : [sanitizeLine(win.label)]
             : [pct];
-        const reset = compactReset(win.resetAt);
+        const reset = compactReset(win.resetAt, win.resetLabel);
         if (reset) {
             parts.push(`${sanitizeLine(win.resetLabel || 'Rst')} ${reset}`);
         }
@@ -238,42 +271,64 @@ function compactQuotaWide(quota, labelWidth = 0) {
     // Multi-window rendering
     if (quota.windows && quota.windows.length > 0) {
         const parts = quota.windows.map(renderWindow);
+        // Build the detail lines (window texts + optional balance)
+        const details = [...parts];
+        if (balanceText && !parts.some((p) => p.includes('Balance '))) {
+            details.push(balanceText);
+        }
+        // Try inline first (single window, fits in one line)
         if (parts.length === 1) {
-            const first = withLabel(parts[0]);
-            if (balanceText && !parts[0].includes('Balance ')) {
-                const indent = ' '.repeat(labelWidth + 1);
-                return [first, `${indent}${balanceText}`];
+            const firstInline = withLabel(parts[0]);
+            if (!wrap || stringCellWidth(firstInline) <= width) {
+                // Inline fits — use classic layout
+                const lines = [firstInline];
+                if (balanceText && !parts[0].includes('Balance ')) {
+                    lines.push(`${indent}${balanceText}`);
+                }
+                return lines;
             }
-            return [first];
+            // Overflow — break: label on its own line, details indented
+            return [label, ...details.map((d) => `${detailIndent}${d}`)];
         }
-        const indent = ' '.repeat(labelWidth + 1);
-        const lines = [
-            withLabel(parts[0]),
-            ...parts.slice(1).map((part) => `${indent}${part}`),
-        ];
-        const alreadyHasBalance = parts.some((part) => part.includes('Balance '));
-        if (balanceText && !alreadyHasBalance) {
-            lines.push(`${indent}${balanceText}`);
+        // Multiple windows: try classic inline layout first
+        const firstInline = withLabel(parts[0]);
+        if (!wrap || stringCellWidth(firstInline) <= width) {
+            const lines = [
+                firstInline,
+                ...parts.slice(1).map((part) => `${indent}${part}`),
+            ];
+            if (balanceText && !parts.some((p) => p.includes('Balance '))) {
+                lines.push(`${indent}${balanceText}`);
+            }
+            return lines;
         }
-        return lines;
+        // Overflow — break all
+        return [label, ...details.map((d) => `${detailIndent}${d}`)];
     }
     if (balanceText) {
-        return [withLabel(balanceText)];
+        return maybeBreak(balanceText, [balanceText]);
     }
     // Fallback: single value from top-level remainingPercent
     const percent = quota.remainingPercent === undefined
         ? '?'
         : `${Math.round(quota.remainingPercent)}%`;
-    const reset = compactReset(quota.resetAt);
-    return [withLabel(`Remaining ${percent}${reset ? ` Rst ${reset}` : ''}`)];
+    const reset = compactReset(quota.resetAt, 'Rst');
+    const fallbackText = `Remaining ${percent}${reset ? ` Rst ${reset}` : ''}`;
+    return maybeBreak(fallbackText, [fallbackText]);
 }
-function compactReset(iso) {
+function compactReset(iso, resetLabel) {
     if (!iso)
         return undefined;
     const timestamp = Date.parse(iso);
     if (Number.isNaN(timestamp))
         return undefined;
     const value = new Date(timestamp);
+    // RightCode subscriptions are displayed as an expiry date (MM-DD), not a time.
+    // Using UTC here makes the output stable across time zones for ISO `...Z` input.
+    if (typeof resetLabel === 'string' && resetLabel.startsWith('Exp')) {
+        const two = (num) => `${num}`.padStart(2, '0');
+        return `${two(value.getUTCMonth() + 1)}-${two(value.getUTCDate())}`;
+    }
     const now = new Date();
     const sameDay = value.getFullYear() === now.getFullYear() &&
         value.getMonth() === now.getMonth() &&
@@ -317,7 +372,7 @@ export function renderMarkdownReport(period, usage, quotas, options) {
             rightCodeSubscriptionProviderIDs.has(providerID);
         if (isSubscription)
             return '-';
-        return `$${cost.toFixed(3)}`;
+        return formatUsd(cost);
     };
     const isSubscriptionMeasuredProvider = (providerID) => {
         const canonical = canonicalProviderID(providerID);
@@ -329,18 +384,16 @@ export function renderMarkdownReport(period, usage, quotas, options) {
         const canonical = canonicalProviderID(providerID);
         if (canonical === 'github-copilot')
             return '-';
-        if (!Number.isFinite(apiCost) || apiCost <= 0)
-            return '$0.00';
-        return `$${apiCost.toFixed(2)}`;
+        return formatUsd(apiCost);
     };
     const measuredCostSummaryValue = () => {
         const providers = Object.values(usage.providers);
         if (providers.length === 0)
-            return `$${usage.cost.toFixed(4)}`;
+            return formatUsd(usage.cost);
         const hasNonSubscription = providers.some((provider) => !isSubscriptionMeasuredProvider(provider.providerID));
         if (!hasNonSubscription)
             return '-';
-        return `$${usage.cost.toFixed(4)}`;
+        return formatUsd(usage.cost);
     };
     const apiCostSummaryValue = () => {
         const providers = Object.values(usage.providers);
@@ -376,7 +429,7 @@ export function renderMarkdownReport(period, usage, quotas, options) {
         }
         if (quota.status === 'ok' && quota.balance) {
             return [
-                mdCell(`- ${quota.label}: ${quota.status} | balance ${quota.balance.currency}${quota.balance.amount.toFixed(2)}`),
+                mdCell(`- ${quota.label}: ${quota.status} | balance ${formatCurrency(quota.balance.amount, quota.balance.currency)}`),
             ];
         }
         const remaining = quota.remainingPercent === undefined
@@ -455,7 +508,7 @@ export function renderToastMessage(period, usage, quotas, options) {
             .sort((left, right) => right.apiCost - left.apiCost)
             .map((provider) => ({
             label: displayShortLabel(provider.providerID),
-            value: `$${provider.apiCost.toFixed(2)}`,
+            value: formatUsd(provider.apiCost),
         }));
         lines.push('');
         lines.push(fitLine('Cost as API', width));
@@ -475,7 +528,7 @@ export function renderToastMessage(period, usage, quotas, options) {
                     const pct = win.remainingPercent === undefined
                         ? '-'
                         : `${win.remainingPercent.toFixed(1)}%`;
-                    const reset = compactReset(win.resetAt);
+                    const reset = compactReset(win.resetAt, win.resetLabel);
                     const parts = [win.label];
                     if (showPercent)
                         parts.push(pct);
@@ -489,7 +542,7 @@ export function renderToastMessage(period, usage, quotas, options) {
                 if (item.balance) {
                     pairs.push({
                         label: '',
-                        value: `Balance ${item.balance.currency}${item.balance.amount.toFixed(2)}`,
+                        value: `Balance ${formatCurrency(item.balance.amount, item.balance.currency)}`,
                     });
                 }
                 return pairs;
@@ -498,14 +551,14 @@ export function renderToastMessage(period, usage, quotas, options) {
                 return [
                     {
                         label: quotaDisplayLabel(item),
-                        value: `Balance ${item.balance.currency}${item.balance.amount.toFixed(2)}`,
+                        value: `Balance ${formatCurrency(item.balance.amount, item.balance.currency)}`,
                     },
                 ];
             }
             const percent = item.remainingPercent === undefined
                 ? '-'
                 : `${item.remainingPercent.toFixed(1)}%`;
-            const reset = compactReset(item.resetAt);
+            const reset = compactReset(item.resetAt, 'Rst');
             return [
                 {
                     label: quotaDisplayLabel(item),

package/dist/providers/third_party/rightcode.js

@@ -51,8 +51,11 @@ function matchesSubscriptionPrefix(providerPrefixes, availablePrefixes) {
 function formatQuotaValue(value) {
     if (!Number.isFinite(value))
         return '0';
-    const rounded = Number(value.toFixed(2));
-    return Number.isInteger(rounded) ? `${Math.trunc(rounded)}` : `${rounded}`;
+    if (Math.abs(value) >= 10) {
+        const one = value.toFixed(1);
+        return one.endsWith('.0') ? one.slice(0, -2) : one;
+    }
+    return value.toFixed(2);
 }
 function parseSubscription(value) {
     const total = asNumber(value.total_quota);

package/dist/storage.js

@@ -13,6 +13,7 @@ export const defaultConfig = {
         width: 36,
         showCost: true,
         showQuota: true,
+        wrapQuotaLines: true,
         includeChildren: true,
         childrenMaxDepth: 6,
         childrenMaxSessions: 128,
@@ -68,6 +69,7 @@ export async function loadConfig(paths) {
             width: Math.max(20, Math.min(60, asNumber(sidebar.width, defaultConfig.sidebar.width))),
             showCost: asBoolean(sidebar.showCost, defaultConfig.sidebar.showCost),
             showQuota: asBoolean(sidebar.showQuota, defaultConfig.sidebar.showQuota),
+            wrapQuotaLines: asBoolean(sidebar.wrapQuotaLines, defaultConfig.sidebar.wrapQuotaLines),
             includeChildren: asBoolean(sidebar.includeChildren, defaultConfig.sidebar.includeChildren),
             childrenMaxDepth: Math.max(1, Math.min(32, Math.floor(asNumber(sidebar.childrenMaxDepth, defaultConfig.sidebar.childrenMaxDepth)))),
             childrenMaxSessions: Math.max(0, Math.min(2000, Math.floor(asNumber(sidebar.childrenMaxSessions, defaultConfig.sidebar.childrenMaxSessions)))),

package/dist/types.d.ts

@@ -99,6 +99,8 @@ export type QuotaSidebarConfig = {
         width: number;
         showCost: boolean;
         showQuota: boolean;
+        /** When true, wrap long quota lines and indent continuations. */
+        wrapQuotaLines: boolean;
         /** Include descendant subagent sessions in session-scoped usage/quota. */
         includeChildren: boolean;
         /** Max descendant traversal depth when includeChildren is enabled. */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leo000001/opencode-quota-sidebar",
-  "version": "1.3.0",
+  "version": "1.5.0",
   "description": "OpenCode plugin that shows quota and token usage in session titles",
   "type": "module",
   "main": "dist/index.js",