@leo000001/opencode-quota-sidebar 4.0.9 → 4.0.12

package/dist/storage_paths.js

@@ -1,6 +1,6 @@
-import os from 'node:os';
-import path from 'node:path';
-import { isDateKey } from './storage_dates.js';
+import os from "node:os";
+import path from "node:path";
+import { isDateKey } from "./storage_dates.js";
 /**
  * Resolve the OpenCode data directory.
  *
@@ -17,8 +17,8 @@ export function resolveOpencodeDataDir() {
         return path.resolve(override);
     const xdg = process.env.XDG_DATA_HOME?.trim();
     if (xdg)
-        return path.join(path.resolve(xdg), 'opencode');
-    return path.join(os.homedir(), '.local', 'share', 'opencode');
+        return path.join(path.resolve(xdg), "opencode");
+    return path.join(os.homedir(), ".local", "share", "opencode");
 }
 /**
  * Resolve OpenCode config directory.
@@ -31,23 +31,38 @@ export function resolveOpencodeConfigDir() {
         return path.resolve(override);
     const xdg = process.env.XDG_CONFIG_HOME?.trim();
     if (xdg)
-        return path.join(path.resolve(xdg), 'opencode');
-    return path.join(os.homedir(), '.config', 'opencode');
+        return path.join(path.resolve(xdg), "opencode");
+    return path.join(os.homedir(), ".config", "opencode");
+}
+export function opencodeConfigPaths(worktree, directory) {
+    const configDir = resolveOpencodeConfigDir();
+    return [
+        path.join(configDir, "opencode.jsonc"),
+        path.join(configDir, "opencode.json"),
+        path.join(worktree, "opencode.jsonc"),
+        path.join(worktree, "opencode.json"),
+        path.join(directory, "opencode.jsonc"),
+        path.join(directory, "opencode.json"),
+        path.join(worktree, ".opencode", "opencode.jsonc"),
+        path.join(worktree, ".opencode", "opencode.json"),
+        path.join(directory, ".opencode", "opencode.jsonc"),
+        path.join(directory, ".opencode", "opencode.json"),
+    ];
 }
 export function stateFilePath(dataDir) {
-    return path.join(dataDir, 'quota-sidebar.state.json');
+    return path.join(dataDir, "quota-sidebar.state.json");
 }
 export function authFilePath(dataDir) {
-    return path.join(dataDir, 'auth.json');
+    return path.join(dataDir, "auth.json");
 }
 export function chunkRootPathFromStateFile(statePath) {
-    return path.join(path.dirname(statePath), 'quota-sidebar-sessions');
+    return path.join(path.dirname(statePath), "quota-sidebar-sessions");
 }
 export function chunkFilePath(rootPath, dateKey) {
     // Defense-in-depth: ensure we never build paths from untrusted inputs.
     if (!isDateKey(dateKey)) {
         throw new Error(`invalid dateKey: ${dateKey}`);
     }
-    const [year, month, day] = dateKey.split('-');
+    const [year, month, day] = dateKey.split("-");
     return path.join(rootPath, year, month, `${day}.json`);
 }

package/dist/title_apply.d.ts

@@ -16,6 +16,7 @@ export declare function createTitleApplicator(deps: {
         allowDefault?: boolean;
     }) => Promise<QuotaSnapshot[]>;
     summarizeSessionUsageForDisplay: (sessionID: string, includeChildren: boolean) => Promise<UsageSummary>;
+    listCurrentProviderIDs?: () => Promise<Set<string> | undefined>;
     scheduleParentRefreshIfSafe: (sessionID: string, parentID?: string) => void;
     isSessionActive?: (sessionID: string) => boolean;
     restoreConcurrency: number;
@@ -30,22 +31,5 @@ export declare function createTitleApplicator(deps: {
     restoreSessionTitle: (sessionID: string, options?: {
         abortIfEnabled?: boolean;
     }) => Promise<boolean>;
-    restoreAllVisibleTitles: (options?: {
-        abortIfEnabled?: boolean;
-    }) => Promise<{
-        attempted: number;
-        restored: number;
-        listFailed: boolean;
-    }>;
-    refreshAllTouchedTitles: () => Promise<{
-        attempted: number;
-        refreshed: number;
-        listFailed: boolean;
-    }>;
-    refreshAllVisibleTitles: () => Promise<{
-        attempted: number;
-        refreshed: number;
-        listFailed: boolean;
-    }>;
     forgetSession: (sessionID: string) => void;
 };

package/dist/title_apply.js

@@ -1,6 +1,6 @@
 import { canonicalizeTitle, canonicalizeTitleForCompare, looksDecorated, normalizeBaseTitle, } from './title.js';
 import { toCachedSessionUsage } from './usage.js';
-import { swallow, debug, mapConcurrent } from './helpers.js';
+import { swallow, debug } from './helpers.js';
 import { resolveTitleView, selectDesktopCompactProviderIDs, } from './format.js';
 import { collapseQuotaSnapshots } from './quota_render.js';
 export function createTitleApplicator(deps) {
@@ -25,6 +25,11 @@ export function createTitleApplicator(deps) {
         }
         return true;
     };
+    const filterAllowedProviderIDs = (providerIDs, allowedProviderIDs) => {
+        if (!allowedProviderIDs)
+            return [];
+        return providerIDs.filter((providerID) => allowedProviderIDs.has(providerID));
+    };
     const applyTitle = async (sessionID) => {
         if (!deps.config.sidebar.enabled)
             return false;
@@ -65,7 +70,8 @@ export function createTitleApplicator(deps) {
                 // Ignore decorated echoes as base-title source.
                 // If we previously applied a decorated title, treat this as an
                 // equivalent echo (OpenCode may normalize whitespace) and keep
-                // lastAppliedTitle in sync so restoreAllVisibleTitles still works.
+                // Keep lastAppliedTitle in sync with server echoes so restore logic can
+                // still tell whether the current title is ours.
                 if (sessionState.lastAppliedTitle &&
                     looksDecorated(sessionState.lastAppliedTitle)) {
                     if (sessionState.lastAppliedTitle !== currentTitle) {
@@ -96,10 +102,16 @@ export function createTitleApplicator(deps) {
         const usage = await deps.summarizeSessionUsageForDisplay(sessionID, deps.config.sidebar.includeChildren);
         const view = deps.getTitleView?.(sessionID) ??
             resolveTitleView({ config: deps.config });
-        const panelQuotaProviders = Array.from(new Set(Object.keys(usage.providers)));
-        const quotaProviders = Array.from(new Set(view === 'compact'
+        const rawPanelQuotaProviders = Array.from(new Set(Object.keys(usage.providers)));
+        const rawQuotaProviders = Array.from(new Set(view === 'compact'
             ? selectDesktopCompactProviderIDs(usage, deps.config)
-            : panelQuotaProviders));
+            : rawPanelQuotaProviders));
+        const allowedProviderIDs = deps.config.sidebar.showQuota &&
+            (rawPanelQuotaProviders.length > 0 || rawQuotaProviders.length > 0)
+            ? await deps.listCurrentProviderIDs?.()
+            : undefined;
+        const panelQuotaProviders = filterAllowedProviderIDs(rawPanelQuotaProviders, allowedProviderIDs);
+        const quotaProviders = filterAllowedProviderIDs(rawQuotaProviders, allowedProviderIDs);
         const quotas = deps.config.sidebar.showQuota && quotaProviders.length > 0
             ? await deps.getQuotaSnapshots(quotaProviders)
             : [];
@@ -278,53 +290,10 @@ export function createTitleApplicator(deps) {
         deps.scheduleSave();
         return true;
     };
-    const restoreAllVisibleTitles = async (options) => {
-        const touched = Object.entries(deps.state.sessions)
-            .filter(([, sessionState]) => Boolean(sessionState.lastAppliedTitle))
-            .map(([sessionID]) => sessionID);
-        const results = await mapConcurrent(touched, deps.restoreConcurrency, async (sessionID) => restoreSessionTitle(sessionID, options));
-        return {
-            attempted: touched.length,
-            restored: results.filter(Boolean).length,
-            listFailed: false,
-        };
-    };
-    const refreshAllTouchedTitles = async () => {
-        const touched = Object.entries(deps.state.sessions)
-            .filter(([, sessionState]) => Boolean(sessionState.lastAppliedTitle))
-            .map(([sessionID]) => sessionID);
-        const results = await mapConcurrent(touched, deps.restoreConcurrency, async (sessionID) => applyTitle(sessionID));
-        return {
-            attempted: touched.length,
-            refreshed: results.filter(Boolean).length,
-            listFailed: false,
-        };
-    };
-    const refreshAllVisibleTitles = async () => {
-        const list = await deps.client.session
-            .list({
-            query: { directory: deps.directory },
-            throwOnError: true,
-        })
-            .catch(swallow('refreshAllVisibleTitles:list'));
-        if (!list?.data || !Array.isArray(list.data)) {
-            return { attempted: 0, refreshed: 0, listFailed: true };
-        }
-        const sessions = list.data.filter((session) => Boolean(session && typeof session.id === 'string'));
-        const results = await mapConcurrent(sessions, deps.restoreConcurrency, async (session) => applyTitle(session.id));
-        return {
-            attempted: sessions.length,
-            refreshed: results.filter(Boolean).length,
-            listFailed: false,
-        };
-    };
     return {
         applyTitle,
         handleSessionUpdatedTitle,
         restoreSessionTitle,
-        restoreAllVisibleTitles,
-        refreshAllTouchedTitles,
-        refreshAllVisibleTitles,
         forgetSession,
     };
 }

package/dist/tools.d.ts

@@ -22,7 +22,7 @@ export declare function createQuotaSidebarTools(deps: {
     showToast: (period: 'session' | 'day' | 'week' | 'month' | 'toggle', message: string) => Promise<void>;
     summarizeForTool: (period: 'session' | 'day' | 'week' | 'month', sessionID: string, includeChildren: boolean) => Promise<UsageSummary>;
     summarizeHistoryForTool: (period: HistoryPeriod, since: string) => Promise<HistoryUsageResult>;
-    listCurrentProviderIDs?: () => Promise<Set<string>>;
+    listCurrentProviderIDs: () => Promise<Set<string>>;
     getQuotaSnapshots: (providerIDs: string[], options?: {
         allowDefault?: boolean;
     }) => Promise<QuotaSnapshot[]>;

package/dist/tools.js

@@ -1,6 +1,30 @@
 import * as z from 'zod';
 import { sinceFromLast } from './period.js';
 import { filterHistoryProvidersForDisplay, filterUsageProvidersForDisplay, } from './provider_catalog.js';
+function emptyProviderUsage(usage) {
+    return {
+        ...usage,
+        providers: {},
+    };
+}
+function strictFilterUsageProviders(usage, allowedProviderIDs) {
+    if (allowedProviderIDs.size === 0)
+        return emptyProviderUsage(usage);
+    return filterUsageProvidersForDisplay(usage, allowedProviderIDs);
+}
+function strictFilterHistoryProviders(history, allowedProviderIDs) {
+    if (allowedProviderIDs.size === 0) {
+        return {
+            ...history,
+            rows: history.rows.map((row) => ({
+                ...row,
+                usage: emptyProviderUsage(row.usage),
+            })),
+            total: emptyProviderUsage(history.total),
+        };
+    }
+    return filterHistoryProvidersForDisplay(history, allowedProviderIDs);
+}
 function tool(input) {
     return input;
 }
@@ -51,17 +75,11 @@ export function createQuotaSidebarTools(deps) {
                     (period !== 'session' && last !== undefined
                         ? sinceFromLast(period, last)
                         : undefined);
-                const allowedProviderIDs = await deps
-                    .listCurrentProviderIDs?.()
-                    .catch(() => new Set());
+                const allowedProviderIDs = await deps.listCurrentProviderIDs();
                 if (period !== 'session' && resolvedSince) {
                     const historyRaw = await deps.summarizeHistoryForTool(period, resolvedSince);
-                    const history = allowedProviderIDs
-                        ? filterHistoryProvidersForDisplay(historyRaw, allowedProviderIDs)
-                        : historyRaw;
-                    const quotas = await deps.getQuotaSnapshots([], {
-                        allowDefault: true,
-                    });
+                    const history = strictFilterHistoryProviders(historyRaw, allowedProviderIDs);
+                    const quotas = await deps.getQuotaSnapshots([...allowedProviderIDs]);
                     const markdown = deps.renderHistoryMarkdownReport(history, quotas, {
                         showCost: deps.config.sidebar.showCost,
                     });
@@ -77,12 +95,8 @@ export function createQuotaSidebarTools(deps) {
                     ? (args.includeChildren ?? deps.config.sidebar.includeChildren)
                     : false;
                 const usageRaw = await deps.summarizeForTool(period, context.sessionID, includeChildren);
-                const usage = allowedProviderIDs
-                    ? filterUsageProvidersForDisplay(usageRaw, allowedProviderIDs)
-                    : usageRaw;
-                // For quota_summary, always show all subscription quota balances,
-                // regardless of which providers were used in the session.
-                const quotas = await deps.getQuotaSnapshots([], { allowDefault: true });
+                const usage = strictFilterUsageProviders(usageRaw, allowedProviderIDs);
+                const quotas = await deps.getQuotaSnapshots([...allowedProviderIDs]);
                 const markdown = deps.renderMarkdownReport(period, usage, quotas, {
                     showCost: deps.config.sidebar.showCost,
                 });

package/dist/tui.d.ts

@@ -1,5 +1,5 @@
 /** @jsxImportSource @opentui/solid */
-import type { TuiPluginModule } from '@opencode-ai/plugin/tui';
+import type { TuiPluginModule } from "@opencode-ai/plugin/tui";
 declare const plugin: TuiPluginModule & {
     id: string;
 };