dsh-plugin-subscription-oauth 0.16.0 → 0.16.1

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/providers/workbuddy.js

@@ -12,7 +12,7 @@ import { LlmAdapter, errorChain, ReasoningEffortId, ToolCallId, } from '@deepsee
 import { idleWatchdog, mapFetchFailure } from './common.js';
 import { proxiedFetch } from '../http.js';
 import { findEntry } from './catalog.js';
-import { WORKBUDDY_ENDPOINT, WORKBUDDY_UA_VERSION, workbuddyHeaders } from '../auth/workbuddy-flow.js';
+import { WORKBUDDY_ENDPOINT, workbuddyHeaders } from '../auth/workbuddy-flow.js';
 import { recordSpend } from './workbuddy-credits.js';
 /** The `workbuddy` provider route key (China build). */
 export const WORKBUDDY_PROVIDER_ID = 'workbuddy';
@@ -80,12 +80,6 @@ function unflagMessages(messages) {
     }
     return messages;
 }
-/** 32 hex digits, for the chat ids WorkBuddy's own client makes. */
-function randomHex() {
-    const bytes = new Uint8Array(16);
-    crypto.getRandomValues(bytes);
-    return [...bytes].map((byte) => byte.toString(16).padStart(2, '0')).join('');
-}
 /** A tool's name may hold letters, digits, `_`, `-`; another character is refused. */
 const NAME_OK = /^[A-Za-z0-9_-]+$/;
 /** A name with each character WorkBuddy refuses as `_`, kept apart from `taken`. */
@@ -285,18 +279,7 @@ export class WorkBuddyAdapter extends LlmAdapter {
             const body = this.requestBody(options);
             const response = await this.fetchFn(WORKBUDDY_API, {
                 method: 'POST',
-                headers: {
-                    'Content-Type': 'application/json',
-                    'Accept': 'text/event-stream',
-                    ...workbuddyHeaders(token),
-                    // Name the chat the way WorkBuddy's own client does: the conversation, the
-                    // turn, and the message. Without these the gateway counts the request under no
-                    // client and cuts the stream, which is why the reply stopped after a few seconds.
-                    'X-Conversation-Message-ID': randomHex(),
-                    'X-Request-ID': randomHex(),
-                    'X-Conversation-Request-ID': randomHex(),
-                    'X-Conversation-ID': randomHex(),
-                },
+                headers: workbuddyHeaders(token),
                 body: JSON.stringify(body),
                 signal: watchdog.signal,
             });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-plugin-subscription-oauth",
-  "version": "0.16.0",
+  "version": "0.16.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",