dsh-workbuddy-xdpool 1.8.1 → 1.8.2

package/CHANGELOG.md

@@ -4,6 +4,46 @@
 
 版本号遵循 [语义化版本](https://semver.org/lang/zh-CN/)。
 
+## 1.8.2 — 免费的那个被限流了，旁边那个收费的同款还能用
+
+> 免费模型被限流的时候，插件以前只会说一句「所有账号都在冷却」。这句话没错，但它让用户以为自己只剩一条路：等。其实同一个模型往往还有一条**收费的**产品行，而且在限流器眼里它们是两个不同的模型——免费行被关小黑屋的时候，收费行通常毫发无伤。这个版本就是把这个「另一条路」写出来。
+
+### 同一个模型，凭什么有两行
+
+上游把一条产品线按**多行**卖，每行有自己的 id、自己的价格、自己的限流额度，但**显示名字是一样的**。实测两个网关：
+
+| 网关 | 免费行 | 收费行 |
+| --- | --- | --- |
+| 国际版 | `deepseek-v4.1-flash`（x0.00） | `deepseek-v4.1-flash-sg`（x0.03） |
+| 国内版 | `hy3`（x0.00） | `hy3-x`（x0.05） |
+
+注意 `-sg` 和 `-x` 跟免费行**没有任何前缀关系**，能把它们认成一家的只有那个相同的显示名。所以匹配是按名字来的，不是按 id 猜的。
+
+### 现在会怎么提示
+
+- **模型列表**：免费行后面挂一个小灰标「付费同款 deepseek-v4.1-flash-sg（0.03x）」，鼠标悬停解释「免费档先被限流；同一个模型的付费行不受这个限制影响」。灰的、低调的——这一行现在仍然是免费的那个，标签只是告诉你退路在哪，不是催你花钱。
+- **429 报错**：以前是「every account is rate-limited for model deepseek-v4.1-flash (4/4 cooling, tried 0)」，现在后面会接一句「deepseek-v4.1-flash-sg is the same model on a paid row (x0.03 credits) and is rate-limited separately; switch to it to keep going」。
+- **账号卡片**：某个账号上「`hy4-preview` cooling to 10:14」这种小标后面，也会跟上「→ 收费行的 id（倍率）还能用」。
+
+### 刻意没做的事
+
+- **收费行不标标签。** 只有倍率等于 0 的行才找孪生兄弟。否则「GLM-5.3」这种本身收费、又恰好有个更便宜的闪速版的模型，也会被挂上一个标签，最后满屏都是提示，等于没提示。
+- **没有收费同款就不说话。** 独苗模型（整条线只有它自己）不会有任何多余文字，也不会留下一个孤零零的分隔符。
+- **不把另一个免费行当退路。** 两个免费行是一起被限流的，切过去纯属换个人排队，说了等于骗人。
+- **倍率未知的行不算数。** 上游没给价格的兄弟行不能被承诺成「那个收费的」——用户切过去以为知道价钱，结果未必。
+
+### 顺带说清楚：国际版没有「每天领 30 积分」
+
+上一版已经查过一遍，这次把话说完整。国际版（`www.workbuddy.ai`）**没有**签到活动，也**没有** `daily-checkin` 这条路由：
+
+- `POST /v2/billing/meter/checkin-activity-status` 返回 200，但 `active: false`（字段在，活动没开）；
+- `GET /v2/billing/meter/get-user-resource` 直接 404（国内版才有这个接口）；
+- `/v2/billing/meter/checkin`、`/daily-checkin-activity`、`/checkin-activity` 全是 404。
+
+国际版真正有的是另一套东西：**成长任务板**（5 条：完成一次对话、安装技能、绑定微信、召唤专家、使用模板）和 **streak 连续打卡**（7 天 / 14 天 / 28 天档位，分别给 0 / 50 / 150 积分）。但它的字段形状跟国内版不一样（没有 credit / energy / target / current），插件目前解析不了，所以**没有**为国际版开自动化——没有可领的东西，开了也只是每天准时去撞 404。
+
+国内版的签到是正常的，多账号逐个领取的链路本来就有，不受本次改动影响。
+
 ## 1.8.1 — 一个过期的登录状态，不再拖着整个池子陪跑
 
 > 有人的卡片上，好几个账号下面顶着一大段红色英文，大意是「上游不认这个登录了，去桌面端重新登录」。话说得没错，可问题是：它只说了结论，没解决过程——那几个账号明明已经废了，每次请求还是要挨个撞一遍，撞得头破血流，旁边几个好端端的账号一次都轮不上。

package/README.md

@@ -50,6 +50,8 @@
 
 - **模型目录带标注**：列出池里能用的模型，附带积分倍率（如 `GLM-5.2 · x0.79`）、免费 / 限时免费 / 夜间折扣标签、能否收图和上下文窗口大小，全部跟随上游实时更新。
 
+- **被限流时告诉你退路**：免费档被 429 冷却时，卡片和报错都会点名**同名的付费行**（如国际版 `deepseek-v4.1-flash` 对 `deepseek-v4.1-flash-sg`、国内版 `hy3` 对 `hy3-x`）。上游按「行」分别限流，所以免费行被关小黑屋时，收费行通常还是通的。
+
 - **国内版 / 国际版自动适配**：按账号凭据里的登录域名自动选上游——国际版登录（`workbuddy.ai`）走 `www.workbuddy.ai`，国内版（默认）走 `copilot.tencent.com`。两种账号可以混在同一个池里。
 
 - **想手动做点啥也行**：卡片和命令行都提供「重新检测账号」「清除所有冷却」「每日签到」三个操作。

package/lib/client.js

@@ -256,6 +256,10 @@ window.__ModuleLoader__.load({
 .dsm-workbuddy-xdpool-account-meta-dead{color:var(--dsw-alias-state-error-primary,#ef4444)}
 .dsm-workbuddy-xdpool-account-modelcool{display:flex;flex-wrap:wrap;gap:6px;margin-top:2px}
 .dsm-workbuddy-xdpool-account-modelcool-chip{display:inline-flex;align-items:center;gap:4px;padding:1px 8px;border-radius:999px;font-size:11px;line-height:18px;background:var(--dsw-alias-state-warning-subtle,rgba(217,119,6,.12));color:var(--dsw-alias-state-warning-primary,#d97706)}
+/* "→ deepseek-v4.1-flash-sg (0.03x) still works" inside a cooling chip. Keeps
+   the warning tint of its parent but drops the weight: it is the way out, not
+   a second problem. */
+.dsm-workbuddy-xdpool-account-modelcool-twin{color:var(--dsw-alias-label-secondary,#c6c9d0);cursor:help}
 .dsm-workbuddy-xdpool-account-error{margin:0;color:var(--dsw-alias-state-error-primary,#ef4444);font-size:13px;line-height:20px}
 
 /* Two-column stats: packages on the left, total + check-in on the right. */
@@ -307,6 +311,10 @@ window.__ModuleLoader__.load({
 /* "活动至 10-31": the campaign's end date. Muted — it is context for planning,
    not a claim about the current price. */
 .dsm-workbuddy-xdpool-model-meta-promo{color:var(--dsw-alias-label-tertiary,#9aa0a8);font-size:11px;line-height:16px;opacity:.85}
+/* "付费同款 deepseek-v4.1-flash-sg (0.03x)": the way out when the free row is
+   rate-limited. Muted like the other meta chips — it is an alternative, not a
+   warning, and the row it sits on is still the free one. */
+.dsm-workbuddy-xdpool-model-meta-twin{color:var(--dsw-alias-label-tertiary,#9aa0a8);font-size:11px;line-height:16px;opacity:.85;cursor:help}
 /* Unreadable credential files: a warning tint, since it explains a smaller pool
    and "encrypted" is actionable (start the app once). */
 .dsm-workbuddy-xdpool-skipped{margin:6px 0 0;padding:7px 10px;border-radius:8px;background:var(--dsw-alias-state-warning-subtle,rgba(217,119,6,.12));display:flex;flex-direction:column;gap:3px}
@@ -510,6 +518,43 @@ window.__ModuleLoader__.load({
 			return status?.kind === "free" || status?.kind === "night";
 		}
 		//#endregion
+		//#region src/siblings.ts
+		/**
+		* The cheapest PAID model sharing `model`'s display name, or undefined.
+		*
+		* Cheapest rather than first, because the point of the hint is "there is a
+		* cheap way out": offering the most expensive twin would make switching look
+		* like a trap. A sibling whose price is unknown is skipped — an unpriced row
+		* cannot be promised as "the paid one".
+		*/
+		function paidSiblingOf(model, models) {
+			let best;
+			for (const candidate of models) {
+				if (candidate.id === model.id) continue;
+				if (candidate.name !== model.name) continue;
+				const multiplier = candidate.multiplier;
+				if (multiplier === void 0 || multiplier <= 0) continue;
+				if (best === void 0 || multiplier < best.multiplier) best = {
+					id: candidate.id,
+					name: candidate.name,
+					multiplier
+				};
+			}
+			return best;
+		}
+		/**
+		* The paid sibling of a model, but ONLY when the model itself is free.
+		*
+		* The guard is the whole point: a `x0.79` row with a `x0.06` cousin is not a
+		* "free model with a paid twin", it is just a more expensive row, and labelling
+		* it would be noise on most of the list. The hint answers one question — "the
+		* free one is limited, what now".
+		*/
+		function paidAlternativeFor(model, models) {
+			if (model.multiplier !== 0) return void 0;
+			return paidSiblingOf(model, models);
+		}
+		//#endregion
 		//#region src/client/PoolCard.tsx
 		/**
 		* WorkBuddy XD Pool card contributed to DSH Plugin configuration.
@@ -1617,6 +1662,7 @@ window.__ModuleLoader__.load({
 							})(),
 							status?.accounts.map((account) => /* @__PURE__ */ (0, react_jsx_runtime.jsx)(AccountBlock, {
 								account,
+								models: status?.models ?? [],
 								...checkinBusyId === void 0 ? {} : { checkinBusyId },
 								onClaimCheckin: (accountId) => {
 									claimCheckin(accountId);
@@ -1723,6 +1769,7 @@ window.__ModuleLoader__.load({
 							children: [...status?.models ?? []].sort((a, b) => Number(isFreeNow(b, now, activeRegion)) - Number(isFreeNow(a, now, activeRegion))).map((model) => /* @__PURE__ */ (0, react_jsx_runtime.jsx)(ModelRow, {
 								model,
 								region: activeRegion,
+								paidTwin: paidAlternativeFor(model, status?.models ?? []),
 								t,
 								draft: modelDraft[model.id] ?? {
 									enabled: model.enabled,
@@ -1739,7 +1786,7 @@ window.__ModuleLoader__.load({
 			});
 		}
 		/** One account block: label + status tag + meta + optional credit panels. */
-		function AccountBlock({ account, t, checkinBusyId, onClaimCheckin, accountBusyId, onToggleDisabled, onIgnoreAccount, onSaveCreditReserve, reserveBusyId }) {
+		function AccountBlock({ account, models, t, checkinBusyId, onClaimCheckin, accountBusyId, onToggleDisabled, onIgnoreAccount, onSaveCreditReserve, reserveBusyId }) {
 			const isDisabled = account.disabled === true;
 			const isCooling = account.cooling === true;
 			const isDead = account.credentialDead === true;
@@ -1812,13 +1859,24 @@ window.__ModuleLoader__.load({
 								}) : null,
 								modelCooldowns.length > 0 ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
 									className: "dsm-workbuddy-xdpool-account-modelcool",
-									children: modelCooldowns.map((mc) => /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
-										className: "dsm-workbuddy-xdpool-account-modelcool-chip",
-										children: t?.("row.modelCooling", {
-											model: mc.modelId,
-											time: formatDateTime(mc.until)
-										}) ?? `${mc.modelId} cooling to ${formatDateTime(mc.until)}`
-									}, mc.modelId))
+									children: modelCooldowns.map((mc) => {
+										const coolingModel = models.find((model) => model.id === mc.modelId);
+										const twin = coolingModel === void 0 ? void 0 : paidAlternativeFor(coolingModel, models);
+										return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("span", {
+											className: "dsm-workbuddy-xdpool-account-modelcool-chip",
+											children: [t?.("row.modelCooling", {
+												model: mc.modelId,
+												time: formatDateTime(mc.until)
+											}) ?? `${mc.modelId} cooling to ${formatDateTime(mc.until)}`, twin === void 0 ? null : /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+												className: "dsm-workbuddy-xdpool-account-modelcool-twin",
+												title: t?.("row.paidTwinHint") ?? "Same model, paid row",
+												children: t?.("row.rateLimitedPaidTwin", {
+													id: twin.id,
+													rate: twin.multiplier.toFixed(2)
+												}) ?? `→ ${twin.id} (${twin.multiplier.toFixed(2)}x) still works`
+											})]
+										}, mc.modelId);
+									})
 								}) : null
 							]
 						}),
@@ -2085,7 +2143,7 @@ window.__ModuleLoader__.load({
 		* context radios stay disabled rather than pretending an edit took hold. The
 		* draft lives in the parent, so this component only ever reports intent.
 		*/
-		function ModelRow({ model, region, t, draft, editable, onToggle, onToggleImage, onBudget }) {
+		function ModelRow({ model, region, paidTwin, t, draft, editable, onToggle, onToggleImage, onBudget }) {
 			const now = /* @__PURE__ */ new Date();
 			const tag = tagFor(model, now, region);
 			const promo = promoStatusFor(model, now, region);
@@ -2184,6 +2242,14 @@ window.__ModuleLoader__.load({
 							className: "dsm-workbuddy-xdpool-model-meta-promo",
 							children: promoUntil
 						}),
+						paidTwin === void 0 ? null : /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+							className: "dsm-workbuddy-xdpool-model-meta-twin",
+							title: t?.("row.paidTwinHint") ?? "Same model, paid row",
+							children: t?.("row.paidTwin", {
+								id: paidTwin.id,
+								rate: paidTwin.multiplier.toFixed(2)
+							}) ?? `paid twin ${paidTwin.id} (${paidTwin.multiplier.toFixed(2)}x)`
+						}),
 						/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
 							className: "dsm-workbuddy-xdpool-model-cap",
 							children: t?.("row.modelOutput", { size: formatCapacity(model.maxOutputTokens) }) ?? `out ${formatCapacity(model.maxOutputTokens)}`
@@ -2345,6 +2411,9 @@ window.__ModuleLoader__.load({
 			"row.nightFreeNow": "free until {time}",
 			"row.nightFreeLater": "free from {time}",
 			"row.promoUntil": "promo to {date}",
+			"row.paidTwin": "paid twin {id} ({rate}x)",
+			"row.paidTwinHint": "The free tier is rate-limited first; this same model has a paid row that keeps working",
+			"row.rateLimitedPaidTwin": "Tip: {id} is the same model on a paid row ({rate}x credits) and is limited separately — switch to it to keep going",
 			"row.skippedFiles": "{count} credential file(s) could not be read",
 			"row.skippedEncrypted": "encrypted — start WorkBuddy once so its key can be read",
 			"row.skippedUnreadable": "file could not be read",
@@ -2503,6 +2572,9 @@ window.__ModuleLoader__.load({
 			"row.nightFreeNow": "免费至 {time}",
 			"row.nightFreeLater": "{time} 起免费",
 			"row.promoUntil": "活动至 {date}",
+			"row.paidTwin": "付费同款 {id}（{rate}x）",
+			"row.paidTwinHint": "免费档先被限流；同一个模型的付费行不受这个限制影响",
+			"row.rateLimitedPaidTwin": "提示：{id} 是同一个模型的付费行（{rate}x 积分），限流是分开算的 —— 切过去就能继续用",
 			"row.skippedFiles": "有 {count} 个凭据文件读不出来",
 			"row.skippedEncrypted": "已加密 —— 启动一次 WorkBuddy 才能取到密钥",
 			"row.skippedUnreadable": "文件读不出来",

package/lib/index.js

@@ -5687,6 +5687,43 @@ function injectSummary(compacted, summary) {
 	];
 }
 //#endregion
+//#region src/siblings.ts
+/**
+* The cheapest PAID model sharing `model`'s display name, or undefined.
+*
+* Cheapest rather than first, because the point of the hint is "there is a
+* cheap way out": offering the most expensive twin would make switching look
+* like a trap. A sibling whose price is unknown is skipped — an unpriced row
+* cannot be promised as "the paid one".
+*/
+function paidSiblingOf(model, models) {
+	let best;
+	for (const candidate of models) {
+		if (candidate.id === model.id) continue;
+		if (candidate.name !== model.name) continue;
+		const multiplier = candidate.multiplier;
+		if (multiplier === void 0 || multiplier <= 0) continue;
+		if (best === void 0 || multiplier < best.multiplier) best = {
+			id: candidate.id,
+			name: candidate.name,
+			multiplier
+		};
+	}
+	return best;
+}
+/**
+* The paid sibling of a model, but ONLY when the model itself is free.
+*
+* The guard is the whole point: a `x0.79` row with a `x0.06` cousin is not a
+* "free model with a paid twin", it is just a more expensive row, and labelling
+* it would be noise on most of the list. The hint answers one question — "the
+* free one is limited, what now".
+*/
+function paidAlternativeFor(model, models) {
+	if (model.multiplier !== 0) return void 0;
+	return paidSiblingOf(model, models);
+}
+//#endregion
 //#region src/shim.ts
 /**
 * Loopback OpenAI-compatible endpoint with multi-account failover.
@@ -5872,6 +5909,22 @@ function createWorkBuddyShim(options) {
 	const server = createServer((req, res) => {
 		handle(req, res);
 	});
+	/**
+	* "The same model has a paid row" sentence for a 429 body, or undefined.
+	*
+	* Reads the catalog the shim was built with, so the hint names a row this
+	* gateway ACTUALLY serves — a CN-only id in a global 429 would be worse than
+	* no hint at all. Absent when the cooling model is itself paid, or when the
+	* family has no priced twin.
+	*/
+	function paidTwinHint(modelId) {
+		const models = catalog.current();
+		const model = models.find((candidate) => candidate.id === modelId);
+		if (model === void 0) return void 0;
+		const twin = paidAlternativeFor(model, models);
+		if (twin === void 0) return void 0;
+		return `${twin.id} is the same model on a paid row (x${twin.multiplier.toFixed(2)} credits) and is rate-limited separately; switch to it to keep going`;
+	}
 	const ready = new Promise((resolve, reject) => {
 		server.once("listening", () => resolve());
 		server.once("error", reject);
@@ -5983,7 +6036,8 @@ function createWorkBuddyShim(options) {
 				if (why.reason === "cooling") {
 					const subject = modelId === void 0 ? "every WorkBuddy account is rate-limited" : `every account is rate-limited for model ${modelId}`;
 					const upstream = last === void 0 ? "" : ` — ${last.message.slice(0, 200)}`;
-					writeOpenAIError(res, 429, "soft_rate", `${subject} (${why.cooling}/${why.total} cooling, tried ${tried.length})${tried.length === 0 ? "" : `: ${tried.join(" → ")}`}${upstream}`);
+					const twin = modelId === void 0 ? void 0 : paidTwinHint(modelId);
+					writeOpenAIError(res, 429, "soft_rate", `${subject} (${why.cooling}/${why.total} cooling, tried ${tried.length})${tried.length === 0 ? "" : `: ${tried.join(" → ")}`}${upstream}` + (twin === void 0 ? "" : ` — ${twin}`));
 					return;
 				}
 				if (why.reason === "disabled") {

package/package.json

@@ -2,7 +2,7 @@
   "name": "dsh-workbuddy-xdpool",
   "displayName": "DSH WorkBuddy XD Pool",
   "description": "Merge every locally signed-in WorkBuddy account into DeepSeek Harness as one auto-failing-over model pool (multi-account rotation, live credits, daily check-in and model catalog).",
-  "version": "1.8.1",
+  "version": "1.8.2",
   "license": "MIT",
   "author": "XDTrees",
   "homepage": "https://github.com/XDTrees/dsh-workbuddy-xdpool#readme",