dsh-connect-workbuddy 4.9.3 → 4.10.0

package/lib/index.js

@@ -1,4 +1,4 @@
-import { $ as isEncryptedFieldWrapper, A as workbuddyAccountId, B as modelIdOfBody, C as defaultDesktopAuthDirs, D as isVaultAccountId, E as isEncryptedCredentialError, F as WorkBuddyUpstreamClient, G as regionOf, H as parseReasoning, I as classifyUpstreamError, J as deriveAtRestKey, K as WORKBUDDY_APP_EXECUTABLE_ENV, L as declaredTools, M as CREDENTIAL_REJECTED_CODE, N as WORKBUDDY_FALLBACK_SYSTEM_PROMPT, O as legacyWorkbuddyOwnAuthPath, P as WorkBuddyCredentialRejectedError, R as isCredentialRejectedError, S as defaultDesktopAuthCandidates, T as hasEncryptedCredentialFields, U as parseUpstreamModel, V as parseCreditMultiplier, W as prepareChatBody, X as fetchAtRestKeyPayload, Y as deriveAtRestKeyId, Z as findWorkbuddyAppExecutable, _ as WORKBUDDY_AUTH_FILENAME, a as readHostHeartbeat, at as workbuddyAppExecutableCandidates, b as WorkBuddyEncryptedCredentialError, c as WORKBUDDY_CONNECT_VERSION, ct as withFileLock, d as FALLBACK_WORKBUDDY_MODELS_GLOBAL, et as isWorkbuddyBundle, f as WorkBuddyCatalog, g as ENCRYPTED_CREDENTIAL_CODE, h as fallbackModelsFor, i as processStartTimeMs, it as readAtRestKey, j as workbuddyOwnAuthPath, k as parseWorkBuddyAuth, l as piAiRuntimeInfo, lt as writeFileAtomic, m as deriveCatalog, n as clearHostHeartbeat, nt as macosNestedAppBundles, o as workbuddyHostHeartbeatPath, p as applyContextBudgets, q as clearAtRestKeyCache, r as isHeartbeatProcessAlive, rt as openEncryptedField, s as writeHostHeartbeat, st as resolveDshHome, t as WORKBUDDY_HOST_HEARTBEAT_FILENAME, tt as macosBundleExecutable, u as FALLBACK_WORKBUDDY_MODELS, v as WORKBUDDY_AUTH_FILE_ENV, w as defaultDesktopAuthPath, x as authFileName, y as WorkBuddyCredentialStore, z as knownRegionOf } from "./host-heartbeat-BHaBzzOr.js";
+import { $ as isEncryptedFieldWrapper, A as workbuddyAccountId, B as modelIdOfBody, C as defaultDesktopAuthDirs, D as isVaultAccountId, E as isEncryptedCredentialError, F as WorkBuddyUpstreamClient, G as regionOf, H as parseReasoning, I as classifyUpstreamError, J as deriveAtRestKey, K as WORKBUDDY_APP_EXECUTABLE_ENV, L as declaredTools, M as CREDENTIAL_REJECTED_CODE, N as WORKBUDDY_FALLBACK_SYSTEM_PROMPT, O as legacyWorkbuddyOwnAuthPath, P as WorkBuddyCredentialRejectedError, R as isCredentialRejectedError, S as defaultDesktopAuthCandidates, T as hasEncryptedCredentialFields, U as parseUpstreamModel, V as parseCreditMultiplier, W as prepareChatBody, X as fetchAtRestKeyPayload, Y as deriveAtRestKeyId, Z as findWorkbuddyAppExecutable, _ as WORKBUDDY_AUTH_FILENAME, a as readHostHeartbeat, at as workbuddyAppExecutableCandidates, b as WorkBuddyEncryptedCredentialError, c as WORKBUDDY_CONNECT_VERSION, ct as withFileLock, d as FALLBACK_WORKBUDDY_MODELS_GLOBAL, et as isWorkbuddyBundle, f as WorkBuddyCatalog, g as ENCRYPTED_CREDENTIAL_CODE, h as fallbackModelsFor, i as processStartTimeMs, it as readAtRestKey, j as workbuddyOwnAuthPath, k as parseWorkBuddyAuth, l as piAiRuntimeInfo, lt as writeFileAtomic, m as deriveCatalog, n as clearHostHeartbeat, nt as macosNestedAppBundles, o as workbuddyHostHeartbeatPath, p as applyContextBudgets, q as clearAtRestKeyCache, r as isHeartbeatProcessAlive, rt as openEncryptedField, s as writeHostHeartbeat, st as resolveDshHome, t as WORKBUDDY_HOST_HEARTBEAT_FILENAME, tt as macosBundleExecutable, u as FALLBACK_WORKBUDDY_MODELS, v as WORKBUDDY_AUTH_FILE_ENV, w as defaultDesktopAuthPath, x as authFileName, y as WorkBuddyCredentialStore, z as knownRegionOf } from "./host-heartbeat-BQHO4oiB.js";
 import z from "@deepseek-ai/schemastery";
 import { appendFile, mkdir, readFile, writeFile } from "node:fs/promises";
 import { randomBytes, randomUUID, timingSafeEqual } from "node:crypto";
