@linxin666/dsh-usage 0.4.1 → 0.4.2

package/lib/index.js

@@ -45,7 +45,7 @@ function mountOnce(packageName, fn) {
 	});
 }
 //#endregion
-//#region ../../node_modules/.pnpm/@deepseek-ai+dsh-brand@0.1.7-rc.1_@deepseek-ai+cordis@4.0.4/node_modules/@deepseek-ai/dsh-brand/lib/index.js
+//#region ../../node_modules/.pnpm/@deepseek-ai+dsh-brand@0.1.7-rc.2_@deepseek-ai+cordis@4.0.4/node_modules/@deepseek-ai/dsh-brand/lib/index.js
 /**
 * Duplicate-install-safe nominal primitive helpers.
 *
@@ -68,7 +68,7 @@ function brandString(value) {
 	return value;
 }
 //#endregion
-//#region ../../node_modules/.pnpm/@deepseek-ai+dsh-credentials@0.1.7-rc.1_@deepseek-ai+cordis@4.0.4_@deepseek-ai+dsh-inva_9b80248df36b741e5eb76c73b242287a/node_modules/@deepseek-ai/dsh-credentials/lib/index.js
+//#region ../../node_modules/.pnpm/@deepseek-ai+dsh-credentials@0.1.7-rc.2_@deepseek-ai+cordis@4.0.4_@deepseek-ai+dsh-inva_98fa173416f048996704a605a96a2b0e/node_modules/@deepseek-ai/dsh-credentials/lib/index.js
 /**
 * Service Definition for the credential-reference capability seam (`ctx.credentials`). Settings and composition files carry
 * *references* to secrets — environment-variable names — while providers own
@@ -235,16 +235,11 @@ function usedPercent(used, limit) {
 function bearer(apiKey) {
 	return { authorization: `Bearer ${apiKey}` };
 }
-/**
-* The official pay-as-you-go balance. `deepseek` is the configurable-catalog
-* route key; `deepseek-official` is the live provider route the llm-deepseek
-* adapter registers (sessions and agent-default-model carry it), so both ids
-* must resolve here or the current provider would never be probed.
-*/
 const DEEPSEEK = {
 	ids: ["deepseek", "deepseek-official"],
 	displayName: "DeepSeek",
 	balance: {
+		origin: "https://api.deepseek.com",
 		build: ({ apiKey }) => ({
 			url: "https://api.deepseek.com/user/balance",
 			headers: bearer(apiKey)
@@ -624,6 +619,40 @@ const PROVIDER_ADAPTERS = [
 function adapterFor(provider) {
 	return PROVIDER_ADAPTERS.find((adapter) => adapter.ids.includes(provider));
 }
+/** Origin of a configured base URL, or undefined when it cannot be parsed. */
+function originOf(baseURL) {
+	if (baseURL === void 0 || baseURL.trim() === "") return void 0;
+	try {
+		return new URL(baseURL).origin;
+	} catch {
+		return;
+	}
+}
+/**
+* Whether an adapter's balance endpoint reports THIS route's account.
+*
+* Some adapter families share one route key across providers that merely
+* speak the same API: `deepseek` is both the official DeepSeek catalog entry
+* and a common id for an OpenAI-compatible reseller (Alibaba Bailian, ...)
+* pointed at another host by the profile's `baseURL`. The balance endpoint is
+* per ORIGIN, not per route key, so probing the official endpoint for a
+* reseller profile reports the official account's money under the reseller's
+* name (issue #1688). An adapter published with a fixed `origin` therefore
+* only applies to a route whose configured base URL is that origin, or to a
+* route that pins no base URL at all (the catalog alias of the official
+* route, which resolves the family's own credential).
+*
+* @param adapter - the matched adapter.
+* @param baseURL - the route's configured base URL (pi-ai profile), if any.
+* @returns true when the adapter may probe its balance endpoint for the route.
+*/
+function balanceAppliesToRoute(adapter, baseURL) {
+	const expected = adapter.balance?.origin;
+	if (expected === void 0) return true;
+	const configured = originOf(baseURL);
+	if (configured === void 0) return true;
+	return configured === expected;
+}
 /**
 * Whether a provider route belongs to the official DeepSeek family: the only
 * family with a spend price book and a settings-section-owned env credential
@@ -1086,7 +1115,8 @@ var UsageService = class {
 				displayName: route.displayName || adapter?.displayName || route.id,
 				credential: snapshot?.credential ?? "none",
 				supported: adapter !== void 0 && (adapter.balance !== void 0 || adapter.plan !== void 0),
-				...adapter?.balance !== void 0 ? { balanceSupported: true } : {},
+				...adapter?.balance !== void 0 && balanceAppliesToRoute(adapter, this.piAiProfile(route.id)?.baseURL) ? { balanceSupported: true } : {},
+				...adapter?.balance !== void 0 && !balanceAppliesToRoute(adapter, this.piAiProfile(route.id)?.baseURL) ? { balanceSupported: false } : {},
 				...adapter?.plan !== void 0 ? { planSupported: true } : {},
 				...snapshot?.balance !== void 0 ? { balance: snapshot.balance } : {},
 				...snapshot?.plan !== void 0 ? { plan: snapshot.plan } : {},
@@ -1415,6 +1445,7 @@ var UsageService = class {
 	async probeRoute(route, adapter) {
 		const credential = await this.resolveCredential(route.id);
 		const previous = this.snapshots.get(route.id);
+		const balanceApplies = balanceAppliesToRoute(adapter, this.piAiProfile(route.id)?.baseURL);
 		if (credential.key === void 0) {
 			this.snapshots.set(route.id, {
 				provider: route.id,
@@ -1430,11 +1461,13 @@ var UsageService = class {
 			displayName: route.displayName || adapter.displayName,
 			credential: credential.kind,
 			supported: true,
+			...adapter.balance !== void 0 && !balanceApplies ? { balanceSupported: false } : {},
 			updatedAt: Date.now()
 		};
 		const runProbe = async (kind) => {
 			const half = adapter[kind];
 			if (half === void 0) return void 0;
+			if (kind === "balance" && !balanceApplies) return void 0;
 			try {
 				const spec = half.build({
 					apiKey: credential.key,

package/lib/types/core/adapters.d.ts

@@ -19,6 +19,14 @@ export interface AdapterProbeContext {
     apiKey: string;
     /** Provider account id riding a dedicated header, when the credential carries one (Codex). */
     accountId?: string;
+    /**
+     * The route's configured base URL (the pi-ai profile's baseURL), when it
+     * declares one. An adapter whose endpoint belongs to one provider origin
+     * uses it to refuse an account that merely shares the route key, so a
+     * differently-hosted model of the same family is never reported with the
+     * other account's number.
+     */
+    baseURL?: string;
 }
 /** A parsed balance fact. */
 export interface BalanceParse {
@@ -37,6 +45,14 @@ export interface ProviderAdapter {
     /** Fallback display name when the LLM runtime has none. */
     displayName: string;
     balance?: {
+        /**
+         * Origin (scheme + host) whose account this balance endpoint reports.
+         * Omitted when the endpoint is per-route by construction (a profile
+         * supplies the host) or when the provider has only one origin. When set,
+         * a route whose configured baseURL resolves elsewhere is not this
+         * origin's account and must not be probed with this adapter.
+         */
+        origin?: string;
         build(context: AdapterProbeContext): ProbeSpec;
         parse(status: number, body: unknown): BalanceParse | undefined;
     };
@@ -45,6 +61,14 @@ export interface ProviderAdapter {
         parse(status: number, body: unknown): PlanParse | undefined;
     };
 }
+/**
+ * The official pay-as-you-go balance. `deepseek` is the configurable-catalog
+ * route key; `deepseek-official` is the live provider route the llm-deepseek
+ * adapter registers (sessions and agent-default-model carry it), so both ids
+ * must resolve here or the current provider would never be probed.
+ */
+/** The official DeepSeek API origin: the only account its balance endpoint reports. */
+export declare const DEEPSEEK_API_ORIGIN = "https://api.deepseek.com";
 /**
  * The adapter registry, in no particular order. Route keys come from the
  * pi-ai provider catalog plus the routes this deployment observed in user
@@ -53,6 +77,27 @@ export interface ProviderAdapter {
 export declare const PROVIDER_ADAPTERS: readonly ProviderAdapter[];
 /** Find the adapter serving a provider route key, if any. */
 export declare function adapterFor(provider: string): ProviderAdapter | undefined;
+/** Origin of a configured base URL, or undefined when it cannot be parsed. */
+export declare function originOf(baseURL: string | undefined): string | undefined;
+/**
+ * Whether an adapter's balance endpoint reports THIS route's account.
+ *
+ * Some adapter families share one route key across providers that merely
+ * speak the same API: `deepseek` is both the official DeepSeek catalog entry
+ * and a common id for an OpenAI-compatible reseller (Alibaba Bailian, ...)
+ * pointed at another host by the profile's `baseURL`. The balance endpoint is
+ * per ORIGIN, not per route key, so probing the official endpoint for a
+ * reseller profile reports the official account's money under the reseller's
+ * name (issue #1688). An adapter published with a fixed `origin` therefore
+ * only applies to a route whose configured base URL is that origin, or to a
+ * route that pins no base URL at all (the catalog alias of the official
+ * route, which resolves the family's own credential).
+ *
+ * @param adapter - the matched adapter.
+ * @param baseURL - the route's configured base URL (pi-ai profile), if any.
+ * @returns true when the adapter may probe its balance endpoint for the route.
+ */
+export declare function balanceAppliesToRoute(adapter: ProviderAdapter, baseURL: string | undefined): boolean;
 /**
  * Whether a provider route belongs to the official DeepSeek family: the only
  * family with a spend price book and a settings-section-owned env credential

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@linxin666/dsh-usage",
   "description": "Usage statistics plugin for the dsh web GUI: per-provider balance and coding-plan quota detection plus a live token usage ledger, with a compact price glance card above the sidebar's Settings row",
-  "version": "0.4.1",
+  "version": "0.4.2",
   "icon": "icon.svg",
   "type": "module",
   "engines": {
@@ -33,7 +33,7 @@
   "license": "Apache-2.0",
   "dsh": {
     "engines": {
-      "dsh": ">=0.1.7-rc.1"
+      "dsh": ">=0.1.7-rc.2"
     },
     "bundle": {
       "patch": "./cordis.patch.yml"
@@ -53,22 +53,22 @@
     "schemastery": "^3.18.0"
   },
   "peerDependencies": {
-    "@deepseek-ai/dsh": ">=0.1.7-rc.1",
+    "@deepseek-ai/dsh": ">=0.1.7-rc.2",
     "react": "^18.2.0"
   },
   "devDependencies": {
     "@deepseek-ai/cordis": "^4.0.4",
-    "@deepseek-ai/dsh-credentials": "^0.1.7-rc.1",
-    "@deepseek-ai/dsh-client-connection": "^0.1.7-rc.1",
-    "@deepseek-ai/dsh-client-locale": "^0.1.7-rc.1",
-    "@deepseek-ai/dsh-client-store": "^0.1.7-rc.1",
-    "@deepseek-ai/dsh-client-ui-renderer": "^0.1.7-rc.1",
-    "@deepseek-ai/dsh-client-ui-settings": "^0.1.7-rc.1",
-    "@deepseek-ai/dsh-client-ui-slots": "^0.1.7-rc.1",
-    "@deepseek-ai/dsh-host-webserver": "^0.1.7-rc.1",
-    "@deepseek-ai/dsh-llm": "^0.1.7-rc.1",
-    "@deepseek-ai/dsh-session": "^0.1.7-rc.1",
-    "@deepseek-ai/dsh-settings": "^0.1.7-rc.1",
+    "@deepseek-ai/dsh-credentials": "^0.1.7-rc.2",
+    "@deepseek-ai/dsh-client-connection": "^0.1.7-rc.2",
+    "@deepseek-ai/dsh-client-locale": "^0.1.7-rc.2",
+    "@deepseek-ai/dsh-client-store": "^0.1.7-rc.2",
+    "@deepseek-ai/dsh-client-ui-renderer": "^0.1.7-rc.2",
+    "@deepseek-ai/dsh-client-ui-settings": "^0.1.7-rc.2",
+    "@deepseek-ai/dsh-client-ui-slots": "^0.1.7-rc.2",
+    "@deepseek-ai/dsh-host-webserver": "^0.1.7-rc.2",
+    "@deepseek-ai/dsh-llm": "^0.1.7-rc.2",
+    "@deepseek-ai/dsh-session": "^0.1.7-rc.2",
+    "@deepseek-ai/dsh-settings": "^0.1.7-rc.2",
     "@testing-library/dom": "^10.4.1",
     "@testing-library/react": "^16.3.2",
     "@types/node": "^22.20.0",

package/src/client/UsageSectionCard.tsx

@@ -128,6 +128,10 @@ function balanceLine(provider: ProviderSnapshotView): ReactNode {
   }
   if (provider.credential === 'oauth') return <span className={styles.muted}>{t('usage.oauth')}</span>
   if (provider.credential === 'none') return <span className={styles.muted}>{t('usage.balance.noCredential')}</span>
+  // balanceSupported === false is the origin gate: the adapter has a balance
+  // endpoint but it belongs to another provider's account (issue #1688), so
+  // the row says so instead of silently vanishing from the card.
+  if (provider.balanceSupported === false) return <span className={styles.muted}>{t('usage.balance.unsupported')}</span>
   if (!provider.supported) return <span className={styles.muted}>{t('usage.balance.unsupported')}</span>
   return null
 }
@@ -298,7 +302,10 @@ export function UsageSectionCard(props: UsageSectionProps): ReactNode {
             <span className={styles.cardTitle}>{t('usage.balance')}</span>
             {(() => {
               const configured = snapshot.providers.filter(isConfigured)
-              const rows = configured.filter((provider) => provider.balanceSupported === true || (provider.balanceSupported === undefined && provider.supported))
+              // Include rows whose balance is deliberately not applicable
+              // (another origin's endpoint): the row itself explains why, which
+              // a single generic line cannot (#1688).
+              const rows = configured.filter((provider) => provider.balanceSupported === true || provider.balanceSupported === false || (provider.balanceSupported === undefined && provider.supported))
               if (rows.length === 0) {
                 return <span className={styles.muted}>{configured.length === 0 ? t('usage.balance.noneConfigured') : t('usage.balance.unsupported')}</span>
               }

package/src/client/index.ts

@@ -42,8 +42,11 @@ async function usageFetch<T>(path: string, method: 'GET' | 'POST'): Promise<T> {
 }
 
 const usageApi: UsageHttpApi = {
-  overview: () => usageFetch('/api/dsh-usage/overview', 'GET'),
-  refresh: () => usageFetch('/api/dsh-usage/refresh', 'POST'),
+  // DOCUMENT-RELATIVE routes (issue #1707): the GUI is served with
+  // `<base href="./">`, so a sub-path deployment resolves these against its
+  // entry directory instead of escaping to the origin root.
+  overview: () => usageFetch('api/dsh-usage/overview', 'GET'),
+  refresh: () => usageFetch('api/dsh-usage/refresh', 'POST'),
 }
 
 /** Settings namespace the section edits (dsh-web-settings maps it onto this row's profile entry id). */

package/src/core/adapters.ts

@@ -22,6 +22,14 @@ export interface AdapterProbeContext {
   apiKey: string
   /** Provider account id riding a dedicated header, when the credential carries one (Codex). */
   accountId?: string
+  /**
+   * The route's configured base URL (the pi-ai profile's baseURL), when it
+   * declares one. An adapter whose endpoint belongs to one provider origin
+   * uses it to refuse an account that merely shares the route key, so a
+   * differently-hosted model of the same family is never reported with the
+   * other account's number.
+   */
+  baseURL?: string
 }
 
 /** A parsed balance fact. */
@@ -43,6 +51,14 @@ export interface ProviderAdapter {
   /** Fallback display name when the LLM runtime has none. */
   displayName: string
   balance?: {
+    /**
+     * Origin (scheme + host) whose account this balance endpoint reports.
+     * Omitted when the endpoint is per-route by construction (a profile
+     * supplies the host) or when the provider has only one origin. When set,
+     * a route whose configured baseURL resolves elsewhere is not this
+     * origin's account and must not be probed with this adapter.
+     */
+    origin?: string
     build(context: AdapterProbeContext): ProbeSpec
     parse(status: number, body: unknown): BalanceParse | undefined
   }
@@ -113,10 +129,14 @@ function bearer(apiKey: string): Record<string, string> {
  * adapter registers (sessions and agent-default-model carry it), so both ids
  * must resolve here or the current provider would never be probed.
  */
+/** The official DeepSeek API origin: the only account its balance endpoint reports. */
+export const DEEPSEEK_API_ORIGIN = 'https://api.deepseek.com'
+
 const DEEPSEEK: ProviderAdapter = {
   ids: ['deepseek', 'deepseek-official'],
   displayName: 'DeepSeek',
   balance: {
+    origin: DEEPSEEK_API_ORIGIN,
     build: ({ apiKey }) => ({ url: 'https://api.deepseek.com/user/balance', headers: bearer(apiKey) }),
     parse: (status, body) => {
       if (status !== 200 || typeof body !== 'object' || body === null) return undefined
@@ -459,6 +479,42 @@ export function adapterFor(provider: string): ProviderAdapter | undefined {
   return PROVIDER_ADAPTERS.find((adapter) => adapter.ids.includes(provider))
 }
 
+/** Origin of a configured base URL, or undefined when it cannot be parsed. */
+export function originOf(baseURL: string | undefined): string | undefined {
+  if (baseURL === undefined || baseURL.trim() === '') return undefined
+  try {
+    return new URL(baseURL).origin
+  } catch {
+    return undefined
+  }
+}
+
+/**
+ * Whether an adapter's balance endpoint reports THIS route's account.
+ *
+ * Some adapter families share one route key across providers that merely
+ * speak the same API: `deepseek` is both the official DeepSeek catalog entry
+ * and a common id for an OpenAI-compatible reseller (Alibaba Bailian, ...)
+ * pointed at another host by the profile's `baseURL`. The balance endpoint is
+ * per ORIGIN, not per route key, so probing the official endpoint for a
+ * reseller profile reports the official account's money under the reseller's
+ * name (issue #1688). An adapter published with a fixed `origin` therefore
+ * only applies to a route whose configured base URL is that origin, or to a
+ * route that pins no base URL at all (the catalog alias of the official
+ * route, which resolves the family's own credential).
+ *
+ * @param adapter - the matched adapter.
+ * @param baseURL - the route's configured base URL (pi-ai profile), if any.
+ * @returns true when the adapter may probe its balance endpoint for the route.
+ */
+export function balanceAppliesToRoute(adapter: ProviderAdapter, baseURL: string | undefined): boolean {
+  const expected = adapter.balance?.origin
+  if (expected === undefined) return true
+  const configured = originOf(baseURL)
+  if (configured === undefined) return true
+  return configured === expected
+}
+
 /**
  * Whether a provider route belongs to the official DeepSeek family: the only
  * family with a spend price book and a settings-section-owned env credential

package/src/host/usage-service.ts

@@ -15,7 +15,7 @@ import type { Session, SessionEvent } from '@deepseek-ai/dsh-session'
 import type { TokenUsage } from '@deepseek-ai/dsh-llm'
 import { dshHome } from '../dsh-home.ts'
 import { withIdentityEncoding } from './http.ts'
-import { adapterFor, isDeepSeekProviderRoute, providerErrorMessage } from '../core/adapters.ts'
+import { adapterFor, balanceAppliesToRoute, isDeepSeekProviderRoute, providerErrorMessage } from '../core/adapters.ts'
 import type { BalanceParse, PlanParse } from '../core/adapters.ts'
 import { foldAliasRoutes } from '../core/provider-routes.ts'
 import { deepseekModelSpend } from '../core/pricing.ts'
@@ -202,7 +202,16 @@ export class UsageService {
         displayName: route.displayName || adapter?.displayName || route.id,
         credential: snapshot?.credential ?? 'none',
         supported: adapter !== undefined && (adapter.balance !== undefined || adapter.plan !== undefined),
-        ...(adapter?.balance !== undefined ? { balanceSupported: true } : {}),
+        // A balance endpoint that belongs to another origin does not report
+        // THIS route's account: it is supported by the adapter but not
+        // applicable here, and the UI renders it as unsupported rather than
+        // showing the other account's number (issue #1688).
+        ...(adapter?.balance !== undefined && balanceAppliesToRoute(adapter, this.piAiProfile(route.id)?.baseURL)
+          ? { balanceSupported: true }
+          : {}),
+        ...(adapter?.balance !== undefined && !balanceAppliesToRoute(adapter, this.piAiProfile(route.id)?.baseURL)
+          ? { balanceSupported: false }
+          : {}),
         ...(adapter?.plan !== undefined ? { planSupported: true } : {}),
         ...(snapshot?.balance !== undefined ? { balance: snapshot.balance } : {}),
         ...(snapshot?.plan !== undefined ? { plan: snapshot.plan } : {}),
@@ -573,6 +582,12 @@ export class UsageService {
   private async probeRoute(route: ProviderRoute, adapter: NonNullable<ReturnType<typeof adapterFor>>): Promise<void> {
     const credential = await this.resolveCredential(route.id)
     const previous = this.snapshots.get(route.id)
+    // The balance endpoint is per ORIGIN, not per route key: a profile that
+    // points a shared route id (`deepseek`) at another host is a different
+    // account, and probing the official endpoint would print this account's
+    // money under that route's name (issue #1688). Such a route reports the
+    // balance as unsupported instead.
+    const balanceApplies = balanceAppliesToRoute(adapter, this.piAiProfile(route.id)?.baseURL)
     if (credential.key === undefined) {
       // Nothing to probe with (oauth grant, no credential): retained facts
       // would never refresh again, so the row resets to its credential
@@ -591,11 +606,13 @@ export class UsageService {
       displayName: route.displayName || adapter.displayName,
       credential: credential.kind,
       supported: true,
+      ...(adapter.balance !== undefined && !balanceApplies ? { balanceSupported: false } : {}),
       updatedAt: Date.now(),
     }
     const runProbe = async (kind: 'balance' | 'plan'): Promise<BalanceView | PlanView | undefined> => {
       const half = adapter[kind]
       if (half === undefined) return undefined
+      if (kind === 'balance' && !balanceApplies) return undefined
       try {
         const spec = half.build({ apiKey: credential.key as string, ...(credential.accountId !== undefined ? { accountId: credential.accountId } : {}) })
         const response = await fetch(spec.url, withIdentityEncoding({