@leo000001/opencode-quota-sidebar 1.8.0 → 1.11.0

package/README.md

@@ -171,8 +171,10 @@ Example config:
   "sidebar": {
     "enabled": true,
     "width": 36,
+    "multilineTitle": true,
     "showCost": true,
     "showQuota": true,
+    "wrapQuotaLines": true,
     "includeChildren": true,
     "childrenMaxDepth": 6,
     "childrenMaxSessions": 128,
@@ -202,6 +204,8 @@ Notes:
 
 - `sidebar.showCost` controls API-cost visibility in sidebar title, `quota_summary` markdown report, and toast message.
 - `sidebar.width` is measured in terminal cells. CJK/emoji truncation is best-effort to avoid sidebar overflow.
+- `sidebar.multilineTitle` controls multi-line sidebar layout (default: `true`). Set `false` for compact single-line title.
+- `sidebar.wrapQuotaLines` controls quota line wrapping and continuation indentation (default: `true`).
 - `sidebar.includeChildren` controls whether session-scoped usage/quota includes descendant subagent sessions (default: `true`).
 - `sidebar.childrenMaxDepth` limits how many levels of nested subagents are traversed (default: `6`, clamped 1–32).
 - `sidebar.childrenMaxSessions` caps the total number of descendant sessions aggregated (default: `128`, clamped 0–2000).

package/dist/format.js

@@ -162,6 +162,56 @@ function alignPairs(pairs, indent = '  ') {
         return `${indent}${padEndCells(pair.label, labelWidth)}  ${pair.value}`;
     });
 }
