dsh-ds-balance 2.1.0 → 2.1.1

package/README.md

@@ -40,7 +40,7 @@
 | 界面 | 一句话 | 你会用它来 |
 |---|---|---|
 | 侧栏圆环 | 常驻左边栏底部的状态环 + 名称，**展开态悬浮条目就报出余额金额**，**环里填了多少 = 余额离该币种预警线还有多远** | 扫一眼就知道还剩多少、离预警线多远 |
-| 余额浮层 | 点条目展开：总额、赠送 / 充值拆分、数据新鲜度、手动刷新（带冷却）；**右上角图标一键跳到插件页** | 核对具体数字，以及数据是几分钟前的 |
+| 余额浮层 | 点条目展开：总额、赠送 / 充值拆分、数据新鲜度、手动刷新（带冷却）；**右上角图标跳到本插件的配置格**（宿主没有那条跨插件深链服务时退回 Plugins 列表，悬浮文字同步改口径） | 核对具体数字，以及数据是几分钟前的 |
 | 设置卡片 | 连接 / 展示 / 阈值 / 刷新四组，**默认四组全收起**，点组头逐组展开 | 换端点、换币种、调预警线、调节奏 |
 
 三种界面的分工是死的：**圆环回答「大概还剩多少」，浮层回答「具体是多少」，卡片回答「怎么算」。**

package/README_en.md

@@ -40,7 +40,7 @@ The balance needs somewhere to live that does not take up room. A permanent stat
 | Surface | One line | Use it for |
 |---|---|---|
 | Sidebar ring | A status ring plus label at the bottom of the sidebar; **in the expanded state, hovering the entry reports the balance amount**, and **how full it is = how far the balance is from that currency's warning line** | Seeing at a glance how much is left and how close it is to the warning line |
-| Balance popover | Click the entry: total, granted / topped-up split, data freshness, manual refresh (with cooldown); **an icon at its top right jumps straight to the Plugins page** | Checking the exact figures, and how many minutes old they are |
+| Balance popover | Click the entry: total, granted / topped-up split, data freshness, manual refresh (with cooldown); **an icon at its top right opens this plugin's configuration page** (on a host without that cross-plugin deep link it falls back to the Plugins list, and its tooltip says so) | Checking the exact figures, and how many minutes old they are |
 | Settings card | Connection / Display / Thresholds / Refresh, **all collapsed by default**, expand a group from its header | Changing the endpoint, the currency, the warning lines, the cadence |
 
 The division of labour is fixed: **the ring answers "roughly how much is left", the popover answers "exactly how much", and the card answers "how is that computed".**

package/lib/client.js

