@kenz1117/dsh-ui-usage-billing 1.6.5 → 1.6.6

package/lib/index.js

@@ -3548,7 +3548,7 @@ function isFormatUnsupportedError(error) {
 * @returns the aggregator holding the per-session fold cache.
 */
 function createUsageAggregator(persistence, options = {}) {
-	const subscriptionMatcher = options.subscriptionProviders === void 0 ? new Set(DEFAULT_SUBSCRIPTION_PROVIDERS) : new Set(options.subscriptionProviders);
+	const subscriptionMatcher = options.subscriptionMatcher ?? (options.subscriptionProviders === void 0 ? new Set(DEFAULT_SUBSCRIPTION_PROVIDERS) : new Set(options.subscriptionProviders));
 	const officialProviderIds = options.officialProviderIds === void 0 ? void 0 : new Set(options.officialProviderIds);
 	const routeAliases = options.routeAliases ?? {};
 	const maxCacheSessions = options.maxCacheSessions ?? 400;
@@ -6406,10 +6406,34 @@ function minmaxDisplayName(provider) {
 /** MiniMax Token Plan / Coding Plan 的 key 判别：普通按量 API key 以 `sk-` 开头，
 *  Token Plan（订阅套餐）key 以 `sk-cp-` 开头。据此区分一个 key 是订阅还是按量，
 *  供查询失败时给出「key 类型 / region」定向提示，避免把按量 key 误当 token-plan
-*  查询后只剩一句笼统的「响应异常」。 */
+*  查询后只剩一句笼统的「响应异常」；也是聚合层订阅豁免的判定依据（同一路由 id
+*  按量/套餐两用，豁免只能按 key）。 */
 function isMiniMaxTokenPlanKey(apiKey) {
 	return apiKey.startsWith("sk-cp-");
 }
+/** MiniMax 系路由 id（官方目录 minimax / minimax-cn 与本插件早期命名 minimax-token-plan[-cn]）。 */
+function isMiniMaxProviderId(providerId) {
+	return /^minimax(?:-cn|-token-plan|-token-plan-cn)?$/i.test(providerId);
+}
+/**
+* 逐路由判定 MiniMax 系路由是否 Coding Plan：按该路由自己的 key（显式 apiKeyEnv
+* 优先，缺省按路由约定 ref）解析后看 `sk-cp-` 前缀。同一路由 id（如官方目录的
+* minimax-cn）按量用户与套餐用户两用，订阅豁免不能按路由 id 一刀切——此前聚合
+* 层默认集合干脆不含 minimax，套餐用户的用量被无条件按量计费。解析不出 key
+* 的路由判为 false（保守：不豁免）。导出供测试：无文件 I/O。
+* @param providers - llm-pi-ai providers 视图。
+* @param resolveRef - 凭据 seam：ref 名 → 非空 key 值。
+* @returns MiniMax 系路由 id → 是否 Coding Plan。
+*/
+async function classifyMiniMaxPlanRoutes(providers, resolveRef) {
+	const out = /* @__PURE__ */ new Map();
+	for (const [route, view] of Object.entries(providers)) {
+		if (!isMiniMaxProviderId(route)) continue;
+		const hit = await firstResolvedRef([...typeof view?.apiKeyEnv === "string" && view.apiKeyEnv !== "" ? [view.apiKeyEnv] : [], ...routeKeyRefCandidates(route)], resolveRef);
+		out.set(route, hit !== void 0 && isMiniMaxTokenPlanKey(hit.value));
+	}
+	return out;
+}
 /** 构造 MiniMax Token Plan 查询端点：避免 base 已含 `/v1` 时拼出 `/v1/v1/...`。 */
 function miniMaxEndpoint(base) {
 	const trimmed = base.replace(/\/+$/, "");
@@ -8077,8 +8101,19 @@ function apply(ctx, config = {}) {
 		}
 		return ids;
 	};
+	const subscriptionRoutes = new Set(config.subscriptionProviders ?? DEFAULT_SUBSCRIPTION_PROVIDERS);
+	const explicitSubscriptionRoutes = new Set(config.subscriptionProviders ?? []);
+	const refreshMiniMaxPlanRoutes = async () => {
+		try {
+			const classified = await classifyMiniMaxPlanRoutes(await readPiAiProviders(ctx.settings), refResolver(ctx.credentials));
+			for (const [route, isPlan] of classified) if (isPlan) subscriptionRoutes.add(route);
+			else if (!explicitSubscriptionRoutes.has(route)) subscriptionRoutes.delete(route);
+		} catch (error) {
+			swallowed("minimax-plan-classify-failed", error);
+		}
+	};
 	const aggregator = createUsageAggregator(adaptSessionPersistence(ctx.sessionPersistence), {
-		...config.subscriptionProviders === void 0 ? {} : { subscriptionProviders: config.subscriptionProviders },
+		subscriptionMatcher: subscriptionRoutes,
 		...config.routeAliases === void 0 ? {} : { routeAliases: config.routeAliases },
 		resolveRoutes: () => readPiAiProviderRoutes(ctx.settings),
 		resolveRegisteredProviders: registeredProvidersOf,
@@ -8087,6 +8122,7 @@ function apply(ctx, config = {}) {
 		...config.searchCallEstimateCny === void 0 ? {} : { searchCallEstimateCny: config.searchCallEstimateCny },
 		ledger: ledgerStore
 	});
+	refreshMiniMaxPlanRoutes();
 	ctx.effect(() => () => {
 		aggregator.flush();
 	}, "usage-billing: ledger flush on dispose");
@@ -8434,6 +8470,7 @@ function apply(ctx, config = {}) {
 		quotas: []
 	};
 	const refreshQuotas = async () => {
+		await refreshMiniMaxPlanRoutes();
 		const { keys, identified } = await resolveSubscriptionKeys(ctx.settings, ctx.credentials);
 		const piProviders = await readPiAiProviders(ctx.settings);
 		const rows = [...await collectSubscriptions(keys, identified.filter((item) => item.adapter).map((item) => {

package/lib/types/aggregate.d.ts

@@ -132,6 +132,13 @@ export declare function sumSiteBuckets(bySite: Readonly<Record<string, {
 export interface AggregateOptions {
     /** 订阅制 provider id 列表；缺省按订阅卡同款 id 判定（`isSubscriptionProviderId`）。 */
     subscriptionProviders?: readonly string[];
+    /**
+     * 订阅判定集合（**引用语义**，优先于 subscriptionProviders）：聚合器直接持有
+     * 传入的 Set 实例，调用方可在运行期原地增删——同一路由 id 按量/套餐两用的
+     * 厂商（MiniMax：`sk-cp-` 前缀 key 才是 Coding Plan）只能按 key 动态判定；
+     * 集合内容变化经 configFingerprint（按内容序列化）自动触发历史行全量重折。
+     */
+    subscriptionMatcher?: ReadonlySet<string>;
     /** 官方渠道 provider id 列表；缺省按 {@link officialChannelOf} 判定（通道 origin 优先）。 */
     officialProviderIds?: readonly string[];
     /**

package/lib/types/client/live-cost.d.ts

@@ -1,12 +1,15 @@
 /**
- * LiveCostBar: the session-scope cost ticker mounted on the composer's dock,
+ * LiveCostBar: the session-scope cost ticker mounted beside the composer,
  * showing the current session's accumulated spend and the latest turn's cost.
  *
- * It rides `conversation.composer.dock` (the stats-line family seat under the
- * composer card, same posture as ui-conversation's own StatsLine), so it stays
- * visible while working without opening the full dashboard. Data comes from the
- * same `/api/billing/usage-stats` endpoint the dashboard polls; the bar reads
- * the current session id from the session-scope standard kit and matches
+ * It is registered on two host seats and renders in exactly one of them per the
+ * position preference: `conversation.composer.dock` (the stats-line family seat
+ * under the composer card, same posture as ui-conversation's own StatsLine) for
+ * 「下方」, and `conversation.input.dock` (the full-width seat above the composer
+ * card, where the host's todo panel and queue dock live) for 「上方」. Either way
+ * it stays visible while working without opening the full dashboard. Data comes
+ * from the same `/api/billing/usage-stats` endpoint the dashboard polls; the bar
+ * reads the current session id from the session-scope standard kit and matches
  * `bySession` (session total) and `byTurn` (latest turn cost). Rendering is a
  * pure function of props and polled data, never a side effect.
  *
@@ -16,6 +19,7 @@
  * visible without opening the dashboard.
  */
 import type { SessionId } from '@deepseek-ai/dsh-session/types';
+import type { LiveCostBarPrefs } from './usage-billing-settings.ts';
 import type { UsageBillingKey } from './locales.ts';
 /** The usage-stats shape the composer bar needs (a thin slice, not the whole doc). */
 export interface LiveStats {
@@ -85,18 +89,48 @@ export declare function lowQuotaChips(quotas: readonly QuotaSlice[], threshold?:
  * @returns 该会话最近一轮的归因模型键；无轮次或轮行未带模型时 undefined。
  */
 export declare function sessionModelOf(stats: LiveStats | null, sessionId: string | undefined): string | undefined;
-/** Props: the framework's session identity plus the owning dock's locale seat. */
+/** 胶囊位置偏好（设置 Tab 三选）。 */
+type CapsulePosition = LiveCostBarPrefs['position'];
+/** 胶囊条的宿主座位：above=input.dock（卡片上方）；below=composer.dock（卡片下方）。 */
+export type CapsuleSeat = Exclude<CapsulePosition, 'toolbar'>;
+/**
+ * 宿主 SessionSnapshot 里决定 hero（空白新会话）态的字段薄切片。input.dock 座位
+ * 的 owner 快照（InputZone.session）按此结构读取。
+ */
+export interface SessionPhaseSlice {
+    readonly blank: boolean;
+    readonly running: boolean;
+    readonly promptAttempted: boolean;
+    readonly awaitingFirstTurn: boolean;
+}
+/**
+ * 会话是否处于宿主的 hero（空白）阶段：复刻 ui-conversation `conversationPhase`
+ * 的 blank 分支——无正在运行的轮次、用户尚未尝试提交、且会话仍空白或等待首轮。
+ * 宿主在 hero 态不渲染 composer.dock（输入框下方座位），但 input.dock 会渲染；
+ * 「上方」座位借此与「下方」保持同样的显隐语义，空白会话页不浮一只空壳药丸。
+ * 导出供测试：纯函数。
+ * @param session - 会话快照薄切片。
+ */
+export declare function isBlankPhase(session: SessionPhaseSlice): boolean;
+/** Props: the framework's session identity plus the owning seat's locale and identity. */
 export interface LiveCostBarProps {
     /** Current Session identity supplied by the session-scope standard kit. */
     sessionId: SessionId;
-    /** The owning dock's locale seat (bound to the billing NS). */
+    /** The owning seat's locale seat (bound to the billing NS). */
     t: (key: UsageBillingKey) => string;
+    /** Which host seat this instance occupies; it renders only when the position pref matches. */
+    seat: CapsuleSeat;
+    /** Owner snapshot the input.dock seat receives (InputZone.session); absent on composer.dock. */
+    session?: SessionPhaseSlice;
 }
 /**
- * Render the live cost ticker for the current session.
- * @param props - framework session identity and locale.
+ * Render the live cost ticker for the current session in one host seat.
+ * @param props - framework session identity, locale, the seat occupied, and
+ * (input.dock only) the owner session snapshot.
  */
-export declare function LiveCostBar({ sessionId, t }: LiveCostBarProps): React.ReactNode;
+export declare function LiveCostBar({ sessionId, t, seat, session }: LiveCostBarProps): React.ReactNode;
+/** Props of the tool-row chip: session identity and locale only (its seat is fixed to input.right). */
+export type LiveCostChipProps = Pick<LiveCostBarProps, 'sessionId' | 't'>;
 /**
  * Render the compact inline chip for the composer tool row (position
  * 「模型选择前」). Occupies a fixed minimal footprint — tier glyph + session
@@ -106,5 +140,6 @@ export declare function LiveCostBar({ sessionId, t }: LiveCostBarProps): React.R
  * amber/red instead of growing it.
  * @param props - framework session identity and locale.
  */
-export declare function LiveCostChip({ sessionId, t }: LiveCostBarProps): React.ReactNode;
+export declare function LiveCostChip({ sessionId, t }: LiveCostChipProps): React.ReactNode;
+export {};
 //# sourceMappingURL=live-cost.d.ts.map

package/lib/types/client/usage-billing-settings.d.ts

@@ -98,7 +98,7 @@ export declare function saveSiteListPrefs(prefs: SiteListPrefs): void;
 export interface LiveCostBarPrefs {
     /** 是否显示输入框下方的即时代费条胶囊（默认 true：保持历史行为）。 */
     show: boolean;
-    /** 胶囊位置：toolbar = 输入框内部工具行内联 chip（默认，issue #47）；below = 输入框下方；above = 输入框上方。 */
+    /** 胶囊位置：toolbar = 输入框内部工具行内联 chip（默认，issue #47）；below = 输入框下方（宿主 composer.dock 座位）；above = 输入框上方（宿主 input.dock 座位，issue #101）。 */
     position: 'below' | 'above' | 'toolbar';
 }
 /** 默认即时代费条偏好：显示在输入框内部（工具行内联 chip，issue #47 反馈「上方/下方」都打断输入视线）。 */

package/lib/types/subscriptions.d.ts

@@ -102,6 +102,25 @@ export declare function identifySubscriptionPlans(providers: Record<string, Subs
  * @returns 窗口列表;无可用窗口时为空数组。
  */
 export declare function parseMiniMaxRemains(body: unknown): SubscriptionWindow[];
+/** MiniMax Token Plan / Coding Plan 的 key 判别：普通按量 API key 以 `sk-` 开头，
+ *  Token Plan（订阅套餐）key 以 `sk-cp-` 开头。据此区分一个 key 是订阅还是按量，
+ *  供查询失败时给出「key 类型 / region」定向提示，避免把按量 key 误当 token-plan
+ *  查询后只剩一句笼统的「响应异常」；也是聚合层订阅豁免的判定依据（同一路由 id
+ *  按量/套餐两用，豁免只能按 key）。 */
+export declare function isMiniMaxTokenPlanKey(apiKey: string): boolean;
+/** MiniMax 系路由 id（官方目录 minimax / minimax-cn 与本插件早期命名 minimax-token-plan[-cn]）。 */
+export declare function isMiniMaxProviderId(providerId: string): boolean;
+/**
+ * 逐路由判定 MiniMax 系路由是否 Coding Plan：按该路由自己的 key（显式 apiKeyEnv
+ * 优先，缺省按路由约定 ref）解析后看 `sk-cp-` 前缀。同一路由 id（如官方目录的
+ * minimax-cn）按量用户与套餐用户两用，订阅豁免不能按路由 id 一刀切——此前聚合
+ * 层默认集合干脆不含 minimax，套餐用户的用量被无条件按量计费。解析不出 key
+ * 的路由判为 false（保守：不豁免）。导出供测试：无文件 I/O。
+ * @param providers - llm-pi-ai providers 视图。
+ * @param resolveRef - 凭据 seam：ref 名 → 非空 key 值。
+ * @returns MiniMax 系路由 id → 是否 Coding Plan。
+ */
+export declare function classifyMiniMaxPlanRoutes(providers: Readonly<Record<string, SubscriptionRouteConfigView | undefined>>, resolveRef: (name: string) => Promise<string | undefined>): Promise<ReadonlyMap<string, boolean>>;
 /**
  * 解析 OpenRouter `/api/v1/credits` 响应:已用% = total_usage / total_credits。
  * 导出供测试:纯函数。

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@kenz1117/dsh-ui-usage-billing",
   "description": "Usage billing dashboard for DeepSeek Harness: sidebar cost metrics plus a full dashboard modal, priced from a current multi-provider catalog with real usage aggregated from session logs.",
-  "version": "1.6.5",
+  "version": "1.6.6",
   "keywords": [
     "deepseek-harness",
     "deepseek",