dsh-sidebar-row-menu 1.7.0 → 1.9.0

package/lib/client.js

@@ -144,6 +144,25 @@ window.__ModuleLoader__.load({
       sessionDeleteArchived: false,
     };
     const ELLIPSIS_KEYS = Object.keys(ELLIPSIS_DEFAULTS);
+    /**
+     * 会话正文空白处右键菜单：把右上角工具条那排按钮按视觉顺序列成一份纵向菜单。
+     * 顺序必须量 getBoundingClientRect：dsh-sidebar-organizer 用 CSS `order`
+     * 排序，DOM 顺序不代表屏幕顺序。
+     */
+    const BLANK_MENU_KEY = 'dsh.sidebar-row-menu.blank-menu.v1';
+    const BLANK_MENU_DEFAULTS = {
+      enabled: true,
+      keepMoreLast: true,
+    };
+    const BLANK_MENU_KEYS = Object.keys(BLANK_MENU_DEFAULTS);
+    /** 「更多操作」类入口的标签；用于按用户要求把它固定在菜单末尾。 */
+    const MORE_LABEL_RE = /^(more|more tools|more actions|more options|更多|更多工具|更多操作|更多选项)$/i;
+    /**
+     * dsh-sidebar-organizer 记住的「更多操作」弹层行序（按行文字）。它的重排是
+     * 给宿主菜单行写 CSS `order`，DOM/数据顺序都不变；本插件的二级菜单要跟它
+     * 联动，只能读这份顺序再排序。
+     */
+    const ORGANIZER_MENU_ORDER_KEY = 'dsh.sidebar-organizer.host-menu-order.v1';
     /**
      * dsh-session-menu 注册的同一能力条目 id。检测到对方存在时，本插件对应项
      * 自动隐藏，避免同一份菜单里出现两条一模一样的动作。
@@ -222,6 +241,12 @@ window.__ModuleLoader__.load({
       'settings.ellipsis.sessionDelete.hint': '在「…」菜单里永久删除这一个会话及其日志。',
       'settings.ellipsis.sessionDeleteArchived.label': '删除所有已归档会话',
       'settings.ellipsis.sessionDeleteArchived.hint': '在已归档会话的「…」菜单里一次清理全部归档会话。',
+      'settings.blankMenuTitle': '会话空白处右键',
+      'settings.blankMenuNote': '在会话正文的空白处右键，会按顶部工具条的视觉顺序列出那排按钮；装了 dsh-sidebar-organizer 时跟随它的排序。分组之间自动加分隔线，「打开方式」按工作区 / 会话菜单的规则收纳。消息、输入框和工具条本身仍走各自的原生菜单。',
+      'settings.blankMenu.enabled.label': '启用空白处右键菜单',
+      'settings.blankMenu.enabled.hint': '在会话正文的空白处（消息之外）右键，弹出与右上角工具条一致的纵向菜单；取不到按钮时不接管原生菜单。',
+      'settings.blankMenu.keepMoreLast.label': '「更多」固定在最右',
+      'settings.blankMenu.keepMoreLast.hint': '把「更多操作」一类的入口固定在菜单最后一项，不受工具条当前顺序影响。',
       'delete.title': '永久删除会话？',
       'delete.description': '会话「{name}」的日志将从磁盘永久删除，此操作无法撤销。',
       'delete.untitled': '未命名会话',
@@ -312,6 +337,12 @@ window.__ModuleLoader__.load({
       'settings.ellipsis.sessionDelete.hint': 'Permanently delete this session and its log from the "…" menu.',
       'settings.ellipsis.sessionDeleteArchived.label': 'Delete all archived sessions',
       'settings.ellipsis.sessionDeleteArchived.hint': 'Clean up every archived session from an archived row\'s "…" menu.',
+      'settings.blankMenuTitle': 'Right-click blank conversation space',
+      'settings.blankMenuNote': 'Right-click empty space in the conversation body to list the header toolbar buttons in their visual order. With dsh-sidebar-organizer installed the order follows its layout. Sections are separated by faint rules and "Open with" is collapsed like the workspace / session menus. Messages, the composer and the toolbar keep their own native menus.',
+      'settings.blankMenu.enabled.label': 'Enable blank-space context menu',
+      'settings.blankMenu.enabled.hint': 'Right-click empty space in the conversation body to open a vertical menu mirroring the top-right toolbar. When no button can be found the native menu is left alone.',
+      'settings.blankMenu.keepMoreLast.label': 'Pin "More" to the far right',
+      'settings.blankMenu.keepMoreLast.hint': 'Always put the "More" style entry last, regardless of its current position in the toolbar.',
       'delete.title': 'Delete this session permanently?',
       'delete.description': 'The log of "{name}" will be removed from disk. This cannot be undone.',
       'delete.untitled': 'Untitled session',
@@ -733,6 +764,68 @@ window.__ModuleLoader__.load({
         || ellipsisSettings.deleteSessions === true;
     }
 
+    /* -------------------------------------- 会话空白处右键菜单（localStorage） */
+
+    function readStoredBlankMenu() {
+      const defaults = { ...BLANK_MENU_DEFAULTS };
+      try {
+        const raw = globalThis.localStorage?.getItem(BLANK_MENU_KEY);
+        if (typeof raw !== 'string' || raw === '') return defaults;
+        const parsed = JSON.parse(raw);
+        if (parsed === null || typeof parsed !== 'object') return defaults;
+        for (const key of BLANK_MENU_KEYS) {
+          if (typeof parsed[key] === 'boolean') defaults[key] = parsed[key];
+        }
+      } catch {
+        /* 坏数据回退默认，不阻断右键 */
+      }
+      return defaults;
+    }
+
+    let blankMenuSettings = readStoredBlankMenu();
+    const blankMenuListeners = new Set();
+
+    function publishBlankMenu() {
+      for (const listener of blankMenuListeners) {
+        try {
+          listener();
+        } catch {
+          /* ignore */
+        }
+      }
+    }
+
+    function subscribeBlankMenu(listener) {
+      blankMenuListeners.add(listener);
+      return () => {
+        blankMenuListeners.delete(listener);
+      };
+    }
+
+    function blankMenuSnapshot() {
+      return blankMenuSettings;
+    }
+
+    function useBlankMenu() {
+      return useSyncExternalStore(subscribeBlankMenu, blankMenuSnapshot, blankMenuSnapshot);
+    }
+
+    function setBlankMenu(key, enabled) {
+      if (!BLANK_MENU_KEYS.includes(key)) return;
+      blankMenuSettings = { ...blankMenuSettings, [key]: enabled === true };
+      try {
+        globalThis.localStorage?.setItem(BLANK_MENU_KEY, JSON.stringify(blankMenuSettings));
+      } catch {
+        /* 隐私模式写不进去也照样生效到本次会话 */
+      }
+      publishBlankMenu();
+    }
+
+    /** 该项默认开启：只有显式存成 false 才关闭。 */
+    function blankOption(key) {
+      return blankMenuSettings[key] !== false;
+    }
+
     /* ------------------------------------- 打开方式：应用列表与二级开关 */
 
     function readStoredChildren() {
@@ -1520,9 +1613,43 @@ window.__ModuleLoader__.load({
       ]],
     ];
 
+    /** 会话空白处右键菜单的开关；顺序跟随工具条，这里只管总开关。 */
+    const BLANK_MENU_ROWS = [
+      ['enabled', 'settings.blankMenu.enabled.label', 'settings.blankMenu.enabled.hint'],
+      ['keepMoreLast', 'settings.blankMenu.keepMoreLast.label', 'settings.blankMenu.keepMoreLast.hint'],
+    ];
+
+    /**
+     * 设置导航图标（DSH 0.2.2 的 `settings.section.icon`）。
+     * 宿主只给 { size, active }，颜色由导航按钮的 currentColor 决定；
+     * 16px 网格、1.5 描边、圆头，跟宿主自绘图标同一套笔触。
+     * 造型是三行条目 + 行尾子菜单箭头：一眼看出「行 → 弹出菜单」。
+     */
+    function SettingsNavIcon({ size = 16 } = {}) {
+      return h('svg', {
+        className: 'dsrm-settings-nav',
+        width: size,
+        height: size,
+        viewBox: '0 0 16 16',
+        fill: 'none',
+        stroke: 'currentColor',
+        strokeWidth: 1.5,
+        strokeLinecap: 'round',
+        strokeLinejoin: 'round',
+        'aria-hidden': 'true',
+        focusable: 'false',
+      }, [
+        h('path', { d: 'M2.75 4.5h8.35' }),
+        h('path', { d: 'M2.75 8h8.35' }),
+        h('path', { d: 'M2.75 11.5h5.6' }),
+        h('path', { d: 'M12.1 6.5 13.6 8l-1.5 1.5' }),
+      ]);
+    }
+
     function SettingsSection({ t }) {
       const items = useItems();
       const ellipsis = useEllipsis();
+      const blank = useBlankMenu();
       const children = useChildren();
       const apps = useApps();
       usePinned();
@@ -1628,6 +1755,24 @@ window.__ModuleLoader__.load({
         ))),
       ));
 
