dsh-xdpool 2.2.1 → 2.3.0

package/CHANGELOG.md

@@ -1,6 +1,25 @@
 # Changelog
 本项目的所有重要变更都会记录在此文件。
 版本号遵循 [语义化版本](https://semver.org/lang/zh-CN/)。
+## 2.3.0 — 扫码渠道接入账号池，免密车道修复，数据看板有了真数
+> 这一版收掉三件大事：扫码登录的账号真正归入账号池并按渠道展示；免费模型车道跟上上游的新校验、不再动辄 403；数据看板不再是一排零。
+### 账号池：扫码渠道按渠道入池、逐模型可控
+**账号池页新增了扫码渠道卡**。此前扫码登录页加的账号游离在账号池之外——账号池只认 WorkBuddy 桌面端登录的账号，扫码加进来的十几个渠道账号在池里没有一席之地，模型开不开、哪个开，全靠猜。现在每家扫码渠道在账号池页有一张自己的卡：账号列表（昵称、启停、到期、余额）、模型列表（逐个勾选启用、免费/失效标签、上下文大小选择）、每日签到与积分领取。改动即时生效，不必点保存。
+配套的 RPC 通道一并补齐：前端与扫码渠道后端之间的账号、模型、积分、启停等请求全部走同一封装（`channel-rpc.ts`），新增 `model.setDisabledMany`、`model.setContextBudget` 等方法，保证卡片上看到的和后端真实状态一致。
+**重复账号自动清理**：同一渠道反复扫码不再攒出一排半成品账号——按「可用性」保留（长期凭据优先于临期凭据），其余清掉，日志里写明留了谁删了谁。
+### 停机补偿：自动领取
+WorkBuddy 侧偶发的模型服务异常会按账号补偿积分（在网页「用量」页顶部领，过期作废）。现在自动任务多了一项「停机补偿」，默认每天下午检查一次，有就领、领完记账，账单里能看到「补偿 +N 积分」。
+### 免费模型车道：跟上上游的客户端校验
+免费模型上游在 10 月中旬收紧了两道校验，旧版几乎每次调用都撞 403：
+- **会话 id 编码**：上游要求会话 id 按规范的降序时间戳编码（低 12 位落在固定区间），旧实现用哈希摘要当前缀，合规概率只有约 1.5%。现在改为确定性派生规范 id——同一会话稳定映射到同一上游会话，配额不会被反复消耗。
+- **客户端指纹**：请求头、路径、工具声明的形状全部对齐当前 CLI 客户端（v2 形状），并用真实网关验证过：免费模型能正常返回内容，超限时明确报限流而不是 403 拒绝。
+### 数据看板：不再是一排零
+免密通道的调用此前从未接入用量记录器，看板上免费模型的调用数恒为 0、重启即清空。现在每次调用（无论成败）都会记录请求数、轮次、首字延迟、生成速度；Token 总量取决于上游是否回传用量帧，不回传时如实显示「未上报」而不是编一个数。
+### 其他
+- 聚合渠道页的模型按「免费优先、上下文窗口、识图能力」排序；能力未知的模型如实留空，不编造窗口数字。
+- 渠道卡模型行在模型较多时提供搜索框；按钮配色统一为中性色，hover 有扫光动效。
+- 重复的登录入口合并；「已添加 N 个账号」的计数修正为去重后的真实数量。
+- 新增 5 个测试文件（免密车道闸门、扫码账号接入、RPC 方法清单、模型选择、客户端 bundle 纯净度），全套 68 文件 895 用例。
 ## 2.2.1 — README 已知限制描述更正
 纯文档修正：README「已知限制」里写着池「没法替你发起登录或扫码」——这是改名前的旧描述。现在的 XD Pool 有扫码登录页，可以为自己十三家渠道发起扫码登录；WorkBuddy 本体的 token 仍由桌面 App 的腾讯 SSO 铸造并绑定设备，这条限制保留但改成了准确的说法。代码无变化，发布这一版只为让 npm 页面的 README 跟上。
 ## 2.2.0 — 账号池重启不再失忆，CLI 修好，快照真正回读

package/lib/bin.js

@@ -161,6 +161,31 @@ const SESSION_DEAD_MARKERS = [
 */
 const ALREADY_CHECKIN_MARKERS = ["已签到", "already"];
 /**
+* Markers for "there is no compensation offer to collect".
+*
+* The offer is seasonal — an outage announcement opens one, and it closes on a
+* deadline — so for most of the year every account answers a claim with a
+* refusal. That is a successful no-op, not a failure, for the same reason
+* `isAlreadyCheckin` exists.
+*/
+const NO_COMPENSATION_MARKERS = [
+	"没有可领取",
+	"暂无可领取",
+	"无可领取",
+	"不可领取",
+	"未开启",
+	"没有活动",
+	"已领取",
+	"已过期",
+	"活动已结束",
+	"已结束",
+	"not eligible",
+	"no compensation",
+	"already claimed",
+	"not found",
+	"expired"
+];
+/**
 * Hosts the international product answers on, once each has been stripped of a
 * leading label. The WorkBuddy AI desktop app signs in at `workbuddy.ai` (and
 * the desktop client itself lists `workbuddy.cc` alongside it); the CodeBuddy
@@ -456,6 +481,16 @@ function isAlreadyCheckin(error) {
 	const message = error instanceof Error ? error.message : String(error);
 	return ALREADY_CHECKIN_MARKERS.some((marker) => message.includes(marker));
 }
+/**
+* Whether an error means "no compensation offer is running for this account".
+*
+* Callers treat this as a successful no-op: the job did its job and correctly
+* found nothing to collect.
+*/
+function isNoCompensation(error) {
+	const lower = (error instanceof Error ? error.message : String(error)).toLowerCase();
+	return NO_COMPENSATION_MARKERS.some((marker) => lower.includes(marker.toLowerCase()));
+}
 /** Parse the upstream's `credits` string into a multiplier. */
 function parseCreditMultiplier(value) {
 	if (typeof value !== "string") return void 0;
@@ -1112,6 +1147,52 @@ var WorkBuddyUpstreamClient = class {
 		};
 	}
 	/**
+	* Read the service-outage compensation offer, if any.
+	*
+	* NOTE the missing `/v2`: unlike the check-in routes, this one lives at
+	* `/billing/meter/compensation-status` and the `/v2` variant answers a plain
+	* 404 (verified on both billing hosts). The web client calls it that way too.
+	*/
+	async fetchCompensationStatus(credential) {
+		const response = await this.fetchImpl(`${billingBase(credential)}/billing/meter/compensation-status`, {
+			method: "POST",
+			headers: billingHeaders(credential),
+			body: "{}",
+			signal: AbortSignal.timeout(JSON_TIMEOUT_MS)
+		});
+		const envelope = await readEnvelope(response);
+		if (!response.ok || envelope.code !== 0) throw envelopeError(response.status, envelope);
+		const data = typeof envelope.data === "object" && envelope.data !== null ? envelope.data : {};
+		return {
+			active: data["active"] === true,
+			claimed: data["claimed"] === true,
+			creditNum: typeof data["credit_num"] === "number" ? data["credit_num"] : 0,
+			...typeof data["end_time"] === "string" && data["end_time"] !== "" ? { endTime: data["end_time"] } : {}
+		};
+	}
+	/**
+	* Collect the running compensation offer.
+	*
+	* Idempotent upstream: a repeat claim answers `code: 0` with
+	* `claimed: true` rather than an error, so a second pass in the same day
+	* records as a no-op instead of a failure.
+	*/
+	async claimCompensation(credential) {
+		const response = await this.fetchImpl(`${billingBase(credential)}/billing/meter/claim-compensation`, {
+			method: "POST",
+			headers: billingHeaders(credential),
+			body: "{}",
+			signal: AbortSignal.timeout(JSON_TIMEOUT_MS)
+		});
+		const envelope = await readEnvelope(response);
+		if (!response.ok || envelope.code !== 0) throw envelopeError(response.status, envelope);
+		const data = typeof envelope.data === "object" && envelope.data !== null ? envelope.data : {};
+		return {
+			claimed: data["claimed"] !== false,
+			creditNum: typeof data["credit_num"] === "number" ? data["credit_num"] : 0
+		};
+	}
+	/**
 	* Public fingerprint fields every desktop event carries.
 	*
 	* The upstream scores a desktop-fingerprinted task only when the event looks
@@ -3120,6 +3201,15 @@ var WorkBuddyAccountPool = class {
 	persistent;
 	/** Path of the durable store; computed once so tests can pin it. */
 	storePath;
+	/**
+	* Optional second source of credentials: the channel pack's account pool,
+	* which holds the accounts the user signed in through the scan-login page.
+	*
+	* A function rather than a list because that pool is mounted asynchronously
+	* and can be re-read on demand; `undefined` means "no such source", which is
+	* the state every test and every pre-mount startup is in.
+	*/
+	externalSource;
 	constructor(options = {}) {
 		this.logger = options.logger;
 		this.authDirs = options.authDirs ?? candidateAuthDirs();
@@ -3146,6 +3236,14 @@ var WorkBuddyAccountPool = class {
 		if (options.creditReserves !== void 0) this.setCreditReserves(options.creditReserves);
 	}
 	/**
+	* Register (or clear, with `undefined`) the extra credential source that
+	* `scan()` merges alongside the auth directories. Rescanning is the caller's
+	* job: this only changes where the next scan looks.
+	*/
+	applyExternalSource(source) {
+		this.externalSource = source;
+	}
+	/**
 	* Replace the permanent ignore list.
 	*
 	* Also drops any already-discovered account that is now ignored, so the change
@@ -3202,6 +3300,15 @@ var WorkBuddyAccountPool = class {
 		}
 		this.skippedFiles = skipped;
 		if (skipped.length > 0) this.logger?.warn?.(`dsh-xdpool: ${skipped.length} credential file(s) could not be read; ${found.length} account(s) still loaded. Reasons: ` + [...new Set(skipped.map((s) => s.reason))].join("; "));
+		if (this.externalSource !== void 0) try {
+			const external = await this.externalSource();
+			for (const credential of external) {
+				if (this.ignoredIds.size > 0 && this.ignoredIds.has(workbuddyAccountId(credential))) continue;
+				found.push(credential);
+			}
+		} catch (error) {
+			this.logger?.warn?.("dsh-xdpool: could not read channel-pack accounts; desktop accounts only", error);
+		}
 		const byId = /* @__PURE__ */ new Map();
 		for (const account of this.accounts) byId.set(account.id, account);
 		if (this.persistent && this.accounts.length === 0) {
@@ -4198,7 +4305,8 @@ const DEFAULT_AUTOMATION_HOURS = {
 	report: [10],
 	tasks: [11],
 	streak: [12],
-	travel: [9, 21]
+	travel: [9, 21],
+	compensation: [13]
 };
 //#endregion
 //#region src/channels.ts
@@ -9156,7 +9264,7 @@ Object.freeze({
 	"openai-responses": "/responses",
 	"anthropic-messages": "/messages"
 });
-process.env.XDPOOL_FREE_BASE;
+typeof process === "undefined" || process.env.XDPOOL_FREE_BASE;
 Object.freeze([
 	"muse-spark-1.3-contributor-free",
 	"muse-spark-1.2-contributor-free",
@@ -9615,7 +9723,8 @@ const JOB_KINDS = [
 	"report",
 	"tasks",
 	"streak",
-	"travel"
+	"travel",
+	"compensation"
 ];
 /**
 * Pick the hour list to run on: the configured one, or the default.
@@ -9662,9 +9771,10 @@ function diffEarnings(before, after) {
 			claimed: entry.claimed - (was?.claimed ?? 0),
 			checkinCredit: entry.checkinCredit - (was?.checkinCredit ?? 0),
 			bonusCredit: entry.bonusCredit - (was?.bonusCredit ?? 0),
-			travelCredit: entry.travelCredit - (was?.travelCredit ?? 0)
+			travelCredit: entry.travelCredit - (was?.travelCredit ?? 0),
+			compensationCredit: entry.compensationCredit - (was?.compensationCredit ?? 0)
 		};
-		if (gain.credit === 0 && gain.energy === 0 && gain.claimed === 0 && gain.checkinCredit === 0 && gain.bonusCredit === 0 && gain.travelCredit === 0) continue;
+		if (gain.credit === 0 && gain.energy === 0 && gain.claimed === 0 && gain.checkinCredit === 0 && gain.bonusCredit === 0 && gain.travelCredit === 0 && gain.compensationCredit === 0) continue;
 		accounts[id] = gain;
 		credit += gain.credit;
 		energy += gain.energy;
@@ -9758,6 +9868,7 @@ var WorkBuddyScheduler = class {
 	reportHours;
 	streakHours;
 	travelHours;
+	compensationHours;
 	timer;
 	running = false;
 	/** Guards against a slow run overlapping the next tick. */
@@ -9777,7 +9888,8 @@ var WorkBuddyScheduler = class {
 		report: { ...EMPTY_JOB_STATE },
 		tasks: { ...EMPTY_JOB_STATE },
 		streak: { ...EMPTY_JOB_STATE },
-		travel: { ...EMPTY_JOB_STATE }
+		travel: { ...EMPTY_JOB_STATE },
+		compensation: { ...EMPTY_JOB_STATE }
 	};
 	claimableSeen = 0;
 	/**
@@ -9814,6 +9926,7 @@ var WorkBuddyScheduler = class {
 		this.taskHours = hoursOrDefault(options.taskHours, DEFAULT_AUTOMATION_HOURS.tasks);
 		this.streakHours = hoursOrDefault(options.streakHours, DEFAULT_AUTOMATION_HOURS.streak);
 		this.travelHours = hoursOrDefault(options.travelHours, DEFAULT_AUTOMATION_HOURS.travel);
+		this.compensationHours = hoursOrDefault(options.compensationHours, DEFAULT_AUTOMATION_HOURS.compensation);
 	}
 	/** Apply a new configuration; safe to call while running. */
 	/**
@@ -9846,6 +9959,7 @@ var WorkBuddyScheduler = class {
 		if (options.taskHours !== void 0) this.taskHours = hoursOrDefault(options.taskHours, DEFAULT_AUTOMATION_HOURS.tasks);
 		if (options.streakHours !== void 0) this.streakHours = hoursOrDefault(options.streakHours, DEFAULT_AUTOMATION_HOURS.streak);
 		if (options.travelHours !== void 0) this.travelHours = hoursOrDefault(options.travelHours, DEFAULT_AUTOMATION_HOURS.travel);
+		if (options.compensationHours !== void 0) this.compensationHours = hoursOrDefault(options.compensationHours, DEFAULT_AUTOMATION_HOURS.compensation);
 	}
 	/** Hours for one job, used by the loop and the status document. */
 	hoursOf(kind) {
@@ -9855,6 +9969,7 @@ var WorkBuddyScheduler = class {
 			case "tasks": return this.taskHours;
 			case "streak": return this.streakHours;
 			case "travel": return this.travelHours;
+			case "compensation": return this.compensationHours;
 		}
 	}
 	/** Start the loop. Idempotent. */
@@ -9968,6 +10083,7 @@ var WorkBuddyScheduler = class {
 			reportHours: this.reportHours,
 			streakHours: this.streakHours,
 			travelHours: this.travelHours,
+			compensationHours: this.compensationHours,
 			jobs,
 			claimableSeen: this.claimableSeen,
 			earningsToday: this.earningsSnapshot(),
@@ -10080,7 +10196,8 @@ var WorkBuddyScheduler = class {
 		const checkinCredit = delta.checkinCredit ?? 0;
 		const bonusCredit = delta.bonusCredit ?? 0;
 		const travelCredit = delta.travelCredit ?? 0;
-		if (credit === 0 && energy === 0 && claimed === 0 && checkinCredit === 0 && bonusCredit === 0 && travelCredit === 0) return;
+		const compensationCredit = delta.compensationCredit ?? 0;
+		if (credit === 0 && energy === 0 && claimed === 0 && checkinCredit === 0 && bonusCredit === 0 && travelCredit === 0 && compensationCredit === 0) return;
 		const existing = this.earnings.get(accountId);
 		this.earnings.set(accountId, {
 			credit: (existing?.credit ?? 0) + credit,
@@ -10089,6 +10206,7 @@ var WorkBuddyScheduler = class {
 			checkinCredit: (existing?.checkinCredit ?? 0) + checkinCredit,
 			bonusCredit: (existing?.bonusCredit ?? 0) + bonusCredit,
 			travelCredit: (existing?.travelCredit ?? 0) + travelCredit,
+			compensationCredit: (existing?.compensationCredit ?? 0) + compensationCredit,
 			date: today
 		});
 		this.persistEarnings();
@@ -10196,7 +10314,19 @@ var WorkBuddyScheduler = class {
 						if (progress !== void 0) progressNote = progress;
 						break;
 					}
-					case "travel": await this.runTravel(account);
+					case "travel":
+						await this.runTravel(account);
+						break;
+					case "compensation": try {
+						const outcome = await this.runCompensation(account);
+						if (outcome.credit > 0) {
+							detail.push(`补偿 +${outcome.credit}`);
+							this.logger.info?.(`automation compensation ${account.label}: +${outcome.credit} credit`);
+						}
+					} catch (error) {
+						if (!isNoCompensation(error)) throw error;
+						this.logger.info?.(`automation compensation ${account.label}: no offer to collect`);
+					}
 				}
 				ok++;
 			} catch (error) {
@@ -10525,6 +10655,27 @@ var WorkBuddyScheduler = class {
 		}
 		this.logger.info?.(`automation travel ${account.label}: nothing to do (state=${travel.state})`);
 	}
+	/**
+	* Collect the running service-outage compensation offer, if any.
+	*
+	* Read-then-claim, rather than claim-blind: a claim costs one mutation the
+	* upstream may reject, and the status call is a free read that also tells us
+	* the size on offer so the ledger records the real number instead of
+	* assuming the usual 500.
+	*
+	* Returns the credits collected — 0 when there was nothing to collect, which
+	* is the normal case for most of the year.
+	*/
+	async runCompensation(account) {
+		const credential = account.credential;
+		const status = await this.client.fetchCompensationStatus(credential);
+		if (!status.active || status.claimed || status.creditNum <= 0) return { credit: 0 };
+		const claim = await this.client.claimCompensation(credential);
+		if (!claim.claimed) return { credit: 0 };
+		const credit = claim.creditNum > 0 ? claim.creditNum : status.creditNum;
+		this.recordEarnings(account.id, dayKey(this.now()), { compensationCredit: credit });
+		return { credit };
+	}
 };
 Object.freeze({
 	"agnes": "推理内容以 think 标签返回",
@@ -10769,6 +10920,7 @@ const automationSchema = z.object({
 	taskHours: z.array(z.number().step(1).min(0).max(23)).description("Local hours for task enrolment and claiming"),
 	streakHours: z.array(z.number().step(1).min(0).max(23)).description("Local hours for streak redemption"),
 	travelHours: z.array(z.number().step(1).min(0).max(23)).description("Local hours for the buddy travel loop"),
+	compensationHours: z.array(z.number().step(1).min(0).max(23)).description("Local hours for the outage-compensation claim"),
 	exhaustCooldownMs: z.number().step(1).min(1e3).description("How long a spent account rests, in milliseconds")
 });
 z.object({