dsh-workbuddy-xdpool 1.4.1 → 1.5.2

package/lib/client.js

@@ -255,39 +255,44 @@ window.__ModuleLoader__.load({
 .dsm-workbuddy-xdpool-auto{margin-top:12px;padding:10px 12px;border:1px solid var(--dsw-alias-border-l2,#36373b);border-radius:10px;background:var(--dsw-alias-bg-module-platform,#202126)}
 .dsm-workbuddy-xdpool-auto-head{display:flex;align-items:center;justify-content:space-between;gap:8px}
 .dsm-workbuddy-xdpool-auto-title{color:var(--dsw-alias-label-primary,#e8e8ea);font-size:12px;font-weight:600}
-.dsm-workbuddy-xdpool-auto-switch{padding:3px 12px;border:1px solid var(--dsw-alias-border-l2,#36373b);border-radius:999px;background:transparent;color:var(--dsw-alias-label-dimmed,#8a97b5);font-size:11px;cursor:pointer;transition:color .16s,border-color .16s,background .16s}
+.dsm-workbuddy-xdpool-auto-switch{padding:3px 12px;border:1px solid var(--dsw-alias-border-l2,#36373b);border-radius:999px;background:transparent;color:var(--dsw-alias-label-secondary,#c6c9d0);font-size:12px;cursor:pointer;transition:color .16s,border-color .16s,background .16s}
 .dsm-workbuddy-xdpool-auto-switch:hover:not(:disabled){border-color:var(--dsw-alias-label-dimmed,#777);color:var(--dsw-alias-label-primary,#e8e8ea)}
 .dsm-workbuddy-xdpool-auto-switch:disabled{opacity:.5;cursor:not-allowed}
 .dsm-workbuddy-xdpool-auto-switch-on{border-color:#28c8b4;color:#28c8b4;background:rgba(40,200,180,.12)}
-.dsm-workbuddy-xdpool-auto-hint{margin:6px 0 0;color:var(--dsw-alias-label-dimmed,#8a97b5);font-size:11px;line-height:1.5}
+.dsm-workbuddy-xdpool-auto-hint{margin:6px 0 0;color:var(--dsw-alias-label-secondary,#c6c9d0);font-size:12px;line-height:1.6}
 .dsm-workbuddy-xdpool-auto-total{display:flex;align-items:baseline;justify-content:space-between;gap:8px;margin-top:8px;padding:6px 8px;border-radius:8px;background:rgba(40,200,180,.08);font-size:11px}
-.dsm-workbuddy-xdpool-auto-total-label{color:var(--dsw-alias-label-dimmed,#8a97b5)}
+.dsm-workbuddy-xdpool-auto-total-label{color:var(--dsw-alias-label-secondary,#c6c9d0);font-size:12px}
 .dsm-workbuddy-xdpool-auto-total{display:flex;flex-direction:column;gap:4px;margin-top:8px;padding:6px 8px;border-radius:8px;background:rgba(40,200,180,.08);font-size:11px}
 .dsm-workbuddy-xdpool-auto-total-list{display:flex;flex-direction:column;gap:2px}
 .dsm-workbuddy-xdpool-auto-total-row{color:#28c8b4;font-variant-numeric:tabular-nums}
 .dsm-workbuddy-xdpool-earned{display:flex;flex-direction:column;gap:4px;margin-top:8px;padding-top:8px;border-top:1px dashed var(--dsw-alias-border-l2,#36373b);font-size:11px}
-.dsm-workbuddy-xdpool-earned-label{color:var(--dsw-alias-label-dimmed,#8a97b5)}
+.dsm-workbuddy-xdpool-earned-label{color:var(--dsw-alias-label-secondary,#c6c9d0);font-size:12px}
 .dsm-workbuddy-xdpool-earned-list{display:flex;flex-direction:column;gap:2px}
 .dsm-workbuddy-xdpool-earned-row{color:#28c8b4;font-variant-numeric:tabular-nums}
 .dsm-workbuddy-xdpool-earned-value{color:#28c8b4;font-weight:600;font-variant-numeric:tabular-nums}
 .dsm-workbuddy-xdpool-auto-jobs{margin-top:8px;display:flex;flex-direction:column;gap:4px}
-.dsm-workbuddy-xdpool-auto-job{display:flex;align-items:center;gap:8px;flex-wrap:wrap;font-size:11px;color:var(--dsw-alias-label-dimmed,#8a97b5)}
-.dsm-workbuddy-xdpool-auto-job-name{flex:0 0 72px;color:var(--dsw-alias-label-primary,#e8e8ea)}
-.dsm-workbuddy-xdpool-auto-job-when{flex:1 1 auto;font-variant-numeric:tabular-nums}
-.dsm-workbuddy-xdpool-auto-job-last{flex:0 0 auto;text-align:right;font-variant-numeric:tabular-nums}
-/* The job detail wraps to its own full-width line: it is a list of reward
-   titles, which needs the whole row rather than a cramped right-hand slot. */
-.dsm-workbuddy-xdpool-auto-job-detail{flex:1 1 100%;color:var(--dsw-alias-label-secondary,#b8bcc4);line-height:1.5;word-break:break-word}
-.dsm-workbuddy-xdpool-auto-job-note{flex:0 0 auto;color:var(--dsw-alias-label-secondary,#b8bcc4)}
-.dsm-workbuddy-xdpool-auto-run{flex:0 0 auto;padding:2px 8px;font-size:10px;line-height:16px}
+.dsm-workbuddy-xdpool-auto-job{display:flex;align-items:center;gap:8px;flex-wrap:wrap;font-size:12px;color:var(--dsw-alias-label-secondary,#c6c9d0)}
+.dsm-workbuddy-xdpool-auto-job-name{flex:0 0 auto;min-width:72px;color:var(--dsw-alias-label-primary,#e8e8ea);font-weight:500}
+.dsm-workbuddy-xdpool-auto-job-when{flex:1 1 auto;color:var(--dsw-alias-label-secondary,#c6c9d0);font-variant-numeric:tabular-nums}
+.dsm-workbuddy-xdpool-auto-job-last{flex:0 0 auto;text-align:right;color:var(--dsw-alias-label-secondary,#c6c9d0);font-variant-numeric:tabular-nums;white-space:nowrap}
+.dsm-workbuddy-xdpool-auto-job-note{flex:0 0 auto;color:var(--dsw-alias-label-secondary,#c6c9d0)}
 /* Reserved credits: one inline number field per account. */
 .dsm-workbuddy-xdpool-reserve{display:flex;align-items:center;gap:6px;flex-wrap:wrap;margin-top:8px;padding-top:8px;border-top:1px dashed var(--dsw-alias-border-l2,#36373b);font-size:11px;color:var(--dsw-alias-label-dimmed,#8a97b5)}
 .dsm-workbuddy-xdpool-reserve-label{flex:0 0 auto}
-.dsm-workbuddy-xdpool-reserve-input{width:76px;padding:2px 6px;border:1px solid var(--dsw-alias-border-l2,#36373b);border-radius:6px;background:transparent;color:var(--dsw-alias-label-primary,#e8e8ea);font:inherit;font-variant-numeric:tabular-nums}
+.dsm-workbuddy-xdpool-reserve-input{width:84px;padding:3px 8px;border:1px solid var(--dsw-alias-border-l2,#3a3d45);border-radius:6px;background:transparent;color:var(--dsw-alias-label-primary,#e8e8ea);font:inherit;font-variant-numeric:tabular-nums;transition:border-color .16s,background .16s}
+.dsm-workbuddy-xdpool-reserve-input:focus{outline:none;border-color:var(--dsw-alias-state-success-primary,#22a06b);background:color-mix(in oklab, var(--dsw-alias-state-success-primary,#22a06b) 7%, transparent)}
 .dsm-workbuddy-xdpool-reserve-input:focus-visible{outline:2px solid var(--dsw-alias-brand-primary,#5686fe);outline-offset:1px}
 .dsm-workbuddy-xdpool-reserve-input:disabled{opacity:.6}
 .dsm-workbuddy-xdpool-reserve-unit{flex:0 0 auto}
 .dsm-workbuddy-xdpool-reserve-badge{flex:0 0 auto;padding:1px 7px;border-radius:999px;background:rgba(232,90,90,.14);color:#e85a5a;font-size:10px}
+/* Explicit Save: the field is a draft, so the button (not a blur) is what
+   commits it — and the outcome is reported right here, next to the control. */
+.dsm-workbuddy-xdpool-reserve-save{flex:0 0 auto;appearance:none;font:inherit;font-size:11px;font-weight:600;line-height:16px;padding:3px 12px;border-radius:6px;border:1px solid color-mix(in oklab, var(--dsw-alias-state-success-primary,#22a06b) 55%, transparent);background:color-mix(in oklab, var(--dsw-alias-state-success-primary,#22a06b) 14%, transparent);color:var(--dsw-alias-state-success-primary,#22a06b);cursor:pointer;transition:opacity .16s,background .16s,border-color .16s,color .16s}
+.dsm-workbuddy-xdpool-reserve-save:hover:not(:disabled){background:color-mix(in oklab, var(--dsw-alias-state-success-primary,#22a06b) 24%, transparent);border-color:var(--dsw-alias-state-success-primary,#22a06b)}
+.dsm-workbuddy-xdpool-reserve-save:disabled{cursor:default;border-color:var(--dsw-alias-border-l2,#3a3d45);background:transparent;color:var(--dsw-alias-label-tertiary,#8a90a0);opacity:.75}
+.dsm-workbuddy-xdpool-reserve-note{flex:0 0 auto;font-size:11px;line-height:16px}
+.dsm-workbuddy-xdpool-reserve-note-ok{color:var(--dsw-alias-state-success-primary,#22a06b)}
+.dsm-workbuddy-xdpool-reserve-note-bad{color:var(--dsw-alias-state-error-primary,#ef4444);font-weight:600}
 `.trim();
 		//#endregion
 		//#region src/client/PoolCard.tsx
@@ -843,6 +848,17 @@ window.__ModuleLoader__.load({
 			* also refreshes the account list afterwards: the reserve badge appears
 			* as soon as the reading crosses the floor.
 			*/
+			/**
+			* Save one account reserved-credit floor.
+			*
+			* A reserve only protects credits if the pool knows the balance, so this also
+			* refreshes the account list afterwards: the reserve badge appears as soon as
+			* the reading crosses the floor.
+			*
+			* Returns whether the host CONFIRMED the write. The card keys its inline
+			* "saved / not saved" note off this, so a failure is shown where the user is
+			* looking instead of only in the card-level notice line.
+			*/
 			const saveCreditReserve = async (accountId, reserve) => {
 				setReserveBusy(accountId);
 				setFlash(void 0);
@@ -863,8 +879,10 @@ window.__ModuleLoader__.load({
 					if (!response.ok) throw new Error(body.error ?? `HTTP ${response.status}`);
 					await refresh(activeRegion);
 					if (mounted.current) setFlash(reserve > 0 ? t?.("row.reserveSaved", { credits: reserve }) ?? `Keeping ${reserve} credits` : t?.("row.reserveCleared") ?? "Reserve cleared");
+					return true;
 				} catch (cause) {
 					if (mounted.current) setError(cause instanceof Error ? cause.message : String(cause));
+					return false;
 				} finally {
 					if (mounted.current) setReserveBusy(void 0);
 				}
@@ -1234,9 +1252,7 @@ window.__ModuleLoader__.load({
 										onClaimCheckin: (accountId) => {
 											claimCheckin(accountId);
 										},
-										onSaveCreditReserve: (accountId, reserve) => {
-											saveCreditReserve(accountId, reserve);
-										},
+										onSaveCreditReserve: (accountId, reserve) => saveCreditReserve(accountId, reserve),
 										onToggleDisabled: (accountId, disabled) => {
 											toggleAccountDisabled(accountId, disabled);
 										},
@@ -1432,19 +1448,41 @@ window.__ModuleLoader__.load({
 		* each save is a settings write plus a status refresh, and a per-character
 		* save would hammer both.
 		*/
+		/**
+		* The reserved-credit floor for one account.
+		*
+		* Saving is an EXPLICIT action, not a blur side effect. The old version
+		* committed `onBlur`, which meant a value could be written without the user
+		* asking for it — and when the write silently failed, the only trace was a
+		* notice line at the top of the card that is easy to miss. That is how
+		* "I typed a number, reopened, and it says 0 again" happened with no visible
+		* error to explain it.
+		*
+		* Now: the field is a draft, Save is enabled only when the draft differs from
+		* what the host last reported, and the outcome (saving / saved / failed) is
+		* shown inline next to the button. Enter also saves, so keyboard flow is not
+		* lost.
+		*/
 		function CreditReserveRow({ account, t, busy, onSave }) {
-			const [draft, setDraft] = (0, react.useState)(String(account.creditReserve ?? 0));
+			const saved = account.creditReserve ?? 0;
+			const [draft, setDraft] = (0, react.useState)(String(saved));
+			const [settled, setSettled] = (0, react.useState)(saved);
+			const [note, setNote] = (0, react.useState)(void 0);
 			(0, react.useEffect)(() => {
-				setDraft(String(account.creditReserve ?? 0));
-			}, [account.creditReserve]);
-			const commit = () => {
-				const parsed = Number.parseInt(draft, 10);
-				const next = Number.isFinite(parsed) && parsed > 0 ? Math.floor(parsed) : 0;
-				if (next === (account.creditReserve ?? 0)) {
+				setSettled(saved);
+				setDraft((current) => current === String(saved) ? current : String(saved));
+			}, [saved]);
+			const parsed = Number.parseInt(draft, 10);
+			const next = Number.isFinite(parsed) && parsed > 0 ? Math.floor(parsed) : 0;
+			const dirty = next !== settled;
+			const commit = async () => {
+				if (busy || !dirty) return;
+				setNote(void 0);
+				if (await onSave(account.id, next)) {
+					setSettled(next);
 					setDraft(String(next));
-					return;
-				}
-				onSave(account.id, next);
+					setNote("saved");
+				} else setNote("failed");
 			};
 			return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 				className: "dsm-workbuddy-xdpool-reserve",
@@ -1463,16 +1501,33 @@ window.__ModuleLoader__.load({
 						"aria-label": t?.("row.reserveTitle") ?? "Keep at least",
 						onChange: (event) => {
 							setDraft(event.target.value);
+							setNote(void 0);
 						},
-						onBlur: commit,
 						onKeyDown: (event) => {
-							if (event.key === "Enter") event.target.blur();
+							if (event.key === "Enter") commit();
 						}
 					}),
 					/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
 						className: "dsm-workbuddy-xdpool-reserve-unit",
-						children: busy ? t?.("row.reserveSaving") ?? "Saving…" : t?.("row.reserveUnit") ?? "credits"
+						children: t?.("row.reserveUnit") ?? "credits"
+					}),
+					/* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
+						type: "button",
+						className: "dsm-workbuddy-xdpool-reserve-save",
+						disabled: busy || !dirty,
+						onClick: () => {
+							commit();
+						},
+						children: busy ? t?.("row.reserveSaving") ?? "Saving…" : t?.("row.reserveSave") ?? "Save"
 					}),
+					note === "saved" ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+						className: "dsm-workbuddy-xdpool-reserve-note dsm-workbuddy-xdpool-reserve-note-ok",
+						children: next > 0 ? t?.("row.reserveSaved", { credits: next }) ?? `Keeping ${next} credits` : t?.("row.reserveCleared") ?? "Reserve cleared"
+					}) : null,
+					note === "failed" ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+						className: "dsm-workbuddy-xdpool-reserve-note dsm-workbuddy-xdpool-reserve-note-bad",
+						children: t?.("row.reserveFailed") ?? "Not saved — try again"
+					}) : null,
 					account.reserved === true ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
 						className: "dsm-workbuddy-xdpool-reserve-badge",
 						children: t?.("row.reserveHolding") ?? "Reserved: skipped"
@@ -1797,9 +1852,11 @@ window.__ModuleLoader__.load({
 			"row.reserveTitle": "Keep at least",
 			"row.reserveUnit": "credits",
 			"row.reserveSaving": "Saving…",
+			"row.reserveSave": "Save",
 			"row.reserveHolding": "Reserved: skipped",
 			"row.reserveSaved": "Keeping {credits} credits",
 			"row.reserveCleared": "Reserve cleared",
+			"row.reserveFailed": "Not saved — try again",
 			"row.autoToday": "Today",
 			"row.autoEarned": "Automation today",
 			"row.autoEnergy": "energy",
@@ -1926,9 +1983,11 @@ window.__ModuleLoader__.load({
 			"row.reserveTitle": "保留积分",
 			"row.reserveUnit": "积分",
 			"row.reserveSaving": "保存中…",
+			"row.reserveSave": "保存",
 			"row.reserveHolding": "已保留·暂停使用",
 			"row.reserveSaved": "已保留 {credits} 积分",
 			"row.reserveCleared": "已取消保留",
+			"row.reserveFailed": "保存失败，请重试",
 			"row.autoToday": "今日自动化",
 			"row.autoEarned": "今日自动化获得",
 			"row.autoEnergy": "能量",

package/lib/index.d.ts

@@ -764,8 +764,12 @@ export declare function defaultDesktopAuthDirs(platform?: NodeJS.Platform, home?
  * Parse a WorkBuddy auth document. Accepts the nested desktop shape
  * `{"auth":{...},"account":{...}}` and the flat panel shape; returns undefined
  * when there is no usable access token.
+ *
+ * `decrypt` opens the desktop app's `$wbEncrypted` field wrapper (5.6.0+, both
+ * platforms). Absent means "plain-string builds only", which is what every
+ * caller without an at-rest key should pass.
  */
-export declare function parseWorkBuddyAuth(text: string, sourcePath: string): WorkBuddyCredential | undefined;
+export declare function parseWorkBuddyAuth(text: string, sourcePath: string, decrypt?: (field: unknown) => string): WorkBuddyCredential | undefined;
 export declare function workbuddyAccountId(credential: Pick<WorkBuddyCredential, 'uin' | 'uid' | 'nickname'>): string;
 /** Every directory the pool should scan, in probe order. */
 export declare function candidateAuthDirs(env?: NodeJS.ProcessEnv): string[];
@@ -1332,7 +1336,7 @@ type AutomationJobKind = 'checkin' | 'tasks' | 'report' | 'streak' | 'travel';
 export declare const AUTOMATION_JOB_KINDS: readonly AutomationJobKind[];
 /** Reject anything that is not a job kind, so a route cannot name an unknown job. */
 export declare function isAutomationJobKind(value: unknown): value is AutomationJobKind;
-export declare function dayKey(date: Date): string;
+export declare function dayKey(date: Date, timeZone?: string): string;
 /**
  * Whether `now`'s local hour is one of `hours`.
  *
@@ -1467,6 +1471,15 @@ export declare class WorkBuddyScheduler {
    * rate-limits per account, so overlapping passes would only trip that limit.
    * A job that throws is recorded and the loop continues.
    */
+  /**
+   * Whether `kind` is due at `now`: its earliest configured hour has passed in
+   * the scheduling timezone, and no hour of today has been consumed yet.
+   *
+   * Hours are consumed per SLOT (one entry per configured hour), so a job with
+   * two hours still runs twice a day — but a job whose hour passed while DSH was
+   * closed runs immediately on the next tick instead of waiting for tomorrow.
+   */
+  private isDue;
   private tick;
   /** Run one job against every eligible account and record the outcome. */
   /**