dsh-workbuddy-xdpool 0.4.2 → 1.0.0

package/lib/client.js

@@ -28,6 +28,8 @@ window.__ModuleLoader__.load({
 		const POOL_RESET_COOLDOWN_PATH = "/plugins/dsh-workbuddy-xdpool/cooldowns/reset";
 		/** Plugin-owned daily check-in action endpoint (claim today's reward). */
 		const POOL_CHECKIN_PATH = "/plugins/dsh-workbuddy-xdpool/checkin";
+		/** Switch one account in or out of the pool (card toggle). */
+		const POOL_ACCOUNT_DISABLE_PATH = "/plugins/dsh-workbuddy-xdpool/accounts/disabled";
 		//#endregion
 		//#region src/client/icon.ts
 		/**
@@ -133,6 +135,13 @@ window.__ModuleLoader__.load({
 .dsm-workbuddy-xdpool-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-xdpool-account-copy{display:flex;flex-direction:column;gap:3px;min-width:0}
 .dsm-workbuddy-xdpool-account-label{color:var(--dsw-alias-label-primary,#e6e6e6);font-size:14px;font-weight:600;line-height:20px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}
+.dsm-workbuddy-xdpool-account-head{display:flex;align-items:center;gap:8px;min-width:0}
+/* Account switched off on the card: still listed (so it can be turned back on) but visually muted. */
+.dsm-workbuddy-xdpool-account-off{opacity:.55}
+/* Small pill switch: "in rotation" vs "off". Native checkbox styled by the label. */
+.dsm-workbuddy-xdpool-account-toggle{display:inline-flex;align-items:center;gap:5px;flex:none;cursor:pointer;color:var(--dsw-alias-label-secondary,#c6c9d0);font-size:11px;line-height:16px;white-space:nowrap}
+.dsm-workbuddy-xdpool-account-toggle input{margin:0;accent-color:var(--dsw-alias-brand-primary,#5686fe)}
+.dsm-workbuddy-xdpool-account-toggle:hover{color:var(--dsw-alias-label-primary,#e6e6e6)}
 .dsm-workbuddy-xdpool-account-tags{display:flex;align-items:center;gap:6px;flex-wrap:wrap}
 .dsm-workbuddy-xdpool-account-tag{padding:1px 8px;border-radius:999px;font-size:11px;line-height:18px;background:var(--dsw-alias-state-success-subtle,rgba(34,160,107,.12));color:var(--dsw-alias-state-success-primary,#22a06b)}
 .dsm-workbuddy-xdpool-account-tag-cooling{background:var(--dsw-alias-state-warning-subtle,rgba(217,119,6,.15));color:var(--dsw-alias-state-warning-primary,#d97706)}
@@ -374,12 +383,26 @@ window.__ModuleLoader__.load({
 			const [flash, setFlash] = (0, react.useState)(void 0);
 			/** Account id whose daily claim is currently in flight. */
 			const [checkinBusyId, setCheckinBusyId] = (0, react.useState)(void 0);
+			/** Account id whose enable/disable switch is in flight, if any. */
+			const [accountBusyId, setAccountBusyId] = (0, react.useState)(void 0);
 			/**
 			* Draft model selection. `undefined` means "no local edits"; once a checkbox
 			* is touched the draft takes over and is what the Save button posts. Discard
 			* drops it back to the copy the server last reported.
 			*/
-			const [draft, setDraft] = (0, react.useState)(void 0);
+			const [draftByRegion, setDraftByRegion] = (0, react.useState)({});
+			/**
+			* The draft for the tab on screen. Keyed by region: the two gateways have
+			* different rosters, so edits made on one tab must not leak into the other
+			* when the user switches tabs (or saves).
+			*/
+			const draft = draftByRegion[activeRegion];
+			const setDraft = (next) => {
+				setDraftByRegion((prev) => ({
+					...prev,
+					[activeRegion]: next
+				}));
+			};
 			const [savingModels, setSavingModels] = (0, react.useState)(false);
 			const mounted = (0, react.useRef)(true);
 			(0, react.useEffect)(() => {
@@ -497,6 +520,41 @@ window.__ModuleLoader__.load({
 					if (mounted.current) setCheckinBusyId(void 0);
 				}
 			};
+			/**
+			* Switch one account in or out of the pool.
+			*
+			* The id travels in the body and the host validates it against the accounts it
+			* really knows, so a stale tab cannot write an orphan id. Disabling only stops
+			* the account from being picked — it stays listed so it can be turned back on —
+			* and the change is saved through the settings section, so it survives a
+			* restart and is re-applied after every re-scan.
+			*/
+			const toggleAccountDisabled = async (accountId, disabled) => {
+				setAccountBusyId(accountId);
+				setFlash(void 0);
+				try {
+					const response = await fetch(POOL_ACCOUNT_DISABLE_PATH, {
+						method: "POST",
+						headers: {
+							accept: "application/json",
+							"content-type": "application/json"
+						},
+						credentials: "same-origin",
+						body: JSON.stringify({
+							accountId,
+							disabled
+						})
+					});
+					const body = await response.json().catch(() => void 0);
+					if (!response.ok) throw new Error(body?.error ?? `HTTP ${response.status}`);
+					await refresh(activeRegion);
+				} catch (cause) {
+					const message = cause instanceof Error ? cause.message : String(cause);
+					if (mounted.current) setError(t?.("row.accountToggleError", { message }) ?? `Could not switch the account: ${message}`);
+				} finally {
+					if (mounted.current) setAccountBusyId(void 0);
+				}
+			};
 			/** Keep the draft in step with the server copy while nothing is dirty. */
 			const modelDraft = draft ?? (status === void 0 ? {} : draftFromStatus(status));
 			/** Model edits need a writable settings scope; otherwise the rows are read-only. */
@@ -600,9 +658,12 @@ window.__ModuleLoader__.load({
 					const imageModelIds = Object.entries(draft).filter(([, e]) => e.images).map(([id]) => id);
 					const contextBudgets = {};
 					for (const [id, entry] of Object.entries(draft)) if (entry.budget !== void 0) contextBudgets[id] = entry.budget;
-					await write.call(settingsScope, "enabledModelIds", enabledModelIds);
-					await write.call(settingsScope, "imageModelIds", imageModelIds);
-					await write.call(settingsScope, "contextBudgets", contextBudgets);
+					const key = activeRegion === "cn" ? "modelSelectionCn" : "modelSelectionGlobal";
+					await write.call(settingsScope, key, {
+						enabledModelIds,
+						imageModelIds,
+						contextBudgets
+					});
 					setDraft(void 0);
 					if (mounted.current) setFlash(t?.("row.modelsSaved") ?? "Saved");
 				} catch (cause) {
@@ -707,17 +768,21 @@ window.__ModuleLoader__.load({
 											children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
 												className: "dsm-workbuddy-xdpool-dist-title",
 												children: t?.("row.distTitle") ?? "Account usage"
-											}), ["priority", "round-robin"].map((option) => {
+											}), [
+												"priority",
+												"balanced",
+												"round-robin"
+											].map((option) => {
 												const active = (status.distribution ?? "priority") === option;
-												const label = option === "priority" ? t?.("row.distPriority") ?? "Priority" : t?.("row.distRoundRobin") ?? "Round-robin";
-												const hint = option === "priority" ? t?.("row.distPriorityHint") ?? "" : t?.("row.distRoundRobinHint") ?? "";
+												const label = option === "priority" ? t?.("row.distPriority") ?? "Priority" : option === "balanced" ? t?.("row.distBalanced") ?? "Balanced" : t?.("row.distRoundRobin") ?? "Round-robin";
+												const hint = option === "priority" ? t?.("row.distPriorityHint") ?? "" : option === "balanced" ? t?.("row.distBalancedHint") ?? "" : t?.("row.distRoundRobinHint") ?? "";
 												return /* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
 													type: "button",
 													role: "radio",
 													"aria-checked": active,
 													title: hint,
 													disabled: !modelsEditable,
-													className: `dsm-workbuddy-xdpool-dist-option${active ? " dsm-workbuddy-xdpool-dist-option-active" : ""}`,
+													className: "dsm-workbuddy-xdpool-dist-option" + (active ? " dsm-workbuddy-xdpool-dist-option-active" : ""),
 													onClick: () => {
 														setDistribution(option);
 													},
@@ -805,6 +870,10 @@ window.__ModuleLoader__.load({
 									onClaimCheckin: (accountId) => {
 										claimCheckin(accountId);
 									},
+									onToggleDisabled: (accountId, disabled) => {
+										toggleAccountDisabled(accountId, disabled);
+									},
+									...accountBusyId === void 0 ? {} : { accountBusyId },
 									t
 								}, account.id))]
 							}) : null,
@@ -865,8 +934,9 @@ window.__ModuleLoader__.load({
 			});
 		}
 		/** One account block: label + status tag + meta + optional credit panels. */
-		function AccountBlock({ account, activeAccountId, t, checkinBusyId, onClaimCheckin }) {
+		function AccountBlock({ account, activeAccountId, t, checkinBusyId, onClaimCheckin, accountBusyId, onToggleDisabled }) {
 			const isActive = account.id === activeAccountId;
+			const isDisabled = account.disabled === true;
 			const isCooling = account.cooling === true;
 			const cooldownUntil = account.cooldownUntil !== void 0 ? Date.parse(account.cooldownUntil) : void 0;
 			const modelCooldowns = account.modelCooldowns ?? [];
@@ -878,13 +948,27 @@ window.__ModuleLoader__.load({
 				cls: "dsm-workbuddy-xdpool-account-tag dsm-workbuddy-xdpool-account-tag-cooling"
 			} : null;
 			return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
-				className: "dsm-workbuddy-xdpool-account",
+				className: isDisabled ? "dsm-workbuddy-xdpool-account dsm-workbuddy-xdpool-account-off" : "dsm-workbuddy-xdpool-account",
 				children: [/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 					className: "dsm-workbuddy-xdpool-account-copy",
 					children: [
-						/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
-							className: "dsm-workbuddy-xdpool-account-label",
-							children: account.label
+						/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+							className: "dsm-workbuddy-xdpool-account-head",
+							children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+								className: "dsm-workbuddy-xdpool-account-label",
+								children: account.label
+							}), /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("label", {
+								className: "dsm-workbuddy-xdpool-account-toggle",
+								title: t?.("row.accountToggleHint") ?? "Include this account in the pool",
+								children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("input", {
+									type: "checkbox",
+									checked: !isDisabled,
+									disabled: accountBusyId === account.id,
+									onChange: (event) => {
+										onToggleDisabled(account.id, !event.target.checked);
+									}
+								}), isDisabled ? t?.("row.accountOff") ?? "Off" : t?.("row.accountInRotation") ?? "In rotation"]
+							})]
 						}),
 						/* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
 							className: "dsm-workbuddy-xdpool-account-tags",
@@ -1171,6 +1255,10 @@ window.__ModuleLoader__.load({
 			"row.ok": "Healthy — requests auto-rotate across accounts",
 			"row.allCooling": "Every account is rate-limited right now; requests pause until a cooldown lifts.",
 			"row.accountNext": "Next up",
+			"row.accountInRotation": "In rotation",
+			"row.accountOff": "Off",
+			"row.accountToggleHint": "Include this account in the pool",
+			"row.accountToggleError": "Could not switch the account: {message}",
 			"row.cooling": "Cooling (rate-limited)",
 			"row.cooldownHits": "{hits} hit(s)",
 			"row.cooldownUntil": "until {time}",
@@ -1223,6 +1311,8 @@ window.__ModuleLoader__.load({
 			"row.distPriorityHint": "Drain one account before moving to the next",
 			"row.distRoundRobin": "Round-robin",
 			"row.distRoundRobinHint": "Spread the spend evenly across accounts",
+			"row.distBalanced": "Balanced",
+			"row.distBalancedHint": "Draw from every account, favouring whichever has been idle longest",
 			"row.accountsScanning": "Detecting…",
 			"row.resetCooldowns": "Clear all cooldowns",
 			"row.resetCooldownsBusy": "Clearing…",
@@ -1257,6 +1347,10 @@ window.__ModuleLoader__.load({
 			"row.ok": "运行健康 —— 请求会在各账号间自动轮换",
 			"row.allCooling": "当前所有账号都处于限流冷却，请求会暂停直到某个冷却结束。",
 			"row.accountNext": "下一个",
+			"row.accountInRotation": "参与轮换",
+			"row.accountOff": "已停用",
+			"row.accountToggleHint": "把这个账号计入池子",
+			"row.accountToggleError": "切换账号失败：{message}",
 			"row.cooling": "冷却中（被限流）",
 			"row.cooldownHits": "触发 {hits} 次",
 			"row.cooldownUntil": "至 {time}",
@@ -1309,6 +1403,8 @@ window.__ModuleLoader__.load({
 			"row.distPriorityHint": "优先用完一个账号再换下一个",
 			"row.distRoundRobin": "轮换模式",
 			"row.distRoundRobinHint": "积分平均分摊到各账号",
+			"row.distBalanced": "均衡",
+			"row.distBalancedHint": "每个账号都参与抽取，闲置越久权重越高",
 			"row.accountsScanning": "正在检测…",
 			"row.resetCooldowns": "清除所有冷却",
 			"row.resetCooldownsBusy": "正在清除…",

package/lib/index.d.ts

@@ -1,7 +1,7 @@
 import z from "@deepseek-ai/schemastery";
 import { Api, Model } from "@earendil-works/pi-ai";
 import { PiAiAdapter } from "@deepseek-ai/dsh-llm-pi-ai";
-import { Context } from "@deepseek-ai/cordis";
+import { Context, Context as Context$1 } from "@deepseek-ai/cordis";
 import { SettingsNamespace } from "@deepseek-ai/dsh-settings";
 //#region src/upstream.d.ts
 /** Upstream failure classes the shim maps onto distinct HTTP answers. */
@@ -228,7 +228,7 @@ export declare function workbuddyAccountId(credential: Pick<WorkBuddyCredential,
 /** Every directory the pool should scan, in probe order. */
 export declare function candidateAuthDirs(env?: NodeJS.ProcessEnv): string[];
 /** How the pool chooses which account serves the next request. */
-type AccountDistribution = 'priority' | 'round-robin';
+type AccountDistribution = 'priority' | 'round-robin' | 'balanced';
 interface AccountPoolOptions {
   /** Logger for discovery and rotation events. */
   logger?: {
@@ -256,10 +256,6 @@ interface AccountPoolOptions {
    */
   distribution?: AccountDistribution;
 }
-/**
- * Read-only pool of every discovered WorkBuddy account, with rate-limit
- * cooldown and round-robin failover.
- */
 export declare class WorkBuddyAccountPool {
   private readonly logger;
   private authDirs;
@@ -272,6 +268,24 @@ export declare class WorkBuddyAccountPool {
   private cursor;
   private lastScanAtMs;
   private preferredId;
+  /**
+   * Account ids the user switched off on the card.
+   *
+   * Disabling is a user preference rather than a property of the credential:
+   * `scan()` rebuilds every account object from the auth files, so the set
+   * lives on the pool and is re-applied from settings after each scan.
+   */
+  private disabledIds;
+  /**
+   * Last time each account served a request, epoch ms. Drives the idle term
+   * of the priority-mode weighting below: an account that just served loses to
+   * one that has been idle, so a small pool stops hammering a single account.
+   *
+   * In-memory on purpose: it only biases the next pick, so a cold start that
+   * treats every account as idle is the right default. Not keyed by id lookup
+   * misses because a removed account simply disappears from the map on re-scan.
+   */
+  private lastUsedAt;
   private refreshInflight;
   constructor(options?: AccountPoolOptions);
   /**
@@ -283,6 +297,7 @@ export declare class WorkBuddyAccountPool {
     authDirs?: readonly string[];
     cooldownMs?: number;
     distribution?: AccountDistribution;
+    disabledAccountIds?: readonly string[];
   }): void;
   /** Rescan the auth directories and merge newly discovered accounts. */
   scan(): Promise<WorkBuddyAccount[]>;
@@ -298,6 +313,22 @@ export declare class WorkBuddyAccountPool {
    * model, e.g. CLI diagnostics).
    */
   private available;
+  /** Round-robin: the legacy cursor walk, kept for the distribution that asks for it. */
+  private pickRoundRobin;
+  /**
+   * Priority mode: weighted random over the eligible accounts.
+   *
+   * The weight is an idle bonus — `1 + min(idleHours * perHour, max)` — so an
+   * account that has never served (or has been idle for a while) outranks one
+   * that just answered. Reference panel logic drops its success-rate term
+   * entirely because a lifetime error counter penalises an account forever;
+   * instantaneous health is already handled by cooldowns, which is why those
+   * accounts never reach this list.
+   *
+   * A pool with no idle history (fresh process) hashes to equal weights, which
+   * spreads the very first picks instead of always returning index 0.
+   */
+  private pickByWeight;
   /**
    * Pick the account to serve a request.
    *
@@ -323,6 +354,10 @@ export declare class WorkBuddyAccountPool {
   /** How the pool currently spreads requests. Shown on the card. */
   currentDistribution(): AccountDistribution;
   prefer(accountId: string | undefined): void;
+  /** Whether the user switched this account off on the card. */
+  isDisabled(accountId: string): boolean;
+  /** Every account id the user switched off, in discovery order. */
+  disabledIdsInOrder(): string[];
   /** Best-effort refresh of one account after a session-dead upstream answer. */
   refreshAccount(accountId: string): Promise<void>;
   /**
@@ -445,6 +480,8 @@ export declare const WORKBUDDY_POOL_PROVIDER = "workbuddy-xdpool";
 interface WorkBuddyAdapterOptions {
   shim: WorkBuddyShim;
   catalog: WorkBuddyCatalog;
+  /** Plugin context; the pi-ai adapter reads `attachments`/`fs` from it. */
+  ctx: Context$1;
   providerId?: string;
   displayName?: string;
 }
@@ -570,6 +607,11 @@ interface PoolWebAccount {
     modelId: string;
     until: string;
   }>;
+  /**
+   * Whether the user switched this account off. A disabled account never
+   * serves a request, but it stays listed so the card can switch it back on.
+   */
+  disabled: boolean;
   rateLimitHits: number;
   /** ISO timestamp of the last successful use (best-effort pool bookkeeping). */
   lastUsedAt?: string;
@@ -655,7 +697,6 @@ interface PoolWebModel {
   /** Whether this model is currently enabled in the picker. */
   enabled: boolean;
 }
-/** The user's saved model selection, echoed back so the card can diff a draft. */
 interface PoolWebModelSelection {
   /** Absent = every model is enabled. */
   enabledModelIds?: readonly string[];
@@ -695,7 +736,7 @@ interface PoolWebStatus {
  */
 type PoolRegion = 'cn' | 'global';
 /** How the pool spreads requests across its accounts. */
-type PoolDistribution = 'priority' | 'round-robin';
+type PoolDistribution = 'priority' | 'round-robin' | 'balanced';
 //#endregion
 //#region src/index.d.ts
 /** Stable Cordis plugin name. */
@@ -723,6 +764,13 @@ export interface Config {
    * spend evenly instead. Absent reads as `priority`.
    */
   distribution?: 'priority' | 'round-robin';
+  /**
+   * Account ids switched off on the card. A disabled account is never picked
+   * to serve a request, but it stays in the pool and on the card so it can be
+   * switched back on. Ids are the pool's stable per-credential keys, which
+   * survive re-scans (see WorkBuddyAccountPool.disabledIds).
+   */
+  disabledAccountIds?: string[];
   /**
    * Model ids enabled in the picker. Absent means "every model the catalog
    * advertises" — an unconfigured install should never present an empty model
@@ -741,9 +789,25 @@ export interface Config {
    * user cap a model without touching the catalog.
    */
   contextBudgets?: Record<string, number>;
+  /**
+   * Per-region model selection. The two gateways advertise different rosters, so
+   * one shared list would let a save on one tab silently rewrite the other tab's
+   * picker. Each region owns its own copy; a region with no entry falls back to
+   * the legacy flat keys above, so an upgrade keeps the list already in use.
+   */
+  modelSelectionCn?: ModelSelectionConfig;
+  modelSelectionGlobal?: ModelSelectionConfig;
+}
+/** One region's saved model selection. */
+export interface ModelSelectionConfig {
+  enabledModelIds?: string[];
+  imageModelIds?: string[];
+  contextBudgets?: Record<string, number>;
 }
 /** Upper bound the card offers as the "default" context window, in tokens. */
 export declare const DEFAULT_CONTEXT_BUDGET = 200000;
+/** Settings key holding one region's saved selection. */
+export declare const modelSelectionKeyFor: (region: 'cn' | 'global') => string;
 /**
  * Plugin configuration schema.
  *