@kenz1117/dsh-ui-usage-billing 1.4.22 → 1.4.24

package/lib/index.js

@@ -2,12 +2,12 @@ import { createRequire } from "node:module";
 import { lstat, mkdir, readFile, rm, stat } from "node:fs/promises";
 import { homedir } from "node:os";
 import { dirname, join } from "node:path";
-import { SessionLogOffset } from "@deepseek-ai/dsh-session/types";
 import { defineTool } from "@deepseek-ai/dsh-tools";
 import { withFileLock, writeFileAtomic } from "@deepseek-ai/dsh-atomic-write";
 import { credentialRef } from "@deepseek-ai/dsh-credentials";
 import { resolveDshHome } from "@deepseek-ai/dsh-home-paths";
 import z from "@deepseek-ai/schemastery";
+import * as sessionTypes from "@deepseek-ai/dsh-session/types";
 import { createHash, createHmac } from "node:crypto";
 //#region lib/types/client/plan-knowledge.js
 /**
@@ -585,15 +585,15 @@ function isPriced(key) {
 	return FALLBACK_RATES.some((rate) => rate.key.toLowerCase() === resolved.toLowerCase());
 }
 /**
-* 促销在 nowMs 是否生效：factor 必须落在 (0,1) 区间，截止时刻及之后视为过期；
-* endsAtMs 缺省表示长期活动，在 factor 合法期间持续生效。
+* 促销在 nowMs 是否生效：factor 必须落在 [0,1) 区间（0 = 活动期免费，issue #86），
+* 截止时刻及之后视为过期；endsAtMs 缺省表示长期活动，在 factor 合法期间持续生效。
 * 导出供测试：纯函数。
 * @param promo - 待判定的促销窗口。
 * @param nowMs - 判定时刻（epoch ms）。
 */
 function isPromoActive(promo, nowMs) {
 	const expired = promo.endsAtMs !== void 0 && nowMs >= promo.endsAtMs;
-	return Number.isFinite(nowMs) && !expired && promo.factor > 0 && promo.factor < 1;
+	return Number.isFinite(nowMs) && !expired && promo.factor >= 0 && promo.factor < 1;
 }
 /**
 * 把限时促销折入条目单价：生效期内返回 price 主档与 offPeak 逐档乘折扣系数的
@@ -606,7 +606,10 @@ function isPromoActive(promo, nowMs) {
 function applyPromo(entry, nowMs) {
 	const { promo } = entry;
 	if (promo === void 0 || !isPromoActive(promo, nowMs)) return entry;
-	const factorOf = (field) => promo.factors?.[field] ?? promo.factor;
+	const factorOf = (field) => {
+		const perBand = promo.factors?.[field];
+		return perBand !== void 0 && perBand >= 0 && perBand < 1 ? perBand : promo.factor;
+	};
 	const scaled = (band) => ({
 		input: band.input * factorOf("input"),
 		cacheHit: band.cacheHit * factorOf("cacheHit"),
@@ -1308,6 +1311,59 @@ const BUILTIN_MODEL_CATALOG = [
 			output: 16.8
 		}
 	},
+	{
+		key: "minimax-m3.1-flash-preview",
+		name: "MiniMax M3.1 Flash Preview",
+		provider: "MiniMax",
+		colorVar: "ds-amber",
+		price: {
+			currency: "CNY",
+			input: 2.1,
+			cacheHit: .42,
+			output: 8.4
+		}
+	},
+	{
+		key: "u2-flash",
+		name: "U2 Flash",
+		provider: "云知声",
+		colorVar: "dsw-static-violet-400",
+		price: {
+			currency: "CNY",
+			input: 1,
+			cacheHit: .2,
+			output: 2
+		},
+		promo: {
+			factor: 0,
+			endsAtMs: Date.UTC(2026, 9, 31, 16, 0, 0),
+			note: "限时免费至 2026-10-31"
+		}
+	},
+	{
+		key: "u2",
+		name: "Unisound U2",
+		provider: "云知声",
+		colorVar: "dsw-static-violet-400",
+		price: {
+			currency: "CNY",
+			input: 1,
+			cacheHit: .2,
+			output: 2
+		}
+	},
+	{
+		key: "u2-med",
+		name: "U2-Med",
+		provider: "云知声",
+		colorVar: "dsw-static-violet-400",
+		price: {
+			currency: "CNY",
+			input: 8,
+			cacheHit: 2,
+			output: 28
+		}
+	},
 	{
 		key: "ernie",
 		name: "ERNIE-5.1",
@@ -2244,6 +2300,11 @@ const BUILTIN_MODEL_KEY_ALIASES = {
 	"minimax-m2-7": "minimax-m2.7",
 	"minimax-m2-7-highspeed": "minimax-m2.7-highspeed",
 	"minimax-m2-7-high-speed": "minimax-m2.7-highspeed",
+	"minimax-m3.1-flash-preview": "minimax-m3.1-flash-preview",
+	"minimax-m3-1-flash-preview": "minimax-m3.1-flash-preview",
+	"u2-flash": "u2-flash",
+	"u2": "u2",
+	"u2-med": "u2-med",
 	"gpt-6": "gpt-6-astra",
 	"gpt-6-astra": "gpt-6-astra",
 	"gpt-6-sol": "gpt-6-sol",
@@ -2269,6 +2330,11 @@ const BUILTIN_MODEL_KEY_ALIASES = {
 * zero while their tokens still count. Pure functions only: the persistence
 * handle is injected, so the fold is unit-testable without a host.
 */