+      const blankRows = BLANK_MENU_ROWS.map(([key, labelKey, hintKey]) => h('div', {
+        className: 'dsrm-settings-row',
+        key,
+      },
+        h('div', { className: 'dsrm-settings-copy' },
+          h('div', { className: 'dsrm-settings-label' }, t(labelKey)),
+          h('div', { className: 'dsrm-settings-hint' }, t(hintKey)),
+        ),
+        h('div', { className: 'dsrm-settings-controls' },
+          jsx(Switch, {
+            checked: blank[key] !== false,
+            disabled: key === 'keepMoreLast' && blank.enabled === false,
+            label: t(labelKey),
+            onChange: (next) => setBlankMenu(key, next),
+          }),
+        ),
+      ));
+
       return h('div', { className: 'dsrm-settings' },
         h('h2', { className: 'dsrm-settings-title' }, t('settings.title')),
         anyConflict ? h('div', { className: 'dsrm-settings-note' }, t('settings.conflictNote')) : null,
@@ -1635,6 +1780,9 @@ window.__ModuleLoader__.load({
         h('h2', { className: 'dsrm-settings-title dsrm-settings-subtitle' }, t('settings.ellipsisTitle')),
         h('div', { className: 'dsrm-settings-note' }, t('settings.ellipsisHint')),
         h('div', { className: 'dsrm-settings-groups' }, ellipsisGroups),
+        h('h2', { className: 'dsrm-settings-title dsrm-settings-subtitle' }, t('settings.blankMenuTitle')),
+        h('div', { className: 'dsrm-settings-note' }, t('settings.blankMenuNote')),
+        h('div', { className: 'dsrm-settings-list' }, blankRows),
       );
     }
 
@@ -1920,6 +2068,686 @@ window.__ModuleLoader__.load({
       showWorkspaceMenu(props, x, y, mode);
     }
 
+    /* ------------------------------------------ 会话正文空白处右键菜单 */
+
+    /**
+     * 右上角工具条的三组扩展点。顺序无关紧要，最终以屏幕坐标为准。
+     * corner 槽是右侧栏收起时出现的「展开右侧栏」等按钮。
+     * section 只用于在空白菜单里分组画淡色横线，和宿主的扩展点边界一致。
+     */
+    const HEADER_SLOT_SELECTORS = [
+      { section: 'actions', selector: '[data-slot="conversation.session.header.actions"]' },
+      { section: 'utilities', selector: '[data-slot="conversation.session.header.utilities"]' },
+      { section: 'corner', selector: '[data-slot="conversation.session.header.corner"]' },
+    ];
+    /** 这些区域里的右键不归空白菜单管：工具条、输入框与工具卡片本身。 */
+    const BLANK_BLOCKERS = [
+      '[data-slot="conversation.header"]',
+      '[data-slot="conversation.session.header"]',
+      '[data-slot="conversation.composer"]',
+      '[data-slot="tool.call.toolview"]',
+    ].join(',');
+    /** 可交互节点：空白处右键不抢它们的原生菜单。 */
+    const BLANK_INTERACTIVE = [      'button',
+      'a[href]',
+      'input',
+      'textarea',
+      'select',
+      'summary',
+      'label',
+      '[contenteditable="true"]',
+      '[role="button"]',
+      '[role="link"]',
+      '[role="menuitem"]',
+      '[role="menu"]',
+      '[role="tab"]',
+      '[role="checkbox"]',
+      '[role="switch"]',
+      '[role="radio"]',
+      '[role="slider"]',
+      '[role="combobox"]',
+      '[role="textbox"]',
+      '[aria-haspopup]',
+    ].join(',');
+    /** 消息正文里仍然让位的控件：输入类与链接用浏览器/宿主的原生菜单。 */
+    const BLANK_MESSAGE_CONTROLS = [
+      'input',
+      'textarea',
+      'select',
+      'a[href]',
+      '[contenteditable="true"]',
+    ].join(',');
+
+    /** 节点是否有非零面积且和视口相交。 */
+    function isOnScreen(node) {
+      if (node === null || node === undefined || typeof node.getBoundingClientRect !== 'function') return false;
+      const rect = node.getBoundingClientRect();
+      if (rect.width <= 0 || rect.height <= 0) return false;
+      const viewportWidth = typeof window.innerWidth === 'number' ? window.innerWidth : 0;
+      const viewportHeight = typeof window.innerHeight === 'number' ? window.innerHeight : 0;
+      return rect.bottom > 0 && rect.right > 0 && rect.top < viewportHeight && rect.left < viewportWidth;
+    }
+
+    /** 找当前可见的会话头部（多标签时可能有多个，取视口内面积最大的那个）。 */
+    function activeSessionHeader() {
+      if (typeof document.querySelectorAll !== 'function') return null;
+      let best = null;
+      let bestArea = 0;
+      for (const slot of document.querySelectorAll('[data-slot="conversation.session.header"]')) {
+        const header = (typeof slot.closest === 'function' ? slot.closest('header') : null) ?? slot.parentElement;
+        if (header === null || header === undefined || typeof header.getBoundingClientRect !== 'function') continue;
+        const rect = header.getBoundingClientRect();
+        if (rect.width <= 0 || rect.height <= 0) continue;
+        const width = Math.max(0, Math.min(rect.right, window.innerWidth) - Math.max(rect.left, 0));
+        const height = Math.max(0, Math.min(rect.bottom, window.innerHeight) - Math.max(rect.top, 0));
+        const area = width * height;
+        if (area > bestArea) {
+          bestArea = area;
+          best = header;
+        }
+      }
+      return best;
+    }
+
+    /** 按钮的可读标签：aria-label / title 优先，最后才用文本。 */
+    function headerButtonLabel(button) {
+      const value = button.getAttribute('aria-label')
+        || button.getAttribute('title')
+        || button.textContent
+        || '';
+      return String(value).replace(/\s+/g, ' ').trim();
+    }
+
+    /** 把按钮里的图标抄成可序列化的形状；MenuItemButton 的 icon 接受任意 React 节点。 */
+    function headerButtonIcon(button) {
+      const svg = typeof button.querySelector === 'function' ? button.querySelector('svg') : null;
+      if (svg !== null && typeof svg.outerHTML === 'string' && svg.outerHTML !== '') {
+        return { html: svg.outerHTML };
+      }
+      const img = typeof button.querySelector === 'function' ? button.querySelector('img[src]') : null;
+      if (img !== null) {
+        const src = img.getAttribute('src');
+        if (typeof src === 'string' && src !== '') return { src };
+      }
+      return null;
+    }
+
+    function isMoreTrigger(button, label) {
+      if (MORE_LABEL_RE.test(label)) return true;
+      const className = typeof button.className === 'string' ? button.className : '';
+      return /morebutton/i.test(className);
+    }
+
+    /**
+     * 从按钮的 fiber 往上找宿主 Menu 的控制器（items + onSelect）。
+     * 「更多操作」按钮的 props 本身只有 onClick，真正的菜单项和选择回调挂在
+     * 宿主的 Menu 组件上；拿到后就能在自己的子菜单里直接调用，而不必点开右上角。
+     */
+    function findHeaderMenuController(button) {
+      try {
+        let fiber = fiberOf(button);
+        for (let depth = 0; depth < 8 && fiber !== null && fiber !== undefined; depth += 1) {
+          const props = fiber.memoizedProps;
+          if (props !== null && typeof props === 'object'
+            && Array.isArray(props.items) && props.items.length > 0
+            && typeof props.onSelect === 'function') {
+            return { items: props.items, onSelect: props.onSelect };
+          }
+          fiber = fiber.return;
+        }
+      } catch {
+        /* ignore */
+      }
+      return null;
+    }
+
+    /**
+     * 宿主的「打开方式」是一整个 split 控件（主按钮 + 更多打开方式箭头）。
+     * 空白菜单要把它收成和原生右键一样的「置顶应用 + 打开方式子菜单」，
+     * 所以收集时就标出来，后续整组替换；认不出来时保持逐按钮原样。
+     */
+    function isOpenWithSplit(unit, candidates) {      if (candidates.length < 2) return false;
+      const className = typeof unit?.className === 'string' ? unit.className : '';
+      if (/split/i.test(className)) return true;
+      return candidates.some((candidate) => /更多打开方式|more open/i.test(headerButtonLabel(candidate)));
+    }
+
+    /**
+     * 收集工具条上的按钮，按屏幕从左到右排序；「更多」按开关压到末尾。
+     * 只统计真实可见、可点、有标签的节点：隐藏槽位、被 organizer 收进「…」的
+     * 按钮不会出现在这里（那正是用户配置后的结果）。
+     */
+    function collectHeaderToolbarItems(header, keepMoreLast) {
+      const found = [];
+      const seen = new Set();
+      if (header === null || header === undefined || typeof header.querySelector !== 'function') return found;
+
+      for (const slot of HEADER_SLOT_SELECTORS) {
+        const container = header.querySelector(slot.selector);
+        if (container === null || container === undefined) continue;
+        const units = typeof container.children === 'object' && container.children !== null
+          ? Array.from(container.children)
+          : [];
+        for (const unit of units) {
+          const candidates = [];
+          if (unit !== null && unit !== undefined && typeof unit.matches === 'function'
+            && unit.matches(BLANK_INTERACTIVE)) {
+            candidates.push(unit);
+          }
+          if (unit !== null && unit !== undefined && typeof unit.querySelectorAll === 'function') {
+            for (const node of unit.querySelectorAll(BLANK_INTERACTIVE)) {
+              if (node !== unit) candidates.push(node);
+            }
+          }
+          const openWith = isOpenWithSplit(unit, candidates);
+          for (const button of candidates) {
+            if (seen.has(button)) continue;
+            if (button.disabled === true) continue;
+            if (button.getAttribute('aria-disabled') === 'true') continue;
+            if (!isOnScreen(button)) continue;
+            const label = headerButtonLabel(button);
+            if (label === '') continue;
+            seen.add(button);
+            const rect = button.getBoundingClientRect();
+            const more = isMoreTrigger(button, label);
+            found.push({
+              button,
+              label,
+              icon: headerButtonIcon(button),
+              more,
+              menu: more ? findHeaderMenuController(button) : null,
+              openWith,
+              section: slot.section,
+              left: rect.left,
+              top: rect.top,
+            });
+          }
+        }
+      }
+
+      found.sort((a, b) => (a.left - b.left) || (a.top - b.top));
+      if (!keepMoreLast) return found;
+      return [...found.filter((item) => !item.more), ...found.filter((item) => item.more)];
+    }
+
+    /** 有选中文字时让位给浏览器的选区右键菜单。 */
+    function hasTextSelection() {
+      try {
+        if (typeof window === 'undefined' || typeof window.getSelection !== 'function') return false;
+        const selection = window.getSelection();
+        if (selection === null || selection === undefined) return false;
+        return String(selection).trim() !== '';
+      } catch {
+        return false;
+      }
+    }
+
+    /**
+     * 右键是否落在会话正文里（工具条、输入框、工具卡片之外，且没有选中文字）。
+     * 消息正文（思考过程、回复、工具摘要……）放宽到只避开输入控件与链接：
+     * 思考标题本身是 role=button，但右键它也应该出菜单。
+     */
+    function isBlankConversationTarget(target) {
+      if (target === null || target === undefined) return false;
+      const start = target.nodeType === 3 ? target.parentElement : target;
+      if (start === null || start === undefined || typeof start.closest !== 'function') return false;
+      if (start.closest('[data-row-key]') !== null) return false;
+      if (start.closest('[data-slot="conversation.session"]') === null) return false;
+      if (start.closest(BLANK_BLOCKERS) !== null) return false;
+      if (hasTextSelection()) return false;
+      if (start.closest('[data-slot="conversation.chat.node"]') !== null) {
+        return start.closest(BLANK_MESSAGE_CONTROLS) === null;
+      }
+      if (start.closest(BLANK_INTERACTIVE) !== null) return false;
+      return true;
+    }
+
+    function headerIconNode(icon) {
+      if (icon === null || icon === undefined) return undefined;
+      if (typeof icon.html === 'string' && icon.html !== '') {
+        return h('span', {
+          className: 'dsrm-header-icon',
+          'aria-hidden': 'true',
+          dangerouslySetInnerHTML: { __html: icon.html },
+        });
+      }
+      if (typeof icon.src === 'string' && icon.src !== '') {
+        return h('img', { className: 'dsrm-header-icon-img', src: icon.src, alt: '' });
+      }
+      return undefined;
+    }
+
+    /** 当前正在看的会话：先看侧栏高亮行，没有就看主视图保留的会话。 */
+    function selectedSessionId() {
+      try {
+        if (typeof document.querySelector === 'function') {
+          const row = document.querySelector('[data-row-key^="session:"][aria-selected="true"]');
+          const key = typeof row?.getAttribute === 'function' ? row.getAttribute('data-row-key') : '';
+          if (typeof key === 'string' && key.startsWith('session:')) return key.slice('session:'.length);
+        }
+      } catch {
+        /* ignore */
+      }
+      const sessions = serviceOf(rootCtx, 'sessions');
+      const byId = sessions?.list?.getSnapshot?.()?.byId;
+      if (byId === null || byId === undefined || typeof byId !== 'object') return '';
+      for (const row of Object.values(byId)) {
+        if (typeof row?.id === 'string' && (row?.retainedBy?.mainView ?? 0) > 0) return row.id;
+      }
+      return '';
+    }
+
+    /**
+     * 空白菜单里的「打开方式」组：与原生工作区 / 会话右键同一套数据 ——
+     * 置顶应用直接平铺，其余收进「打开方式」子菜单；开关、置顶与子项都在设置页配置。
+     */
+    function BlankOpenWithRows({ t, cwd, separatorBefore, onClose }) {
+      const apps = useApps();
+      useChildren();
+      usePinned();
+      const [open, setOpen] = useState(false);
+      const [box, setBox] = useState(null);
+      const hostRef = useRef(null);
+      const closeTimer = useRef(0);
+
+      useEffect(() => {
+        if (!open) return undefined;
+        const dismiss = (event) => {
+          const host = hostRef.current;
+          if (host !== null && host.contains(event.target)) return;
+          setOpen(false);
+        };
+        const onKeyDown = (event) => {
+          if (event.key === 'Escape') setOpen(false);
+        };
+        document.addEventListener('mousedown', dismiss, true);
+        document.addEventListener('keydown', onKeyDown, true);
+        return () => {
+          document.removeEventListener('mousedown', dismiss, true);
+          document.removeEventListener('keydown', onKeyDown, true);
+        };
+      }, [open]);
+
+      // MenuSurface 不保证转发 ref，按条目数估算高度即可（列表本身会滚动）。
+      useEffect(() => {
+        if (!open) return;
+        const host = hostRef.current;
+        if (host === null) return;
+        const pinnedIds = new Set(effectivePinned(apps.ids).filter((id) => childOn(id)));
+        const count = apps.ids.filter((id) => childOn(id) && !pinnedIds.has(id)).length;
+        const height = Math.min(380, Math.max(40, count * 34 + 8));
+        setBox(submenuGeometry(host.getBoundingClientRect(), { width: 220, height }));
+      }, [open, apps.status, apps.ids]);
+
+      useEffect(() => () => window.clearTimeout(closeTimer.current), []);
+
+      const openNow = () => {
+        window.clearTimeout(closeTimer.current);
+        if (!open && hostRef.current !== null) {
+          const pinnedIds = new Set(effectivePinned(apps.ids).filter((id) => childOn(id)));
+          const count = apps.ids.filter((id) => childOn(id) && !pinnedIds.has(id)).length;
+          const height = Math.min(380, Math.max(40, count * 34 + 8));
+          setBox(submenuGeometry(hostRef.current.getBoundingClientRect(), { width: 220, height }));
+        }
+        setOpen(true);
+        ensureApps();
+      };
+      const closeSoon = () => {
+        window.clearTimeout(closeTimer.current);
+        closeTimer.current = window.setTimeout(() => setOpen(false), 160);
+      };
+      const pick = (appId) => {
+        setOpen(false);
+        onClose();
+        openApplication(appId, cwd).then((ok) => {
+          if (!ok) toast(t('openFailed'));
+        });
+      };
+
+      const pinnedIds = new Set(effectivePinned(apps.ids).filter((id) => childOn(id)));
+      const enabledApps = apps.ids.filter((id) => childOn(id));
+      const submenuApps = enabledApps.filter((id) => !pinnedIds.has(id));
+
+      let panelBody;
+      if (apps.status === 'error') {
+        panelBody = h('div', { className: 'dsrm-submenu-empty' }, t('settings.appsError'));
+      } else if (apps.ids.length === 0) {
+        panelBody = h('div', { className: 'dsrm-submenu-empty' }, apps.status === 'loading' ? t('settings.appsLoading') : t('settings.appsUnavailable'));
+      } else if (submenuApps.length === 0) {
+        panelBody = h('div', { className: 'dsrm-submenu-empty' }, t('settings.appsAllOff'));
+      } else {
+        panelBody = submenuApps.map((id) => jsx(MenuItemButton, {
+          key: id,
+          onSelect: () => pick(id),
+          icon: appIcon(id),
+          children: appLabel(id, t),
+        }));
+      }
+
+      return h(Fragment, null,
+        separatorBefore ? h('div', { className: 'dsrm-sep', role: 'separator' }) : null,
+        Array.from(pinnedIds).map((id) => jsx(MenuItemButton, {
+          key: `pinned-${id}`,
+          onSelect: () => pick(id),
+          icon: appIcon(id),
+          children: t('openWithApp', { name: appLabel(id, t) }),
+        })),
+        h('div', {
+          className: 'dsrm-openwith',
+          ref: hostRef,
+          onPointerOver: openNow,
+          onPointerEnter: openNow,
+          onPointerLeave: closeSoon,
+        },
+          jsx(MenuItemButton, {
+            onSelect: () => {
+              if (open) setOpen(false);
+              else openNow();
+            },
+            icon: jsx(IconRightUpOutlineRegular, { size: 14 }),
+            children: h('span', { className: 'dsrm-host-label' },
+              h('span', { className: 'dsrm-host-label-text' }, t('openWith')),
+              jsx(IconChevronRightOutlineRegular, { size: 12, className: 'dsrm-submenu-chevron' }),
+            ),
+          }),
+          open ? h(MenuSurface, {
+            role: 'group',
+            'aria-label': t('openWith'),
+            className: 'dsrm-submenu',
+            style: {
+              left: box?.left ?? 0,
+              top: box?.top ?? 0,
+              visibility: box === null ? 'hidden' : 'visible',
+            },
+          }, panelBody) : null,
+        ),
+      );
+    }
+
+    /**
+     * dsh-sidebar-organizer 把「更多操作」弹层的行序存在 localStorage 里（按行文字），
+     * 只对宿主弹层写 CSS `order`。自己的二级菜单必须按同一份顺序排，才能看起来联动。
+     */
+    function organizerMenuOrder() {
+      try {
+        const raw = window.localStorage.getItem(ORGANIZER_MENU_ORDER_KEY);
+        if (raw === null) return [];
+        const parsed = JSON.parse(raw);
+        return Array.isArray(parsed) ? parsed.filter((value) => typeof value === 'string') : [];
+      } catch {
+        return [];
+      }
+    }
+
+    function orderMoreItems(entries) {
+      const saved = organizerMenuOrder();
+      if (saved.length === 0) return 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);
+    }
+
+    /**
+     * 空白菜单里的「更多操作」：直接读宿主 Menu 的 items / onSelect，
+     * 在自己的子菜单里复刻那几项（复制 / 下载 / 反馈……），不再点开右上角的「…」。
+     */
+    function BlankMoreRows({ label, icon, controller, separatorBefore, onClose, children }) {
+      const [open, setOpen] = useState(false);
+      const [box, setBox] = useState(null);
+      const hostRef = useRef(null);
+      const closeTimer = useRef(0);
+      const entries = orderMoreItems(controller.items);
+
+      useEffect(() => {
+        if (!open) return undefined;
+        const dismiss = (event) => {
+          const host = hostRef.current;
+          if (host !== null && host.contains(event.target)) return;
+          setOpen(false);
+        };
+        const onKeyDown = (event) => {
+          if (event.key === 'Escape') setOpen(false);
+        };
+        document.addEventListener('mousedown', dismiss, true);
+        document.addEventListener('keydown', onKeyDown, true);
+        return () => {
+          document.removeEventListener('mousedown', dismiss, true);
+          document.removeEventListener('keydown', onKeyDown, true);
+        };
+      }, [open]);
+
+      useEffect(() => {
+        if (!open) return;
+        const host = hostRef.current;
+        if (host === null) return;
+        const height = Math.min(320, Math.max(40, entries.length * 34 + 8));
+        setBox(submenuGeometry(host.getBoundingClientRect(), { width: 220, height }));
+      }, [open, controller, entries.length]);
+
+      useEffect(() => () => window.clearTimeout(closeTimer.current), []);
+
+      const openNow = () => {
+        window.clearTimeout(closeTimer.current);
+        if (!open && hostRef.current !== null) {
+          const height = Math.min(320, Math.max(40, entries.length * 34 + 8));
+          setBox(submenuGeometry(hostRef.current.getBoundingClientRect(), { width: 220, height }));
+        }
+        setOpen(true);
+      };
+      const closeSoon = () => {
+        window.clearTimeout(closeTimer.current);
+        closeTimer.current = window.setTimeout(() => setOpen(false), 160);
+      };
+      const pick = (id) => {
+        setOpen(false);
+        onClose();
+        try {
+          controller.onSelect(id);
+        } catch (error) {
+          console.warn('[dsh-sidebar-row-menu] header menu action failed:', error);
+        }
+      };
+
+      return h(Fragment, null,
+        separatorBefore ? h('div', { className: 'dsrm-sep', role: 'separator' }) : null,
+        h('div', {
+          className: 'dsrm-openwith dsrm-more',
+          ref: hostRef,
+          onPointerOver: openNow,
+          onPointerEnter: openNow,
+          onPointerLeave: closeSoon,
+        },
+          jsx(MenuItemButton, {
+            onSelect: () => {
+              if (open) setOpen(false);
+              else openNow();
+            },
+            icon: headerIconNode(icon),
+            children: h('span', { className: 'dsrm-host-label' },
+              h('span', { className: 'dsrm-host-label-text' }, children ?? label),
+              jsx(IconChevronRightOutlineRegular, { size: 12, className: 'dsrm-submenu-chevron' }),
+            ),
+          }),
+          open ? h(MenuSurface, {
+            role: 'group',
+            'aria-label': label,
+            className: 'dsrm-submenu',
+            style: {
+              left: box?.left ?? 0,
+              top: box?.top ?? 0,
+              visibility: box === null ? 'hidden' : 'visible',
+            },
+          }, entries.map((entry, index) => jsx(MenuItemButton, {
+            key: typeof entry.id === 'string' ? entry.id : `more-item-${index}`,
+            onSelect: () => pick(entry.id),
+            disabled: entry.disabled === true,
+            icon: entry.icon === null || entry.icon === undefined
+              ? undefined
+              : h('span', { className: 'dsrm-header-icon' }, entry.icon),
+            children: entry.label,
+          }))) : null,
+        ),
+      );
+    }
+
+    /**
+     * 工具条按钮的纵向菜单。每条点下去是「真的按一下」原按钮：
+     * 先关菜单再派发 click，宿主弹出层才能正常锚定到原按钮。
+     * 「打开方式」整组换成和原生右键一致的置顶应用 + 子菜单，其余按钮原样复刻。
+     */
+    function HeaderToolbarMenu({ x, y, items, t, sessionId, onClose }) {
+      const hostRef = useRef(null);
+      const [pos, setPos] = useState(null);
+      const itemsConfig = useItems();
+      const apps = useApps();
+      useChildren();
+      usePinned();
+
+      useEffect(() => {
+        const host = hostRef.current;
+        const dismiss = (event) => {
+          if (host !== null && host.contains(event.target)) return;
+          onClose();
+        };
+        const onKeyDown = (event) => {
+          if (event.key === 'Escape') onClose();
+        };
+        document.addEventListener('mousedown', dismiss, true);
+        document.addEventListener('keydown', onKeyDown, true);
+        return () => {
+          document.removeEventListener('mousedown', dismiss, true);
+          document.removeEventListener('keydown', onKeyDown, true);
+        };
+      }, [onClose]);
+
+      useLayoutEffect(() => {
+        const host = hostRef.current;
+        if (host === null) return;
+        const rect = host.getBoundingClientRect();
+        const margin = 8;
+        const left = Math.max(margin, Math.min(x, window.innerWidth - rect.width - margin));
+        const top = Math.max(margin, Math.min(y, window.innerHeight - rect.height - margin));
+        setPos((prev) => (prev !== null && prev.left === left && prev.top === top ? prev : { left, top }));
+      }, [x, y, items]);
+
+      const cwd = typeof sessionId === 'string' && sessionId !== '' ? sessionCwd(rootCtx, sessionId) : '';
+      const enabledApps = apps.ids.filter((id) => childOn(id));
+      // 工具条上的 split「打开方式」只有在能拿到会话目录、且设置里开着时才接管；
+      // 否则保留宿主的两个原按钮，菜单仍然是工具条的镜像。
+      const ownOpenWith = itemsConfig.openWith !== false
+        && cwd !== ''
+        && enabledApps.length > 0
+        && items.some((item) => item.openWith);
+
+      const rows = [];
+      let section = '';
+      const takeSeparator = (next) => {
+        const separator = section !== '' && section !== next;
+        section = next;
+        return separator;
+      };
+      let openWithDone = false;
+      items.forEach((item, index) => {
+        // 设置里关掉「打开方式」时，空白菜单也不出现这一组，和工作区 / 会话右键一致。
+        if (item.openWith && itemsConfig.openWith === false) return;
+        if (item.openWith && ownOpenWith) {
+          if (!openWithDone) {
+            openWithDone = true;
+            rows.push(jsx(BlankOpenWithRows, {
+              key: 'open-with',
+              t,
+              cwd,
+              separatorBefore: takeSeparator('open-with'),
+              onClose,
+            }));
+          }
+          return;
+        }
+        if (item.more && item.menu !== null && item.menu !== undefined) {
+          rows.push(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 },
+            separatorBefore: takeSeparator('more'),
+            onClose,
+            children: item.label,
+          }));
+          return;
+        }
+        rows.push(jsx(MenuItemButton, {
+          key: `${index}:${item.label}`,
+          separatorBefore: takeSeparator(item.openWith ? 'open-with' : (item.more ? 'more' : (item.section || 'toolbar'))),
+          onSelect: () => {
+            onClose();
+            // 等菜单卸载完再点：否则宿主的弹出层会被面板的全局 dismiss 立刻收掉。
+            window.setTimeout(() => {
+              try {
+                item.button.click();
+              } catch (error) {
+                console.warn('[dsh-sidebar-row-menu] toolbar action click failed:', error);
+              }
+            }, 0);
+          },
+          icon: headerIconNode(item.icon),
+          children: item.label,
+        }));
+      });
+
+      return h('div', {
+        className: 'dsrm-menu',
+        ref: hostRef,
+        style: {
+          left: pos?.left ?? x,
+          top: pos?.top ?? y,
+          visibility: pos === null ? 'hidden' : 'visible',
+        },
+      }, h(MenuSurface, { role: 'group', className: 'dsrm-menu-surface dsrm-header-menu' }, rows));
+    }
+
+    function openHeaderToolbarMenu(items, x, y, sessionId = '') {
+      if (items.length === 0) return;
+      closeMenu();
+      menuHost = document.createElement('div');
+      menuHost.setAttribute(MENU_ATTR, 'header-toolbar');
+      menuHost.style.cssText = 'position:fixed;left:0;top:0;width:0;height:0;z-index:2147483647';
+      document.body.appendChild(menuHost);
+      menuRoot = createRoot(menuHost);
+      menuRoot.render(jsx(HeaderToolbarMenu, {
+        x,
+        y,
+        items,
+        t: localeOf(rootCtx),
+        sessionId,
+        onClose: () => closeMenu(),
+      }));
+    }
+
+    function onBlankConversationContextMenu(event) {
+      if (!blankOption('enabled')) return;
+      if (!isBlankConversationTarget(event.target)) return;
+      const items = collectHeaderToolbarItems(activeSessionHeader(), blankOption('keepMoreLast'));
+      if (items.length === 0) return;
+      event.preventDefault();
+      event.stopPropagation();
+      event.stopImmediatePropagation?.();
+      // 提前预热应用列表：下一次右键就能直接呈现置顶应用 + 子菜单。
+      try {
+        ensureApps();
+      } catch {
+        /* ignore */
+      }
+      try {
+        openHeaderToolbarMenu(items, event.clientX, event.clientY, selectedSessionId());
+      } catch (error) {
+        console.warn('[dsh-sidebar-row-menu] blank context menu failed:', error);
+      }
+    }
+
     /**
      * 行尾「…」按钮已经展开内置菜单时，用同一个按钮位置改挂本插件菜单。
      * 只在用户为工作区行开启了至少一个「…」附加项时接管；否则原生菜单原样工作。
@@ -2646,7 +3474,7 @@ window.__ModuleLoader__.load({
 
     /** 设置页：所有新增项都能在这里关掉。 */
     function registerSettings(ctx) {
-      return ctx.slots.inject('settings.section', function* () {
+      const stopSection = ctx.slots.inject('settings.section', function* () {
         yield ctx.slots.register({
           name: 'settings.section',
           id: 'sidebar-row-menu',
@@ -2655,6 +3483,21 @@ window.__ModuleLoader__.load({
           locale: NS,
         }, SettingsSection);
       });
+      // 0.2.2 起导航栏按 section id 取自定义图标（settings.section.icon，
+      // owner 传 { size, active }）。0.2.1 没有这个 slot，对未声明的 key
+      // 调 inject 可能直接抛错，吞掉即可——两个版本共用同一份客户端代码。
+      try {
+        ctx.slots.inject('settings.section.icon', function* () {
+          yield ctx.slots.register({
+            name: 'settings.section.icon',
+            id: 'sidebar-row-menu',
+            order: 32,
+          }, SettingsNavIcon);
+        });
+      } catch (error) {
+        console.warn('[dsh-sidebar-row-menu] settings.section.icon is unavailable:', error);
+      }
+      return stopSection;
     }
 
     /* -------------------------------------------- 会话行：展开官方菜单 */
@@ -2843,8 +3686,13 @@ window.__ModuleLoader__.load({
 .dsrm-submenu{position:fixed;z-index:1101;min-width:180px;max-width:300px;max-height:min(380px,64vh);overflow:auto;padding:4px}
 .dsrm-submenu-empty{padding:6px 8px;color:var(--dsw-alias-label-tertiary);font-size:12px;line-height:18px}
 .dsrm-menu{position:fixed;z-index:2147483647}
-.dsrm-menu-surface{min-width:210px;padding:4px}
-.dsrm-sep{height:.5px;margin:3px 2px;background:var(--dsw-alias-border-l2)}
+.dsrm-menu-surface{box-sizing:border-box;min-width:144px;padding:4px}
+.dsrm-header-menu{max-height:min(70vh,520px);overflow:auto}
+.dsrm-header-icon{display:inline-flex;align-items:center;justify-content:center;width:14px;height:14px;color:inherit}
+.dsrm-header-icon svg{width:14px;height:14px;display:block}
+.dsrm-header-icon-img{width:14px;height:14px;border-radius:3px;display:block;object-fit:contain}
+.dsrm-openwith{display:block}
+.dsrm-sep{height:.5px;margin:3px 8px;background:var(--dsw-alias-border-l2)}
 /* 150% 缩放等分数像素比下，宿主 0.5px 的分隔线会被摊成两行近乎透明，补到 1px 才看得见。 */
 @media (min-resolution:1.2dppx) and (max-resolution:1.99dppx){[role="menu"] [role="separator"],.dsrm-sep{height:1px}}
 .dsrm-app-icon{width:14px;height:14px;border-radius:3px;display:block;object-fit:contain}
@@ -2910,7 +3758,11 @@ window.__ModuleLoader__.load({
       if (start === null || start === undefined || typeof start.closest !== 'function') return;
 
       const row = start.closest('[data-row-key]');
-      if (row === null) return;
+      if (row === null) {
+        // 不在任何侧栏行上：正文空白处的右键交给工具条菜单。
+        onBlankConversationContextMenu(event);
+        return;
+      }
       const rowKey = row.getAttribute('data-row-key') ?? '';
       if (!rowKey.startsWith('workspace:') && !rowKey.startsWith('session:')) return;