@@ -78,6 +78,46 @@ async function resolveCredentialRecovery(options) {
 	};
 	return { reloginRequired: false };
 }
+/** How the display copy names each campaign. */
+const WORKBUDDY_BENEFIT_TITLES = {
+	compensation: "模型服务异常补偿",
+	gift: "新人首月赠送"
+};
+/**
+* Resolve one campaign against the clock.
+*
+* `active` is the gateway's own window verdict and is trusted as-is; the clock is
+* consulted only for the countdown, never to override `active`. An account whose
+* clock is skewed therefore still renders the upstream's answer rather than a
+* locally-invented one.
+*/
+function benefitOf(benefit, nowMs) {
+	const daysLeft = benefit.endsAtMs === void 0 ? void 0 : Math.max(0, Math.ceil((benefit.endsAtMs - nowMs) / 864e5));
+	const state = benefit.claimed ? "claimed" : benefit.active ? "claimable" : "expired";
+	return {
+		kind: benefit.kind,
+		state,
+		creditNum: benefit.creditNum,
+		...benefit.endsAtMs === void 0 ? {} : { endsAtMs: benefit.endsAtMs },
+		...daysLeft === void 0 ? {} : { daysLeft },
+		urgent: state === "claimable" && daysLeft !== void 0 && daysLeft <= 3
+	};
+}
+/**
+* The claimable campaigns of one account, urgent first.
+*
+* Ordered by `daysLeft` ascending so the soonest-expiring offer leads — the whole
+* point of surfacing this is that a 3-day window otherwise lapses unnoticed. A
+* campaign with no stated end sorts last, because "no deadline" is never more
+* urgent than a deadline.
+*
+* `claimed` and `expired` campaigns are dropped here, not in the renderer: the
+* user asked for them to be ABSENT, and encoding that in one tested place beats
+* asking every caller to remember to filter.
+*/
+function claimableBenefits(benefits, nowMs) {
+	return benefits.map((benefit) => benefitOf(benefit, nowMs)).filter((view) => view.state === "claimable").sort((left, right) => (left.daysLeft ?? 1e6) - (right.daysLeft ?? 1e6));
+}
 //#endregion
 //#region src/adapter.ts
 /**
@@ -2691,10 +2731,39 @@ function failoverReasonText(failure) {
 		case "policy_reject": return "被服务端策略拒绝";
 		case "not_found": return "模型不可用";
 		case "server": return "上游异常";
-		default: return `不可用（http ${failure.status}）`;
+		case "client": return "请求被上游拒绝";
+		default: return "不可用";
 	}
 }
 /**
+* One upstream sentence, made safe to paste into a single-line error message.
+*
+* `result.message` carries the WHOLE upstream body — for a classified failure
+* that is a JSON envelope 637–777 characters long whose first 400 characters are
+* the `code`/`requestId`/`extError` skeleton (`param: ""`, `Request: null`). A
+* plain `slice(0, 400)` therefore cut the one actionable sentence in half: the
+* reply ended mid-word at `Pleas` and the reader lost `displayTips` entirely
+* (issue #78).
+*
+* Two rules keep that from happening again:
+* - whitespace collapses to single spaces, because the body is JSON/HTML and its
+*   newlines would otherwise render as a ragged block inside one paragraph;
+* - the cut prefers a sentence boundary once one exists past the halfway point,
+*   so a clipped sentence reads as "truncated" instead of as broken prose, and
+*   the `…` always says the text continues.
+*
+* This is the LAST resort: a body that parsed into a `detail` with `displayMsg`
+* or `tips` never reaches it, and those are short by construction.
+*/
+function clippedUpstreamText(text, limit) {
+	const collapsed = text.replace(/\s+/gu, " ").trim();
+	if (collapsed.length <= limit) return collapsed;
+	const cut = collapsed.slice(0, limit);
+	const stop = Math.max(cut.lastIndexOf("。"), cut.lastIndexOf("！"), cut.lastIndexOf("？"), cut.lastIndexOf(". "), cut.lastIndexOf("! "), cut.lastIndexOf("? "));
+	if (stop >= Math.floor(limit / 2)) return `${cut.slice(0, stop + 1).trimEnd()}…`;
+	return `${cut.trimEnd()}…`;
+}
+/**
 * The line prepended to an answer that came from a failover account.
 *
 * Block-quoted and bracketed so it reads as machinery rather than as the model's
@@ -3094,11 +3163,11 @@ function createWorkBuddyShim(options) {
 		if (!result.ok) {
 			const attempts = triedAccountIds.length;
 			const note = attempts > 1 ? `（已尝试 ${attempts} 个账号）` : "";
-			const shortfall = failoverShortfall === void 0 ? void 0 : await failoverShortfall().catch(() => void 0);
+			const shortfall = failoverShortfall !== void 0 && failoverAccount !== void 0 && isFailoverWorthy(result.kind) ? await failoverShortfall().catch(() => void 0) : void 0;
 			const why = shortfall === void 0 ? "" : `：${shortfall}`;
 			if (result.kind === "policy_reject") {
 				const detail = result.detail;
-				const lead = detail?.displayMsg ?? result.message.slice(0, 200);
+				const lead = detail?.displayMsg ?? clippedUpstreamText(result.message, 200);
 				const meta = ["服务端策略拒绝"];
 				if (detail?.upstreamCode !== void 0) meta.push(`code ${detail.upstreamCode}`);
 				if (detail?.requestId !== void 0) meta.push(`requestId ${detail.requestId}`);
@@ -3108,7 +3177,7 @@ function createWorkBuddyShim(options) {
 			}
 			if (result.kind === "model_busy") {
 				const detail = result.detail;
-				const lead = detail?.displayMsg ?? result.message.slice(0, 200);
+				const lead = detail?.displayMsg ?? clippedUpstreamText(result.message, 200);
 				const meta = ["模型当前负载较高"];
 				if (detail?.upstreamCode !== void 0) meta.push(`code ${detail.upstreamCode}`);
 				if (detail?.requestId !== void 0) meta.push(`requestId ${detail.requestId}`);
@@ -3116,7 +3185,15 @@ function createWorkBuddyShim(options) {
 				writeOpenAIError(res, KIND_STATUS[result.kind], result.kind, message, hostErrorCode(result.kind));
 				return;
 			}
-			writeOpenAIError(res, KIND_STATUS[result.kind], result.kind, `workbuddy 上游失败：${failoverReasonText(result)}（http ${result.status}）${note}${why}。${result.message.slice(0, 400)}` + (failoverShortfall === void 0 ? "" : "。池中没有其他可用账号，建议换一个模型继续，或稍后等待该账号的额度恢复"), hostErrorCode(result.kind));
+			const detail = result.detail;
+			const meta = [];
+			if (detail?.upstreamCode !== void 0) meta.push(`code ${detail.upstreamCode}`);
+			if (detail?.requestId !== void 0) meta.push(`requestId ${detail.requestId}`);
+			const stamp = meta.length === 0 ? "" : `（${meta.join("，")}）`;
+			const receipt = detail?.tips ?? detail?.displayMsg ?? clippedUpstreamText(result.message, 400);
+			const advice = result.kind === "client" ? "该请求被上游按参数拒绝：与网络、账号、额度都无关，换账号也不会改变结果，请按上面的提示调整后重试" : shortfall === void 0 ? "" : "建议换一个模型继续，或稍后等待该账号的额度恢复";
+			const body = advice === "" ? receipt : `${receipt.replace(/[。.]$/u, "")}。${advice}`;
+			writeOpenAIError(res, KIND_STATUS[result.kind], result.kind, `workbuddy 上游失败：${failoverReasonText(result)}（http ${result.status}）${note}${why}${stamp}。${body}`, hostErrorCode(result.kind));
 			return;
 		}
 		res.writeHead(200, {
@@ -4735,6 +4812,15 @@ const WORKBUDDY_USAGE_PATH = "/plugins/dsh-connect-workbuddy/usage";
 * per-account figures.
 */
 const WORKBUDDY_ACCOUNT_CREDITS_PATH = "/plugins/dsh-connect-workbuddy/account-credits";
