dsh-sidebar-row-menu 1.11.0 → 1.11.1

package/CHANGELOG.md

@@ -1,5 +1,25 @@
 # Changelog
 
+## 1.11.1 — 2026-11-08
+
+### 中文摘要
+
+- **修好与新版 dsh-sidebar-organizer 的联动：被它收进「更多操作」的头部按钮，现在也出现在
+  本插件自绘的「更多操作」二级菜单里。** 新版 organizer 的收纳行是直接插进宿主弹层的 DOM，
+  不在宿主 Menu 的 `items` 里，所以之前只读 `items` 的子菜单会少掉这些行（例如
+  「IP 防护」）。现在按 organizer 记在 `dsh.sidebar-organizer.layout.v1` 的收纳顺序补行，
+  排在宿主条目之前（与它在原生弹层里的位置一致），点击时再点一次被收起来的原按钮。
+
+### Changed
+
+- **Restored the dsh-sidebar-organizer link: header buttons it tucks into the native
+  "More actions" popup now show up in this plugin's own "More actions" submenu.** The
+  organizer injects those rows straight into the host popup's DOM, so they never appear
+  in the host Menu's `items` and a submenu built from `items` alone (e.g. "IP guard")
+  lost them. They are now re-derived from the marked header buttons, ordered by
+  `dsh.sidebar-organizer.layout.v1`, placed before the host items (matching their position
+  in the native popup), and clicking one clicks the tucked original button.
+
 ## 1.11.0 — 2026-11-06
 
 ### 中文摘要

package/lib/client.js

