dsh-sidebar-row-menu 1.4.3 → 1.5.0

package/CHANGELOG.md

@@ -1,5 +1,39 @@
 # Changelog
 
+## 1.5.0 — 2026-11-05
+
+### Added
+
+- **DSH 0.2.2 native context menus**: on hosts that expose `ctx.contextMenus`, the
+  workspace-row entries are registered as data contributions instead of a self-drawn
+  menu. Entries keep their positions relative to the host items —
+  New session 90, pinned app 150, Open with 180, Copy workspace path 250,
+  Open in new tab 260, Delete workspace and all sessions 310 — so they interleave
+  with the native Rename (100), Reveal (200) and Delete workspace (300). Right-click
+  and the row's `…` button open the same menu, because the host now shares one menu
+  between them. On 0.2.1 the plugin still draws its own workspace menu. Session-row
+  entries keep using the `sidebar.workspaces.session.menu.item` extension point.
+
+### Fixed
+
+- The permanent-delete confirmation falls back to “Untitled session” instead of
+  showing an empty `会话「」` for sessions whose title has not been generated yet.
+- On 0.2.2 the settings page now hides the workspace-row “Also show in the … menu”
+  switches: the host shares one native menu between right-click and the `…` button,
+  so those per-entry toggles could never take effect there. The session-row switches
+  still work and stay visible.
+
+### 中文摘要
+
+- **支持 DSH 0.2.2 的原生右键菜单**：宿主提供 `ctx.contextMenus` 时，工作区行条目改为
+  数据贡献注册，按 order 与原生项交错排列（新会话 90、置顶应用 150、打开方式 180、
+  复制工作区路径 250、在新标签打开 260、删除工作区及所有会话 310；原生为重命名 100、
+  在文件夹显示 200、删除工作区 300）。右键与行尾「…」共用宿主同一份菜单。0.2.1 上仍
+  走自绘工作区菜单；会话行条目继续通过 `sidebar.workspaces.session.menu.item` 扩展点渲染。
+- 修复未命名会话「永久删除」确认框显示空标题的问题，回退为「未命名会话」。
+- 0.2.2 的设置页隐藏工作区行「同时放进「…」菜单」开关（该版本右键与「…」共用同一份
+  菜单，开关无从生效）；会话行的同类开关保留且仍然有效。
+
 ## 1.4.3 — 2026-11-04
 
 ### Changed

package/README.en.md

@@ -99,6 +99,10 @@ Settings → "Row menu" toggles every new entry:
 The "Also show in the "…" menu" switches are all off by default; until one is
 enabled the "…" menu is exactly DSH's own.
 
+On DSH 0.2.2 and later, the workspace row's right-click and "…" already open the
+same host menu, so the plugin entries always show up there; the "Also show in the
+"…" menu → workspace" switches only affect 0.2.1 and older hosts.
+
 Switches live in browser `localStorage` (`dsh.sidebar-row-menu.items.v1`,
 `dsh.sidebar-row-menu.open-with.v1`, `dsh.sidebar-row-menu.open-with.pinned.v1` and
 `dsh.sidebar-row-menu.ellipsis.v1`)
@@ -423,15 +427,32 @@ incompatible installs, and the plugin market shows it as the supported version;
 0.3 and later need re-verification before the upper bound is raised.
 
 Built against DSH client `0.2.1-rc.5` (`ProjectRowItem`, `SessionNodeItem`,
-`Menu`). If a DSH upgrade changes those row components or the menu positioning:
-
-- workspace right-click silently stops appearing (no error, no UI breakage);
+`Menu`). DSH 0.2.2 moved the sidebar context menus to data-driven
+`ctx.contextMenus`, and the plugin picks the path by host capability:
+
+- **0.2.2+**: workspace entries are registered with `ctx.contextMenus.register`
+  (New session 90, pinned app 150, Open with 180, Copy workspace path 250,
+  Open in new tab 260, Delete workspace and all sessions 310), interleaved by
+  order with the native Rename (100), Reveal (200) and Delete workspace (300).
+  Right-click and the "…" button share the host's single menu.
+- **0.2.1**: no `contextMenus` service, so the plugin keeps drawing its own
+  workspace menu.
+- **Session rows**: 0.2.2 still supports the
+  `sidebar.workspaces.session.menu.item` extension point; the plugin entries keep
+  mounting there, and right-click still opens the host menu at the pointer.
+
+If a DSH upgrade changes those row components or the menu positioning:
+
+- workspace right-click falls back to the self-drawn menu (0.2.1 path) or silently
+  stops appearing (no error, no UI breakage);
 - session right-click falls back to opening next to the "…" button, with correct content.
 
 ## Known limitations
 