+/**
+* Plugin-owned benefit claim endpoint: POST + loopback, ONE account per call.
+*
+* A credit grant is a write on a real account, so it carries the same guards as
+* check-in, plus `?accountId=` because the pool can hold accounts this plugin
+* did not pick. There is deliberately no batch action here — see
+* `claimBenefit` and the route handler.
+*/
+const WORKBUDDY_BENEFIT_CLAIM_PATH = "/plugins/dsh-connect-workbuddy/benefit/claim";
 /** Plugin-owned live model refresh endpoint. */
 const WORKBUDDY_MODELS_REFRESH_PATH = "/plugins/dsh-connect-workbuddy/models/refresh";
 /** Plugin-owned local account rescan endpoint. */
@@ -5329,6 +5415,7 @@ async function workBuddyWebPool(deps, region, fast = false) {
 	const rankedIds = new Set(ranked.map((row) => row.account.id));
 	const others = await pool.otherAccounts?.(region) ?? [];
 	const checkedIn = fast ? pool.cachedCheckedInToday?.(region) ?? {} : await pool.checkedInToday?.(region).catch(() => ({})) ?? {};
+	const claimable = fast ? pool.cachedBenefits?.(region) ?? {} : await pool.benefits?.(region).catch(() => ({})) ?? {};
 	const rows = [...ranked.map((row) => ({
 		account: row.account,
 		member: true,
@@ -5376,7 +5463,18 @@ async function workBuddyWebPool(deps, region, fast = false) {
 			...row?.excludedBy === void 0 ? {} : { excludedBy: row.excludedBy },
 			current: account.id === currentAccountId,
 			member,
-			...checkedIn[account.id] === void 0 ? {} : { checkedInToday: checkedIn[account.id] }
+			...checkedIn[account.id] === void 0 ? {} : { checkedInToday: checkedIn[account.id] },
+			...(() => {
+				const views = claimable[account.id];
+				if (views === void 0 || views.length === 0) return {};
+				return { benefits: views.map((view) => ({
+					kind: view.kind,
+					title: WORKBUDDY_BENEFIT_TITLES[view.kind],
+					creditNum: view.creditNum,
+					...view.daysLeft === void 0 ? {} : { daysLeft: view.daysLeft },
+					urgent: view.urgent
+				})) };
+			})()
 		};
 	});
 	return {
@@ -5506,6 +5604,43 @@ function registerWorkBuddyStatusRoute(ctx, deps) {
 				}
 			}
 		});
+		ctx.webServer.register({
+			kind: "exact",
+			path: WORKBUDDY_BENEFIT_CLAIM_PATH,
+			handler: async (req, res) => {
+				if (req.method !== "POST") return json(res, 405, { error: "method not allowed" });
+				if (!loopbackOrigin(req)) return json(res, 403, { error: "origin-not-trusted" });
+				const region = requestRegion(req, res);
+				if (region === void 0) return;
+				const url = new URL(req.url ?? "/", "http://127.0.0.1");
+				const accountId = url.searchParams.get(WORKBUDDY_POOL_ACCOUNT_PARAM);
+				const kind = url.searchParams.get("kind");
+				if (accountId === null || accountId === "") return json(res, 400, { error: "accountId is required" });
+				if (kind !== "compensation" && kind !== "gift") return json(res, 400, { error: "kind must be compensation or gift" });
+				try {
+					const credential = await deps.store(region).credentialFor(accountId);
+					if (credential === void 0) return json(res, 404, { error: "no credential for this account" });
+					const target = (await deps.client.fetchBenefits(credential)).find((benefit) => benefit.kind === kind);
+					if (target === void 0) return json(res, 404, { error: "benefit not available on this account" });
+					if (target.claimed) return json(res, 409, {
+						error: "benefit already claimed",
+						benefit: target
+					});
+					if (!target.active) return json(res, 409, {
+						error: "benefit activity is not active",
+						benefit: target
+					});
+					await deps.client.claimBenefit(credential, kind);
+					deps.pool?.invalidateBenefit?.(region, accountId);
+					json(res, 200, {
+						claimed: true,
+						benefit: (await deps.client.fetchBenefits(credential)).find((benefit) => benefit.kind === kind) ?? target
+					});
+				} catch (error) {
+					json(res, 500, { error: safeMessage(error) });
+				}
+			}
+		});
 		const disposeRefresh = ctx.webServer.register({
 			kind: "exact",
 			path: WORKBUDDY_MODELS_REFRESH_PATH,
@@ -6231,6 +6366,16 @@ function apply(ctx, config) {
 	* immediately instead of waiting out the TTL.
 	*/
 	const checkinStateCache = {};
+	/**
+	* Per-region, per-account benefit readings (issue #79).
+	*
+	* Same shape and same reasoning as `checkinStateCache`: claim state changes
+	* when a human acts on the web page or in the desktop app, not spontaneously,
+	* so a per-poll read of two endpoints per account would be thousands of
+	* requests a day to learn nothing. Coarser than the check-in TTL because a
+	* benefit window is measured in days, not hours.
+	*/
+	const benefitStateCache = {};
 	const settingsNs = settingsNamespaceOf(ctx);
 	const stacks = {};
 	for (const region of REGION_KEYS) {
@@ -6616,6 +6761,77 @@ function apply(ctx, config) {
 				}
 				return cached;
 			},
+			/**
+			* Claimable promotional benefits per account (issue #79).
+			*
+			* Only campaigns the account can STILL claim are returned — a claimed or
+			* lapsed one is absent, which is what the issue asked for. Absent means
+			* the card shows no benefit line at all.
+			*
+			* Two status reads per account, so it is cached for `BENEFIT_CACHE_MS` and
+			* skipped entirely when the pool is off (same reasoning as
+			* `checkedInToday`: no table, no request).
+			*/
+			async benefits(region) {
+				if (!poolPreferencesOf(current(), region).enabled) return {};
+				const store = stacks[region].store;
+				const accounts = await store.accounts();
+				const now = Date.now();
+				const entries = await Promise.all(accounts.map(async (account) => {
+					const cached = benefitStateCache[region]?.[account.id];
+					if (cached !== void 0 && now - cached.atMs < 18e5) return [account.id, cached.views];
+					const credential = await store.credentialFor(account.id).catch(() => void 0);
+					if (credential === void 0) return void 0;
+					const read = await client.fetchBenefits(credential).catch(() => void 0);
+					if (read === void 0) return void 0;
+					const views = claimableBenefits(read, now);
+					benefitStateCache[region] = {
+						...benefitStateCache[region],
+						[account.id]: {
+							views,
+							atMs: now
+						}
+					};
+					return [account.id, views];
+				}));
+				return Object.fromEntries(entries.filter((entry) => entry !== void 0));
+			},
+			/**
+			* Claimable benefits from the readings already taken this process.
+			*
+			* The first-paint counterpart of `benefits`, mirroring
+			* `cachedCheckedInToday`: no request, so painting never blocks on two
+			* calls per account. An unmeasured account is absent, not empty.
+			*/
+			cachedBenefits(region) {
+				if (!poolPreferencesOf(current(), region).enabled) return {};
+				const now = Date.now();
+				const state = benefitStateCache[region] ?? {};
+				const cached = {};
+				for (const [accountId, entry] of Object.entries(state)) {
+					if (now - entry.atMs >= 18e5) continue;
+					cached[accountId] = entry.views;
+				}
+				return cached;
+			},
+			/**
+			* Drop one account's cached benefit reading (issue #79).
+			*
+			* The claim route writes upstream itself, so this cache is the ONLY thing
+			* that can keep answering "claimable" after a successful claim — and it was
+			* never invalidated: the credits went up, the 领取 pill stayed for up to 30
+			* minutes, and the claim looked like it had silently failed. That is the
+			* exact symptom the user reported. `checkin` already deletes its entries
+			* after a batch; this is the same rule for the claim.
+			*
+			* Deleting (rather than overwriting with the post-claim read) keeps the
+			* ownership where it belongs: the route already made the authoritative
+			* re-read, and the next `benefits()` refills this from live data.
+			*/
+			invalidateBenefit(region, accountId) {
+				const cached = benefitStateCache[region];
+				if (cached !== void 0) delete cached[accountId];
+			},
 			async currentAccountId(region) {
 				await applyPoolSelection(region).catch(() => void 0);
 				const credential = await stacks[region].store.current().catch(() => void 0);

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "dsh-connect-workbuddy",
   "displayName": "DSH Connect WorkBuddy",
-  "description": "把本机登录的 WorkBuddy 模型接入 DeepSeek Harness，并提供只读的积分概览与模型管理。",
-  "version": "4.9.3",
+  "description": "把本机登录的 WorkBuddy 模型（国内版与国际版）接入 DeepSeek Harness：每次刷新按上游目录自动读取每个模型的积分倍率，支持逐模型图片输入开关、多账号切换与账号池自动换号，并提供每日签到、卡片与输入框里的胶囊积分读数等只读积分概览。",
+  "version": "4.10.0",
   "author": "dingminhua",
   "copyright": "Copyright (c) 2026 LaoDing",
   "license": "MIT",