dsh-connect-workbuddy 1.4.0 → 2.0.1

package/lib/client.js

@@ -29,6 +29,17 @@ window.__ModuleLoader__.load({
 		const WORKBUDDY_ACCOUNTS_REFRESH_PATH = "/plugins/dsh-connect-workbuddy/accounts/refresh";
 		/** Plugin-owned daily check-in action endpoint. */
 		const WORKBUDDY_CHECKIN_PATH = "/plugins/dsh-connect-workbuddy/checkin";
+		/** Query parameter naming the region a card request addresses. */
+		const WORKBUDDY_REGION_PARAM = "region";
+		/** Every region, in card tab order. */
+		const WORKBUDDY_REGIONS = ["cn", "global"];
+		/**
+		* Address one region's status route. The two regions are separate provider
+		* stacks; every card request carries the region whose tab the user is on.
+		*/
+		function withWorkBuddyRegion(path, region) {
+			return `${path}?${WORKBUDDY_REGION_PARAM}=${region}`;
+		}
 		/**
 		* Project one card row into its persisted `lastCatalog` shape: the native
 		* context window becomes the stored `contextWindow`, and the card-only
@@ -70,7 +81,8 @@ window.__ModuleLoader__.load({
 		*     dingminhua/dsh-subagent-default-model（MIT）的 SETTINGS_CSS。
 		*     沿用目的是让两个插件共享同一套外部表现语言。
 		* 改动：类名由 `dsm-trae-*` 改为 `dsm-workbuddy-*`；
-		*   移除 trae 特有的 1M 变体样式，新增按套餐聚合的积分行样式。
+		*   移除 trae 特有的 1M 变体样式，新增按套餐聚合的积分行样式；
+		*   双 provider 化后新增国内版/国际版 tab 栏样式。
 		*
 		* @module dsh-connect-workbuddy/client/styles
 		*/
@@ -95,6 +107,12 @@ window.__ModuleLoader__.load({
 .dsm-btn-primary{background:var(--dsw-alias-label-primary);color:var(--dsw-alias-bg-layer-3)}
 .dsm-btn-primary:hover:not(:disabled){opacity:.9}
 .dsm-workbuddy-usage{display:flex;flex-direction:column;gap:16px;margin:0;padding:16px 0 4px}
+.dsm-workbuddy-tabs{display:flex;gap:6px;padding:4px;border:1px solid var(--dsw-alias-border-l2,#3a3d45);border-radius:10px;background:var(--dsw-alias-bg-layer-3,#2a2c33)}
+.dsm-workbuddy-tab{appearance:none;font:inherit;cursor:pointer;flex:1;border:0;border-radius:7px;padding:7px 10px;color:var(--dsw-alias-label-tertiary,#999);font-size:13px;font-weight:500;line-height:18px;background:transparent;transition:color .15s,background .15s;white-space:nowrap;overflow:hidden;text-overflow:ellipsis}
+.dsm-workbuddy-tab:hover:not(:disabled):not(.dsm-workbuddy-tab-active){color:var(--dsw-alias-label-primary,#e6e6e6)}
+.dsm-workbuddy-tab:focus-visible{outline:2px solid var(--dsw-alias-brand-primary,#5686fe);outline-offset:1px}
+.dsm-workbuddy-tab-active{color:var(--dsw-alias-label-primary,#e6e6e6);background:var(--dsw-alias-bg-layer-2,#232529);box-shadow:inset 0 0 0 1px var(--dsw-alias-border-l2,#3a3d45)}
+.dsm-workbuddy-tab-dot{display:inline-block;width:7px;height:7px;border-radius:50%;margin-right:6px;vertical-align:baseline}
 .dsm-workbuddy-usage-account{display:flex;align-items:center;justify-content:space-between;gap:12px;padding:12px 14px;border:1px solid var(--dsw-alias-border-l2,#3a3d45);border-radius:14px;background:var(--dsw-alias-bg-layer-2,#24262c)}
 .dsm-workbuddy-usage-account-copy{display:flex;flex-direction:column;gap:3px;min-width:0}
 .dsm-workbuddy-usage-expiry{padding-left:19px;color:var(--dsw-alias-label-tertiary,#9aa0a8);font-size:12px;line-height:18px}
@@ -177,12 +195,15 @@ window.__ModuleLoader__.load({
 		*     60 秒轮询与 AbortController 清理、以及
 		*     `IconChevronDownOutline14` 的使用，均来自该项目的 TraeUsageCard。
 		*   折叠卡片外壳与 `settings.plugin.item` 槽位形态来自
-		*     dingminhua/dsh-subagent-default-model（MIT）。
+		*   dingminhua/dsh-subagent-default-model（MIT）。
 		* 改动：
 		*   1. 积分区改为「合计 + 按套餐名聚合的进度条」，因为实测单个账号下
 		*      同名套餐可达 19 个，逐条渲染会淹没卡片（原项目按上游条目直出）；
 		*   2. 模型行补上 WorkBuddy 上游给出的积分倍率、多模态与推理档位；
-		*   3. 移除与 WorkBuddy 上游无关的 1M 变体勾选。
+		*   3. 移除与 WorkBuddy 上游无关的 1M 变体勾选；
+		*   4. 双 provider 化后卡片顶部为「国内版 / 国际版」tab 栏 —— 每个 tab
+		*      是一个独立供应商（workbuddy / workbuddy-global），账号、积分、
+		*      模型目录与草稿完全按区域隔离，切 tab 不丢另一侧未保存的草稿。
 		*
 		* @module dsh-connect-workbuddy/client/WorkBuddyCard
 		*/
@@ -234,20 +255,33 @@ window.__ModuleLoader__.load({
 		function dotStyle(status) {
 			return { background: status === "signed-in" ? "var(--dsw-alias-state-success-primary, #22a06b)" : status === "error" ? "var(--dsw-alias-state-error-primary, #d92d20)" : "var(--dsw-alias-label-dimmed, #9aa0a6)" };
 		}
+		/** Read the per-region account selections out of the settings snapshot. */
+		function configuredAccountsOf(configured) {
+			const accounts = configured?.accounts;
+			return typeof accounts === "object" && accounts !== null ? accounts : {};
+		}
 		/** Render WorkBuddy sign-in state, credits, and model selection as one card. */
 		function WorkBuddyCard({ t, settingsScope }) {
 			if (t === void 0) throw new Error("WorkBuddy plugin card requires its translation function");
 			const [open, setOpen] = (0, react.useState)(false);
-			const [status, setStatus] = (0, react.useState)({
-				status: "signed-out",
-				accounts: []
+			/** The region whose tab is on screen; each tab is its own provider stack. */
+			const [activeRegion, setActiveRegion] = (0, react.useState)("cn");
+			/** Last-known usage per region, so tab dots survive tab switches. */
+			const [statusByRegion, setStatusByRegion] = (0, react.useState)({
+				cn: {
+					status: "signed-out",
+					accounts: []
+				},
+				global: {
+					status: "signed-out",
+					accounts: []
+				}
 			});
 			const [busy, setBusy] = (0, react.useState)(false);
 			const [settingsRevision, setSettingsRevision] = (0, react.useState)(0);
-			const [draftModels, setDraftModels] = (0, react.useState)(void 0);
-			const [draftEnabledIds, setDraftEnabledIds] = (0, react.useState)(void 0);
-			const [draftImageIds, setDraftImageIds] = (0, react.useState)(void 0);
-			const [draftContextBudgets, setDraftContextBudgets] = (0, react.useState)(void 0);
+			/** Per-region unsaved model edits; a draft on one tab is never dropped by
+			* switching to the other tab, only by that tab's discard/save. */
+			const [drafts, setDrafts] = (0, react.useState)({});
 			const [saving, setSaving] = (0, react.useState)(false);
 			/** Save failure surfaced next to the buttons; cleared by the next attempt. */
 			const [saveError, setSaveError] = (0, react.useState)(void 0);
@@ -264,38 +298,53 @@ window.__ModuleLoader__.load({
 			(0, react.useEffect)(() => settingsScope?.subscribe(() => {
 				setSettingsRevision((value) => value + 1);
 			}), [settingsScope]);
-			const refreshUsage = (0, react.useCallback)(async (signal) => {
+			const refreshUsage = (0, react.useCallback)(async (region, signal) => {
 				try {
-					const response = await fetch(WORKBUDDY_USAGE_PATH, {
+					const response = await fetch(withWorkBuddyRegion(WORKBUDDY_USAGE_PATH, region), {
 						headers: { accept: "application/json" },
 						credentials: "same-origin",
 						...signal === void 0 ? {} : { signal }
 					});
 					const value = await response.json().catch(() => void 0);
 					if (!response.ok) throw new Error(`HTTP ${response.status}`);
-					if (mounted.current && signal?.aborted !== true) setStatus(value);
-					return value;
+					const usage = value;
+					if (mounted.current && signal?.aborted !== true) setStatusByRegion((prev) => ({
+						...prev,
+						[region]: usage
+					}));
+					return usage;
 				} catch (error) {
-					if (mounted.current && signal?.aborted !== true) setStatus({
-						status: "error",
-						message: error instanceof Error ? error.message : t("row.requestFailed")
-					});
+					if (mounted.current && signal?.aborted !== true) setStatusByRegion((prev) => ({
+						...prev,
+						[region]: {
+							status: "error",
+							message: error instanceof Error ? error.message : t("row.requestFailed")
+						}
+					}));
 					return;
 				}
 			}, [t]);
 			(0, react.useEffect)(() => {
 				if (!open) return;
 				const controller = new AbortController();
-				refreshUsage(controller.signal);
+				refreshUsage(activeRegion, controller.signal);
 				return () => {
 					controller.abort();
 				};
-			}, [open, refreshUsage]);
+			}, [
+				open,
+				activeRegion,
+				refreshUsage
+			]);
+			const status = statusByRegion[activeRegion] ?? {
+				status: "signed-out",
+				accounts: []
+			};
 			(0, react.useEffect)(() => {
 				if (!open || status.status !== "signed-in") return;
 				const controller = new AbortController();
 				const timer = window.setInterval(() => {
-					refreshUsage(controller.signal);
+					refreshUsage(activeRegion, controller.signal);
 				}, POLL_INTERVAL_MS);
 				return () => {
 					window.clearInterval(timer);
@@ -303,13 +352,14 @@ window.__ModuleLoader__.load({
 				};
 			}, [
 				open,
+				activeRegion,
 				refreshUsage,
 				status.status
 			]);
 			const rescanAccounts = async () => {
 				setBusy(true);
 				try {
-					const response = await fetch(WORKBUDDY_ACCOUNTS_REFRESH_PATH, {
+					const response = await fetch(withWorkBuddyRegion(WORKBUDDY_ACCOUNTS_REFRESH_PATH, activeRegion), {
 						method: "POST",
 						headers: { accept: "application/json" },
 						credentials: "same-origin"
@@ -317,10 +367,13 @@ window.__ModuleLoader__.load({
 					const body = await response.json();
 					if (!response.ok || !Array.isArray(body.accounts)) throw new Error(`HTTP ${response.status}`);
 					const selected = body.accounts.find((account) => account.selected)?.id;
-					const configured = settingsScope?.getSnapshot().value;
-					const configuredId = typeof configured === "object" && configured !== null && typeof configured.accountId === "string" ? configured.accountId : void 0;
-					if (selected !== void 0 && selected !== configuredId && settingsScope?.getSnapshot().writable === true) await settingsScope.set("accountId", selected);
-					await refreshUsage();
+					const configuredAccounts = configuredAccountsOf(settingsScope?.getSnapshot().value);
+					const configuredId = configuredAccounts[activeRegion];
+					if (selected !== void 0 && selected !== configuredId && settingsScope?.getSnapshot().writable === true) await settingsScope.set("accounts", {
+						...configuredAccounts,
+						[activeRegion]: selected
+					});
+					await refreshUsage(activeRegion);
 				} finally {
 					if (mounted.current) setBusy(false);
 				}
@@ -329,8 +382,12 @@ window.__ModuleLoader__.load({
 				if (settingsScope === void 0) return;
 				setSwitchingAccount(true);
 				try {
-					await settingsScope.set("accountId", accountId);
-					await refreshUsage();
+					const configuredAccounts = configuredAccountsOf(settingsScope.getSnapshot().value);
+					await settingsScope.set("accounts", {
+						...configuredAccounts,
+						[activeRegion]: accountId
+					});
+					await refreshUsage(activeRegion);
 				} finally {
 					if (mounted.current) setSwitchingAccount(false);
 				}
@@ -339,14 +396,14 @@ window.__ModuleLoader__.load({
 				setCheckingIn(true);
 				setCheckinActionError(void 0);
 				try {
-					const response = await fetch(WORKBUDDY_CHECKIN_PATH, {
+					const response = await fetch(withWorkBuddyRegion(WORKBUDDY_CHECKIN_PATH, activeRegion), {
 						method: "POST",
 						headers: { accept: "application/json" },
 						credentials: "same-origin"
 					});
 					const body = await response.json().catch(() => void 0);
 					if (!response.ok) throw new Error(body?.error ?? `HTTP ${response.status}`);
-					await refreshUsage();
+					await refreshUsage(activeRegion);
 				} catch (error) {
 					if (mounted.current) setCheckinActionError(error instanceof Error ? error.message : t("row.requestFailed"));
 				} finally {
@@ -356,7 +413,7 @@ window.__ModuleLoader__.load({
 			const refreshModels = async () => {
 				setBusy(true);
 				try {
-					const response = await fetch(WORKBUDDY_MODELS_REFRESH_PATH, {
+					const response = await fetch(withWorkBuddyRegion(WORKBUDDY_MODELS_REFRESH_PATH, activeRegion), {
 						method: "POST",
 						headers: { accept: "application/json" },
 						credentials: "same-origin"
@@ -372,54 +429,86 @@ window.__ModuleLoader__.load({
 						const budget = activeContextBudgets[id];
 						if (typeof budget === "number") stillBudgets[id] = budget;
 					}
-					setDraftModels(fresh);
-					setDraftEnabledIds(new Set(stillEnabled));
-					setDraftImageIds(new Set(stillImages));
-					setDraftContextBudgets(stillBudgets);
+					setDrafts((prev) => ({
+						...prev,
+						[activeRegion]: {
+							models: fresh,
+							enabledIds: new Set(stillEnabled),
+							imageIds: new Set(stillImages),
+							contextBudgets: stillBudgets
+						}
+					}));
 				} catch (error) {
-					if (mounted.current) setStatus({
-						status: "error",
-						message: error instanceof Error ? error.message : t("row.requestFailed")
-					});
+					if (mounted.current) setStatusByRegion((prev) => ({
+						...prev,
+						[activeRegion]: {
+							status: "error",
+							message: error instanceof Error ? error.message : t("row.requestFailed")
+						}
+					}));
 				} finally {
 					if (mounted.current) setBusy(false);
 				}
 			};
-			const visibleModels = draftModels ?? (status.status === "signed-in" ? status.models : []);
+			const draft = drafts[activeRegion];
+			const visibleModels = draft?.models ?? (status.status === "signed-in" ? status.models : []);
 			const savedEnabledIds = status.status === "signed-in" ? new Set(status.enabledModelIds) : /* @__PURE__ */ new Set();
-			const activeEnabledIds = draftEnabledIds ?? savedEnabledIds;
+			const activeEnabledIds = draft?.enabledIds ?? savedEnabledIds;
 			const savedImageIds = status.status === "signed-in" ? new Set(status.imageModelIds) : /* @__PURE__ */ new Set();
-			const activeImageIds = draftImageIds ?? savedImageIds;
+			const activeImageIds = draft?.imageIds ?? savedImageIds;
 			const configured = settingsScope?.getSnapshot().value;
 			const configuredRegion = status.status === "signed-in" ? configured?.regions?.[status.region] : void 0;
 			const legacyContextBudgets = status.status === "signed-in" && status.region === "cn" ? configured?.contextBudgets : void 0;
 			const savedContextBudgetsSource = configuredRegion?.contextBudgets ?? legacyContextBudgets;
-			const activeContextBudgets = draftContextBudgets ?? (typeof savedContextBudgetsSource === "object" && savedContextBudgetsSource !== null ? savedContextBudgetsSource : {});
-			const dirty = draftModels !== void 0 || draftEnabledIds !== void 0 || draftImageIds !== void 0 || draftContextBudgets !== void 0;
+			const savedContextBudgets = typeof savedContextBudgetsSource === "object" && savedContextBudgetsSource !== null ? savedContextBudgetsSource : {};
+			const activeContextBudgets = draft?.contextBudgets ?? savedContextBudgets;
+			const dirty = draft !== void 0;
+			const editDraft = (edit) => {
+				setDrafts((prev) => ({
+					...prev,
+					[activeRegion]: edit(prev[activeRegion] ?? {
+						models: [...visibleModels],
+						enabledIds: new Set(activeEnabledIds),
+						imageIds: new Set(activeImageIds),
+						contextBudgets: { ...activeContextBudgets }
+					})
+				}));
+			};
 			const toggleModel = (modelId) => {
-				const next = new Set(activeEnabledIds);
-				if (!next.delete(modelId)) next.add(modelId);
-				setDraftEnabledIds(next);
-				setDraftModels([...visibleModels]);
+				editDraft((current) => {
+					const next = new Set(current.enabledIds);
+					if (!next.delete(modelId)) next.add(modelId);
+					return {
+						...current,
+						enabledIds: next
+					};
+				});
 			};
 			const toggleImage = (modelId) => {
-				const next = new Set(activeImageIds);
-				if (!next.delete(modelId)) next.add(modelId);
-				setDraftImageIds(next);
-				setDraftModels([...visibleModels]);
+				editDraft((current) => {
+					const next = new Set(current.imageIds);
+					if (!next.delete(modelId)) next.add(modelId);
+					return {
+						...current,
+						imageIds: next
+					};
+				});
 			};
 			const setContextBudget = (modelId, budget) => {
-				setDraftContextBudgets({
-					...activeContextBudgets,
-					[modelId]: budget
-				});
-				setDraftModels([...visibleModels]);
+				editDraft((current) => ({
+					...current,
+					contextBudgets: {
+						...current.contextBudgets,
+						[modelId]: budget
+					}
+				}));
 			};
 			const discardModels = () => {
-				setDraftModels(void 0);
-				setDraftEnabledIds(void 0);
-				setDraftImageIds(void 0);
-				setDraftContextBudgets(void 0);
+				setDrafts((prev) => {
+					const next = { ...prev };
+					delete next[activeRegion];
+					return next;
+				});
 			};
 			const saveModels = async () => {
 				if (settingsScope === void 0) return;
@@ -438,7 +527,7 @@ window.__ModuleLoader__.load({
 						}
 					});
 					discardModels();
-					await refreshUsage();
+					await refreshUsage(activeRegion);
 				} catch (error) {
 					if (mounted.current) setSaveError(error instanceof Error ? error.message : t("row.requestFailed"));
 				} finally {
@@ -485,6 +574,32 @@ window.__ModuleLoader__.load({
 					children: open ? /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 						className: "dsm-workbuddy-usage",
 						children: [
+							/* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
+								className: "dsm-workbuddy-tabs",
+								role: "tablist",
+								"aria-label": title,
+								children: WORKBUDDY_REGIONS.map((region) => {
+									const regionStatus = statusByRegion[region];
+									return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("button", {
+										type: "button",
+										role: "tab",
+										"aria-selected": region === activeRegion,
+										className: `dsm-workbuddy-tab${region === activeRegion ? " dsm-workbuddy-tab-active" : ""}`,
+										onClick: () => {
+											setActiveRegion(region);
+										},
+										children: [regionStatus === void 0 ? null : /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+											"aria-hidden": "true",
+											className: "dsm-workbuddy-tab-dot",
+											style: dotStyle(regionStatus.status)
+										}), region === "cn" ? t("row.tabCn") : t("row.tabGlobal")]
+									}, region);
+								})
+							}),
+							/* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
+								className: "dsm-workbuddy-models-summary",
+								children: t("row.tabHint")
+							}),
 							/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 								className: "dsm-workbuddy-usage-account",
 								children: [/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
@@ -787,9 +902,12 @@ window.__ModuleLoader__.load({
 		*/
 		const en = {
 			"row.title": "WorkBuddy credits & models (dsh-connect-workbuddy)",
-			"row.desc": "Use the models in the WorkBuddy desktop app directly in DSH, and see your remaining credits at a glance.",
+			"row.desc": "Use WorkBuddy models in DSH and see your remaining credits; the domestic and international sides are two independent providers, each with its own account — use both at the same time.",
 			"row.expand": "Expand",
 			"row.collapse": "Collapse",
+			"row.tabCn": "Domestic",
+			"row.tabGlobal": "Global",
+			"row.tabHint": "Each tab is a separate provider (workbuddy / workbuddy-global) with its own account, credits, and models. Both sides are live at once: different sessions can pick from either side, and changes on one tab never touch the other.",
 			"row.signedOut": "Not signed in",
 			"row.signedOutHint": "Sign in once in the WorkBuddy desktop app; this plugin follows that sign-in automatically.",
 			"row.signedIn": "Signed in: {accountName}",
@@ -832,9 +950,12 @@ window.__ModuleLoader__.load({
 		};
 		const zh = {
 			"row.title": "接入使用 WorkBuddy 积分与模型（dsh-connect-workbuddy）",
-			"row.desc": "在 DSH 中直接使用 WorkBuddy 桌面 App 包含的模型，并随时查看剩余积分。",
+			"row.desc": "在 DSH 中使用 WorkBuddy 模型并随时查看剩余积分；国内版与国际版是两个独立供应商，各有自己的账号，可同时使用。",
 			"row.expand": "展开",
 			"row.collapse": "收起",
+			"row.tabCn": "国内版",
+			"row.tabGlobal": "国际版",
+			"row.tabHint": "每个 tab 是一个独立供应商（workbuddy / workbuddy-global），各有自己的账号、积分与模型。两边同时生效：不同会话可各选一边，一侧的改动不影响另一侧。",
 			"row.signedOut": "未登录",
 			"row.signedOutHint": "在 WorkBuddy 桌面 App 里登录一次即可，插件会自动跟随当前登录的账号。",
 			"row.signedIn": "已登录：{accountName}",