@kenz1117/dsh-ui-usage-billing 1.0.26 → 1.0.28

package/lib/index.js

@@ -6,6 +6,7 @@ import { defineTool } from "@deepseek-ai/dsh-tools";
 import { withFileLock, writeFileAtomic } from "@deepseek-ai/dsh-atomic-write";
 import { credentialRef } from "@deepseek-ai/dsh-credentials";
 import z from "@deepseek-ai/schemastery";
+import { SessionLogOffset } from "@deepseek-ai/dsh-session/types";
 import { createHash, createHmac } from "node:crypto";
 //#region lib/types/client/plan-knowledge.js
 /**
@@ -1817,12 +1818,6 @@ function foldUsage(acc, usage, key, subscription, timeMs, official = false) {
 	}
 }
 /**
-* 联网搜索辅助请求的单次费用估算默认值（人民币元）。DeepSeek 官方对搜索请求
-* （web_search 服务端工具注入上下文）照常计费，实测每次约 0.01~0.03 元，取中值；
-* 部署可在插件配置 `searchCallEstimateCny` 覆盖（设 0 关闭估算）。
-*/
-const DEFAULT_SEARCH_CALL_ESTIMATE_CNY = .02;
-/**
 * Fold one auxiliary web-search LLM request (issue #15) into an accumulator.
 * 这类调用绕过对话通道直连官方端点，日志只记请求（无响应/用量事件），token
 * 不可知：按「每次估值」计入费用并单独累计 `searchCalls`，不产生 token 维度。
@@ -2029,26 +2024,22 @@ function turnState(turns, turn) {
 	turns.set(turn, fresh);
 	return fresh;
 }
-/**
-* Fold one session's events into a {@link SessionFold}. 每个 LLM 调用归属到
-* 其 `assistant/message` 自带 `message.source` 记录的模型（agent-loop 落盘时从
-* 当次请求复制，每个调用一条，不依赖稀疏的 request/header）；source 缺失时
-* 兜底到最近一次 request/header 的状态。同时提取最新会话标题、最后活跃时间，
-* 并按轮次折叠每轮费用明细（turn/start → turn/end；调用按 (turn) 归组）。
-* @param events - the session's persisted events in log order.
-* @param subscriptionProviders - provider ids billed through subscription plans.
-* @param officialProviderIds - provider ids treated as the official DeepSeek channel
-*   (default: any `deepseek`-prefixed id). Others count as third-party.
-* @param routes - 当前 provider 路由视图（中转站归组）。
-* @param searchCallEstimateCny - 联网搜索请求的单次费用估算（人民币元；0 关闭估算）。
-* @param seedLength - 持久化的 fork 血缘边界（`SessionHeader.seedLength`，缺省 0）：
-*   fork 子会话日志里 `seq < seedLength` 的事件拷贝自父会话、已在父会话计费，
-*   折叠时跳过以避免重复计费；resume 续写复用同一会话日志（每次续写追加一个
-*   `session/end-seed` 标记）但 header 保持原 fork 值，历史段照常计费。
-* @returns the per-session fold (cached by the incremental aggregator).
-*/
-function foldSession(events, subscriptionProviders, officialProviderIds, routes = {}, searchCallEstimateCny = DEFAULT_SEARCH_CALL_ESTIMATE_CNY, seedLength = 0) {
-	const fold = {
+/** 空白折叠状态机（与全量折叠的初值逐字一致）。 */
+function freshMachine() {
+	return {
+		key: "other",
+		subscription: false,
+		official: false,
+		siteBucket: "unknown",
+		turns: /* @__PURE__ */ new Map(),
+		steps: /* @__PURE__ */ new Map(),
+		lastOpenStepKey: void 0,
+		toolSeen: /* @__PURE__ */ new Set()
+	};
+}
+/** 空白 fold 的统一构造：foldSession 与聚合器的分片/增量路径共用同一字段初值。 */
+function freshFold() {
+	return {
 		total: emptyUsage(),
 		byModel: /* @__PURE__ */ new Map(),
 		byDay: /* @__PURE__ */ new Map(),
@@ -2069,14 +2060,29 @@ function foldSession(events, subscriptionProviders, officialProviderIds, routes
 		},
 		lastActive: 0
 	};
-	let key = "other";
-	let subscription = false;
-	let official = false;
-	let siteBucket = "unknown";
-	const turns = /* @__PURE__ */ new Map();
-	const steps = /* @__PURE__ */ new Map();
-	let lastOpenStepKey;
-	const toolSeen = /* @__PURE__ */ new Set();
+}
+/**
+* 把一批事件折进既有 fold（状态机跨批次延续）。全量折叠、超大会话的分片折叠、
+* 活跃会话的 seq 增量折叠共用同一段循环体，保证三种路径的字段语义逐字一致。
+* @param fold - 累计目标（原地修改）。
+* @param machine - 折叠状态机：进入时为上一批次末态，返回时为本批次末态。
+* @param events - 本批次事件（日志顺序）。
+* @param subscriptionProviders - provider ids billed through subscription plans.
+* @param officialProviderIds - 官方直连 provider 集合（undefined = 按 deepseek 前缀判定）。
+* @param routes - 当前 provider 路由视图（中转站归组）。
+* @param searchCallEstimateCny - 联网搜索请求的单次费用估算（人民币元）。
+* @param seedLength - fork 血缘边界（seq 低于它的事件是父会话种子，跳过）；
+*   来源为存储元数据的 `inheritedEventCount`。
+*/
+function foldInto(fold, machine, events, subscriptionProviders, officialProviderIds, routes, searchCallEstimateCny, seedLength) {
+	let key = machine.key;
+	let subscription = machine.subscription;
+	let official = machine.official;
+	let siteBucket = machine.siteBucket;
+	const turns = machine.turns;
+	const steps = machine.steps;
+	let lastOpenStepKey = machine.lastOpenStepKey;
+	const toolSeen = machine.toolSeen;
 	for (const event of events) {
 		if (seedLength > 0 && typeof event.seq === "number" && Number.isFinite(event.seq) && event.seq < seedLength) continue;
 		fold.lastActive = Math.max(fold.lastActive, event.time);
@@ -2224,7 +2230,15 @@ function foldSession(events, subscriptionProviders, officialProviderIds, routes
 			}
 		}
 	}
-	fold.turns = [...turns.values()].filter((state) => state.input > 0 || state.output > 0).sort((a, b) => a.turn - b.turn).map((state) => ({
+	machine.key = key;
+	machine.subscription = subscription;
+	machine.official = official;
+	machine.siteBucket = siteBucket;
+	machine.lastOpenStepKey = lastOpenStepKey;
+}
+/** 从轮次状态派生 fold.turns（每批次结束后重派生；半开轮次跨批次保留）。 */
+function refreshTurns(fold, machine) {
+	fold.turns = [...machine.turns.values()].filter((state) => state.input > 0 || state.output > 0).sort((a, b) => a.turn - b.turn).map((state) => ({
 		turn: state.turn,
 		model: state.model,
 		input: state.input,
@@ -2235,7 +2249,6 @@ function foldSession(events, subscriptionProviders, officialProviderIds, routes
 		startedAt: state.startedAt === Number.MAX_SAFE_INTEGER ? fold.lastActive : state.startedAt,
 		...state.endedAt === void 0 ? {} : { endedAt: state.endedAt }
 	}));
-	return fold;
 }
 /**
 * 生成一个 step 的性能样本；无效 / 超出 sane 上限（15 分钟）时返回 undefined，
@@ -2315,6 +2328,23 @@ function createUsageAggregator(persistence, options = {}) {
 	/** 每次聚合取最新的 provider 路由视图（中转站零配置发现）；缺省按空处理（全部未知路由）。 */
 	const routesOf = () => options.resolveRoutes?.() ?? {};
 	const searchEstimate = options.searchCallEstimateCny ?? .02;
+	const FOLD_CHUNK_EVENTS = 8e3;
+	/** 把一份（全量或增量）折叠结果登记进 durable ledger；内容无变化时不落盘。 */
+	const recordLedger = (id, cwd, stamp, fold) => {
+		if (options.ledger === void 0) return;
+		const entry = {
+			id,
+			...cwd === void 0 ? {} : { cwd },
+			...stamp === null ? {} : { stamp },
+			foldVersion: 7,
+			fold: serializeFold(fold)
+		};
+		const row = ledger.get(id);
+		if (row === void 0 || row.stamp !== entry.stamp || row.cwd !== entry.cwd || row.foldVersion !== entry.foldVersion || stamp === null && JSON.stringify(row.fold) !== JSON.stringify(entry.fold)) {
+			ledger.set(id, entry);
+			ledgerNeedsSave = true;
+		}
+	};
 	const ensureLedgerLoaded = async () => {
 		if (ledgerLoaded || options.ledger === void 0) return;
 		ledgerLoaded = true;
@@ -2376,34 +2406,77 @@ function createUsageAggregator(persistence, options = {}) {
 				continue;
 			}
 			try {
-				const { events } = await persistence.readFrom(meta.id, 0);
+				const cwd = meta.cwd;
+				const ledgerRow = ledger.get(id);
+				if (ledgerRow !== void 0 && ledgerRow.stamp !== void 0 && stamp !== null && ledgerRow.stamp === stamp && (ledgerRow.foldVersion ?? 1) === 7) {
+					const fold = deserializeFold(ledgerRow.fold);
+					cache.set(id, {
+						stamp,
+						fold
+					});
+					folds.push({
+						id,
+						...cwd === void 0 ? {} : { cwd },
+						fold
+					});
+					included.add(id);
+					continue;
+				}
+				const previous = cache.get(id);
+				if (previous?.machine !== void 0 && previous.lastSeq !== void 0) {
+					const from = previous.lastSeq + 1;
+					const { events, inheritedEventCount } = await persistence.readFrom(meta.id, SessionLogOffset(from));
+					const after = await stampOf(meta);
+					if (stamp !== null && after !== stamp) {
+						cache.delete(id);
+						continue;
+					}
+					const first = events[0]?.seq;
+					if (events.length === 0 || first !== from) {
+						cache.delete(id);
+						continue;
+					}
+					foldInto(previous.fold, previous.machine, events, subscriptionProviders, officialProviderIds, routesOf(), searchEstimate, inheritedEventCount);
+					refreshTurns(previous.fold, previous.machine);
+					previous.lastSeq = events[events.length - 1]?.seq ?? previous.lastSeq;
+					previous.stamp = stamp;
+					cache.delete(id);
+					cache.set(id, previous);
+					folds.push({
+						id,
+						...cwd === void 0 ? {} : { cwd },
+						fold: previous.fold
+					});
+					included.add(id);
+					recordLedger(id, cwd, stamp, previous.fold);
+					continue;
+				}
+				const { events, inheritedEventCount } = await persistence.readFrom(meta.id, SessionLogOffset(0));
 				const after = await stampOf(meta);
 				if (stamp !== null && after !== stamp) continue;
-				const fold = foldSession(events, subscriptionProviders, officialProviderIds, routesOf(), searchEstimate, meta.seedLength ?? 0);
+				const fold = freshFold();
+				const machine = freshMachine();
+				for (let start = 0; start < events.length; start += FOLD_CHUNK_EVENTS) {
+					foldInto(fold, machine, events.slice(start, start + FOLD_CHUNK_EVENTS), subscriptionProviders, officialProviderIds, routesOf(), searchEstimate, inheritedEventCount);
+					if (start + FOLD_CHUNK_EVENTS < events.length) await new Promise((resolve) => {
+						setImmediate(resolve);
+					});
+				}
+				refreshTurns(fold, machine);
+				const last = events[events.length - 1];
 				cache.set(id, {
 					stamp,
-					fold
+					fold,
+					machine,
+					...last !== void 0 && typeof last.seq === "number" ? { lastSeq: last.seq } : {}
 				});
 				folds.push({
 					id,
-					...meta.cwd === void 0 ? {} : { cwd: meta.cwd },
+					...cwd === void 0 ? {} : { cwd },
 					fold
 				});
 				included.add(id);
-				if (options.ledger !== void 0) {
-					const entry = {
-						id,
-						...meta.cwd === void 0 ? {} : { cwd: meta.cwd },
-						...stamp === null ? {} : { stamp },
-						foldVersion: 7,
-						fold: serializeFold(fold)
-					};
-					const previous = ledger.get(id);
-					if (previous === void 0 || previous.stamp !== entry.stamp || previous.cwd !== entry.cwd || previous.foldVersion !== entry.foldVersion || stamp === null && JSON.stringify(previous.fold) !== JSON.stringify(entry.fold)) {
-						ledger.set(id, entry);
-						ledgerNeedsSave = true;
-					}
-				}
+				recordLedger(id, cwd, stamp, fold);
 			} catch (error) {
 				skipped.push(id);
 				console.warn("[usage-billing] skip unreadable session", id, error);

package/lib/types/aggregate.d.ts

@@ -475,10 +475,10 @@ export declare function messageTextLength(message: unknown): number;
  *   (default: any `deepseek`-prefixed id). Others count as third-party.
  * @param routes - 当前 provider 路由视图（中转站归组）。
  * @param searchCallEstimateCny - 联网搜索请求的单次费用估算（人民币元；0 关闭估算）。
- * @param seedLength - 持久化的 fork 血缘边界（`SessionHeader.seedLength`，缺省 0）：
+ * @param seedLength - 持久化的 fork 血缘边界（存储元数据 `inheritedEventCount`，缺省 0）：
  *   fork 子会话日志里 `seq < seedLength` 的事件拷贝自父会话、已在父会话计费，
  *   折叠时跳过以避免重复计费；resume 续写复用同一会话日志（每次续写追加一个
- *   `session/end-seed` 标记）但 header 保持原 fork 值，历史段照常计费。
+ *   `session/end-seed` 标记）但继承切割保持原值，历史段照常计费。
  * @returns the per-session fold (cached by the incremental aggregator).
  */
 export declare function foldSession(events: readonly {

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

@@ -78,4 +78,14 @@ export interface LiveCostBarProps {
  * @param props - framework session identity and locale.
  */
 export declare function LiveCostBar({ sessionId, t }: LiveCostBarProps): React.ReactNode;
+/**
+ * Render the compact inline chip for the composer tool row (position
+ * 「模型选择前」). Occupies a fixed minimal footprint — tier glyph + session
+ * spend — so it never crowds the model picker; the full breakdown (switch
+ * countdown, turn cost, quota alerts) rides the host Tooltip primitive (the
+ * native title never renders in the webview), and a low quota tints the chip
+ * amber/red instead of growing it.
+ * @param props - framework session identity and locale.
+ */
+export declare function LiveCostChip({ sessionId, t }: LiveCostBarProps): React.ReactNode;
 //# sourceMappingURL=live-cost.d.ts.map

package/lib/types/client/locales.d.ts

@@ -1,5 +1,5 @@
 /** Locale dictionaries for the usage billing surface. */
-export type UsageBillingKey = 'title' | 'cost' | 'todayCost' | 'monthCost' | 'yearCost' | 'monthProjected' | 'liveTurn' | 'liveSession' | 'calls' | 'cacheHitRate' | 'tokens' | 'inputTokens' | 'outputTokens' | 'avgCost' | 'trend' | 'trend7d' | 'trend30d' | 'trendMetric' | 'trendMetricCost' | 'trendMetricTokens' | 'trendEmpty' | 'budget' | 'budgetAmount' | 'budgetSummary' | 'sessions' | 'sessionTitle' | 'project' | 'lastActive' | 'sessionOverflow' | 'budgetTierBody' | 'models' | 'providerBilling' | 'actual' | 'pricing' | 'input' | 'output' | 'cacheHit' | 'peak' | 'offPeak' | 'flat' | 'band' | 'close' | 'footer' | 'footerCredit' | 'lastUpdated' | 'noData' | 'todayRate' | 'rateLive' | 'rateBuiltin' | 'promoBadge' | 'promoUntil' | 'promoOpenEnded' | 'pricingTip' | 'pricingUnit' | 'pricingNotes' | 'ubPeak' | 'ubOff' | 'ubStd' | 'peakBand' | 'pricingSource' | 'noteCache' | 'noteBand' | 'noteSource' | 'balance' | 'balanceUnconfigured' | 'balanceUnauthorized' | 'balanceUnreachable' | 'uncatalogued' | 'estimatedPricing' | 'balanceDays' | 'balanceLowBody' | 'reconcileDrift' | 'reconcileDismiss' | 'subscriptionNotConfigured' | 'subscriptionUnauthorized' | 'subscriptionUnavailable' | 'subscriptionInvalid' | 'subscriptionRateLimited' | 'subscriptionSession' | 'subscriptionWeekly' | 'subscriptionMonthly' | 'subscriptionBilling' | 'subscriptionRemaining' | 'subscriptionExhausted' | 'subscriptionReset' | 'subscriptionNoApi' | 'floatWindow' | 'floatModeCombined' | 'floatModeSubscription' | 'floatMode' | 'floatTargets' | 'floatWindowHint' | 'floatNoTargets' | 'floatNoTargetsHint' | 'cardDisplay' | 'cardDisplayHint' | 'cardMetric' | 'cardMetricMoney' | 'cardMetricTokens' | 'triggerMonthTokens' | 'subscriptionsStale' | 'staleLedgerNotice' | 'tokenCacheWrite' | 'toolRank' | 'toolName' | 'userPrices' | 'userPricesHint' | 'userPriceSave' | 'userPriceModel' | 'userPriceSource' | 'userPriceSourceHint' | 'userPriceOffPeak' | 'userPriceCurrency' | 'userPriceAdd' | 'userPriceRemove' | 'sessionStaleBadge' | 'heatmapLess' | 'heatmapMore' | 'currency' | 'currencyCny' | 'currencyUsd' | 'heatmap' | 'rounds' | 'roundsHint' | 'anomaly' | 'workspaces' | 'workspacesHint' | 'model' | 'thModel' | 'thInputMiss' | 'thInputHit' | 'costAbbr' | 'tabOverview' | 'tabTrends' | 'tabProviders' | 'tabPricing' | 'tabSettings' | 'budgetHint' | 'peakAlertHint' | 'peakAlertDescPeak' | 'peakAlertDescOff' | 'export' | 'exportCsvDay' | 'exportCsvSession' | 'exportJson' | 'peakShare' | 'peakSharePerCall' | 'offPeakSavings' | 'perfMax' | 'weekCost' | 'roleCost' | 'roleUser' | 'roleAssistant' | 'roleTool' | 'roleHint' | 'tierPeak' | 'tierOff' | 'tierToPeak' | 'tierToOff' | 'tierAlertEnterPeak' | 'tierAlertEnterOff' | 'peakAlertTitlePeak' | 'peakAlertTitleOff' | 'peakAlert' | 'peakAlertLeadMin' | 'peakAlertPos' | 'peakAlertMode' | 'peakAlertPosCorner' | 'peakAlertPosCenter' | 'peakAlertModePeak' | 'peakAlertModeOff' | 'peakAlertModeBoth' | 'peakAlertWebNotify' | 'peakAlertPreview' | 'planTypeCode' | 'planTypeToken' | 'subscriptionFeePerMonth' | 'triggerToday' | 'triggerMonth' | 'subscriptionIncluded' | 'free' | 'official' | 'thirdParty' | 'perfSamples' | 'perfTtft' | 'perfP50' | 'perfP90' | 'perfTps' | 'perfLatency' | 'perfEstimated' | 'perfEmpty' | 'perfTpsUnit' | 'perfTitle' | 'perfHint' | 'perfAll' | 'perfChartEmpty' | 'heatmapYear' | 'heatmapMonth' | 'activeDays' | 'streakDays' | 'subscriptionAutoDetect' | 'pluginVersion' | 'pluginAuthor' | 'pluginRepository' | 'pluginNpm' | 'pluginLicense' | 'tabToken' | 'tokenExport' | 'tokenExportCsv' | 'tokenCacheHitRate' | 'tokenReasoningShare' | 'tokenReasoningShort' | 'tokenIo' | 'tokenPeak' | 'tokenDaily' | 'tokenByModel' | 'tokenMiss' | 'tokenHit' | 'tokenOutput' | 'tokenViewStructure' | 'tokenViewModel' | 'tokenHitShort' | 'tokenMissShort' | 'tokenTotal' | 'tokenShare' | 'usageStatsTool' | 'usageStatsToolHint' | 'balanceGranted' | 'balanceTopped' | 'balanceDaily' | 'balanceDaysLong' | 'balanceDaysUnit' | 'popTodayModel' | 'popNoConsumption' | 'popTitle' | 'popDirectLead' | 'popSubLead' | 'unpricedHint' | 'searchEstimateHint' | 'siteListDisplay' | 'siteListDisplayHint' | 'liveCostBar' | 'liveCostBarHint' | 'exportCsvSite' | 'panelRelayQuota' | 'relayBalance' | 'relayNoQuota' | 'relayWindowUsed' | 'relayKindNewApi' | 'relayKindSub2Api' | 'relayKindUnknown';
+export type UsageBillingKey = 'title' | 'cost' | 'todayCost' | 'monthCost' | 'yearCost' | 'monthProjected' | 'liveTurn' | 'liveSession' | 'calls' | 'cacheHitRate' | 'tokens' | 'inputTokens' | 'outputTokens' | 'avgCost' | 'trend' | 'trend7d' | 'trend30d' | 'trendMetric' | 'trendMetricCost' | 'trendMetricTokens' | 'trendEmpty' | 'budget' | 'budgetAmount' | 'budgetSummary' | 'sessions' | 'sessionTitle' | 'project' | 'lastActive' | 'sessionOverflow' | 'budgetTierBody' | 'models' | 'providerBilling' | 'actual' | 'pricing' | 'input' | 'output' | 'cacheHit' | 'peak' | 'offPeak' | 'flat' | 'band' | 'close' | 'footer' | 'footerCredit' | 'lastUpdated' | 'noData' | 'todayRate' | 'rateLive' | 'rateBuiltin' | 'promoBadge' | 'promoUntil' | 'promoOpenEnded' | 'pricingTip' | 'pricingUnit' | 'pricingNotes' | 'ubPeak' | 'ubOff' | 'ubStd' | 'peakBand' | 'pricingSource' | 'noteCache' | 'noteBand' | 'noteSource' | 'balance' | 'balanceUnconfigured' | 'balanceUnauthorized' | 'balanceUnreachable' | 'uncatalogued' | 'estimatedPricing' | 'balanceDays' | 'balanceLowBody' | 'reconcileDrift' | 'reconcileDismiss' | 'subscriptionNotConfigured' | 'subscriptionUnauthorized' | 'subscriptionUnavailable' | 'subscriptionInvalid' | 'subscriptionRateLimited' | 'subscriptionSession' | 'subscriptionWeekly' | 'subscriptionMonthly' | 'subscriptionBilling' | 'subscriptionRemaining' | 'subscriptionExhausted' | 'subscriptionReset' | 'subscriptionNoApi' | 'floatWindow' | 'floatModeCombined' | 'floatModeSubscription' | 'floatMode' | 'floatTargets' | 'floatWindowHint' | 'floatNoTargets' | 'floatNoTargetsHint' | 'cardDisplay' | 'cardDisplayHint' | 'cardMetric' | 'cardMetricMoney' | 'cardMetricTokens' | 'triggerMonthTokens' | 'subscriptionsStale' | 'staleLedgerNotice' | 'tokenCacheWrite' | 'toolRank' | 'toolName' | 'userPrices' | 'userPricesHint' | 'userPriceSave' | 'userPriceModel' | 'userPriceSource' | 'userPriceSourceHint' | 'userPriceOffPeak' | 'userPriceNormal' | 'userPriceCurrency' | 'userPriceAdd' | 'userPriceRemoveSelected' | 'userPriceSelect' | 'sessionStaleBadge' | 'heatmapLess' | 'heatmapMore' | 'currency' | 'currencyCny' | 'currencyUsd' | 'heatmap' | 'rounds' | 'roundsHint' | 'anomaly' | 'workspaces' | 'workspacesHint' | 'model' | 'thModel' | 'thInputMiss' | 'thInputHit' | 'costAbbr' | 'tabOverview' | 'tabTrends' | 'tabProviders' | 'tabPricing' | 'tabSettings' | 'budgetHint' | 'peakAlertHint' | 'peakAlertDescPeak' | 'peakAlertDescOff' | 'export' | 'exportCsvDay' | 'exportCsvSession' | 'exportJson' | 'peakShare' | 'peakSharePerCall' | 'offPeakSavings' | 'perfMax' | 'weekCost' | 'roleCost' | 'roleUser' | 'roleAssistant' | 'roleTool' | 'roleHint' | 'tierPeak' | 'tierOff' | 'tierToPeak' | 'tierToOff' | 'tierAlertEnterPeak' | 'tierAlertEnterOff' | 'peakAlertTitlePeak' | 'peakAlertTitleOff' | 'peakAlert' | 'peakAlertLeadMin' | 'peakAlertPos' | 'peakAlertMode' | 'peakAlertPosCorner' | 'peakAlertPosCenter' | 'peakAlertModePeak' | 'peakAlertModeOff' | 'peakAlertModeBoth' | 'peakAlertWebNotify' | 'peakAlertPreview' | 'planTypeCode' | 'planTypeToken' | 'subscriptionFeePerMonth' | 'triggerToday' | 'triggerMonth' | 'subscriptionIncluded' | 'free' | 'official' | 'thirdParty' | 'perfSamples' | 'perfTtft' | 'perfP50' | 'perfP90' | 'perfTps' | 'perfLatency' | 'perfEstimated' | 'perfEmpty' | 'perfTpsUnit' | 'perfTitle' | 'perfHint' | 'perfAll' | 'perfChartEmpty' | 'heatmapYear' | 'heatmapMonth' | 'activeDays' | 'streakDays' | 'subscriptionAutoDetect' | 'pluginVersion' | 'pluginAuthor' | 'pluginRepository' | 'pluginNpm' | 'pluginLicense' | 'tabToken' | 'tokenExport' | 'tokenExportCsv' | 'tokenCacheHitRate' | 'tokenReasoningShare' | 'tokenReasoningShort' | 'tokenIo' | 'tokenPeak' | 'tokenDaily' | 'tokenByModel' | 'tokenMiss' | 'tokenHit' | 'tokenOutput' | 'tokenViewStructure' | 'tokenViewModel' | 'tokenHitShort' | 'tokenMissShort' | 'tokenTotal' | 'tokenShare' | 'usageStatsTool' | 'usageStatsToolHint' | 'balanceGranted' | 'balanceTopped' | 'balanceDaily' | 'balanceDaysLong' | 'balanceDaysUnit' | 'popTodayModel' | 'popNoConsumption' | 'popTitle' | 'popDirectLead' | 'popSubLead' | 'unpricedHint' | 'searchEstimateHint' | 'siteListDisplay' | 'siteListDisplayHint' | 'liveCostBar' | 'liveCostBarHint' | 'liveCostBarPosition' | 'liveCostBarPosBelow' | 'liveCostBarPosAbove' | 'liveCostBarPosToolbar' | 'exportCsvSite' | 'panelRelayQuota' | 'relayBalance' | 'relayNoQuota' | 'relayWindowUsed' | 'relayKindNewApi' | 'relayKindSub2Api' | 'relayKindUnknown';
 export declare const NS = "usageBilling";
 export declare const zh: Record<UsageBillingKey, string>;
 export declare const en: Record<UsageBillingKey, string>;

package/lib/types/client/pricing.d.ts

@@ -165,9 +165,15 @@ export declare function isPeakHour(beijingHour: number): boolean;
  */
 export declare function tierAt(timeMs: number | null | undefined): PriceTierId;
 /**
- * 当前峰谷档位与距下次切换的时长。导出供测试：纯函数。
+ * 当前峰谷档位与距下一切换的时长。导出供测试：纯函数。
+ *
+ * 下一切换点统一定义为档位真正变化的最近边界：自当前时刻起逐天扫描工作日的
+ * 09:00 / 12:00 / 14:00 / 18:00，候选时刻的档位由 {@link tierAt} 判定——
+ * 周末（周六/周日）北京全天低谷、没有边界，扫描自然跳过；工作日深夜跨周末
+ * 时落到周一 09:00 而非周末伪边界（issue #33）。
+ * 最坏情形（周五 18:00 后 → 周一 09:00）约 63h，7 天窗口必然覆盖。
  * @param nowMs - 当前时刻（epoch 毫秒）。
- * @returns 当前档位与到下一个切换边界的毫秒数。
+ * @returns 当前档位与到下一切换边界的毫秒数。
  */
 export declare function tierCountdown(nowMs: number): {
     tier: PriceTierId;

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

@@ -82,8 +82,10 @@ export declare function saveSiteListPrefs(prefs: SiteListPrefs): void;
 export interface LiveCostBarPrefs {
     /** 是否显示输入框下方的即时代费条胶囊（默认 true：保持历史行为）。 */
     show: boolean;
+    /** 胶囊位置：below = 输入框下方（默认）；above = 输入框上方；toolbar = 工具行模型选择前的内联 chip。 */
+    position: 'below' | 'above' | 'toolbar';
 }
-/** 默认即时代费条偏好：显示（升级用户零感知）。 */
+/** 默认即时代费条偏好：显示在输入框下方（升级用户零感知）。 */
 export declare const DEFAULT_LIVE_COST_BAR_PREFS: LiveCostBarPrefs;
 /** localStorage key（与其他 `dsh.ui-usage-billing.*` 偏好同命名空间）。 */
 export declare const LIVE_COST_BAR_STORAGE_KEY = "dsh.ui-usage-billing.livecost";

package/lib/types/index.d.ts

@@ -12,7 +12,7 @@
 import type { IncomingMessage, ServerResponse } from 'node:http';
 import type { Context } from '@deepseek-ai/cordis';
 import type { CredentialProvider } from '@deepseek-ai/dsh-credentials';
-import { type SettingsProvider } from '@deepseek-ai/dsh-settings';
+import type { SettingsProvider } from '@deepseek-ai/dsh-settings';
 import { type UsageLedgerStore } from './aggregate.ts';
 import type { CustomBalanceConfig, DeclaredEndpointConfig, SubscriptionPlanConfig } from './pricing-shared.ts';
 import { type IdentifiedSubscriptionPlan, type SubscriptionKeys } from './subscriptions.ts';

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.0.26",
+  "version": "1.0.28",
   "keywords": [
     "deepseek-harness",
     "deepseek",
@@ -63,6 +63,12 @@
       }
     }
   },
+  "scripts": {
+    "build": "tsc -b tsconfig.json && tsdown",
+    "bundle": "tsdown",
+    "watch": "tsdown --watch",
+    "test": "vitest run"
+  },
   "license": "MIT",
   "engines": {
     "node": "^22.19.0 || >=24.0.0"
@@ -96,6 +102,7 @@
     "@deepseek-ai/cordis": "*",
     "@deepseek-ai/cordis-plugin-include": "^1.0.7",
     "@deepseek-ai/cordis-plugin-loader": "^1.0.3",
+    "@deepseek-ai/dsh-api-gateway": "0.1.2-rc.1",
     "@deepseek-ai/dsh-api-remotes": "0.1.2-rc.1",
     "@deepseek-ai/dsh-api-session-controller": "0.1.2-rc.1",
     "@deepseek-ai/dsh-atomic-write": "0.1.2-rc.1",
@@ -103,6 +110,8 @@
     "@deepseek-ai/dsh-client-store": "0.1.2-rc.1",
     "@deepseek-ai/dsh-client-ui-conversation": "0.1.2-rc.1",
     "@deepseek-ai/dsh-client-ui-primitives": "0.1.2-rc.1",
+    "@deepseek-ai/dsh-client-ui-renderer": "0.1.2-rc.1",
+    "@deepseek-ai/dsh-client-ui-sidebar": "0.1.2-rc.1",
     "@deepseek-ai/dsh-client-ui-slots": "0.1.2-rc.1",
     "@deepseek-ai/dsh-credentials": "0.1.2-rc.1",
     "@deepseek-ai/dsh-host-webserver": "0.1.2-rc.1",
@@ -113,6 +122,7 @@
     "@deepseek-ai/dsh-session-persistence": "0.1.2-rc.1",
     "@deepseek-ai/dsh-settings": "0.1.2-rc.1",
     "@deepseek-ai/dsh-tools": "0.1.2-rc.1",
+    "@deepseek-ai/dsh-typert-protocol": "0.1.2-rc.1",
     "@deepseek-ai/schemastery": "^3.18.2",
     "@testing-library/dom": "^10.4.1",
     "@testing-library/react": "^16.1.0",
@@ -124,6 +134,7 @@
     "react-dom": "^18.2.0",
     "semver": "^7.7.2",
     "tsdown": "^0.22.2",
+    "typescript": "^6.0.3",
     "use-sync-external-store": "1.2.0",
     "vitest": "^4.1.8"
   },
@@ -133,10 +144,5 @@
     "lib/client.js",
     "lib/types/**/*.d.ts",
     "cordis.patch.yml"
-  ],
-  "scripts": {
-    "bundle": "tsdown",
-    "watch": "tsdown --watch",
-    "test": "vitest run"
-  }
-}
+  ]
+}