@@ -56,7 +56,10 @@ var zh = {
   "popover.cooldown": "{value} \u79D2\u540E\u53EF\u518D\u6B21\u5237\u65B0",
   "popover.mismatch": "\u672A\u627E\u5230 {wanted} \u4F59\u989D\uFF0C\u5F53\u524D\u663E\u793A {shown}",
   "popover.action.useShown": "\u6539\u7528 {shown}",
+  // 右上角图标的两档措辞。落点由**宿主能力**决定（跨插件深链服务在不在），
+  // 措辞就跟着落点分档：一句含糊的话盖不住两种落点。见 BalancePopover 的 PluginsAction。
   "popover.action.openPlugins": "\u6253\u5F00\u63D2\u4EF6\u9875",
+  "popover.action.openPluginConfig": "\u6253\u5F00\u63D2\u4EF6\u914D\u7F6E\u9875",
   "state.unavailable": "\u8D26\u6237\u4E0D\u53EF\u7528",
   "state.stale": "\u6570\u636E\u5DF2\u8FC7\u671F",
   "state.error": "\u8BFB\u53D6\u5931\u8D25",
@@ -137,6 +140,7 @@ var en = {
   "popover.mismatch": "No {wanted} balance found; showing {shown}",
   "popover.action.useShown": "Use {shown}",
   "popover.action.openPlugins": "Open the Plugins page",
+  "popover.action.openPluginConfig": "Open the plugin configuration page",
   "state.unavailable": "Account unavailable",
   "state.stale": "Data is stale",
   "state.error": "Failed to load",
@@ -1544,7 +1548,7 @@ function BalancePopover(props) {
     onRefresh,
     onUseShown,
     useShownDisabled,
-    onOpenPlugins
+    pluginsAction
   } = props;
   const shown = selection.shown;
   const totalText = shown === null ? BALANCE_PLACEHOLDER : formatMoney(shown.total, shown.currency);
@@ -1559,6 +1563,7 @@ function BalancePopover(props) {
   if (refreshing) statusText = t("popover.refreshing");
   else if (cooling) statusText = interpolate(t("popover.cooldown"), { value: String(cooldownSeconds) });
   const refreshLabel = t("sidebar.aria.refresh");
+  const pluginsLabel = t(pluginsAction?.reachesConfig === true ? "popover.action.openPluginConfig" : "popover.action.openPlugins");
   return /* @__PURE__ */ (0, import_jsx_runtime3.jsxs)(
     "section",
     {
@@ -1582,13 +1587,13 @@ function BalancePopover(props) {
               ]
             }
           ),
-          onOpenPlugins === void 0 ? null : /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(import_dsh_client_ui_primitives3.Tooltip, { label: t("popover.action.openPlugins"), side: "top", delayMs: 500, children: /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(
+          pluginsAction === void 0 ? null : /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(import_dsh_client_ui_primitives3.Tooltip, { label: pluginsLabel, side: "top", delayMs: 500, children: /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(
             "button",
             {
               type: "button",
               className: BalancePopover_default.iconButton,
-              "aria-label": t("popover.action.openPlugins"),
-              onClick: onOpenPlugins,
+              "aria-label": pluginsLabel,
+              onClick: pluginsAction.open,
               children: /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(import_dsh_client_ui_primitives3.IconPluginPinwheelOutlineRegular, { size: 16 })
             }
           ) })
@@ -1728,18 +1733,18 @@ function useConfigSlotState(probe) {
   return state;
 }
 function usePluginsNavigation(navigation) {
-  const [openPlugins, setOpenPlugins] = (0, import_react5.useState)(() => navigation?.getSnapshot());
+  const [action, setAction] = (0, import_react5.useState)(() => navigation?.getSnapshot());
   (0, import_react5.useEffect)(() => {
     if (navigation === void 0) {
-      setOpenPlugins(void 0);
+      setAction(void 0);
       return;
     }
-    setOpenPlugins(() => navigation.getSnapshot());
+    setAction(navigation.getSnapshot());
     return navigation.subscribe(() => {
-      setOpenPlugins(() => navigation.getSnapshot());
+      setAction(navigation.getSnapshot());
     });
   }, [navigation]);
-  return openPlugins;
+  return action;
 }
 function stateLabelKey(response, selection) {
   if (response.state === "error") return response.error?.code === "NO_KEY" ? "state.noKey" : "state.error";
@@ -1893,11 +1898,17 @@ function SidebarBalance({
     if (current === null) return;
     void onSelectCurrency(current.currency);
   }, [selection, onSelectCurrency]);
-  const openPlugins = usePluginsNavigation(pluginsNavigation);
-  const handleOpenPlugins = (0, import_react5.useCallback)(() => {
-    closeNow();
-    openPlugins?.();
-  }, [closeNow, openPlugins]);
+  const pluginsAction = usePluginsNavigation(pluginsNavigation);
+  const popoverPluginsAction = (0, import_react5.useMemo)(
+    () => pluginsAction === void 0 ? void 0 : {
+      reachesConfig: pluginsAction.reachesConfig,
+      open: () => {
+        closeNow();
+        pluginsAction.open();
+      }
+    },
+    [closeNow, pluginsAction]
+  );
   const configSlotState = useConfigSlotState(configSlotProbe);
   const shown = selection.shown;
   const ring = ringSpecFor(response.severity);
@@ -1966,7 +1977,7 @@ function SidebarBalance({
               onRefresh: handleRefresh,
               onUseShown: handleUseShown,
               useShownDisabled: !config.writable,
-              onOpenPlugins: openPlugins === void 0 ? void 0 : handleOpenPlugins
+              pluginsAction: popoverPluginsAction
             }
           ),
           document.body
@@ -2063,25 +2074,59 @@ function SettingsSeatComponent(props) {
 }
 var PLUGINS_PANEL_ID = "plugins";
 function createPluginsNavigation() {
-  let open;
+  let selectPanel;
+  let openBundle;
+  let snapshot;
   const listeners2 = /* @__PURE__ */ new Set();
-  const publish = (next) => {
-    if (next === open) return;
-    open = next;
+  const open = () => {
+    if (openBundle !== void 0) {
+      try {
+        openBundle(BUNDLE_CONFIG_KEY);
+        return;
+      } catch (error) {
+        console.warn("[WARN] ds-balance: cannot open the bundle config page", error);
+      }
+    }
+    try {
+      selectPanel?.();
+    } catch (error) {
+      console.warn("[WARN] ds-balance: cannot switch to the plugins panel", error);
+    }
+  };
+  const publish = () => {
+    const reachesConfig = openBundle !== void 0;
+    const next = selectPanel === void 0 ? void 0 : { open, reachesConfig };
+    const unchanged = next === void 0 ? snapshot === void 0 : snapshot !== void 0 && snapshot.reachesConfig === reachesConfig;
+    if (unchanged) return;
+    snapshot = next;
     for (const listener of [...listeners2]) listener();
   };
   return {
-    getSnapshot: () => open,
+    getSnapshot: () => snapshot,
     subscribe: (listener) => {
       listeners2.add(listener);
       return () => {
         listeners2.delete(listener);
       };
     },
-    attach: (callback) => {
-      publish(callback);
+    attachPanel: (callback) => {
+      selectPanel = callback;
+      publish();
       return () => {
-        if (open === callback) publish(void 0);
+        if (selectPanel === callback) {
+          selectPanel = void 0;
+          publish();
+        }
+      };
+    },
+    attachDeepLink: (callback) => {
+      openBundle = callback;
+      publish();
+      return () => {
+        if (openBundle === callback) {
+          openBundle = void 0;
+          publish();
+        }
       };
     }
   };
@@ -2091,21 +2136,13 @@ function apply(ctx) {
   const configSlotProbe = createConfigSlotProbe();
   ctx.effect(() => () => configSlotProbe.dispose(), "ds-balance: config slot probe");
   const pluginsNavigation = createPluginsNavigation();
-  let openBundlePanel;
   ctx.inject(["pluginNavigation"], (navCtx) => {
     const face = navCtx["pluginNavigation"];
     if (typeof face !== "object" || face === null) return;
     const candidate = face["openBundle"];
     if (typeof candidate !== "function") return;
     const openBundle = candidate.bind(face);
-    navCtx.effect(() => {
-      openBundlePanel = (packageName) => {
-        openBundle(packageName);
-      };
-      return () => {
-        openBundlePanel = void 0;
-      };
-    }, "ds-balance: bundle config deep link");
+    navCtx.effect(() => pluginsNavigation.attachDeepLink(openBundle), "ds-balance: bundle config deep link");
   });
   ctx.inject(["layout"], (layoutCtx) => {
     if (!("layout" in layoutCtx)) return;
@@ -2113,21 +2150,12 @@ function apply(ctx) {
     if (typeof face !== "object" || face === null) return;
     if (!("selectPanel" in face) || typeof face.selectPanel !== "function") return;
     const selectPanel = face.selectPanel.bind(face);
-    layoutCtx.effect(() => pluginsNavigation.attach(() => {
-      if (openBundlePanel !== void 0) {
-        try {
-          openBundlePanel(BUNDLE_CONFIG_KEY);
-          return;
-        } catch (error) {
-          console.warn("[WARN] ds-balance: cannot open the bundle config page", error);
-        }
-      }
-      try {
+    layoutCtx.effect(
+      () => pluginsNavigation.attachPanel(() => {
         selectPanel(PLUGINS_PANEL_ID);
-      } catch (error) {
-        console.warn("[WARN] ds-balance: cannot switch to the plugins panel", error);
-      }
-    }), "ds-balance: plugins panel navigation");
+      }),
+      "ds-balance: plugins panel navigation"
+    );
   });
   ctx.inject(["configForms"], (configCtx) => {
     configSlotProbe.markDeclared();

package/lib/types/client/locales.d.ts

@@ -22,6 +22,7 @@ export declare const zh: {
     readonly 'popover.mismatch': "未找到 {wanted} 余额，当前显示 {shown}";
     readonly 'popover.action.useShown': "改用 {shown}";
     readonly 'popover.action.openPlugins': "打开插件页";
+    readonly 'popover.action.openPluginConfig': "打开插件配置页";
     readonly 'state.unavailable': "账户不可用";
     readonly 'state.stale': "数据已过期";
     readonly 'state.error': "读取失败";

package/lib/types/client/sidebar/BalancePopover.d.ts

@@ -46,10 +46,23 @@ export interface BalancePopoverProps {
      */
     useShownDisabled?: boolean;
     /**
-     * 「切到 Plugins 页」回调。宿主没提供 layout 服务时给 undefined ——
-     * 这时右上角那个图标按钮**不渲染**：不留按不动的死按钮。
+     * 右上角图标：点下去做什么、落到哪里。宿主没提供 layout 服务时给 undefined ——
+     * 这时那个按钮**不渲染**：不留按不动的死按钮。
      */
-    onOpenPlugins?: () => void;
+    pluginsAction?: PluginsAction;
+}
+/**
+ * 浮层右上角图标点下去会发生什么。
+ *
+ * 落点由**宿主能力**决定：宿主提供跨插件深链服务时直达本插件的配置格，
+ * 服务缺席时只能到 Plugins 列表。所以措辞跟着落点分档 ——
+ * 「打开插件配置页」与「打开插件页」各说自己那一件事，不许用一句含糊的话盖住两种落点。
+ */
+export interface PluginsAction {
+    /** 执行跳转；「先关浮层」由父组件包在里面。 */
+    open: () => void;
+    /** 落点是不是本插件的配置格。 */
+    reachesConfig: boolean;
 }
 /**
  * 渲染余额浮层。

package/lib/types/client/sidebar/SidebarBalance.d.ts

@@ -13,14 +13,16 @@
  */
 import { type LocaleKey } from '../locales.ts';
 import { type ConfigSlotProbe } from '../config-slot.ts';
+import { type PluginsAction } from './BalancePopover.tsx';
 /**
- * 「切到 Plugins 页」这个**可选**入口。宿主没提供 layout 服务时整条链不存在，
+ * 「打开本插件配置」这个**可选**入口。宿主没提供 layout 服务时整条链不存在，
  * 浮层右上角的图标因此不渲染 —— 不留按不动的死按钮。
  * 形态与 `configSlotProbe` 一样是个可订阅的小对象：服务可能晚到，图标要能自己出现、也能自己消失。
+ * 快照里带**落点**（见 BalancePopover 的 PluginsAction）：深链服务在不在，措辞跟着分档。
  */
 export interface PluginsNavigation {
-    /** 当前可用的导航回调；服务还没到位时是 undefined。 */
-    getSnapshot: () => (() => void) | undefined;
+    /** 当前可用的动作与落点；宿主没有 layout 服务时是 undefined。 */
+    getSnapshot: () => PluginsAction | undefined;
     /**
      * 订阅它的出现与消失。
      * @param listener - 变化回调。
@@ -41,7 +43,7 @@ export interface SidebarBalanceProps {
      */
     configSlotProbe: ConfigSlotProbe;
     /**
-     * 「切到 Plugins 页」的可选入口：有它才渲染浮层右上角那个图标按钮。
+     * 「打开本插件配置」的可选入口：有它才渲染浮层右上角那个图标按钮。
      * 宿主缺 layout 服务时整条链不存在，图标就不出现。
      */
     pluginsNavigation?: PluginsNavigation;

package/lib/version.d.ts

@@ -8,5 +8,5 @@
 /** 线上 schema 版本。响应里逐条回传，消费方据此判断兼容性。 */
 export declare const SCHEMA_VERSION = 1;
 /** 插件版本。与 `package.json` 的 `version` 一致（有测试兜底）。 */
-export declare const PLUGIN_VERSION = "2.1.0";
+export declare const PLUGIN_VERSION = "2.1.1";
 //# sourceMappingURL=version.d.ts.map

package/lib/version.js

@@ -8,5 +8,5 @@
 /** 线上 schema 版本。响应里逐条回传，消费方据此判断兼容性。 */
 export const SCHEMA_VERSION = 1;
 /** 插件版本。与 `package.json` 的 `version` 一致（有测试兜底）。 */
-export const PLUGIN_VERSION = '2.1.0';
+export const PLUGIN_VERSION = '2.1.1';
 //# sourceMappingURL=version.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-ds-balance",
-  "version": "2.1.0",
+  "version": "2.1.1",
   "icon": "./icon.svg",
   "description": "DSH plugin: shows the DeepSeek account balance at the bottom of the sidebar, with a configuration card on the Plugins page.",
   "keywords": [