dsh-plugin-subscription-oauth 0.16.0 → 0.16.2

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

@@ -85,7 +85,7 @@ export declare function finishWorkBuddySignIn(start: WorkBuddySignInStart, fetch
 }>;
 /** The domain a token names, else the API host. */
 export declare function workbuddyDomain(token: Pick<WorkBuddyTokenSet, 'domain'>): string;
-/** The headers WorkBuddy's desktop app sends with a chat and its account. */
+/** The headers WorkBuddy's chat gateway accepts: its own CLI's, nothing more. */
 export declare function workbuddyHeaders(token: WorkBuddyTokenSet): Record<string, string>;
 /** Whether a token is close enough to its end that a request should refresh it. */
 export declare function workbuddyStale(token: Pick<WorkBuddyTokenSet, 'expiresAt'>): boolean;
@@ -140,6 +140,7 @@ export declare function claimWorkBuddyCheckin(token: WorkBuddyTokenSet, fetchFn:
 /** The account's precise remaining credits, summed across its live packages. */
 export declare function readWorkBuddyCredits(token: WorkBuddyTokenSet, fetchFn: typeof fetch): Promise<{
     remaining: number;
+    total: number;
     nearestExpiryMs?: number;
 } | null>;
 /** Read the account's plan and metered credits for the Settings card. */

package/lib/auth/workbuddy-flow.js

@@ -214,26 +214,21 @@ async function workbuddyEnterprise(token, who, fetchFn) {
     const pick = same.length === 1 ? same[0] : last.length === 1 ? last[0] : mine.length === 1 ? mine[0] : undefined;
     return pick && typeof pick.enterpriseId === 'string' ? pick.enterpriseId.trim() : '';
 }
-/** The headers WorkBuddy's desktop app sends with a chat and its account. */
+/** The headers WorkBuddy's chat gateway accepts: its own CLI's, nothing more. */
 export function workbuddyHeaders(token) {
     const headers = {
+        'Accept': 'application/json, text/plain, */*',
+        'X-Requested-With': 'XMLHttpRequest',
+        'Origin': 'https://copilot.tencent.com',
+        'Referer': 'https://copilot.tencent.com/',
+        'User-Agent': 'CLI/2.63.2 CodeBuddy/2.63.2',
+        'Content-Type': 'application/json',
         'Authorization': `Bearer ${token.accessToken}`,
-        'X-User-Id': token.uid ?? '',
+        ...token.uid === undefined || token.uid === '' ? { 'X-No-User-Id': '1' } : { 'X-User-Id': token.uid },
+        ...token.enterpriseId === undefined || token.enterpriseId === '' ? { 'X-No-Enterprise-Id': '1' } : { 'X-Enterprise-Id': token.enterpriseId },
         'X-Domain': workbuddyDomain(token),
         'X-Product': 'SaaS',
-        'X-IDE-Type': 'WorkBuddy',
-        'User-Agent': `WorkBuddy/${WORKBUDDY_UA_VERSION}`,
-        'X-Requested-With': 'XMLHttpRequest',
-        'X-Agent-Intent': 'craft',
-        'X-Agent-Purpose': 'conversation',
-        'X-IDE-Name': 'WorkBuddy',
-        'X-IDE-Version': WORKBUDDY_UA_VERSION,
     };
-    const enterprise = typeof token.enterpriseId === 'string' ? token.enterpriseId.trim() : '';
-    if (enterprise !== '') {
-        headers['X-Enterprise-Id'] = enterprise;
-        headers['X-Tenant-Id'] = enterprise;
-    }
     return headers;
 }
 /** Whether a token is close enough to its end that a request should refresh it. */
@@ -473,12 +468,14 @@ export async function readWorkBuddyCredits(token, fetchFn) {
         return undefined;
     };
     let remaining = 0;
+    let totalSize = 0;
     let nearestExpiryMs;
     let livePackages = 0;
     for (const account of accounts) {
         const num = (key) => capacity(account[key]);
         const monthly = num('CapacityType') === 4;
         const remain = monthly ? num('CycleCapacityRemain') : num('CapacityRemain');
+        const size = monthly ? num('CycleCapacitySize') : num('CapacitySize');
         const capped = remain < 0 ? 0 : remain;
         const cycleEndMs = parseDate(account.CycleEndTime);
         const expiresAtMs = monthly ? undefined : parseDate(account.ExpiredTime) ?? cycleEndMs;
@@ -486,6 +483,7 @@ export async function readWorkBuddyCredits(token, fetchFn) {
             continue;
         livePackages += 1;
         remaining += capped;
+        totalSize += size > 0 ? size : capped;
         if (expiresAtMs !== undefined && (nearestExpiryMs === undefined || expiresAtMs < nearestExpiryMs)) {
             nearestExpiryMs = expiresAtMs;
         }
@@ -494,7 +492,7 @@ export async function readWorkBuddyCredits(token, fetchFn) {
     // account, say — so the caller falls through to its own meter.
     if (livePackages === 0)
         return null;
-    return { remaining, ...nearestExpiryMs === undefined ? {} : { nearestExpiryMs } };
+    return { remaining, total: totalSize, ...nearestExpiryMs === undefined ? {} : { nearestExpiryMs } };
 }
 /** The account's credits from its resource summary: the plan's used against granted. */
 function usageOfSummary(summary, plan) {
@@ -542,10 +540,15 @@ export async function readWorkBuddyUsage(token, plan, fetchFn, spend) {
         const credits = await readWorkBuddyCredits(token, fetchFn);
         if (credits !== null) {
             const window = { label: 'Credits', used: spend?.spent ?? 0 };
-            if (credits.remaining > 0 || (spend?.spent ?? 0) > 0) {
-                const limit = credits.remaining + (spend?.spent ?? 0);
-                window.limit = limit;
-                window.usedPercent = limit > 0 ? (100 * (spend?.spent ?? 0)) / limit : 0;
+            // The bar reads spent against the total the packages grant, not remaining-plus-spent,
+            // so a fresh cycle's spend shows small against its full grant.
+            if (credits.total > 0) {
+                window.limit = credits.total;
+                window.usedPercent = (100 * (spend?.spent ?? 0)) / credits.total;
+            }
+            else if ((spend?.spent ?? 0) > 0) {
+                window.limit = spend?.spent ?? 0;
+                window.usedPercent = 100;
             }
             if (credits.nearestExpiryMs !== undefined)
                 window.resetsAt = credits.nearestExpiryMs;

package/lib/client/SubscriptionsSection.js

@@ -305,8 +305,19 @@ function windowLabel(t, window) {
     const key = `usage_${window.label}`;
     return key in en ? t(key) : window.label;
 }
-/** How much of one window is spent, as a display string. */
+/** Credit-like window labels: money, not a share of an allowance. */
+const CREDIT_WINDOW_LABELS = /credit|wallet|balance|token|point|积分|额度/i;
+/**
+ * How much of one window is spent, as a display string.
+ *
+ * A credit balance (WorkBuddy's Credits) reads as the raw used/limit count; a time
+ * quota reads as the spent percent. Told apart by the label, since both state the
+ * same fields.
+ */
 function windowAmount(window) {
+    if (CREDIT_WINDOW_LABELS.test(window.label) && window.used !== undefined && window.limit !== undefined) {
+        return `${String(window.used)}/${String(window.limit)}`;
+    }
     if (window.usedPercent !== undefined)
         return `${String(Math.round(window.usedPercent))}%`;
     if (window.used !== undefined && window.limit !== undefined)

package/lib/client.js

@@ -1341,8 +1341,17 @@ function windowLabel(t, window$1) {
 	const key = `usage_${window$1.label}`;
 	return key in en ? t(key) : window$1.label;
 }
-/** How much of one window is spent, as a display string. */
+/** Credit-like window labels: money, not a share of an allowance. */
+const CREDIT_WINDOW_LABELS = /credit|wallet|balance|token|point|积分|额度/i;
+/**
+* How much of one window is spent, as a display string.
+*
+* A credit balance (WorkBuddy's Credits) reads as the raw used/limit count; a time
+* quota reads as the spent percent. Told apart by the label, since both state the
+* same fields.
+*/
 function windowAmount$1(window$1) {
+	if (CREDIT_WINDOW_LABELS.test(window$1.label) && window$1.used !== void 0 && window$1.limit !== void 0) return `${String(window$1.used)}/${String(window$1.limit)}`;
 	if (window$1.usedPercent !== void 0) return `${String(Math.round(window$1.usedPercent))}%`;
 	if (window$1.used !== void 0 && window$1.limit !== void 0) return `${String(window$1.used)}/${String(window$1.limit)}`;
 	return "—";