dsh-connect-trae 4.1.0 → 4.3.0

package/lib/index.d.ts

@@ -3,6 +3,46 @@ import { Context, ProviderStreams } from "@earendil-works/pi-ai";
 import { PiAiAdapter } from "@deepseek-ai/dsh-llm-pi-ai";
 import { Context as Context$1 } from "@deepseek-ai/cordis";
 import { AttachmentStore } from "@deepseek-ai/dsh-attachment";
+//#region src/promo.d.ts
+/** One price pair, as upstream published it. Rates are credits per Mtoken. */
+interface TraePromoPrice {
+  /** Undiscounted rate. */
+  beforeRate?: number;
+  /** Discounted rate, when upstream stated one for this branch. */
+  rate?: number;
+  /**
+   * Pay ratio in percent, straight from `discount`: 100 = full price, 50 = 五折,
+   * 25 = 二五折. NOT a 0–1 multiplier — read literally, the way it is written.
+   */
+  discountPercent?: number;
+}
+/** One `off_peak` window: ISO weekdays 1(Monday)–7(Sunday), minutes 0–1440. */
+interface TraePromoWindow {
+  weekdays: number[];
+  /** Inclusive. */
+  startMinute: number;
+  /** Exclusive; 1440 is upstream's way of writing "end of day". */
+  endMinute: number;
+}
+/** The whole `activity_discount` document, kept unflattened on purpose. */
+interface TraeActivityDiscount {
+  /** Upstream's machine name for the campaign, e.g. `subsidy_member_discount`. */
+  subKey?: string;
+  /** Upstream's own "right now" verdict. */
+  current?: TraePromoPrice & {
+    discountType?: string;
+  };
+  /** Subscription price — hover material only, see the module note. */
+  member?: TraePromoPrice;
+  /** Recurring cheap hours, judged locally against each model's own zone. */
+  offPeak?: TraePromoPrice & {
+    timeZone?: string;
+    windows: TraePromoWindow[];
+  };
+  /** Subsidy branch, when upstream names it separately from `current`. */
+  subsidy?: TraePromoPrice;
+}
+//#endregion
 //#region src/reasoning.d.ts
 declare const TRAE_REASONING_EFFORTS: readonly ["minimal", "low", "medium", "high", "xhigh"];
 type TraeReasoningEffort = typeof TRAE_REASONING_EFFORTS[number];
@@ -43,6 +83,11 @@ interface TraeDiscoveredModel {
    * `config_info_list` for the chat functions).
    */
   function?: string;
+  /**
+   * Trae's discount rule for this row (`features.activity_discount`), kept whole
+   * so the card can judge it against the clock at paint time (src/promo.ts).
+   */
+  activityDiscount?: TraeActivityDiscount;
 }
 /**
  * Parse only capabilities explicitly advertised by Trae's remote model API.
@@ -181,6 +226,16 @@ interface TraeModelInfo {
    * image to a model that cannot read one burns credits for a silent failure.
    */
   multimodal?: boolean;
+  /**
+   * Trae's discount RULE for this model, exactly as published (see src/promo.ts).
+   *
+   * Kept unflattened and unjudged: whether a badge is painted depends on the
+   * clock, so the card judges it at paint time rather than trusting a verdict
+   * frozen into a saved catalog. Absent means the model carries no promotion
+   * document — including every `ai` (international) row, whose subscription
+   * models publish no `consumption_rate` at all.
+   */
+  activityDiscount?: TraeActivityDiscount;
 }
 /**
  * Bootstrap catalog: identity only where current Trae metadata has not been
@@ -267,6 +322,15 @@ interface TraeWireModel {
    * therefore has to replay the directory's own function.
    */
   function?: string;
+  /**
+   * The row's own `activity_discount`, read from `display_contact_config`.
+   *
+   * The wire roster is the richer of the two directories (8 rows carrying a
+   * discount vs the Remote directory's 4), and the same model can name a
+   * different campaign on each side, so this value wins over the Remote one
+   * during the merge — the precedence `creditMultiplier` already follows.
+   */
+  activityDiscount?: TraeActivityDiscount;
 }
 /**
  * Merge the two Trae model sources into one authoritative catalog.
@@ -748,6 +812,13 @@ interface TraeWebModel {
   probe?: TraeModelProbeVerdict;
   /** Upstream's own words for the verdict, when it gave any. */
   probeDetail?: string;