+/** 会话日志偏移：宿主 0.1.2-alpha.4 前的 dsh-session/types 不导出 SessionLogOffset
+* 值，具名导入让这些宿主装载即崩（v1.4.19~v1.4.22 实测，alpha.3 真机复现）；
+* namespace 导入不做具名导出校验，缺导出时退化为恒等——偏移类型是
+* BrandedNumber，值域与 number 同构，老宿主的 readFrom 原样收数字。 */
+const sessionLogOffsetOf = sessionTypes.SessionLogOffset ?? ((value) => value);
 /**
 * 走订阅套餐（coding / token plan / opencode 订阅）的 provider id：这些通道的
 * 调用按套餐计费，不再按 token 计费，因此即使模型 id 与计费表撞名也一律豁免。
@@ -3352,7 +3418,7 @@ function createUsageAggregator(persistence, options = {}) {
 				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 { events, inheritedEventCount } = await persistence.readFrom(meta.id, sessionLogOffsetOf(from));
 					const after = await stampOf(meta);
 					if (stamp !== null && after !== stamp) {
 						cache.delete(id);
@@ -3378,7 +3444,7 @@ function createUsageAggregator(persistence, options = {}) {
 					recordLedger(id, cwd, stamp, previous.fold);
 					continue;
 				}
-				const { events, inheritedEventCount } = await persistence.readFrom(meta.id, SessionLogOffset(0));
+				const { events, inheritedEventCount } = await persistence.readFrom(meta.id, sessionLogOffsetOf(0));
 				const after = await stampOf(meta);
 				if (stamp !== null && after !== stamp) continue;
 				const fold = freshFold();
@@ -6921,8 +6987,8 @@ function adaptSessionPersistence(raw) {
 				const events = Array.isArray(slice) ? slice : slice.events;
 				return {
 					meta: handle.header,
-					fromSeq: SessionLogOffset(fromSeq),
-					inheritedEventCount: SessionLogOffset(handle.inheritedEventCount),
+					fromSeq: sessionLogOffsetOf(fromSeq),
+					inheritedEventCount: sessionLogOffsetOf(handle.inheritedEventCount),
 					events
 				};
 			} finally {

package/lib/types/aggregate.d.ts

@@ -10,11 +10,15 @@
  * zero while their tokens still count. Pure functions only: the persistence
  * handle is injected, so the fold is unit-testable without a host.
  */
