dsh-plugin-subscription-oauth 0.10.0 → 0.10.1

package/lib/auth/workbuddy-flow.d.ts

@@ -93,3 +93,16 @@ export declare function workbuddyStale(token: Pick<WorkBuddyTokenSet, 'expiresAt
 export declare function workbuddyRefreshable(token: WorkBuddyTokenSet): boolean;
 /** Spend a refresh token for a new access token. */
 export declare function refreshWorkBuddyToken(token: WorkBuddyTokenSet, fetchFn: typeof fetch): Promise<WorkBuddyTokenSet>;
+/** One metered window the Settings card reads. */
+export interface WorkBuddyUsageWindow {
+    label: string;
+    usedPercent?: number;
+    used?: number;
+    limit?: number;
+    resetsAt?: number;
+}
+/** Read the account's plan and metered credits for the Settings card. */
+export declare function readWorkBuddyUsage(token: WorkBuddyTokenSet, plan: string | undefined, fetchFn: typeof fetch): Promise<{
+    plan: string;
+    windows: WorkBuddyUsageWindow[];
+}>;

package/lib/auth/workbuddy-flow.js

@@ -263,3 +263,106 @@ function workbuddyEnterpriseHeaders(token) {
     const enterprise = typeof token.enterpriseId === 'string' ? token.enterpriseId.trim() : '';
     return enterprise === '' ? {} : { 'X-Enterprise-Id': enterprise, 'X-Tenant-Id': enterprise };
 }
+/** A capacity the billing API sends, as a string or number; empty is 0. */
+function capacity(value) {
+    if (value === null || value === undefined || value === '')
+        return 0;
+    if (typeof value === 'number')
+        return value;
+    const text = String(value);
+    const number = Number(text);
+    return Number.isNaN(number) ? 0 : number;
+}
+/** A count as the card says one: whole, else to two places. */
+function compact(number) {
+    return Number.isInteger(number)
+        ? String(number)
+        : number.toFixed(2).replace(/0+$/, '').replace(/\.$/, '');
+}
+/** Ask the billing API, saying its message, else its code, else the HTTP status. */
+async function workbuddyMeter(token, path, body, fetchFn) {
+    const response = await fetchFn(WORKBUDDY_ENDPOINT + path, {
+        method: 'POST',
+        headers: {
+            'Content-Type': 'application/json',
+            'Accept': 'application/json',
+            'User-Agent': `WorkBuddy/${WORKBUDDY_UA_VERSION}`,
+            ...workbuddyHeaders(token),
+        },
+        body: JSON.stringify(body),
+        signal: AbortSignal.timeout(20_000),
+    });
+    let env = {};
+    try {
+        env = JSON.parse(await response.text());
+    }
+    catch {
+        env = {};
+    }
+    const code = Number.parseInt(String(env.code ?? ''), 10) || 0;
+    if (!response.ok) {
+        if (code)
+            throw new Error(String(env.msg ?? `error ${code}`));
+        if (env.msg)
+            throw new Error(String(env.msg));
+        throw new Error(`HTTP ${response.status}`);
+    }
+    if (code !== 0)
+        throw new Error(String(env.msg ?? `error ${code}`));
+    return isRecord(env.data) ? env.data : null;
+}
+/** The account's credits from its resource summary: the plan's used against granted. */
+function usageOfSummary(summary, plan) {
+    const isPaid = summary?.IsPaidUser === true;
+    const out = { plan: plan ?? (isPaid ? 'Pro' : 'Free'), windows: [] };
+    let total = 0;
+    let used = 0;
+    const packages = Array.isArray(summary?.Packages) ? summary.Packages.filter(isRecord) : [];
+    for (const pkg of packages) {
+        total += capacity(pkg.CycleTotalCapacity);
+        used += capacity(pkg.CycleUsedCapacity);
+    }
+    if (total > 0) {
+        out.windows.push({
+            label: 'Credits',
+            usedPercent: (100 * used) / total,
+            used,
+            limit: total,
+        });
+    }
+    return out;
+}
+/** An enterprise account's credits, from the enterprise meter; null when it grants none. */
+function enterpriseUsageOf(data) {
+    const limit = capacity(data?.limitNum);
+    if (!(limit > 0))
+        return null;
+    const used = capacity(data?.credit);
+    const window = { label: 'Credits', usedPercent: (100 * used) / limit, used, limit };
+    const at = (value) => typeof value === 'string' && /^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}$/.test(value.trim())
+        ? Date.parse(value.trim().replace(' ', 'T') + '+08:00')
+        : 0;
+    const reset = at(data?.cycleResetTime);
+    const start = at(data?.cycleStartTime);
+    if (reset > 0)
+        window.resetsAt = reset;
+    return window;
+}
+/** Read the account's plan and metered credits for the Settings card. */
+export async function readWorkBuddyUsage(token, plan, fetchFn) {
+    const summary = await workbuddyMeter(token, '/billing/meter/get-user-resource-summary', {}, fetchFn);
+    const out = usageOfSummary(summary, plan);
+    // An enterprise account's summary has no packages: its credits are the enterprise meter's.
+    if (out.windows.length === 0) {
+        try {
+            const enterprise = enterpriseUsageOf(await workbuddyMeter(token, '/billing/meter/get-enterprise-user-usage', {}, fetchFn));
+            if (enterprise !== null) {
+                return { plan: plan ?? 'Enterprise', windows: [enterprise] };
+            }
+        }
+        catch {
+            // The personal-account refusal (10001) leaves the card as the summary said.
+        }
+    }
+    return out;
+}

