dsh-xdpool 2.4.4 → 2.4.5

package/CHANGELOG.md

@@ -1,6 +1,18 @@
 # Changelog
 本项目的所有重要变更都会记录在此文件。
 版本号遵循 [语义化版本](https://semver.org/lang/zh-CN/)。
+## 2.4.5 — 侧栏面板能滚动了
+
+> 2.4.4 把账号池搬到侧栏那行之后，页面在折叠处被切掉、怎么都翻不到下半页。这不是新功能缺失，是我把设置页里的组件原样塞进了另一个容器，而**那个容器不滚动**。
+
+### 面板被裁切
+
+`@deepseek-ai/dsh-client-ui-layout` 把中央列样式成 `display:flex; flex-direction:column; overflow:hidden`——设置对话框自己带滚动容器，所以同一个组件放在设置里能滚动，放进主区域就只能被裁掉。现在页面外面包一层 `.dsm-xdpool-page`（`height:100%; min-height:0; overflow:auto`），由它当滚动容器；顺带补上设置对话框原本提供的内边距，否则卡片会贴着窗口边缘。设置页那条路径**不受影响**：那里宿主已经在滚，再加一层会双份。
+
+### 其他
+
+- 侧栏那行标签保持 `XD Pool`（中英文都不译）。
+
 ## 2.4.4 — 扫码登录后仍显示「登录已被拒绝」，以及侧栏入口
 
 > 两个都不算新功能：一个是**我上一版自己的代码**把刚扫的凭据判成「旧的」；另一个是入口位置——账号池一直只能从「设置」里进。

package/lib/client.js

@@ -1670,39 +1670,19 @@ window.__ModuleLoader__.load({
 ):active:not(:disabled){transform:none}
 }
 
-/* ── Docked entry beside the settings control ────────────────────────────────
-   The sidebar button and the overlay are two separate registrations with no
-   shared ancestor, so neither can carry the shell's own custom properties: the
-   easing curves are re-declared here rather than inherited. Everything below is
-   scoped to .dsm-xdpool-dock so it cannot reach into the host's sidebar. */
-.dsm-xdpool-dock{--ease-instrument:cubic-bezier(.16,1,.3,1);position:relative;z-index:1;display:flex;align-items:center;gap:8px;width:100%;min-width:0;padding:6px 8px;border:1px solid transparent;border-radius:9px;background:transparent;color:var(--dsw-alias-label-secondary,#c6c9d0);font:inherit;font-size:12px;line-height:17px;font-weight:560;text-align:left;cursor:pointer;overflow:hidden;transition:color .2s var(--ease-instrument),background .2s var(--ease-instrument),border-color .2s var(--ease-instrument)}
-.dsm-xdpool-dock:hover{color:var(--dsw-alias-label-primary,#e8e8ea);background:color-mix(in srgb, var(--dsw-alias-label-primary,#e8e8ea) 7%, transparent);border-color:color-mix(in srgb, var(--dsw-alias-border-l2,#ffffff1f) 70%, transparent)}
-.dsm-xdpool-dock-on{color:var(--dsw-alias-label-primary,#e8e8ea);background:color-mix(in srgb, var(--dsw-alias-state-business-primary,#5686fe) 14%, transparent);border-color:color-mix(in srgb, var(--dsw-alias-state-business-primary,#5686fe) 40%, transparent)}
-/* The sweep is the same gesture the card's own buttons make, so the dock reads
-   as part of the plugin rather than a host control. */
-.dsm-xdpool-dock::after{content:"";position:absolute;top:0;bottom:0;left:-60%;width:42%;pointer-events:none;background:linear-gradient(100deg,transparent,rgb(255 255 255 / 12%),transparent);transform:skewX(-18deg);transition:left .5s var(--ease-instrument)}
-.dsm-xdpool-dock:hover::after{left:118%}
-.dsm-xdpool-dockicon{flex:none;width:16px;height:16px;background-color:currentColor;-webkit-mask-image:var(--dsm-xdpool-dock-glyph);mask-image:var(--dsm-xdpool-dock-glyph);-webkit-mask-repeat:no-repeat;mask-repeat:no-repeat;-webkit-mask-position:center;mask-position:center;-webkit-mask-size:16px 16px;mask-size:16px 16px}
-.dsm-xdpool-docklabel{min-width:0;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}
-/* No dark backdrop: the panel is a companion to the conversation, not a modal,
-   and dimming the whole host for a settings card reads as a page navigation.
-   Clicking outside still closes it — the scrim covers the viewport and is
-   transparent, so only the click is caught. */
-.dsm-xdpool-dockscrim{position:fixed;inset:0;z-index:60;display:flex;align-items:stretch;justify-content:flex-end;background:transparent}
-.dsm-xdpool-dockpanel{--ease-instrument:cubic-bezier(.16,1,.3,1);display:flex;flex-direction:column;width:min(760px, 92vw);margin:14px;border:1px solid color-mix(in srgb, var(--dsw-alias-border-l2,#ffffff1f) 82%, transparent);border-radius:16px;background:color-mix(in srgb, var(--dsw-alias-bg-layer-1,#141517) 96%, transparent);box-shadow:0 20px 60px rgb(0 0 0 / 45%);overflow:hidden;animation:dsm-xdpool-dock-in .3s var(--ease-instrument)}
-@keyframes dsm-xdpool-dock-in{from{opacity:0;transform:translateX(18px)}to{opacity:1;transform:none}}
-.dsm-xdpool-dockhead{display:flex;align-items:center;gap:10px;padding:10px 12px;border-bottom:1px solid color-mix(in srgb, var(--dsw-alias-border-l1,#ffffff14) 80%, transparent)}
-.dsm-xdpool-docktitle{flex:1 1 auto;font-size:12px;line-height:17px;font-weight:640;color:var(--dsw-alias-label-primary,#e8e8ea)}
-.dsm-xdpool-dockclose{appearance:none;flex:none;width:22px;height:22px;padding:0;border:1px solid transparent;border-radius:7px;background:transparent;color:var(--dsw-alias-label-tertiary,#8a90a0);font:inherit;font-size:15px;line-height:1;cursor:pointer;transition:color .16s ease,background .16s ease}
-.dsm-xdpool-dockclose:hover{color:var(--dsw-alias-label-primary,#e8e8ea);background:color-mix(in srgb, var(--dsw-alias-label-primary,#e8e8ea) 9%, transparent)}
-/* The card inside the panel was built for the settings dialog's width; scroll
-   the panel body, never the card, so its own sticky header keeps working. */
-.dsm-xdpool-dockbody{flex:1 1 auto;min-height:0;overflow:auto;padding:14px}
-@media (prefers-reduced-motion:reduce){
-.dsm-xdpool-dock::after{display:none}
-.dsm-xdpool-dockpanel{animation:none}
-}
-
+`.trim();
+		/**
+		* Frame for hosting the pool in the main column instead of the settings dialog.
+		*
+		* `.centerCol` is `overflow:hidden`, so this element is the scrollport; without
+		* it the page clips at the fold. The horizontal inset is asymmetric on purpose —
+		* the sidebar sits on the left of this column, so the left edge needs less air
+		* than the right one to look centred.
+		*/
+		const PAGE_CSS = `
+.dsm-xdpool-page{flex:1 1 auto;height:100%;min-height:0;overflow:auto;box-sizing:border-box;padding:20px 28px 34px}
+.dsm-xdpool-page > .dsm-xdpool-shell{margin:0 auto}
+@media (max-width:720px){.dsm-xdpool-page{padding:14px 16px 26px}}
 `.trim();
 		//#endregion
 		//#region src/client/avatar.ts
@@ -12358,7 +12338,7 @@ window.__ModuleLoader__.load({
 		*
 		* @module dsh-xdpool/version
 		*/
-		const POOL_VERSION = "2.4.4";
+		const POOL_VERSION = "2.4.5";
 		//#endregion
 		//#region src/client/PoolCard.tsx
 		/**
@@ -14732,15 +14712,33 @@ window.__ModuleLoader__.load({
 		* `fill-rule="evenodd"` cuts the interior notches out of the silhouette so the
 		* three layers stay distinguishable at that size.
 		*/
+		/**
+		* The mark's geometry, independent of any wrapper element.
+		*
+		* Kept separate from {@link POOL_NAV_ICON_SVG} because the two consumers need
+		* different frames: the settings nav row masks a standalone document, while the
+		* sidebar panel row renders paths into an `svg` the shell sizes for it (16px
+		* wide, 18px in the collapsed rail). Sharing the paths — rather than the whole
+		* document, parsed back out with a regex — is what keeps the two placements from
+		* drifting apart when the artwork changes.
+		*/
+		const POOL_NAV_ICON_PATHS = [{
+			fill: "currentColor",
+			fillRule: "evenodd",
+			d: "M12 2.6a3.1 3.1 0 1 1 0 6.2 3.1 3.1 0 0 1 0-6.2Zm0 1.7a1.4 1.4 0 1 0 0 2.8 1.4 1.4 0 0 0 0-2.8ZM6.6 8.9a2.6 2.6 0 1 1 0 5.2 2.6 2.6 0 0 1 0-5.2Zm0 1.6a1 1 0 1 0 0 2 1 1 0 0 0 0-2ZM17.4 8.9a2.6 2.6 0 1 1 0 5.2 2.6 2.6 0 0 1 0-5.2Zm0 1.6a1 1 0 1 0 0 2 1 1 0 0 0 0-2Z"
+		}, {
+			fill: "none",
+			stroke: "currentColor",
+			strokeWidth: 1.7,
+			strokeLinecap: "round",
+			strokeDasharray: "2.6 2.2",
+			d: "M4.4 17.2a8.6 8.6 0 0 0 15.2 0"
+		}];
+		/** The same mark as a standalone SVG document, for `mask-image`. */
 		const POOL_NAV_ICON_SVG = [
 			"<svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 24 24\" width=\"16\" height=\"16\">",
-			"<path fill=\"currentColor\" fill-rule=\"evenodd\" d=\"",
-			"M12 2.6a3.1 3.1 0 1 1 0 6.2 3.1 3.1 0 0 1 0-6.2Zm0 1.7a1.4 1.4 0 1 0 0 2.8 1.4 1.4 0 0 0 0-2.8Z",
-			"M6.6 8.9a2.6 2.6 0 1 1 0 5.2 2.6 2.6 0 0 1 0-5.2Zm0 1.6a1 1 0 1 0 0 2 1 1 0 0 0 0-2Z",
-			"M17.4 8.9a2.6 2.6 0 1 1 0 5.2 2.6 2.6 0 0 1 0-5.2Zm0 1.6a1 1 0 1 0 0 2 1 1 0 0 0 0-2Z",
-			"\"/>",
-			"<path fill=\"none\" stroke=\"currentColor\" stroke-width=\"1.7\" stroke-linecap=\"round\"",
-			" d=\"M4.4 17.2a8.6 8.6 0 0 0 15.2 0\" stroke-dasharray=\"2.6 2.2\"/>",
+			`<path fill="currentColor" fill-rule="evenodd" d="${POOL_NAV_ICON_PATHS[0].d}"/>`,
+			`<path fill="none" stroke="currentColor" stroke-width="1.7" stroke-linecap="round" d="${POOL_NAV_ICON_PATHS[1].d}" stroke-dasharray="2.6 2.2"/>`,
 			"</svg>"
 		].join("");
 		/**
@@ -14752,135 +14750,67 @@ window.__ModuleLoader__.load({
 		*/
 		const POOL_NAV_ICON_MASK_URL = `data:image/svg+xml;utf8,${encodeURIComponent(POOL_NAV_ICON_SVG)}`;
 		//#endregion
-		//#region src/client/dock.tsx
+		//#region src/client/panel-icon.tsx
 		/**
-		* The docked entry: a `sidebar.footer.action` button that opens the pool card in
-		* a `shell.overlay` panel.
-		*
-		* Why not link to the Settings page the card already lives on: the host's
-		* sidebar slot hands a registrant exactly `{ wide }` — no `openSettings`, no
-		* navigation seat. dsh-purge, dshmarket and everything else third-party solve it
-		* the same way, by owning the surface: a button that toggles an overlay of its
-		* own. Re-implementing the card for the overlay would mean two copies to keep in
-		* step, so the overlay renders the very same `PoolCard` the settings section
-		* renders, page state and all.
-		*
-		* The open flag lives at module scope rather than in React state because the
-		* button and the panel are two separate slot registrations with no common
-		* ancestor; module state plus a subscription is the only channel between them.
+		* Render the pool's mark.
+		*
+		* Inlined rather than masked from a data URI because the shell gives the glyph an
+		* 18px box in the collapsed rail: a `mask-size: 16px` silhouette would read as
+		* smaller than the first-party icons beside it, and scaling the mask would blur
+		* its 1.7px arc. Both placements share {@link POOL_NAV_ICON_PATHS}, so the artwork
+		* cannot drift between the settings nav row and this one.
 		*/
-		/** Subscribers re-read {@link dockedOpen}; the setter notifies them. */
-		const listeners = /* @__PURE__ */ new Set();
-		let dockedOpen = false;
-		/** Read whether the docked panel is showing. */
-		function isDockedOpen() {
-			return dockedOpen;
-		}
-		/** Show or hide the docked panel, notifying every registrant. */
-		function setDockedOpen(open) {
-			if (dockedOpen === open) return;
-			dockedOpen = open;
-			for (const listener of [...listeners]) listener();
-		}
-		/** Subscribe to {@link setDockedOpen}. Returns the unsubscribe. */
-		function subscribeDockedOpen(listener) {
-			listeners.add(listener);
-			return () => {
-				listeners.delete(listener);
-			};
-		}
-		/** Subscribe a component to the open flag. */
-		function useDockedOpen() {
-			const [open, setOpen] = (0, react.useState)(isDockedOpen);
-			(0, react.useEffect)(() => {
-				setOpen(isDockedOpen());
-				return subscribeDockedOpen(() => {
-					setOpen(isDockedOpen());
-				});
-			}, []);
-			return open;
+		function PanelIcon({ size }) {
+			const edge = typeof size === "number" && size > 0 ? size : 16;
+			return /* @__PURE__ */ (0, react_jsx_runtime.jsx)("svg", {
+				xmlns: "http://www.w3.org/2000/svg",
+				viewBox: "0 0 24 24",
+				width: edge,
+				height: edge,
+				"aria-hidden": "true",
+				focusable: "false",
+				children: POOL_NAV_ICON_PATHS.map((shape, index) => /* @__PURE__ */ (0, react_jsx_runtime.jsx)("path", { ...shape }, index))
+			});
 		}
+		//#endregion
+		//#region src/client/page.tsx
 		/**
-		* The sidebar button.
+		* The wrapper that makes the pool usable as a *sidebar panel*.
+		*
+		* Two problems it solves, both invisible from inside `PoolShell`:
+		*
+		* 1. Scrolling. The settings dialog owns a scroll container, so a page dropped
+		*    into `settings.plugin.item` can be as tall as it likes. The main column
+		*    cannot: `@deepseek-ai/dsh-client-ui-layout` styles `.centerCol` as
+		*    `display:flex; flex-direction:column; overflow:hidden`, and the slot is
+		*    rendered into that box with no scrolling of its own. Without a scrollport
+		*    here the page simply clips — which is what happens if you register
+		*    `PoolCard` into the `main` slot directly. The reference community plugin
+		*    solves it the same way, with `height:100%; min-height:0; overflow:auto` on
+		*    its page root.
+		*
+		* 2. Insets. The settings dialog supplies padding around the card; the main
+		*    column supplies none, so the same markup arrives flush against the window
+		*    edge. The padding below restores the frame the dialog used to provide.
 		*
-		* Renders a glyph and, only when the rail is wide, the product name: a label in
-		* the collapsed 56px rail is clipped mid-word, which reads as a layout bug.
+		* `PAGE_CSS` is injected here rather than living in `SHARED_CARD_CSS` because
+		* the stylesheets in `PoolShell` are rendered *inside* the shell — this wrapper
+		* is its parent, so nothing from that subtree could style it.
+		*
+		* @module dsh-xdpool/client/page
 		*/
-		function SidebarEntry({ wide }) {
-			const open = useDockedOpen();
-			const label = "XD Pool";
-			return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("button", {
-				type: "button",
-				className: `dsm-xdpool-dock${open ? " dsm-xdpool-dock-on" : ""}`,
-				title: open ? "收起 XD Pool" : "打开 XD Pool",
-				"aria-expanded": open,
-				"aria-label": label,
-				style: { "--dsm-xdpool-dock-glyph": `url("${POOL_NAV_ICON_MASK_URL}")` },
-				onClick: () => {
-					setDockedOpen(!isDockedOpen());
-				},
-				children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
-					className: "dsm-xdpool-dockicon",
-					"aria-hidden": "true"
-				}), wide === true ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
-					className: "dsm-xdpool-docklabel",
-					children: label
-				}) : null]
-			});
-		}
 		/**
-		* The panel, rendered into `shell.overlay`.
+		* `PoolCard`, sized and scrolled for the main column.
 		*
-		* `children` is the card itself, passed in rather than imported so this module
-		* stays free of the card's dependency graph (the overlay must not drag the
-		* settings scope in with it when the host line has no scope to hand out).
+		* Kept as a separate component instead of an option on `PoolCard` so the
+		* settings registration stays exactly what it was: the dialog already provides
+		* both the scrollport and the insets, and adding either again would double
+		* them.
 		*/
-		function DockedPanel({ children }) {
-			const open = useDockedOpen();
-			(0, react.useEffect)(() => {
-				if (!open) return;
-				const onKeyDown = (event) => {
-					if (event.key === "Escape") setDockedOpen(false);
-				};
-				window.addEventListener("keydown", onKeyDown);
-				return () => {
-					window.removeEventListener("keydown", onKeyDown);
-				};
-			}, [open]);
-			if (!open) return null;
-			return /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
-				className: "dsm-xdpool-dockscrim",
-				role: "presentation",
-				onClick: () => {
-					setDockedOpen(false);
-				},
-				children: /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
-					className: "dsm-xdpool-dockpanel",
-					role: "dialog",
-					"aria-modal": "false",
-					"aria-label": "XD Pool",
-					onClick: (event) => {
-						event.stopPropagation();
-					},
-					children: [/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
-						className: "dsm-xdpool-dockhead",
-						children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
-							className: "dsm-xdpool-docktitle",
-							children: "XD Pool"
-						}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
-							type: "button",
-							className: "dsm-xdpool-dockclose",
-							"aria-label": "关闭",
-							onClick: () => {
-								setDockedOpen(false);
-							},
-							children: "×"
-						})]
-					}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
-						className: "dsm-xdpool-dockbody",
-						children
-					})]
-				})
+		function PoolPage(props) {
+			return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+				className: "dsm-xdpool-page",
+				children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("style", { children: PAGE_CSS }), /* @__PURE__ */ (0, react_jsx_runtime.jsx)(PoolCard, { ...props })]
 			});
 		}
 		//#endregion
@@ -15961,22 +15891,22 @@ window.__ModuleLoader__.load({
 				}, PoolCard));
 				installNavIcon(ctx, () => t("row.navLabel"));
 				try {
-					ctx.slots.inject("sidebar.footer.action", () => ctx.slots.register({
-						name: "sidebar.footer.action",
-						id: "xdpool-dock",
-						order: 60,
-						label: "XD Pool"
-					}, SidebarEntry));
-					ctx.slots.inject("shell.overlay", () => ctx.slots.register({
-						name: "shell.overlay",
-						id: "xdpool-dock-panel",
-						order: 60
-					}, () => /* @__PURE__ */ (0, react_jsx_runtime.jsx)(DockedPanel, { children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(PoolCard, { ...settingsScope === void 0 ? { t } : {
-						t,
-						settingsScope
-					} }) })));
+					ctx.slots.inject("sidebar.panellist", () => ctx.slots.register({
+						name: "sidebar.panellist",
+						id: "xdpool",
+						order: 20,
+						label: () => t("row.navLabel")
+					}, PanelIcon));
+					ctx.slots.inject("main", () => ctx.slots.register({
+						name: "main",
+						key: "xdpool",
+						inject: () => settingsScope === void 0 ? { t } : {
+							t,
+							settingsScope
+						}
+					}, PoolPage));
 				} catch (error) {
-					console.error("[dsh-xdpool] docked entry unavailable (settings page unaffected):", error);
+					console.error("[dsh-xdpool] sidebar entry unavailable (settings page unaffected):", error);
 				}
 			} catch (error) {
 				console.error("[dsh-xdpool] client page failed to load (host provider unaffected):", error);

package/package.json

@@ -2,7 +2,7 @@
   "name": "dsh-xdpool",
   "displayName": "DSH XD Pool",
   "description": "One DSH model pool for every free quota you have: merge all locally signed-in WorkBuddy accounts with auto-failover, sign in to 13 vendors by QR/web, aggregate 76 vendors' free tiers, plus a usage dashboard, model routing, a local OpenAI-compatible gateway and a points-automation suite.",
-  "version": "2.4.4",
+  "version": "2.4.5",
   "license": "MIT",
   "author": "XDTrees",
   "homepage": "https://github.com/XDTrees/dsh-xdpool#readme",