@leo000001/opencode-quota-sidebar 4.1.1 → 4.1.2

package/dist/cli.js

@@ -12,7 +12,7 @@ import { sinceFromLast } from './period.js';
 import { authFilePath, loadConfig, loadState, 
 // reused for CLI-local config layering
 quotaConfigPaths, resolveOpencodeDataDir, stateFilePath, } from './storage.js';
-import { filterHistoryProvidersForDisplay, filterUsageProvidersForDisplay, listCurrentProviderIDs, } from './provider_catalog.js';
+import { filterHistoryProvidersForDisplay, filterUsageProvidersForDisplay, listConnectedProviderIDs, listCurrentProviderIDs, } from './provider_catalog.js';
 import { createUsageService } from './usage_service.js';
 function emptyProviderUsage(usage) {
     return {
@@ -38,6 +38,9 @@ function strictFilterHistoryProviders(history, allowedProviderIDs) {
     }
     return filterHistoryProvidersForDisplay(history, allowedProviderIDs);
 }
+function cliQuotaProviderIDs(usageProviderIDs, connectedProviderIDs) {
+    return [...new Set([...usageProviderIDs, ...connectedProviderIDs])];
+}
 const DEFAULT_OPENCODE_BASE_URL = 'http://localhost:4096';
 const DEFAULT_OPENCODE_HOST = '127.0.0.1';
 const DEFAULT_OPENCODE_PORT = 4096;
@@ -656,15 +659,21 @@ export async function runCli(argv) {
                 listDescendantSessionIDs: async () => [],
             },
         });
-        const allowedProviderIDs = await listCurrentProviderIDs({
-            client,
-            directory,
-        });
+        const [allowedProviderIDs, connectedProviderIDs] = await Promise.all([
+            listCurrentProviderIDs({
+                client,
+                directory,
+            }),
+            listConnectedProviderIDs({
+                client,
+                directory,
+            }),
+        ]);
         if (command.since || command.last !== undefined) {
             const resolvedSince = command.since || sinceFromLast(command.period, command.last);
             const historyRaw = await usageService.summarizeHistoryUsage(command.period, resolvedSince);
             const history = strictFilterHistoryProviders(historyRaw, allowedProviderIDs);
-            const quotas = await quotaService.getQuotaSnapshots(Object.keys(history.total.providers));
+            const quotas = await quotaService.getQuotaSnapshots(cliQuotaProviderIDs(Object.keys(history.total.providers), connectedProviderIDs));
             return renderCliHistoryDashboard({
                 result: history,
                 quotas,
@@ -674,7 +683,7 @@ export async function runCli(argv) {
         }
         const usageRaw = await usageService.summarizeForTool(command.period, '', false);
         const usage = strictFilterUsageProviders(usageRaw, allowedProviderIDs);
-        const quotas = await quotaService.getQuotaSnapshots(Object.keys(usage.providers));
+        const quotas = await quotaService.getQuotaSnapshots(cliQuotaProviderIDs(Object.keys(usage.providers), connectedProviderIDs));
         return renderCliDashboard({
             label: cliCurrentLabel(command.period),
             usage,

package/dist/provider_catalog.d.ts

@@ -4,5 +4,9 @@ export declare function listCurrentProviderIDs(input: {
     client: unknown;
     directory: string;
 }): Promise<Set<string>>;
+export declare function listConnectedProviderIDs(input: {
+    client: unknown;
+    directory: string;
+}): Promise<Set<string>>;
 export declare function filterUsageProvidersForDisplay(usage: UsageSummary, allowedProviderIDs: ReadonlySet<string>): UsageSummary;
 export declare function filterHistoryProvidersForDisplay(result: HistoryUsageResult, allowedProviderIDs: ReadonlySet<string>): HistoryUsageResult;

package/dist/provider_catalog.js

@@ -1,10 +1,14 @@
 function isRecord(value) {
     return typeof value === 'object' && value !== null && !Array.isArray(value);
 }
-function providerListFromResponse(response) {
-    const data = isRecord(response) && Object.prototype.hasOwnProperty.call(response, 'data')
+function providerDataFromResponse(response) {
+    return isRecord(response) &&
+        Object.prototype.hasOwnProperty.call(response, 'data')
         ? response.data
         : undefined;
+}
+function providerListFromResponse(response) {
+    const data = providerDataFromResponse(response);
     const record = isRecord(data) ? data : undefined;
     return Array.isArray(record?.providers)
         ? record.providers
@@ -14,6 +18,13 @@ function providerListFromResponse(response) {
                 ? data
                 : undefined;
 }
+function connectedProviderIDsFromResponse(response) {
+    const data = providerDataFromResponse(response);
+    const record = isRecord(data) ? data : undefined;
+    return Array.isArray(record?.connected)
+        ? record.connected.filter((item) => typeof item === 'string' && !!item)
+        : undefined;
+}
 export async function listCurrentProviderIDs(input) {
     const client = input.client;
     const ids = new Set();
@@ -46,6 +57,34 @@ export async function listCurrentProviderIDs(input) {
     }
     return ids;
 }
+export async function listConnectedProviderIDs(input) {
+    const client = input.client;
+    const ids = new Set();
+    const collect = (response) => {
+        const connected = connectedProviderIDsFromResponse(response);
+        if (!connected)
+            return false;
+        for (const providerID of connected)
+            ids.add(providerID);
+        return ids.size > 0;
+    };
+    if (client.config?.providers) {
+        const response = await client.config.providers({
+            query: { directory: input.directory },
+            throwOnError: true,
+        });
+        if (collect(response))
+            return ids;
+    }
+    if (client.provider?.list) {
+        const response = await client.provider.list({
+            query: { directory: input.directory },
+            throwOnError: true,
+        });
+        collect(response);
+    }
+    return ids;
+}
 export function filterUsageProvidersForDisplay(usage, allowedProviderIDs) {
     if (allowedProviderIDs.size === 0)
         return usage;

package/package.json

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