@leo000001/opencode-quota-sidebar 1.13.6 → 1.13.8

package/README.md

@@ -63,6 +63,10 @@ Want to add support for another provider (Google Antigravity, Zhipu AI, Firmware
   - RightCode daily quota shows `$remaining/$dailyTotal` + expiry (e.g. `RC Daily $105/$60 Exp 02-27`, without trailing percent) and also shows balance on the next indented line when available; `Exp` remains date-only
 - Session-scoped usage/quota can include descendant subagent sessions (enabled by default via `sidebar.includeChildren=true`). Traversal is bounded by `childrenMaxDepth` (default 6), `childrenMaxSessions` (default 128), and `childrenConcurrency` (default 5); truncation is logged when `OPENCODE_QUOTA_DEBUG=1`. Day/week/month ranges never merge children — only session scope does.
 - Toast message includes three sections: `Token Usage`, `Cost as API` (per provider), and `Quota`
+- OpenAI priority API-cost detection uses two fallbacks in order:
+  - message metadata: `openai.serviceTier` / `openai.service_tier`
+  - model defaults from `provider.list`: `models[modelID].options.serviceTier`
+  - provider aliases with `npm: "@ai-sdk/openai"` are treated as OpenAI for this billing rule
 - Quota snapshots are de-duplicated before rendering to avoid repeated provider lines
 - Custom tools:
   - `quota_summary` — generate usage report for session/day/week/month (markdown + toast)

package/dist/cost.d.ts

@@ -1,6 +1,6 @@
 import type { AssistantMessage } from '@opencode-ai/sdk';
 export declare const SUBSCRIPTION_API_COST_PROVIDERS: Set<string>;
-export declare function canonicalApiCostProviderID(providerID: string): string;
+export declare function canonicalApiCostProviderID(providerID: string, npmPackage?: string): string;
 export type ModelCostRates = {
     input: number;
     output: number;
@@ -13,7 +13,8 @@ export type ModelCostRates = {
         cacheWrite: number;
     };
 };
+export declare function openAIServiceTierFromMessage(message: AssistantMessage): string | undefined;
 export declare function modelCostKey(providerID: string, modelID: string): string;
 export declare function parseModelCostRates(value: unknown): ModelCostRates | undefined;
 export declare function guessModelCostDivisor(rates: ModelCostRates): 1 | 1000000;
-export declare function calcEquivalentApiCostForMessage(message: AssistantMessage, rates: ModelCostRates): number;
+export declare function calcEquivalentApiCostForMessage(message: AssistantMessage, rates: ModelCostRates, canonicalProviderID?: string, serviceTier?: string | undefined): number;

package/dist/cost.js

@@ -5,7 +5,20 @@ function normalizeKnownProviderID(providerID) {
         return 'github-copilot';
     return providerID;
 }
-export function canonicalApiCostProviderID(providerID) {
+function canonicalProviderByNpmPackage(npmPackage) {
+    const normalized = npmPackage.trim().toLowerCase();
+    if (normalized === '@ai-sdk/openai')
+        return 'openai';
+    if (normalized === '@ai-sdk/anthropic')
+        return 'anthropic';
+    return undefined;
+}
+export function canonicalApiCostProviderID(providerID, npmPackage) {
+    const byPackage = typeof npmPackage === 'string'
+        ? canonicalProviderByNpmPackage(npmPackage)
+        : undefined;
+    if (byPackage)
+        return byPackage;
     const normalized = normalizeKnownProviderID(providerID);
     if (SUBSCRIPTION_API_COST_PROVIDERS.has(normalized))
         return normalized;
@@ -19,6 +32,11 @@ export function canonicalApiCostProviderID(providerID) {
     }
     return normalized;
 }
+export function openAIServiceTierFromMessage(message) {
+    const info = message;
+    return (info.providerMetadata?.openai?.serviceTier ??
+        info.providerMetadata?.openai?.service_tier);
+}
 export function modelCostKey(providerID, modelID) {
     return `${providerID}:${modelID}`;
 }
@@ -78,18 +96,20 @@ export function guessModelCostDivisor(rates) {
         ? MODEL_COST_DIVISOR_PER_MILLION
         : MODEL_COST_DIVISOR_PER_TOKEN;
 }
-export function calcEquivalentApiCostForMessage(message, rates) {
+export function calcEquivalentApiCostForMessage(message, rates, canonicalProviderID = message.providerID, serviceTier = openAIServiceTierFromMessage(message)) {
     const effectiveRates = message.tokens.input > 200_000 && rates.contextOver200k
         ? rates.contextOver200k
         : rates;
+    const priorityMultiplier = canonicalProviderID === 'openai' && serviceTier === 'priority' ? 2 : 1;
     // For providers that expose reasoning tokens separately, they are still
     // billed as output/completion tokens (same unit price). Our UI also merges
     // reasoning into the single Output statistic, so API cost should match that.
     const billedOutput = message.tokens.output + message.tokens.reasoning;
-    const rawCost = message.tokens.input * effectiveRates.input +
+    const rawCost = (message.tokens.input * effectiveRates.input +
         billedOutput * effectiveRates.output +
         message.tokens.cache.read * effectiveRates.cacheRead +
-        message.tokens.cache.write * effectiveRates.cacheWrite;
+        message.tokens.cache.write * effectiveRates.cacheWrite) *
+        priorityMultiplier;
     const divisor = guessModelCostDivisor(effectiveRates);
     const normalized = rawCost / divisor;
     return Number.isFinite(normalized) && normalized > 0 ? normalized : 0;

package/dist/usage_service.js

@@ -1,5 +1,5 @@
 import { TtlValueCache } from './cache.js';
-import { calcEquivalentApiCostForMessage, canonicalApiCostProviderID, modelCostKey, parseModelCostRates, SUBSCRIPTION_API_COST_PROVIDERS, } from './cost.js';
+import { calcEquivalentApiCostForMessage, canonicalApiCostProviderID, modelCostKey, openAIServiceTierFromMessage, parseModelCostRates, SUBSCRIPTION_API_COST_PROVIDERS, } from './cost.js';
 import { dateKeyFromTimestamp, scanSessionsByCreatedRange, updateSessionsInDayChunks, } from './storage.js';
 import { periodStart } from './period.js';
 import { debug, isRecord, mapConcurrent, swallow } from './helpers.js';
@@ -30,7 +30,7 @@ export function createUsageService(deps) {
             return cached;
         const providerClient = deps.client;
         if (!providerClient.provider?.list) {
-            return modelCostCache.set({}, 30_000);
+            return modelCostCache.set({ rates: {}, providerAliases: {}, modelServiceTiers: {} }, 30_000);
         }
         const response = await providerClient.provider
             .list({
@@ -45,11 +45,56 @@ export function createUsageService(deps) {
             Array.isArray(response.data.all)
             ? response.data.all
             : [];
-        const map = all.reduce((acc, provider) => {
+        const providerAliases = all.reduce((acc, provider) => {
+            if (!isRecord(provider))
+                return acc;
+            if (typeof provider.id !== 'string')
+                return acc;
+            const canonical = canonicalApiCostProviderID(provider.id, typeof provider.npm === 'string' ? provider.npm : undefined);
+            if (!SUBSCRIPTION_API_COST_PROVIDERS.has(canonical))
+                return acc;
+            acc[provider.id] = canonical;
+            return acc;
+        }, {});
+        const modelServiceTiers = all.reduce((acc, provider) => {
             if (!isRecord(provider))
                 return acc;
             const providerID = typeof provider.id === 'string'
-                ? canonicalApiCostProviderID(provider.id)
+                ? (providerAliases[provider.id] ??
+                    canonicalApiCostProviderID(provider.id, typeof provider.npm === 'string' ? provider.npm : undefined))
+                : undefined;
+            if (!providerID)
+                return acc;
+            if (!SUBSCRIPTION_API_COST_PROVIDERS.has(providerID))
+                return acc;
+            const models = provider.models;
+            if (!isRecord(models))
+                return acc;
+            for (const [modelKey, modelValue] of Object.entries(models)) {
+                if (!isRecord(modelValue))
+                    continue;
+                const options = isRecord(modelValue.options)
+                    ? modelValue.options
+                    : undefined;
+                const serviceTier = typeof options?.serviceTier === 'string'
+                    ? options.serviceTier
+                    : undefined;
+                if (!serviceTier)
+                    continue;
+                const modelID = typeof modelValue.id === 'string' ? modelValue.id : modelKey;
+                acc[modelCostKey(providerID, modelID)] = serviceTier;
+                if (modelKey !== modelID) {
+                    acc[modelCostKey(providerID, modelKey)] = serviceTier;
+                }
+            }
+            return acc;
+        }, {});
+        const rates = all.reduce((acc, provider) => {
+            if (!isRecord(provider))
+                return acc;
+            const providerID = typeof provider.id === 'string'
+                ? (providerAliases[provider.id] ??
+                    canonicalApiCostProviderID(provider.id, typeof provider.npm === 'string' ? provider.npm : undefined))
                 : undefined;
             if (!providerID)
                 return acc;
@@ -72,13 +117,15 @@ export function createUsageService(deps) {
             }
             return acc;
         }, {});
-        return modelCostCache.set(map, Math.max(30_000, deps.config.quota.refreshMs));
+        return modelCostCache.set({ rates, providerAliases, modelServiceTiers }, Math.max(30_000, deps.config.quota.refreshMs));
     };
     const calcEquivalentApiCost = (message, modelCostMap) => {
-        const providerID = canonicalApiCostProviderID(message.providerID);
+        const providerID = typeof modelCostMap.providerAliases[message.providerID] === 'string'
+            ? modelCostMap.providerAliases[message.providerID]
+            : canonicalApiCostProviderID(message.providerID);
         if (!SUBSCRIPTION_API_COST_PROVIDERS.has(providerID))
             return 0;
-        const rates = modelCostMap[modelCostKey(providerID, message.modelID)];
+        const rates = modelCostMap.rates[modelCostKey(providerID, message.modelID)];
         if (!rates) {
             const key = modelCostKey(providerID, message.modelID);
             if (!missingApiCostRateKeys.has(key)) {
@@ -87,7 +134,9 @@ export function createUsageService(deps) {
             }
             return 0;
         }
-        return calcEquivalentApiCostForMessage(message, rates);
+        const serviceTier = openAIServiceTierFromMessage(message) ??
+            modelCostMap.modelServiceTiers[modelCostKey(providerID, message.modelID)];
+        return calcEquivalentApiCostForMessage(message, rates, providerID, serviceTier);
     };
     const isFiniteNumber = (value) => typeof value === 'number' && Number.isFinite(value);
     const decodeTokens = (value) => {
@@ -143,12 +192,34 @@ export function createUsageService(deps) {
             tokens,
         };
     };
+    const extractProviderMetadata = (parts) => {
+        if (!Array.isArray(parts))
+            return undefined;
+        for (const part of parts) {
+            if (!isRecord(part))
+                continue;
+            const meta = part.metadata;
+            if (isRecord(meta))
+                return meta;
+            const stateMeta = isRecord(part.state)
+                ? part.state?.metadata
+                : undefined;
+            if (isRecord(stateMeta))
+                return stateMeta;
+        }
+        return undefined;
+    };
     const decodeMessageEntry = (value) => {
         if (!isRecord(value))
             return undefined;
         const decoded = decodeMessageInfo(value.info);
         if (!decoded)
             return undefined;
+        const metadata = extractProviderMetadata(value.parts);
+        if (metadata && decoded.role === 'assistant') {
+            const msg = decoded;
+            msg.providerMetadata = metadata;
+        }
         return { info: decoded };
     };
     const decodeMessageEntries = (value) => {

package/package.json

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