-- Depends on the props shape of the built-in row components. If DSH changes them,
-  right-click silently does nothing.
+- On 0.2.1 the plugin depends on the props shape of the built-in row components.
+  From 0.2.2 the workspace entries use `contextMenus`; the session entries still
+  rely on the legacy extension point. If DSH changes the corresponding
+  implementation, right-click may silently do nothing.
 - Session right-click depends on the row's `Menu` staying in the fiber subtree. If
   it is not found, the plugin clicks the row-actions ellipsis button; failing that
   it gives up — it never builds a competing menu and never triggers row open.

package/README.md

@@ -86,6 +86,9 @@
 
 「同时放进「…」菜单」下的开关默认全部关闭，`…` 菜单在未开启时与 DSH 完全一致。
 
+DSH 0.2.2 起，工作区行的右键与「…」本身就是同一份宿主菜单，插件条目会一直出现在「…」里，
+「同时放进「…」菜单 → 工作区」这组开关只影响 0.2.1 及更早的宿主。
+
 开关存在浏览器 `localStorage`（`dsh.sidebar-row-menu.items.v1`、
 `dsh.sidebar-row-menu.open-with.v1`、`dsh.sidebar-row-menu.open-with.pinned.v1` 与
 `dsh.sidebar-row-menu.ellipsis.v1`），
@@ -370,14 +373,24 @@ DSH 宿主按该范围拒绝安装不兼容的宿主，插件市场也按它显
 再放宽上限。
 
 按 DSH 客户端 `0.2.1-rc.5` 的 `ProjectRowItem` / `SessionNodeItem` / `Menu` 实现。
+DSH 0.2.2 起把侧栏右键菜单改成数据驱动（`ctx.contextMenus`），本包会按宿主能力自动选择路径：
+
+- **0.2.2 及以上**：工作区行改用 `ctx.contextMenus.register` 贡献动作
+  （新会话 90、置顶应用 150、打开方式 180、复制路径 250、新标签 260、删除工作区及所有会话 310），
+  与原生「重命名」「在文件夹显示」「删除工作区」按 order 交错排列，右键与「…」共用同一份菜单；
+- **0.2.1**：没有 `contextMenus` 服务，保持原来的自绘工作区菜单；
+- **会话行**：0.2.2 仍保留 `sidebar.workspaces.session.menu.item` 扩展点，本包条目继续从这里
+  渲染；右键仍按指针位置展开宿主菜单。
+
 DSH 升级若改动行组件或菜单定位实现：
 
-- 工作区右键会静默不弹（不会报错、不影响原界面）；
+- 工作区右键会退回自绘菜单（0.2.1 路径），或静默不弹（不会报错、不影响原界面）；
 - 会话右键会退回行尾「…」按钮旁，内容仍然正确。
 
 ## 已知限制
 
-- 依赖 DSH 内置行组件的 props 形状。DSH 升级若改了这两个组件，右键会静默不弹。
+- 0.2.1 下依赖 DSH 内置行组件的 props 形状；0.2.2 起工作区条目改走 `contextMenus`，
+  会话条目仍依赖旧扩展点。DSH 升级若改掉对应实现，右键可能静默不弹。
 - 会话右键依赖行内 `Menu` 组件仍在 fiber 子树里。找不到时退回点击行内操作区的
   省略号按钮，再找不到就放弃 —— 不会自建菜单，也不会误触行的打开动作。
 - 永久删除默认只对**已归档**会话开放；在设置里开启「允许删除未归档会话」后，未归档