+function compactQuotaInline(quota) {
+    const label = sanitizeLine(quotaDisplayLabel(quota));
+    if (quota.status !== 'ok')
+        return label;
+    if (quota.windows && quota.windows.length > 0) {
+        const first = quota.windows[0];
+        const showPercent = first.showPercent !== false;
+        const firstLabel = sanitizeLine(first.label || '');
+        const pct = first.remainingPercent === undefined
+            ? undefined
+            : `${Math.round(first.remainingPercent)}%`;
+        const summary = showPercent
+            ? [firstLabel, pct].filter(Boolean).join(' ')
+            : firstLabel.replace(/^Daily\s+/i, '') || firstLabel;
+        const hasMore = quota.windows.length > 1 ||
+            (quota.balance !== undefined && !summary.includes('Balance '));
+        return `${label}${summary ? ` ${summary}` : ''}${hasMore ? '+' : ''}`;
+    }
+    if (quota.balance) {
+        return `${label} ${formatCurrency(quota.balance.amount, quota.balance.currency)}`;
+    }
+    if (quota.remainingPercent !== undefined) {
+        return `${label} ${Math.round(quota.remainingPercent)}%`;
+    }
+    return label;
+}
+function renderSingleLineTitle(baseTitle, usage, quotas, config, width) {
+    const baseBudget = Math.min(16, Math.max(8, Math.floor(width * 0.35)));
+    const base = fitLine(baseTitle, baseBudget);
+    const segments = [
+        `Input ${sidebarNumber(usage.input)}  Output ${sidebarNumber(usage.output)}`,
+    ];
+    if (usage.cacheRead > 0) {
+        segments.push(`Cache Read ${sidebarNumber(usage.cacheRead)}`);
+    }
+    if (usage.cacheWrite > 0) {
+        segments.push(`Cache Write ${sidebarNumber(usage.cacheWrite)}`);
+    }
+    if (config.sidebar.showCost && usage.apiCost > 0) {
+        segments.push(formatApiCostLine(usage.apiCost));
+    }
+    if (config.sidebar.showQuota) {
+        const visibleQuotas = collapseQuotaSnapshots(quotas).filter((q) => ['ok', 'error', 'unsupported', 'unavailable'].includes(q.status));
+        segments.push(...visibleQuotas.map(compactQuotaInline));
+    }
+    const detail = segments.filter(Boolean).join(' | ');
+    if (!detail)
+        return fitLine(baseTitle, width);
+    return fitLine(`${base} | ${detail}`, width);
+}
 /**
  * Render sidebar title with multi-line token breakdown.
  *
@@ -175,8 +225,11 @@ function alignPairs(pairs, indent = '  ') {
  */
 export function renderSidebarTitle(baseTitle, usage, quotas, config) {
     const width = Math.max(8, Math.floor(config.sidebar.width || 36));
-    const lines = [];
     const safeBaseTitle = stripAnsi(baseTitle || 'Session').split(/\r?\n/, 1)[0] || 'Session';
+    if (config.sidebar.multilineTitle !== true) {
+        return renderSingleLineTitle(safeBaseTitle, usage, quotas, config, width);
+    }
+    const lines = [];
     lines.push(fitLine(safeBaseTitle, width));
     lines.push('');
     // Input / Output line
@@ -217,9 +270,13 @@ export function renderSidebarTitle(baseTitle, usage, quotas, config) {
 /**
  * Multi-window quota format for sidebar.
  *
- * When wrapLines=false (or content fits):
+ * When provider has a single detail line and it fits:
  *   "OpenAI 5h 80% Rst 16:20"
- *   "       Weekly 70% Rst 03-01"
+ *
+ * When provider has multiple detail lines (multi-window or balance + window):
+ *   "OpenAI"
+ *   "  5h 80% Rst 16:20"
+ *   "  Weekly 70% Rst 03-01"
  *
  * When wrapLines=true and label+content overflows width:
  *   "RC-openai"
@@ -229,7 +286,6 @@ export function renderSidebarTitle(baseTitle, usage, quotas, config) {
 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;
@@ -276,34 +332,15 @@ function compactQuotaWide(quota, labelWidth = 0, options) {
         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 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;
-            }
-            // Overflow — break: label on its own line, details indented
+        // Keep a unified wrapped layout for providers that have multiple detail
+        // lines so OpenAI/Copilot/others match the RightCode multi-line style,
+        // regardless of wrapLines.
+        if (details.length > 1) {
             return [label, ...details.map((d) => `${detailIndent}${d}`)];
         }
-        // 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;
-        }
-        // Overflow — break all
-        return [label, ...details.map((d) => `${detailIndent}${d}`)];
+        // Single detail line: keep inline unless width wrapping requires a break.
+        const single = details[0];
+        return maybeBreak(single, [single]);
     }
     if (balanceText) {
         return maybeBreak(balanceText, [balanceText]);

package/dist/index.js

@@ -155,7 +155,6 @@ export async function QuotaSidebarPlugin(input) {
         markDirty,
         scheduleSave,
         renderSidebarTitle,
-        quotaRuntime,
         getQuotaSnapshots,
         summarizeSessionUsageForDisplay,
         scheduleParentRefreshIfSafe,

package/dist/providers/core/copilot.js

@@ -2,11 +2,15 @@ import { isRecord, swallow } from '../../helpers.js';
 import { asNumber, configuredProviderEnabled, fetchWithTimeout, normalizePercent, toIso, } from '../common.js';
 async function fetchCopilotQuota(ctx) {
     const checkedAt = Date.now();
+    const sourceProviderID = typeof ctx.sourceProviderID === 'string' && ctx.sourceProviderID
+        ? ctx.sourceProviderID
+        : ctx.providerID;
+    const enterprise = sourceProviderID.startsWith('github-copilot-enterprise');
     const base = {
-        providerID: ctx.providerID,
+        providerID: sourceProviderID,
         adapterID: 'github-copilot',
-        label: 'GitHub Copilot',
-        shortLabel: 'Copilot',
+        label: enterprise ? 'GitHub Copilot Enterprise' : 'GitHub Copilot',
+        shortLabel: enterprise ? 'Copilot Ent' : 'Copilot',
         sortOrder: 20,
     };
     if (!ctx.auth) {

package/dist/storage.js

@@ -11,6 +11,7 @@ export const defaultConfig = {
     sidebar: {
         enabled: true,
         width: 36,
+        multilineTitle: true,
         showCost: true,
         showQuota: true,
         wrapQuotaLines: true,
@@ -64,6 +65,7 @@ export async function loadConfig(paths) {
             sidebar: {
                 enabled: asBoolean(sidebar.enabled, base.sidebar.enabled),
                 width: Math.max(20, Math.min(60, asNumber(sidebar.width, base.sidebar.width))),
+                multilineTitle: asBoolean(sidebar.multilineTitle, base.sidebar.multilineTitle ?? true),
                 showCost: asBoolean(sidebar.showCost, base.sidebar.showCost),
                 showQuota: asBoolean(sidebar.showQuota, base.sidebar.showQuota),
                 wrapQuotaLines: asBoolean(sidebar.wrapQuotaLines, base.sidebar.wrapQuotaLines),

package/dist/title.js

@@ -1,6 +1,51 @@
+function sanitizeTitleFragment(value) {
+    return stripAnsi(value)
+        .replace(/[\x00-\x1F\x7F-\x9F]/g, ' ')
+        .trimEnd();
+}
+function isStrongDecoratedDetail(line) {
+    if (!line)
+        return false;
+    if (/^Input\s+\S+\s+Output(?:\s+\S+)?/.test(line))
+        return true;
+    if (/^Cache\s+(Read|Write)\s+\S+/.test(line))
+        return true;
+    if (/^\$\S+\s+as API cost\b/.test(line))
+        return true;
+    // Single-line compact mode compatibility.
+    if (/^I(?:nput)?\s+\$?\d[\d.,]*[kKmM]?\s+O(?:utput)?\s+\$?\d[\d.,]*[kKmM]?$/.test(line))
+        return true;
+    if (/^C(?:ache\s*)?R(?:ead)?\s+\$?\d[\d.,]*[kKmM]?$/.test(line))
+        return true;
+    if (/^C(?:ache\s*)?W(?:rite)?\s+\$?\d[\d.,]*[kKmM]?$/.test(line))
+        return true;
+    return false;
+}
+function isQuotaLikeProviderDetail(line) {
+    if (!line)
+        return false;
+    if (!/^(OpenAI|Copilot|Anthropic|RightCode|RC)\b/.test(line))
+        return false;
+    return /\b(Rst|Exp\+?|Balance|Remaining)\b|\d{1,3}%/.test(line);
+}
+function decoratedSingleLineBase(line) {
+    const parts = sanitizeTitleFragment(line)
+        .split(/\s*\|\s*/)
+        .map((part) => part.trim());
+    if (parts.length < 2)
+        return undefined;
+    const details = parts.slice(1);
+    if (!details.some((detail) => isStrongDecoratedDetail(detail))) {
+        return undefined;
+    }
+    return parts[0] || 'Session';
+}
 export function normalizeBaseTitle(title) {
     const firstLine = stripAnsi(title).split(/\r?\n/, 1)[0] || 'Session';
-    return firstLine.replace(/[\x00-\x1F\x7F-\x9F]/g, ' ').trimEnd() || 'Session';
+    const decoratedBase = decoratedSingleLineBase(firstLine);
+    if (decoratedBase)
+        return decoratedBase;
+    return sanitizeTitleFragment(firstLine) || 'Session';
 }
 export function stripAnsi(value) {
     // Remove terminal escape sequences. Sidebar titles must be plain text.
@@ -40,20 +85,12 @@ export function canonicalizeTitleForCompare(value) {
  */
 export function looksDecorated(title) {
     const lines = stripAnsi(title).split(/\r?\n/);
-    if (lines.length < 2)
-        return false;
-    const detail = lines.slice(1).map((line) => line.trim());
-    return detail.some((line) => {
-        if (!line)
-            return false;
-        if (/^Input\s+\S+\s+Output\s+\S+/.test(line))
-            return true;
-        if (/^Cache\s+(Read|Write)\s+\S+/.test(line))
-            return true;
-        if (/^\$\S+\s+as API cost/.test(line))
-            return true;
-        if (/^(OpenAI|Copilot|Anthropic|RightCode|RC)\b/.test(line))
-            return true;
-        return false;
-    });
+    if (lines.length < 2) {
+        return Boolean(decoratedSingleLineBase(lines[0] || ''));
+    }
+    const detail = lines
+        .slice(1)
+        .map((line) => sanitizeTitleFragment(line).trim());
+    return (detail.some((line) => isStrongDecoratedDetail(line)) ||
+        detail.some((line) => isQuotaLikeProviderDetail(line)));
 }

package/dist/title_apply.d.ts

@@ -10,9 +10,6 @@ export declare function createTitleApplicator(deps: {
     markDirty: (dateKey: string | undefined) => void;
     scheduleSave: () => void;
     renderSidebarTitle: (baseTitle: string, usage: UsageSummary, quotas: QuotaSnapshot[], config: QuotaSidebarConfig) => string;
-    quotaRuntime: {
-        normalizeProviderID: (providerID: string) => string;
-    };
     getQuotaSnapshots: (providerIDs: string[], options?: {
         allowDefault?: boolean;
     }) => Promise<QuotaSnapshot[]>;

package/dist/title_apply.js

@@ -56,7 +56,7 @@ export function createTitleApplicator(deps) {
             }
         }
         const usage = await deps.summarizeSessionUsageForDisplay(sessionID, deps.config.sidebar.includeChildren);
-        const quotaProviders = Array.from(new Set(Object.keys(usage.providers).map((id) => deps.quotaRuntime.normalizeProviderID(id))));
+        const quotaProviders = Array.from(new Set(Object.keys(usage.providers)));
         const quotas = deps.config.sidebar.showQuota && quotaProviders.length > 0
             ? await deps.getQuotaSnapshots(quotaProviders)
             : [];

package/dist/types.d.ts

@@ -97,6 +97,12 @@ export type QuotaSidebarConfig = {
     sidebar: {
         enabled: boolean;
         width: number;
+        /**
+         * When true, render multi-line decorated session titles.
+         * Enabled by default for clearer token/quota layout in sidebar.
+         * Set false to keep a compact single-line title.
+         */
+        multilineTitle?: boolean;
         showCost: boolean;
         showQuota: boolean;
         /** When true, wrap long quota lines and indent continuations. */

package/package.json

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

package/quota-sidebar.config.example.json

@@ -2,8 +2,10 @@
   "sidebar": {
     "enabled": true,
     "width": 36,
+    "multilineTitle": true,
     "showCost": true,
     "showQuota": true,
+    "wrapQuotaLines": true,
     "includeChildren": true,
     "childrenMaxDepth": 6,
     "childrenMaxSessions": 128,