package/lib/providers/workbuddy-provider.js

@@ -8,7 +8,7 @@ import { REAUTH_REQUIRED, ProviderError } from '../errors.js';
 import { TokenStore } from '../auth/store.js';
 import { TokenManager } from '../auth/tokens.js';
 import { LOGIN_CANCELLED_MESSAGE } from '../auth/device-flow.js';
-import { finishWorkBuddySignIn, parseWorkBuddySession, refreshWorkBuddyToken, startWorkBuddySignIn, workbuddyRefreshable, workbuddyStale, WORKBUDDY_EARLY_MS, } from '../auth/workbuddy-flow.js';
+import { finishWorkBuddySignIn, parseWorkBuddySession, readWorkBuddyUsage, refreshWorkBuddyToken, startWorkBuddySignIn, workbuddyRefreshable, workbuddyStale, WORKBUDDY_EARLY_MS, } from '../auth/workbuddy-flow.js';
 import { WorkBuddyAdapter, WORKBUDDY_CODE_URL, WORKBUDDY_CATALOG, WORKBUDDY_DEFAULT_MODEL, WORKBUDDY_PROVIDER_ID, WORKBUDDY_PROVIDER_NAME, } from './workbuddy.js';
 import { ProviderController } from '../auth/provider-controller.js';
 import { proxiedFetch } from '../http.js';
@@ -130,6 +130,17 @@ export function createWorkBuddyProvider(options) {
         userModels: () => options.preferences.extraIds(WORKBUDDY_PROVIDER_ID),
         fetchFn,
     });
+    /** The stored session's fields as the token a request or meter signs with. */
+    const tokenOf = (session) => ({
+        accessToken: session.accessToken,
+        expiresAt: session.expiresAt,
+        ...session.refreshToken === undefined ? {} : { refreshToken: session.refreshToken },
+        ...session.uid === undefined ? {} : { uid: session.uid },
+        ...session.enterpriseId === undefined ? {} : { enterpriseId: session.enterpriseId },
+        ...session.domain === undefined ? {} : { domain: session.domain },
+        ...session.tokenType === undefined ? {} : { tokenType: session.tokenType },
+        ...session.refreshExpiresAt === undefined ? {} : { refreshExpiresAt: session.refreshExpiresAt },
+    });
     const spec = {
         id: WORKBUDDY_PROVIDER_ID,
         displayName: WORKBUDDY_PROVIDER_NAME,
@@ -142,7 +153,13 @@ export function createWorkBuddyProvider(options) {
         catalogOwn: () => adapter.ownCatalogEntries(),
         fallbackContextWindow: WORKBUDDY_CATALOG[0]?.contextWindow ?? 0,
         discover: () => Promise.resolve(undefined),
-        usage: () => Promise.resolve({ windows: [] }),
+        usage: async (_accessToken, account) => {
+            const held = await store.get(account);
+            if (held === undefined)
+                return undefined;
+            const read = await readWorkBuddyUsage(tokenOf(held), held.accountId, fetchFn);
+            return { plan: read.plan, windows: read.windows };
+        },
         details: () => [
             { key: 'provider', value: WORKBUDDY_PROVIDER_NAME },
             { key: 'endpoint', value: 'https://copilot.tencent.com' },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-plugin-subscription-oauth",
-  "version": "0.10.0",
+  "version": "0.10.1",
   "description": "Use subscription accounts as DeepSeek Harness LLM providers — Kimi Code (OAuth device flow), Grok / X Premium (OIDC + PKCE), Google Antigravity (Google OAuth + Cloud Code Assist) and GLM / BigModel (ZCode's browser sign-in) — with per-model visibility, drag-to-reorder Auto fallback and plan quotas from the web Settings page",
   "license": "MIT",
   "author": "EricFL1998",