package/lib/client.js

@@ -187,6 +187,7 @@ window.__ModuleLoader__.load({
       'settings.collapse': '收起应用列表',
       'settings.ellipsisTitle': '同时放进「…」菜单',
       'settings.ellipsisHint': '勾选后，对应条目会额外出现在行尾「…」按钮的菜单里，并沿用上面的单项开关；不勾选则只在右键菜单出现。',
+      'settings.ellipsisHintNative': '当前 DSH 版本的「…」按钮与右键共用同一份菜单，工作区行无需单独登记；这里只保留会话行的开关。',
       'settings.ellipsisWorkspace': '工作区行',
       'settings.ellipsisSession': '会话行',
       'settings.ellipsis.newSession.label': '新建会话',
@@ -207,6 +208,7 @@ window.__ModuleLoader__.load({
       'settings.ellipsis.sessionDeleteArchived.hint': '在已归档会话的「…」菜单里一次清理全部归档会话。',
       'delete.title': '永久删除会话？',
       'delete.description': '会话「{name}」的日志将从磁盘永久删除，此操作无法撤销。',
+      'delete.untitled': '未命名会话',
       'delete.archivedTitle': '删除所有已归档会话？',
       'delete.archivedDescription': '将永久删除 {n} 个已归档会话及其日志，此操作无法撤销。',
       'delete.confirm': '永久删除',
@@ -270,6 +272,7 @@ window.__ModuleLoader__.load({
       'settings.collapse': 'Hide applications',
       'settings.ellipsisTitle': 'Also show in the "…" menu',
       'settings.ellipsisHint': 'Checked entries also appear in the row\'s "…" button menu, still subject to the switches above. Unchecked entries stay right-click only.',
+      'settings.ellipsisHintNative': 'In this DSH version the "…" button opens the same menu as right-click, so workspace rows need no separate entries; only the session row switches below apply.',
       'settings.ellipsisWorkspace': 'Workspace rows',
       'settings.ellipsisSession': 'Session rows',
       'settings.ellipsis.newSession.label': 'New session',
@@ -290,6 +293,7 @@ window.__ModuleLoader__.load({
       'settings.ellipsis.sessionDeleteArchived.hint': 'Clean up every archived session from an archived row\'s "…" menu.',
       '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',
       'delete.archivedTitle': 'Delete all archived sessions?',
       'delete.archivedDescription': 'Permanently delete {n} archived sessions and their logs. This cannot be undone.',
       'delete.confirm': 'Delete permanently',
@@ -1140,7 +1144,7 @@ window.__ModuleLoader__.load({
             : t('delete.workspaceEmptyDescription', { name: request.displayTitle ?? '' }))
           : bulk
             ? t('delete.archivedDescription', { n: ids.length })
-            : t('delete.description', { name: request.displayTitle ?? '' }),
+            : t('delete.description', { name: request.displayTitle || t('delete.untitled') }),
         footer: h(Fragment, null,
           jsx(Button, { variant: 'outline', disabled: busy, onClick: close, children: t('delete.cancel') }),
           jsx(Button, {
@@ -1499,6 +1503,11 @@ window.__ModuleLoader__.load({
       const children = useChildren();
       const apps = useApps();
       usePinned();
+      // 0.2.2 起行尾「…」与右键共用同一份原生菜单，工作区行的附加开关不再生效。
+      const nativeEllipsis = contextMenusOf(rootCtx) !== null;
+      const ellipsisRows = nativeEllipsis
+        ? ELLIPSIS_ROWS.filter(([groupKey]) => groupKey !== 'workspace')
+        : ELLIPSIS_ROWS;
       const [expanded, setExpanded] = useState(false);
       const anyConflict = takenOver('openWith') || takenOver('deleteSession') || takenOver('deleteArchived');
       const locked = items.openWith === false;
@@ -1578,7 +1587,7 @@ window.__ModuleLoader__.load({
         return key === 'openWith' && childRows ? [row, childRows] : [row];
       });
 
-      const ellipsisGroups = ELLIPSIS_ROWS.map(([groupKey, titleKey, rows]) => h('div', {
+      const ellipsisGroups = ellipsisRows.map(([groupKey, titleKey, rows]) => h('div', {
         className: 'dsrm-settings-group',
         key: groupKey,
       },
@@ -1606,7 +1615,7 @@ window.__ModuleLoader__.load({
         anyConflict ? h('div', { className: 'dsrm-settings-note' }, t('settings.conflictNote')) : null,
         h('div', { className: 'dsrm-settings-list' }, rows),
         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-note' }, t(nativeEllipsis ? 'settings.ellipsisHintNative' : 'settings.ellipsisHint')),
         h('div', { className: 'dsrm-settings-groups' }, ellipsisGroups),
       );
     }
@@ -1961,6 +1970,257 @@ window.__ModuleLoader__.load({
       });
     }
 
+    /* -------------------------------- 工作区行：0.2.2 原生右键贡献 */
+
+    /**
+     * DSH 0.2.2 把右键菜单改成数据贡献（ctx.contextMenus），工作区行也不再向
+     * 行组件传 actions/onCreate，插件原来的自绘入口会取不到 props。这里改为
+     * 向宿主注册同一批动作；0.2.1 没有这个服务，保持自绘菜单不变。
+     */
+    function contextMenusOf(ctx) {
+      const usable = (menus) => (menus !== null && menus !== undefined && typeof menus.register === 'function' ? menus : null);
+      // 先走 ctx.get：未 inject 时直接读 ctx.contextMenus 会抛错，读不到服务。
+      try {
+        const viaGet = usable(ctx?.get?.('contextMenus'));
+        if (viaGet !== null) return viaGet;
+      } catch {
+        /* 服务容器尚未就绪 */
+      }
+      try {
+        return usable(ctx?.contextMenus);
+      } catch {
+        /* 未 inject 的服务属性访问会抛错，按不存在处理 */
+      }
+      return null;
+    }
+
+    /** 应用缓存包成宿主可订阅的数据源，应用列表到达后菜单会自动重解析。 */
+    const appsSource = {
+      getSnapshot: () => appsState,
+      subscribe: (listener) => subscribeApps(listener),
+    };
+
+    /** 应用图标走 data 贡献：resolve 里带 src，组件只负责渲染。 */
+    function ContextMenuAppIcon({ icon }) {
+      const src = typeof icon?.src === 'string' ? icon.src : '';
+      if (src === '') return null;
+      return jsx('img', {
+        className: 'dsrm-app-icon',
+        src,
+        alt: '',
+        onError: (event) => {
+          event.currentTarget.style.visibility = 'hidden';
+        },
+      });
+    }
+
+    function workspaceSessionIds(workspaceId) {
+      const snapshot = serviceOf(rootCtx, 'workspaces')?.list?.getSnapshot?.();
+      const entry = Array.isArray(snapshot?.items)
+        ? snapshot.items.find((candidate) => candidate?.workspaceId === workspaceId)
+        : undefined;
+      return Array.isArray(entry?.sessionIds)
+        ? entry.sessionIds.filter((id) => typeof id === 'string' && id !== '')
+        : [];
+    }
+
+    function openAppAt(appId, cwd, t) {
+      if (cwd === '') {
+        toast(t('noPath'));
+        return;
+      }
+      openApplication(appId, cwd).then((ok) => {
+        if (!ok) toast(t('openFailed'));
+      });
+    }
+
+    /**
+     * 数据贡献的一批工作区动作；group 字段决定它挂到哪个 order 的 provider，
+     * 从而夹在原生 rename(100)/reveal(200)/delete(300) 之间。
+     */
+    function workspaceMenuActions(ctx, value, t) {
+      const workspaceId = typeof value?.workspaceId === 'string' ? value.workspaceId : '';
+      if (workspaceId === '') return [];
+      const cwd = typeof value?.path === 'string' ? value.path : '';
+      const items = [];
+
+      items.push({
+        id: 'new-session',
+        group: 'new',
+        label: t('newSession'),
+        icon: { key: 'sidebar-row-menu.new' },
+        run: () => {
+          const ui = serviceOf(rootCtx, 'uiWorkspace');
+          if (typeof ui?.startSession === 'function') {
+            try {
+              ui.startSession(workspaceId, {});
+            } catch (error) {
+              console.warn('[dsh-sidebar-row-menu] new session failed:', error);
+            }
+          }
+        },
+      });
+
+      const apps = appsSnapshot();
+      const withApps = itemsSnapshot().openWith !== false;
+      const pinned = withApps ? effectivePinned(apps.ids).filter((id) => childOn(id)) : [];
+      pinned.forEach((id, index) => {
+        items.push({
+          id: `pinned-${id}`,
+          group: 'pinned',
+          separatorBefore: index === 0,
+          label: t('openWithApp', { name: appLabel(id, t) }),
+          icon: { key: 'sidebar-row-menu.app', src: ICON_ROUTE + encodeURIComponent(id) },
+          run: () => openAppAt(id, cwd, t),
+        });
+      });
+      const enabledApps = withApps ? apps.ids.filter((id) => childOn(id)) : [];
+      const pinnedSet = new Set(pinned);
+      const submenuApps = enabledApps.filter((id) => !pinnedSet.has(id));
+      if (withApps) ensureApps();
+      if (withApps && submenuApps.length > 0) {
+        items.push({
+          id: 'open-with',
+          group: 'open-with',
+          separatorBefore: pinned.length === 0,
+          label: t('openWith'),
+          children: submenuApps.map((id) => ({
+            id: `app-${id}`,
+            label: appLabel(id, t),
+            icon: { key: 'sidebar-row-menu.app', src: ICON_ROUTE + encodeURIComponent(id) },
+            run: () => openAppAt(id, cwd, t),
+          })),
+        });
+      }
+
+      items.push({
+        id: 'copy-path',
+        group: 'copy',
+        separatorBefore: pinned.length === 0 && submenuApps.length === 0,
+        label: t('copyPath'),
+        icon: { key: 'sidebar-row-menu.copy' },
+        run: () => {
+          if (cwd === '') {
+            toast(t('noPath'));
+            return;
+          }
+          copyText(cwd, t);
+        },
+      });
+
+      const tabs = serviceOf(rootCtx, 'projectTabs') ?? globalThis.__DSH_PROJECT_TABS__ ?? null;
+      if (tabs !== null && typeof tabs?.openWorkspaceInTab === 'function') {
+        items.push({
+          id: 'tab',
+          group: 'tab',
+          label: t('openInTab'),
+          icon: { key: 'sidebar-row-menu.tab' },
+          run: () => {
+            Promise.resolve().then(() => tabs.openWorkspaceInTab(workspaceId)).catch((reason) => {
+              console.warn('[dsh-sidebar-row-menu] open in tab failed:', reason);
+              toast(t('actionFailed'));
+            });
+          },
+        });
+      }
+
+      items.push({
+        id: 'delete-sessions',
+        group: 'delete',
+        danger: true,
+        separatorBefore: false,
+        label: t('deleteWorkspaceSessions'),
+        icon: { key: 'sidebar-row-menu.delete' },
+        run: () => {
+          const title = typeof value?.displayTitle === 'string' && value.displayTitle !== '' ? value.displayTitle : cwd;
+          requestDelete({
+            mode: 'workspace',
+            workspaceId,
+            sessionIds: workspaceSessionIds(workspaceId),
+            displayTitle: title,
+          });
+        },
+      });
+
+      return items;
+    }
+
+    /** 宿主只按 provider.order 排序，同组顺序即数组顺序；故每组单独注册。 */
+    const WORKSPACE_MENU_GROUPS = [
+      { key: 'new', order: 90 },
+      { key: 'pinned', order: 150 },
+      { key: 'open-with', order: 180 },
+      { key: 'copy', order: 250 },
+      { key: 'tab', order: 260 },
+      { key: 'delete', order: 310 },
+    ];
+
+    /** 注册工作区动作；服务可能晚于插件 apply 出现，带有限重试。 */
+    function registerWorkspaceContextMenu(ctx) {
+      let disposers = null;
+      let icons = null;
+      let timer = 0;
+      let attempts = 0;
+
+      const registerIcons = () => {
+        if (ctx.slots === null || ctx.slots === undefined) return;
+        icons = ctx.slots.inject('contextMenu.icon', function* () {
+          yield ctx.slots.register({ name: 'contextMenu.icon', key: 'sidebar-row-menu.new' }, IconNewChatOutlineRegular);
+          yield ctx.slots.register({ name: 'contextMenu.icon', key: 'sidebar-row-menu.copy' }, IconCopyOutlineRegular);
+          yield ctx.slots.register({ name: 'contextMenu.icon', key: 'sidebar-row-menu.tab' }, IconProjectAddOutlineRegular);
+          yield ctx.slots.register({ name: 'contextMenu.icon', key: 'sidebar-row-menu.delete' }, IconTrashOutlineRegular);
+          yield ctx.slots.register({ name: 'contextMenu.icon', key: 'sidebar-row-menu.app' }, ContextMenuAppIcon);
+        });
+      };
+
+      const register = () => {
+        timer = 0;
+        if (disposers !== null) return;
+        const menus = contextMenusOf(ctx);
+        if (menus === null) {
+          if (attempts >= 40 || typeof setTimeout !== 'function') return;
+          attempts += 1;
+          timer = setTimeout(register, 250);
+          return;
+        }
+        registerIcons();
+        const registered = [];
+        for (const group of WORKSPACE_MENU_GROUPS) {
+          try {
+            registered.push(menus.register({
+              id: `sidebar-row-menu.workspace.${group.key}`,
+              target: 'workspace',
+              order: group.order,
+              observe: () => [appsSource],
+              resolve: (target) => workspaceMenuActions(ctx, target, localeOf(ctx))
+                .filter((action) => action.group === group.key)
+                .map(({ group: _group, ...action }) => action),
+            }));
+          } catch (error) {
+            console.warn(`[dsh-sidebar-row-menu] workspace context registration failed (${group.key}):`, error);
+          }
+        }
+        if (registered.length > 0) disposers = registered;
+      };
+
+      register();
+      return () => {
+        if (timer !== 0) clearTimeout(timer);
+        for (const dispose of disposers ?? []) {
+          try {
+            dispose?.();
+          } catch {
+            /* 注册已随插件生命周期撤销 */
+          }
+        }
+        try {
+          icons?.();
+        } catch {
+          /* icon 条目可能未注册成功 */
+        }
+      };
+    }
+
     /** 删除确认框挂到 shell.overlay，避免菜单关闭时被一起卸载。 */
     function registerDeleteDialog(ctx) {
       return ctx.slots.inject('shell.overlay', function* () {
@@ -2288,10 +2548,12 @@ window.__ModuleLoader__.load({
       if (typeof ctx.effect === 'function') {
         ctx.effect(() => installStyles(), 'sidebar-row-menu: styles');
       }
+      const stopWorkspaceMenu = registerWorkspaceContextMenu(ctx);
       const teardown = install();
       if (ctx !== null && typeof ctx.effect === 'function') {
         ctx.effect(() => () => {
           rootCtx = null;
+          stopWorkspaceMenu();
           teardown();
         }, 'sidebar-row-menu: row context menus');
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-sidebar-row-menu",
-  "version": "1.4.3",
+  "version": "1.5.0",
   "type": "module",
   "description": "DSH sidebar right-click menus: a self-composed menu for workspace rows, and the native slot menu opened at the pointer for session rows, with open-with and archived-session cleanup.",
   "keywords": [