@@ -120,6 +120,7 @@ var BLANK_MENU_DEFAULTS = {
 var BLANK_MENU_KEYS = Object.keys(BLANK_MENU_DEFAULTS);
 var MORE_LABEL_RE = /^(more|more tools|more actions|more options|更多|更多工具|更多操作|更多选项)$/i;
 var ORGANIZER_MENU_ORDER_KEY = "dsh.sidebar-organizer.host-menu-order.v1";
+var ORGANIZER_LAYOUT_KEY = "dsh.sidebar-organizer.layout.v1";
 var FOREIGN_ITEMS = {
   openWith: "session-menu-open-with",
   deleteSession: "session-menu-delete",
@@ -2724,11 +2725,96 @@ function orderMoreItems(entries) {
   const rank = new Map(saved.map((label, index) => [label, index]));
   return entries.map((entry, index) => ({ entry, index, rank: rank.has(entry.label) ? rank.get(entry.label) : saved.length })).sort((a, b) => a.rank - b.rank || a.index - b.index).map((item) => item.entry);
 }
+function organizerHiddenOrder() {
+  try {
+    const raw = window.localStorage.getItem(ORGANIZER_LAYOUT_KEY);
+    if (raw === null) return [];
+    const parsed = JSON.parse(raw);
+    const hidden = parsed?.scopes?.header?.hidden;
+    return Array.isArray(hidden) ? hidden.filter((value) => typeof value === "string") : [];
+  } catch {
+    return [];
+  }
+}
+function organizerFingerprint(value) {
+  let text = String(value ?? "").trim();
+  if (text.startsWith("host:")) text = text.slice(5);
+  else if (text.startsWith("text:")) text = text.slice(5);
+  const cut = Math.max(text.lastIndexOf(":"), text.lastIndexOf("："));
+  if (cut > 0 && text.slice(cut + 1).trim() !== "") text = text.slice(0, cut);
+  return text.replace(/\d+/g, "n").toLowerCase().replace(/[^a-z0-9\u4e00-\u9fa5]+/g, "-").replace(/^-+|-+$/g, "");
+}
+function organizerTuckedHeaderItems() {
+  const root = activeSessionHeader();
+  if (!root || typeof root.querySelector !== "function") return [];
+  const order = organizerHiddenOrder();
+  const rank = /* @__PURE__ */ new Map();
+  for (const id of order) {
+    const fingerprint = organizerFingerprint(id);
+    if (fingerprint !== "" && !rank.has(fingerprint)) rank.set(fingerprint, rank.size);
+  }
+  const items = [];
+  const seen = /* @__PURE__ */ new Set();
+  for (const slot of HEADER_SLOT_SELECTORS) {
+    const container = root.querySelector(slot.selector);
+    if (!container) continue;
+    for (const unit of Array.from(container.children ?? [])) {
+      const candidates = [];
+      if (typeof unit?.matches === "function" && unit.matches(BLANK_INTERACTIVE)) candidates.push(unit);
+      if (typeof unit?.querySelectorAll === "function") {
+        for (const node of unit.querySelectorAll(BLANK_INTERACTIVE)) {
+          if (node !== unit) candidates.push(node);
+        }
+      }
+      for (const button of candidates) {
+        if (seen.has(button)) continue;
+        if (typeof button?.getAttribute !== "function") continue;
+        if (button.getAttribute("data-dso-scope") !== "header") continue;
+        if (button.getAttribute("data-dso-hidden") !== "1") continue;
+        if (button.disabled === true || button.getAttribute("aria-disabled") === "true") continue;
+        const label = headerButtonLabel(button);
+        if (label === "") continue;
+        seen.add(button);
+        const key = button.getAttribute("data-dso-key") ?? "";
+        const fingerprints = [organizerFingerprint(key), organizerFingerprint(label)].filter((value) => value !== "");
+        const known = fingerprints.map((fingerprint) => rank.get(fingerprint)).filter((value) => value !== void 0);
+        items.push({
+          id: `organizer:${key === "" ? label : key}`,
+          label,
+          icon: headerButtonIcon(button),
+          button,
+          rank: known.length === 0 ? Number.MAX_SAFE_INTEGER : Math.min(...known),
+          order: items.length
+        });
+      }
+    }
+  }
+  return items.sort((a, b) => a.rank - b.rank || a.order - b.order).map(({ id, label, icon, button }) => ({ id, label, icon, button }));
+}
+function moreSubmenuItems(menu) {
+  return [...organizerTuckedHeaderItems(), ...orderMoreItems(menu.items)];
+}
+function moreSelectHandler(menu, entries) {
+  return (id) => {
+    const entry = entries.find((item) => item.id === id);
+    if (!entry || typeof entry.button?.click !== "function") {
+      menu.onSelect(id);
+      return;
+    }
+    window.setTimeout(() => {
+      try {
+        entry.button.click();
+      } catch (error) {
+        console.warn("[dsh-sidebar-row-menu] tucked header action failed:", error);
+      }
+    }, 0);
+  };
+}
 function BlankMoreRows({ label, icon, controller, separatorBefore, onClose, children }) {
   const [open, setOpen] = (0, import_react.useState)(false);
   const hostRef = (0, import_react.useRef)(null);
   const { closeSoon, openNow } = useHoverSubmenu(setOpen);
-  const entries = orderMoreItems(controller.items);
+  const entries = controller.items;
   useSubmenuDismiss(open, setOpen, hostRef);
   const box = useSubmenuPos(open, hostRef, [entries.length]);
   const pick = (id) => {
@@ -2822,13 +2908,12 @@ function HeaderToolbarMenu({ x, y, items, t, sessionId, onClose }) {
       return;
     }
     if (item.more && item.menu !== null && item.menu !== void 0) {
+      const moreItems = moreSubmenuItems(item.menu);
       rows.push((0, import_jsx_runtime.jsx)(BlankMoreRows, {
         key: `${index}:more`,
         label: item.label,
         icon: item.icon,
-        // 宿主弹层的行序由 dsh-sidebar-organizer 用 CSS order 控制，这里的
-        // 子菜单是自绘的，必须按它保存的顺序重排才能保持联动。
-        controller: { items: orderMoreItems(item.menu.items), onSelect: item.menu.onSelect },
+        controller: { items: moreItems, onSelect: moreSelectHandler(item.menu, moreItems) },
         separatorBefore: takeSeparator("more"),
         onClose,
         children: item.label

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-sidebar-row-menu",
-  "version": "1.11.0",
+  "version": "1.11.1",
   "type": "module",
   "description": "Adds open-with and cleanup entries to the DSH sidebar context menus (interleaved on 0.2.2+, self-drawn workspace menu on 0.2.1), plus a conversation-body right-click menu that mirrors the session header toolbar with in-menu open-with and more-actions submenus.",
   "keywords": [