-import { SessionLogOffset } from '@deepseek-ai/dsh-session/types';
-import type { SessionEvent, SessionHeader, SessionId } from '@deepseek-ai/dsh-session/types';
+import type { SessionEvent, SessionHeader, SessionId, SessionLogOffset as SessionLogOffsetT } from '@deepseek-ai/dsh-session/types';
 import type { TokenUsage } from '@deepseek-ai/dsh-llm';
 import { resolveCatalogKey } from './client/pricing.ts';
 import { BUILTIN_MODEL_KEY_ALIASES } from './builtin-catalog.ts';
+/** 会话日志偏移：宿主 0.1.2-alpha.4 前的 dsh-session/types 不导出 SessionLogOffset
+ * 值，具名导入让这些宿主装载即崩（v1.4.19~v1.4.22 实测，alpha.3 真机复现）；
+ * namespace 导入不做具名导出校验，缺导出时退化为恒等——偏移类型是
+ * BrandedNumber，值域与 number 同构，老宿主的 readFrom 原样收数字。 */
+export declare const sessionLogOffsetOf: (value: number) => SessionLogOffsetT;
 export { BUILTIN_MODEL_KEY_ALIASES, resolveCatalogKey };
 /**
  * 走订阅套餐（coding / token plan / opencode 订阅）的 provider id：这些通道的
@@ -212,8 +216,8 @@ export declare function workspaceNameOf(cwd: string | undefined): string;
 /** readFrom 返回的后缀切片：与宿主 0.1.2 的 SessionEventSuffix 同构，本地结构声明。 */
 export interface UsageEventSuffix {
     readonly meta: SessionHeader;
-    readonly inheritedEventCount: SessionLogOffset;
-    readonly fromSeq: SessionLogOffset;
+    readonly inheritedEventCount: SessionLogOffsetT;
+    readonly fromSeq: SessionLogOffsetT;
     readonly events: readonly SessionEvent[];
 }
 /**
@@ -227,7 +231,7 @@ export interface UsageEventSuffix {
  */
 export interface UsagePersistence {
     list(): Promise<readonly SessionHeader[]>;
-    readFrom(id: SessionId, fromSeq: SessionLogOffset): Promise<UsageEventSuffix>;
+    readFrom(id: SessionId, fromSeq: SessionLogOffsetT): Promise<UsageEventSuffix>;
     locate?(meta: SessionHeader): {
         path: string;
     } | undefined;

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

@@ -278,12 +278,12 @@ export interface ModelPrice extends PriceBand {
  * （主档与 offPeak）单价按 factor 折扣计价与显示，截止时刻起自动恢复刊例价。
  */
 export interface PricePromo {
-    /** 折扣系数（0.5 = 五折）；仅 (0,1) 区间有效，非法值视为无促销。 */
+    /** 折扣系数（0.5 = 五折，0 = 活动期免费）；仅 [0,1) 区间有效，非法值视为无促销。 */
     factor: number;
     /**
      * 分档折扣覆盖：厂商对不同档位给不同折扣时逐档指定（如 GPT-5.6 Sol 促销为
      * 缓存 0.8 / 输入 0.8 / 输出 2/3）。缺省档位沿用 {@link factor}；单档取值
-     * 仅 (0,1) 区间有效，非法值回落 factor。
+     * 仅 [0,1) 区间有效（0 = 该档活动期免费），非法值回落 factor。
      */
     factors?: Partial<Record<'input' | 'cacheHit' | 'cacheMiss' | 'output', number>>;
     /**
@@ -382,8 +382,8 @@ export declare function modelOf(key: string): ModelEntry;
  */
 export declare function isPriced(key: string): boolean;
 /**
- * 促销在 nowMs 是否生效：factor 必须落在 (0,1) 区间，截止时刻及之后视为过期；
- * endsAtMs 缺省表示长期活动，在 factor 合法期间持续生效。
+ * 促销在 nowMs 是否生效：factor 必须落在 [0,1) 区间（0 = 活动期免费，issue #86），
+ * 截止时刻及之后视为过期；endsAtMs 缺省表示长期活动，在 factor 合法期间持续生效。
  * 导出供测试：纯函数。
  * @param promo - 待判定的促销窗口。
  * @param nowMs - 判定时刻（epoch ms）。

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.4.22",
+  "version": "1.4.24",
   "keywords": [
     "deepseek-harness",
     "deepseek",