+  /**
+   * Trae's discount rule for this row, straight from the directory that
+   * advertised it (see src/promo.ts). The CARD decides whether it is live right
+   * now: the rule carries weekday/time windows in an upstream-declared zone, so
+   * a verdict baked in here would be stale by the next morning.
+   */
+  activityDiscount?: TraeActivityDiscount;
 }
 /**
  * One model's availability verdict from the one-click test.
@@ -2717,6 +2788,11 @@ interface TraeSoloModel {
   reasoning?: TraeReasoningCapability;
   /** Effective (post-discount) credit multiplier, as the Trae IDE shows it. */
   creditMultiplier?: number;
+  /**
+   * The row's `activity_discount` rule, read from `display_contact_config`.
+   * Display data only: src/promo.ts decides at paint time whether a badge shows.
+   */
+  activityDiscount?: TraeActivityDiscount;
   /** The directory function that listed this config (replayed when calling it). */
   function?: string;
 }

package/lib/index.js

@@ -236,12 +236,14 @@ function mergeTraeModelSources(remote, wire) {
 		const wireModel = wireById.get(displayKey(model.id)) ?? wireByName.get(displayKey(model.name));
 		const creditMultiplier = wireModel?.creditMultiplier ?? model.creditMultiplier;
 		const wireFunction = wireModel?.function ?? model.function;
+		const activityDiscount = wireModel?.activityDiscount ?? model.activityDiscount;
 		result.push({
 			id: model.id,
 			name: model.name,
 			...model.contextWindow === void 0 ? {} : { contextWindow: model.contextWindow },
 			...model.maxContextWindow === void 0 ? {} : { maxContextWindow: model.maxContextWindow },
 			...creditMultiplier === void 0 ? {} : { creditMultiplier },
+			...activityDiscount === void 0 ? {} : { activityDiscount },
 			input: ["text"],
 			...wireModel?.maxTokens === void 0 ? {} : { maxTokens: wireModel.maxTokens },
 			...model.multimodal === void 0 ? {} : { multimodal: model.multimodal },
@@ -310,6 +312,7 @@ function discoveredCatalog(models) {
 		...model.maxContextWindow === void 0 ? {} : { maxContextWindow: model.maxContextWindow },
 		input: ["text"],
 		...model.creditMultiplier === void 0 ? {} : { creditMultiplier: model.creditMultiplier },
+		...model.activityDiscount === void 0 ? {} : { activityDiscount: model.activityDiscount },
 		...model.multimodal === void 0 ? {} : { multimodal: model.multimodal },
 		...model.function === void 0 ? {} : { wireFunction: model.function },
 		reasoningSupported: model.reasoningSupported,
@@ -3738,6 +3741,97 @@ function traeEndpoint(baseUrl, path) {
 	return `${baseUrl.replace(/\/$/, "")}/${path.replace(/^\//, "")}`;
 }
 //#endregion
+//#region src/promo.ts
+function record$1(value) {
+	return typeof value === "object" && value !== null && !Array.isArray(value) ? value : void 0;
+}
+function finite(value) {
+	return typeof value === "number" && Number.isFinite(value) ? value : void 0;
+}
+function percent(value) {
+	const parsed = finite(value);
+	return parsed !== void 0 && parsed > 0 && parsed < 100 ? parsed : void 0;
+}
+function ratePair(raw) {
+	const entry = record$1(raw);
+	if (entry === void 0) return {};
+	const beforeRate = finite(entry["before_consumption_rate"]);
+	const rate = finite(entry["consumption_rate"]) ?? finite(entry["after_consumption_rate"]);
+	const discountPercent = percent(entry["discount"]);
+	return {
+		...beforeRate === void 0 || beforeRate <= 0 ? {} : { beforeRate },
+		...rate === void 0 || rate <= 0 ? {} : { rate },
+		...discountPercent === void 0 ? {} : { discountPercent }
+	};
+}
+function windows(raw) {
+	const list = Array.isArray(raw) ? raw : [];
+	const parsed = [];
+	for (const item of list) {
+		const entry = record$1(item);
+		if (entry === void 0) continue;
+		const weekdays = Array.isArray(entry["weekdays"]) ? entry["weekdays"].filter((day) => Number.isInteger(day) && day >= 1 && day <= 7) : [];
+		const startMinute = finite(entry["start_minute"]);
+		const endMinute = finite(entry["end_minute"]);
+		if (weekdays.length === 0 || startMinute === void 0 || endMinute === void 0) continue;
+		if (startMinute < 0 || startMinute > 1439 || endMinute < 1 || endMinute > 1440) continue;
+		if (startMinute >= endMinute) continue;
+		parsed.push({
+			weekdays,
+			startMinute,
+			endMinute
+		});
+	}
+	return parsed;
+}
+/**
+* Parse one `activity_discount` document.
+*
+* `value` may be the already-parsed object (both call sites hand us the parent
+* object) or the raw JSON string; anything without `enable: true` reads as "no
+* promotion" rather than as a rule we might later misjudge.
+*/
+function parseTraeActivityDiscount(value) {
+	let source = value;
+	if (typeof source === "string") {
+		if (source === "") return void 0;
+		try {
+			source = JSON.parse(source);
+		} catch {
+			return;
+		}
+	}
+	const raw = record$1(source);
+	if (raw === void 0 || raw["enable"] !== true) return void 0;
+	const data = record$1(raw["data"]);
+	if (data === void 0) return void 0;
+	const subKey = typeof raw["subKey"] === "string" && raw["subKey"] !== "" ? raw["subKey"] : void 0;
+	const currentRaw = record$1(data["current"]);
+	const currentType = typeof currentRaw?.["discount_type"] === "string" ? currentRaw["discount_type"] : void 0;
+	const current = currentRaw === void 0 ? void 0 : {
+		...ratePair(currentRaw),
+		...currentType === void 0 ? {} : { discountType: currentType }
+	};
+	const memberRaw = data["member"];
+	const member = record$1(memberRaw) === void 0 ? void 0 : ratePair(memberRaw);
+	const subsidyRaw = data["subsidy"];
+	const subsidy = record$1(subsidyRaw) === void 0 ? void 0 : ratePair(subsidyRaw);
+	const offPeakRaw = record$1(data["off_peak"]);
+	const offPeak = offPeakRaw === void 0 ? void 0 : {
+		...ratePair(offPeakRaw),
+		...typeof offPeakRaw["time_zone"] === "string" && offPeakRaw["time_zone"] !== "" ? { timeZone: offPeakRaw["time_zone"] } : {},
+		windows: windows(offPeakRaw["time_windows"])
+	};
+	const parsed = {
+		...subKey === void 0 ? {} : { subKey },
+		...current === void 0 ? {} : { current },
+		...member === void 0 ? {} : { member },
+		...offPeak === void 0 ? {} : { offPeak },
+		...subsidy === void 0 ? {} : { subsidy }
+	};
+	return parsed.current === void 0 && parsed.member === void 0 && parsed.offPeak === void 0 && parsed.subsidy === void 0 ? void 0 : parsed;
+}
+//#endregion
 //#region src/reasoning.ts
 const TRAE_REASONING_EFFORTS = [
 	"minimal",
@@ -3905,6 +3999,29 @@ function prepareSoloBody(source, defaultModel = "glm-5.2", functionName) {
 	return JSON.stringify(body);
 }
 /**
+* Parse this row's `display_contact_config` document.
+*
+* It is a *string* holding a second JSON document, and three different readers
+* (the credit multiplier, the promotion rule, and whatever upstream adds next)
+* need it — so it is decoded once here rather than three times.
+*/
+function wireContactConfig(config) {
+	const raw = config["display_contact_config"];
+	if (typeof raw !== "string" || raw === "") return void 0;
+	let parsed;
+	try {
+		parsed = JSON.parse(raw);
+	} catch {
+		return;
+	}
+	if (typeof parsed !== "object" || parsed === null || Array.isArray(parsed)) return void 0;
+	return parsed;
+}
+/** The promotion rule from `display_contact_config`, when the row carries one. */
+function wireActivityDiscount(config) {
+	return parseTraeActivityDiscount(wireContactConfig(config)?.["activity_discount"]);
+}
+/**
 * Read the effective credit multiplier from a `get_detail_param` row.
 *
 * The rate the Trae IDE renders lives in `display_contact_config` — a *string*
@@ -3920,15 +4037,8 @@ function prepareSoloBody(source, defaultModel = "glm-5.2", functionName) {
 * field keep their bare name — parsed-but-absent, never fabricated.
 */
 function wireCreditMultiplier(config) {
-	const raw = config["display_contact_config"];
-	if (typeof raw !== "string" || raw === "") return void 0;
-	let parsed;
-	try {
-		parsed = JSON.parse(raw);
-	} catch {
-		return;
-	}
-	if (typeof parsed !== "object" || parsed === null) return void 0;
+	const parsed = wireContactConfig(config);
+	if (parsed === void 0) return void 0;
 	const consumption = parsed["consumption_rate"];
 	if (typeof consumption !== "object" || consumption === null) return void 0;
 	const entry = consumption;
@@ -4036,6 +4146,7 @@ var TraeSoloUpstreamClient = class {
 				...detail
 			});
 			const creditMultiplier = wireCreditMultiplier(config);
+			const activityDiscount = wireActivityDiscount(config);
 			if (byId.has(id)) continue;
 			byId.set(id, {
 				id,
@@ -4044,6 +4155,7 @@ var TraeSoloUpstreamClient = class {
 				...maxTokens === void 0 ? {} : { maxTokens },
 				...reasoning === void 0 ? {} : { reasoning },
 				...creditMultiplier === void 0 ? {} : { creditMultiplier },
+				...activityDiscount === void 0 ? {} : { activityDiscount },
 				function: directoryFunction
 			});
 		}
@@ -4858,6 +4970,7 @@ function parseTraeRemoteModel(value, groupFunction) {
 	const consumptionData = record(consumption?.["data"]);
 	const creditMultiplier = consumption?.["enable"] === true ? finitePositive(consumptionData?.["rate"]) : void 0;
 	const reasoningSupported = record(features?.["reasoning"])?.["enable"] === true;
+	const activityDiscount = parseTraeActivityDiscount(features?.["activity_discount"]);
 	const reasoningConfig = record(raw.reasoning_effort_config);
 	const supported = (Array.isArray(reasoningConfig?.["options"]) ? reasoningConfig["options"] : []).flatMap((option) => {
 		if (typeof option !== "string") return [];
@@ -4874,6 +4987,7 @@ function parseTraeRemoteModel(value, groupFunction) {
 		...dev === void 0 ? {} : { contextWindow: dev },
 		...max === void 0 ? {} : { maxContextWindow: max },
 		...creditMultiplier === void 0 ? {} : { creditMultiplier },
+		...activityDiscount === void 0 ? {} : { activityDiscount },
 		reasoningSupported,
 		...supported.length === 0 ? {} : { reasoning: {
 			supported,
@@ -4963,8 +5077,7 @@ function traeSoloRemoteFallbackBases(region, officialBase) {
 	return backupBase === officialBase ? [] : [backupBase];
 }
 /**
-* Of two rows for the SAME model id, the one that advertises the stronger
-* capacity (issue #23).
+* Of two rows for the SAME model id, the one the catalog should keep.
 *
 * The gateway groups its directory by function and reports a model's capacity
 * per group, with the group order varying between calls. Keeping the strongest
@@ -4972,6 +5085,9 @@ function traeSoloRemoteFallbackBases(region, officialBase) {
 * LEXICOGRAPHIC and must be applied all the way down, or ordering leaks back in
 * at the next field:
 *
+*  0. the kept row must also carry the promotional rule, which the groups
+*     disagree about — the rule is copied onto the capacity winner, and of two
+*     rules the one that can say more wins (see the comment in the body);
 *  1. a row with a Max tier beats one without (`maxContextWindow` is only set
 *     when the group reported `max_mode: true` with a positive max);
 *  2. two Max rows: the larger max wins;
@@ -4989,6 +5105,52 @@ function traeSoloRemoteFallbackBases(region, officialBase) {
 */
 function preferStrongerRow(candidate, incumbent) {
 	if (incumbent === void 0) return candidate;
+	const winner = strongerCapacityRow(candidate, incumbent);
+	const rule = richerRule(candidate.activityDiscount, incumbent.activityDiscount);
+	if (rule === void 0 || rule === winner.activityDiscount) return winner;
+	return {
+		...winner,
+		activityDiscount: rule
+	};
+}
+/**
+* Step 0's tie-break: of two rules for the same model id, the one that can say
+* more about this moment. Every parsed rule already passed `enable: true` (see
+* parseTraeActivityDiscount), so the ranking is: an upstream "right now"
+* discount first, then the rule covering more clock. Two rules that rank EQUAL
+* are compared by their canonical content, so the answer depends on the rule
+* documents and never on which group the gateway answered first (issue #23).
+*/
+function richerRule(candidate, incumbent) {
+	if (candidate === void 0) return incumbent;
+	if (incumbent === void 0) return candidate;
+	const score = (rule) => {
+		return (rule.current !== void 0 && (rule.current.discountType ?? "none") !== "none" ? 1 : 0) * 1e3 + (rule.offPeak?.windows.length ?? 0);
+	};
+	const candidateScore = score(candidate);
+	const incumbentScore = score(incumbent);
+	if (candidateScore !== incumbentScore) return candidateScore > incumbentScore ? candidate : incumbent;
+	return canonicalRule(candidate) < canonicalRule(incumbent) ? candidate : incumbent;
+}
+/**
+* Content-only identity for two rules that scored the same.
+*
+* The score cannot distinguish, say, two `current: none` rules with two windows
+* each in different hours — and keeping "whichever arrived first" would let the
+* gateway's group order decide whether tonight's badge appears. Key order is
+* normalised (the objects are ours, but a caller may hand us a literal), so
+* equal documents compare equal and the incumbent is kept unchanged.
+*/
+function canonicalRule(rule) {
+	const canonical = (value) => {
+		if (Array.isArray(value)) return value.map((item) => canonical(item));
+		if (typeof value !== "object" || value === null) return value;
+		return Object.fromEntries(Object.entries(value).sort(([left], [right]) => left < right ? -1 : left > right ? 1 : 0).map(([key, item]) => [key, canonical(item)]));
+	};
+	return JSON.stringify(canonical(rule));
+}
+/** Steps 1–4 of the documented order: the row advertising the stronger capacity. */
+function strongerCapacityRow(candidate, incumbent) {
 	const candidateMax = candidate.maxContextWindow;
 	const incumbentMax = incumbent.maxContextWindow;
 	if (candidateMax !== void 0 && incumbentMax === void 0) return candidate;
@@ -8756,7 +8918,8 @@ const modelConfig = z.object({
 	creditMultiplier: z.number(),
 	wireFunction: z.string(),
 	wireConfigName: z.string(),
-	multimodal: z.boolean()
+	multimodal: z.boolean(),
+	activityDiscount: z.any()
 });
 /**
 * One panel's saved state. Panels are keyed `cn | enterprise | ai` — see

package/package.json

@@ -2,7 +2,7 @@
   "name": "dsh-connect-trae",
   "displayName": "DSH Connect Trae",
   "description": "把本机登录的 Trae 模型接入 DeepSeek Harness：国内版与国际版双供应商并行，提供用量/积分概览与每日签到领取。",
-  "version": "4.1.0",
+  "version": "4.3.0",
   "author": "dingminhua",
   "copyright": "Copyright (c) 2026 LaoDing",
   "license": "MIT",
@@ -50,7 +50,9 @@
     "typecheck": "tsc -p tsconfig.json && tsc -p tsconfig.client.json",
     "check": "pnpm run typecheck && pnpm run test && pnpm run build",
     "verify:release": "node scripts/verify-release.mjs",
-    "card:shot": "vitest run --config vitest.card.config.ts"
+    "card:shot": "vitest run --config vitest.card.config.ts",
+    "promo:shot": "vitest run --config vitest.card.config.ts -t \"promo shot\"",
+    "panels:shot": "vitest run --config vitest.card.config.ts -t \"panels shot\""
   },
   "dsh": {
     "bundle": {