dsh-sidebar-row-menu 1.4.0 → 1.4.2

package/lib/client.js

@@ -88,8 +88,10 @@ window.__ModuleLoader__.load({
       if (children.length === 0) return jsx(type, props);
       return jsx(type, { ...props, children: children.length === 1 ? children[0] : children });
     }
-    /** 永久删除会话的宿主端点（只允许删除已归档会话，见本文件条目）。 */
+    /** 永久删除会话的宿主端点；是否对未归档会话开放由本地开关决定。 */
     const DELETE_ENDPOINT = '/dsh-sidebar-row-menu/session/delete';
+    /** 删除「工作区 + 其下全部会话」的宿主端点。 */
+    const WORKSPACE_DELETE_ENDPOINT = '/dsh-sidebar-row-menu/workspace/delete';
     /** 官方 open-in-app 的三条路由；用文档相对路径让浏览器自带认证。 */
     const APPS_ROUTE = 'open-in-app/apps';
     const OPEN_ROUTE = 'open-in-app/open';
@@ -104,7 +106,33 @@ window.__ModuleLoader__.load({
       'intellij', 'pycharm', 'webstorm', 'phpstorm', 'goland', 'rider', 'rustrover',
       'androidstudio', 'xcode',
     ];
-    const ITEM_KEYS = ['openWith', 'deleteSession', 'deleteArchived'];
+    /**
+     * 各项菜单开关的默认值。删除未归档会话是破坏性能力，默认关闭，
+     * 必须在设置里主动开启后才出现在普通会话的右键菜单里。
+     */
+    const ITEM_DEFAULTS = {
+      openWith: true,
+      deleteSession: true,
+      deleteArchived: true,
+      deleteUnarchived: false,
+    };
+    const ITEM_KEYS = Object.keys(ITEM_DEFAULTS);
+    /**
+     * 「右键专属条目是否也放进行尾…菜单」的逐项开关。
+     * 全部默认关闭：不勾选时点「…」看到的仍是 DSH 原生菜单。
+     */
+    const ELLIPSIS_KEY = 'dsh.sidebar-row-menu.ellipsis.v1';
+    const ELLIPSIS_DEFAULTS = {
+      newSession: false,
+      openWith: false,
+      copyPath: false,
+      openInTab: false,
+      deleteSessions: false,
+      sessionOpenWith: false,
+      sessionDelete: false,
+      sessionDeleteArchived: false,
+    };
+    const ELLIPSIS_KEYS = Object.keys(ELLIPSIS_DEFAULTS);
     /**
      * dsh-session-menu 注册的同一能力条目 id。检测到对方存在时，本插件对应项
      * 自动隐藏，避免同一份菜单里出现两条一模一样的动作。
@@ -125,6 +153,7 @@ window.__ModuleLoader__.load({
       copyPath: '复制工作区路径',
       openInTab: '在新标签中打开',
       deleteWorkspace: '删除工作区',
+      deleteWorkspaceSessions: '删除工作区及所有会话',
       copied: '已复制',
       copyFailed: '复制失败，请重试',
       noPath: '没有可用的目录路径',
@@ -138,9 +167,11 @@ window.__ModuleLoader__.load({
       'settings.openWith.label': '打开方式',
       'settings.openWith.hint': '在子菜单里选择编辑器、终端或文件管理器打开工作区或会话目录；置顶的应用直接显示在菜单一级。',
       'settings.deleteSession.label': '永久删除会话',
-      'settings.deleteSession.hint': '在已归档会话的菜单里永久删除这一个会话及其日志。',
+      'settings.deleteSession.hint': '在会话菜单里永久删除这一个会话及其日志；默认只对已归档会话显示。',
       'settings.deleteArchived.label': '删除所有已归档会话',
       'settings.deleteArchived.hint': '在已归档会话的菜单里一次清理全部归档会话。',
+      'settings.deleteUnarchived.label': '允许删除未归档会话',
+      'settings.deleteUnarchived.hint': '开启后，未归档会话的右键菜单也会出现「永久删除会话」；确认后日志立即从磁盘移除，不可恢复。',
       'settings.children': '选择要显示的应用',
       'settings.pin': '置顶',
       'settings.pinned': '已置顶',
@@ -154,6 +185,26 @@ window.__ModuleLoader__.load({
       'settings.appsAllOff': '所有应用都被二级开关隐藏了',
       'settings.expand': '展开应用列表',
       'settings.collapse': '收起应用列表',
+      'settings.ellipsisTitle': '同时放进「…」菜单',
+      'settings.ellipsisHint': '勾选后，对应条目会额外出现在行尾「…」按钮的菜单里，并沿用上面的单项开关；不勾选则只在右键菜单出现。',
+      'settings.ellipsisWorkspace': '工作区行',
+      'settings.ellipsisSession': '会话行',
+      'settings.ellipsis.newSession.label': '新建会话',
+      'settings.ellipsis.newSession.hint': '在「…」菜单里直接新建该工作区的会话。',
+      'settings.ellipsis.openWith.label': '打开方式',
+      'settings.ellipsis.openWith.hint': '在「…」菜单里用外部应用打开工作区或会话目录。',
+      'settings.ellipsis.copyPath.label': '拷贝工作区路径',
+      'settings.ellipsis.copyPath.hint': '在「…」菜单里复制工作区目录路径。',
+      'settings.ellipsis.openInTab.label': '在新标签页打开',
+      'settings.ellipsis.openInTab.hint': '在「…」菜单里把工作区作为标签页打开。',
+      'settings.ellipsis.deleteSessions.label': '删除工作区及所有会话',
+      'settings.ellipsis.deleteSessions.hint': '在「…」菜单里同时清掉工作区记录和它下面的全部会话。',
+      'settings.ellipsis.sessionOpenWith.label': '打开方式',
+      'settings.ellipsis.sessionOpenWith.hint': '在「…」菜单里用外部应用打开会话目录。',
+      'settings.ellipsis.sessionDelete.label': '永久删除会话',
+      'settings.ellipsis.sessionDelete.hint': '在「…」菜单里永久删除这一个会话及其日志。',
+      'settings.ellipsis.sessionDeleteArchived.label': '删除所有已归档会话',
+      'settings.ellipsis.sessionDeleteArchived.hint': '在已归档会话的「…」菜单里一次清理全部归档会话。',
       'delete.title': '永久删除会话？',
       'delete.description': '会话「{name}」的日志将从磁盘永久删除，此操作无法撤销。',
       'delete.archivedTitle': '删除所有已归档会话？',
@@ -168,6 +219,14 @@ window.__ModuleLoader__.load({
       'delete.unavailable': '删除服务不可用',
       'delete.done': '已删除会话',
       'delete.doneMany': '已删除 {n} 个会话',
+      'delete.workspaceTitle': '删除工作区及所有会话？',
+      'delete.workspaceDescription': '工作区「{name}」及其下 {n} 个会话的日志将被永久删除，目录本身保留。此操作无法撤销。',
+      'delete.workspaceEmptyDescription': '工作区「{name}」下没有会话，将只删除工作区记录。',
+      'delete.workspaceConfirm': '全部删除',
+      'delete.workspacePending': '正在删除工作区及会话…',
+      'delete.workspacePartial': '已删除 {done} 个会话，失败 {failed} 个；工作区已保留。',
+      'delete.workspaceDone': '已删除工作区及 {n} 个会话',
+      'delete.workspaceEmptyDone': '已删除工作区',
     };
     const en = {
       newSession: 'New session',
@@ -177,6 +236,7 @@ window.__ModuleLoader__.load({
       copyPath: 'Copy workspace path',
       openInTab: 'Open in new tab',
       deleteWorkspace: 'Delete workspace',
+      deleteWorkspaceSessions: 'Delete workspace and all sessions',
       copied: 'Copied',
       copyFailed: 'Copy failed, please retry',
       noPath: 'No usable directory path',
@@ -190,9 +250,11 @@ window.__ModuleLoader__.load({
       'settings.openWith.label': 'Open with',
       'settings.openWith.hint': 'Pick an editor, terminal or file manager for workspace or session directories; pinned apps show up directly in the menu.',
       'settings.deleteSession.label': 'Delete session permanently',
-      'settings.deleteSession.hint': 'Permanently delete a single archived session and its transcript from an archived row.',
+      'settings.deleteSession.hint': 'Permanently delete one session and its transcript from its menu; shown on archived sessions by default.',
       'settings.deleteArchived.label': 'Delete all archived sessions',
       'settings.deleteArchived.hint': 'Clean up every archived session from an archived session row.',
+      'settings.deleteUnarchived.label': 'Allow deleting unarchived sessions',
+      'settings.deleteUnarchived.hint': 'Also show "Delete session permanently" on unarchived rows. The transcript is removed from disk immediately and cannot be restored.',
       'settings.children': 'Applications to show',
       'settings.pin': 'Pin',
       'settings.pinned': 'Pinned',
@@ -206,6 +268,26 @@ window.__ModuleLoader__.load({
       'settings.appsAllOff': 'Every application is hidden by the switches above',
       'settings.expand': 'Show applications',
       '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.ellipsisWorkspace': 'Workspace rows',
+      'settings.ellipsisSession': 'Session rows',
+      'settings.ellipsis.newSession.label': 'New session',
+      'settings.ellipsis.newSession.hint': 'Create a session for this workspace from the "…" menu.',
+      'settings.ellipsis.openWith.label': 'Open with',
+      'settings.ellipsis.openWith.hint': 'Open the workspace or session directory with an external app from the "…" menu.',
+      'settings.ellipsis.copyPath.label': 'Copy workspace path',
+      'settings.ellipsis.copyPath.hint': 'Copy the workspace directory path from the "…" menu.',
+      'settings.ellipsis.openInTab.label': 'Open in new tab',
+      'settings.ellipsis.openInTab.hint': 'Open the workspace as a tab from the "…" menu.',
+      'settings.ellipsis.deleteSessions.label': 'Delete workspace and all sessions',
+      'settings.ellipsis.deleteSessions.hint': 'Remove the workspace record and every session under it from the "…" menu.',
+      'settings.ellipsis.sessionOpenWith.label': 'Open with',
+      'settings.ellipsis.sessionOpenWith.hint': 'Open the session directory with an external app from the "…" menu.',
+      'settings.ellipsis.sessionDelete.label': 'Delete session permanently',
+      '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.',
       'delete.title': 'Delete this session permanently?',
       'delete.description': 'The log of "{name}" will be removed from disk. This cannot be undone.',
       'delete.archivedTitle': 'Delete all archived sessions?',
@@ -220,6 +302,14 @@ window.__ModuleLoader__.load({
       'delete.unavailable': 'The delete service is unavailable',
       'delete.done': 'Session deleted',
       'delete.doneMany': 'Deleted {n} sessions',
+      'delete.workspaceTitle': 'Delete the workspace and all its sessions?',
+      'delete.workspaceDescription': 'The workspace "{name}" and the logs of its {n} sessions will be permanently deleted; the directory itself is kept. This cannot be undone.',
+      'delete.workspaceEmptyDescription': 'The workspace "{name}" has no sessions; only the workspace record will be deleted.',
+      'delete.workspaceConfirm': 'Delete all',
+      'delete.workspacePending': 'Deleting the workspace and sessions…',
+      'delete.workspacePartial': 'Deleted {done} sessions, failed {failed}; the workspace was kept.',
+      'delete.workspaceDone': 'Deleted the workspace and {n} sessions',
+      'delete.workspaceEmptyDone': 'Workspace deleted',
     };
 
     /** 官方 open-in-app 的应用 id → 显示名。官方 locale 没有这张表。 */
@@ -341,6 +431,8 @@ window.__ModuleLoader__.load({
     /** 当前挂着的菜单宿主与 React root。 */
     let menuHost = null;
     let menuRoot = null;
+    /** 当前「…」菜单锚定的按钮；用来判断再次点击是否应收起。 */
+    let ellipsisTrigger = null;
     /** 客户端根上下文（apply 时记下，右键时用来取服务 / 文案）。 */
     let rootCtx = null;
 
@@ -361,6 +453,7 @@ window.__ModuleLoader__.load({
       const root = menuRoot;
       menuHost = null;
       menuRoot = null;
+      ellipsisTrigger = null;
       unmountAt(host, root);
     }
 
@@ -487,8 +580,7 @@ window.__ModuleLoader__.load({
     /* ------------------------------------------------ 菜单项设置（localStorage） */
 
     function readStoredItems() {
-      const defaults = {};
-      for (const key of ITEM_KEYS) defaults[key] = true;
+      const defaults = { ...ITEM_DEFAULTS };
       try {
         const raw = globalThis.localStorage?.getItem(ITEMS_KEY);
         if (typeof raw !== 'string' || raw === '') return defaults;
@@ -543,7 +635,77 @@ window.__ModuleLoader__.load({
     }
 
     function itemOn(key) {
-      return itemSettings[key] !== false;
+      return itemSettings[key] ?? ITEM_DEFAULTS[key] ?? false;
+    }
+
+    /* -------------------------------- 「…」菜单附加开关（localStorage） */
+
+    function readStoredEllipsis() {
+      const defaults = { ...ELLIPSIS_DEFAULTS };
+      try {
+        const raw = globalThis.localStorage?.getItem(ELLIPSIS_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 ELLIPSIS_KEYS) {
+          if (typeof parsed[key] === 'boolean') defaults[key] = parsed[key];
+        }
+      } catch {
+        /* 坏数据回退默认 */
+      }
+      return defaults;
+    }
+
+    let ellipsisSettings = readStoredEllipsis();
+    const ellipsisListeners = new Set();
+
+    function publishEllipsis() {
+      for (const listener of ellipsisListeners) {
+        try {
+          listener();
+        } catch {
+          /* ignore */
+        }
+      }
+    }
+
+    function subscribeEllipsis(listener) {
+      ellipsisListeners.add(listener);
+      return () => {
+        ellipsisListeners.delete(listener);
+      };
+    }
+
+    function ellipsisSnapshot() {
+      return ellipsisSettings;
+    }
+
+    function useEllipsis() {
+      return useSyncExternalStore(subscribeEllipsis, ellipsisSnapshot, ellipsisSnapshot);
+    }
+
+    function setEllipsis(key, enabled) {
+      if (!ELLIPSIS_KEYS.includes(key)) return;
+      ellipsisSettings = { ...ellipsisSettings, [key]: enabled === true };
+      try {
+        globalThis.localStorage?.setItem(ELLIPSIS_KEY, JSON.stringify(ellipsisSettings));
+      } catch {
+        /* 隐私模式写不进去也照样生效到本次会话 */
+      }
+      publishEllipsis();
+    }
+
+    function ellipsisOn(key) {
+      return ellipsisSettings[key] === true;
+    }
+
+    /** 工作区行是否至少有一项要在「…」菜单里显示（否则完全不接管原生菜单）。 */
+    function workspaceEllipsisOn() {
+      return ellipsisSettings.newSession === true
+        || ellipsisSettings.openWith === true
+        || ellipsisSettings.copyPath === true
+        || ellipsisSettings.openInTab === true
+        || ellipsisSettings.deleteSessions === true;
     }
 
     /* ------------------------------------- 打开方式：应用列表与二级开关 */
@@ -889,6 +1051,20 @@ window.__ModuleLoader__.load({
         .catch(() => ({ ok: false, deleted: 0, failed: ids.length, error: 'network' }));
     }
 
+    function postWorkspaceDelete(workspaceId) {
+      if (typeof fetch !== 'function') return Promise.resolve({ ok: false, deleted: 0, failed: 0, error: 'network' });
+      return fetch(WORKSPACE_DELETE_ENDPOINT, {
+        method: 'POST',
+        headers: { 'content-type': 'application/json' },
+        body: JSON.stringify({ workspaceId }),
+      })
+        .then((response) => response.json().catch(() => null)
+          .then((payload) => (payload !== null && typeof payload === 'object'
+            ? payload
+            : { ok: false, deleted: 0, failed: 0, error: `HTTP ${response.status}` })))
+        .catch(() => ({ ok: false, deleted: 0, failed: 0, error: 'network' }));
+    }
+
     /** shell.overlay 上的对话框宿主；没有请求时什么都不渲染。 */
     function DeleteDialog({ t }) {
       const request = useDeleteRequest();
@@ -900,8 +1076,11 @@ window.__ModuleLoader__.load({
       const [busy, setBusy] = useState(false);
       const [error, setError] = useState(null);
       const [partial, setPartial] = useState(null);
+      const workspace = request.mode === 'workspace';
       const bulk = request.mode === 'archived';
-      const ids = bulk ? request.sessionIds : [request.sessionId];
+      const ids = workspace
+        ? (Array.isArray(request.sessionIds) ? request.sessionIds : [])
+        : bulk ? request.sessionIds : [request.sessionId];
       const close = () => {
         if (!busy) closeDelete();
       };
@@ -913,11 +1092,29 @@ window.__ModuleLoader__.load({
         const wasMain = ids.some((id) => isMainSession(id));
         void (async () => {
           try {
-            const result = await postDelete(ids);
+            const result = workspace
+              ? await postWorkspaceDelete(request.workspaceId)
+              : await postDelete(ids);
             if (result.ok !== true && (result.deleted ?? 0) === 0) {
               const reason = typeof result.error === 'string' && result.error !== '' ? result.error : t('delete.unavailable');
               throw new Error(reason);
             }
+            if (workspace) {
+              // 会话删除有失败时 host 会保留工作区，让用户重试；成功才关框。
+              if (result.ok !== true) {
+                setPartial({ done: result.deleted ?? 0, failed: result.failed ?? 0, workspace: true });
+                return;
+              }
+              if (wasMain) serviceOf(rootCtx, 'uiWorkspace')?.clearMain?.();
+              closeDelete();
+              toast(
+                (result.deleted ?? 0) > 0
+                  ? t('delete.workspaceDone', { n: result.deleted ?? 0 })
+                  : t('delete.workspaceEmptyDone'),
+                'success',
+              );
+              return;
+            }
             if (wasMain) serviceOf(rootCtx, 'uiWorkspace')?.clearMain?.();
             if ((result.failed ?? 0) > 0) {
               setPartial({ done: result.deleted ?? 0, failed: result.failed });
@@ -936,24 +1133,34 @@ window.__ModuleLoader__.load({
         open: true,
         onClose: close,
         closeLabel: t('delete.cancel'),
-        title: bulk ? t('delete.archivedTitle') : t('delete.title'),
-        description: bulk
-          ? t('delete.archivedDescription', { n: ids.length })
-          : t('delete.description', { name: request.displayTitle ?? '' }),
+        title: workspace ? t('delete.workspaceTitle') : bulk ? t('delete.archivedTitle') : t('delete.title'),
+        description: workspace
+          ? (ids.length > 0
+            ? t('delete.workspaceDescription', { name: request.displayTitle ?? '', n: ids.length })
+            : t('delete.workspaceEmptyDescription', { name: request.displayTitle ?? '' }))
+          : bulk
+            ? t('delete.archivedDescription', { n: ids.length })
+            : t('delete.description', { name: request.displayTitle ?? '' }),
         footer: h(Fragment, null,
           jsx(Button, { variant: 'outline', disabled: busy, onClick: close, children: t('delete.cancel') }),
           jsx(Button, {
             variant: 'outline',
             disabled: busy,
             onClick: confirm,
-            children: h('span', { className: 'dsrm-danger-label' }, bulk ? t('delete.archivedConfirm') : t('delete.confirm')),
+            children: h('span', { className: 'dsrm-danger-label' }, workspace
+              ? t('delete.workspaceConfirm')
+              : bulk ? t('delete.archivedConfirm') : t('delete.confirm')),
           })),
         children: [
           busy
-            ? h('div', { className: 'dsrm-status-text', role: 'status', key: 'busy' }, bulk ? t('delete.archivedPending') : t('delete.pending'))
+            ? h('div', { className: 'dsrm-status-text', role: 'status', key: 'busy' }, workspace
+              ? t('delete.workspacePending')
+              : bulk ? t('delete.archivedPending') : t('delete.pending'))
             : null,
           partial !== null
-            ? h('div', { className: 'dsrm-status-text', role: 'status', key: 'partial' }, t('delete.archivedPartial', { done: partial.done, failed: partial.failed }))
+            ? h('div', { className: 'dsrm-status-text', role: 'status', key: 'partial' }, partial.workspace
+              ? t('delete.workspacePartial', { done: partial.done, failed: partial.failed })
+              : t('delete.archivedPartial', { done: partial.done, failed: partial.failed }))
             : null,
           error !== null
             ? h('div', { className: 'dsrm-error-text', role: 'alert', key: 'error' }, t('delete.failed', { message: error }))
@@ -1152,7 +1359,9 @@ window.__ModuleLoader__.load({
      * 且和 dsh-session-menu 的同名能力二选一。
      */
     function SessionOpenWithMenuItem({ sessionId, useMenuOpenState, t }) {
-      const visible = useRightClickEntry();
+      const rightClick = useRightClickEntry();
+      const ellipsis = useEllipsis();
+      const visible = rightClick || ellipsis.sessionOpenWith === true;
       const items = useItems();
       const apps = useApps();
       const setMenuOpen = menuCloser(useMenuOpenState);
@@ -1173,7 +1382,9 @@ window.__ModuleLoader__.load({
      * 放进一级菜单，用户也可以在设置里改。置顶项不再重复出现在「打开方式」里。
      */
     function SessionOpenWithPinnedMenuItem({ sessionId, useMenuOpenState, t }) {
-      const visible = useRightClickEntry();
+      const rightClick = useRightClickEntry();
+      const ellipsis = useEllipsis();
+      const visible = rightClick || ellipsis.sessionOpenWith === true;
       const items = useItems();
       useChildren();
       const apps = useApps();
@@ -1206,16 +1417,18 @@ window.__ModuleLoader__.load({
     }
 
     /**
-     * 会话条目「永久删除会话」：只在已归档会话的菜单里显示；和 dsh-session-menu
-     * 的同名功能二选一。
+     * 会话条目「永久删除会话」：已归档会话默认可见；未归档会话要先在设置里
+     * 打开「允许删除未归档会话」。和 dsh-session-menu 的同名功能二选一。
      */
     function SessionDeleteMenuItem({ sessionId, displayTitle, useMenuOpenState, t }) {
-      const visible = useRightClickEntry();
+      const rightClick = useRightClickEntry();
+      const ellipsis = useEllipsis();
+      const visible = rightClick || ellipsis.sessionDelete === true;
       const items = useItems();
       const archived = useArchivedIds();
       const setMenuOpen = menuCloser(useMenuOpenState);
       if (!visible || items.deleteSession === false || takenOver('deleteSession')) return null;
-      if (!archived.has(sessionId)) return null;
+      if (!archived.has(sessionId) && items.deleteUnarchived !== true) return null;
       return jsx(MenuItemButton, {
         danger: true,
         separatorBefore: true,
@@ -1233,7 +1446,9 @@ window.__ModuleLoader__.load({
      * 和 dsh-session-menu 的同名功能二选一。displayTitle 用作确认文案。
      */
     function SessionDeleteArchivedMenuItem({ sessionId, displayTitle, useMenuOpenState, t }) {
-      const visible = useRightClickEntry();
+      const rightClick = useRightClickEntry();
+      const ellipsis = useEllipsis();
+      const visible = rightClick || ellipsis.sessionDeleteArchived === true;
       const items = useItems();
       const archived = useArchivedIds();
       const setMenuOpen = menuCloser(useMenuOpenState);
@@ -1258,11 +1473,29 @@ window.__ModuleLoader__.load({
     const SETTINGS_ROWS = [
       ['openWith', 'settings.openWith.label', 'settings.openWith.hint'],
       ['deleteSession', 'settings.deleteSession.label', 'settings.deleteSession.hint'],
+      ['deleteUnarchived', 'settings.deleteUnarchived.label', 'settings.deleteUnarchived.hint'],
       ['deleteArchived', 'settings.deleteArchived.label', 'settings.deleteArchived.hint'],
     ];
 
+    /** 「…」菜单附加开关；按行分组，避免用户分不清工作区项和会话项。 */
+    const ELLIPSIS_ROWS = [
+      ['workspace', 'settings.ellipsisWorkspace', [
+        ['newSession', 'settings.ellipsis.newSession.label', 'settings.ellipsis.newSession.hint'],
+        ['openWith', 'settings.ellipsis.openWith.label', 'settings.ellipsis.openWith.hint'],
+        ['copyPath', 'settings.ellipsis.copyPath.label', 'settings.ellipsis.copyPath.hint'],
+        ['openInTab', 'settings.ellipsis.openInTab.label', 'settings.ellipsis.openInTab.hint'],
+        ['deleteSessions', 'settings.ellipsis.deleteSessions.label', 'settings.ellipsis.deleteSessions.hint'],
+      ]],
+      ['session', 'settings.ellipsisSession', [
+        ['sessionOpenWith', 'settings.ellipsis.sessionOpenWith.label', 'settings.ellipsis.sessionOpenWith.hint'],
+        ['sessionDelete', 'settings.ellipsis.sessionDelete.label', 'settings.ellipsis.sessionDelete.hint'],
+        ['sessionDeleteArchived', 'settings.ellipsis.sessionDeleteArchived.label', 'settings.ellipsis.sessionDeleteArchived.hint'],
+      ]],
+    ];
+
     function SettingsSection({ t }) {
       const items = useItems();
+      const ellipsis = useEllipsis();
       const children = useChildren();
       const apps = useApps();
       usePinned();
@@ -1309,6 +1542,9 @@ window.__ModuleLoader__.load({
 
       // 应用开关必须紧跟「打开方式」这一行，而不是落到整个列表末尾。
       const rows = SETTINGS_ROWS.flatMap(([key, labelKey, hintKey]) => {
+        // 「允许删除未归档会话」依赖「永久删除会话」这条主开关。
+        const lockedByParent = key === 'deleteUnarchived'
+          && (items.deleteSession === false || takenOver('deleteSession'));
         const row = h('div', { className: 'dsrm-settings-row', key },
           h('div', { className: 'dsrm-settings-copy' },
             h('div', { className: 'dsrm-settings-label' }, t(labelKey)),
@@ -1316,9 +1552,12 @@ window.__ModuleLoader__.load({
           ),
           h('div', { className: 'dsrm-settings-controls' },
             jsx(Switch, {
-              checked: items[key] !== false,
-              disabled: takenOver(key),
+              checked: items[key] === true,
+              disabled: takenOver(key) || lockedByParent,
               label: t(labelKey),
+              title: lockedByParent
+                ? t('settings.childLocked', { name: t('settings.deleteSession.label') })
+                : undefined,
               onChange: (next) => setItem(key, next),
             }),
             key === 'openWith'
@@ -1339,10 +1578,36 @@ window.__ModuleLoader__.load({
         return key === 'openWith' && childRows ? [row, childRows] : [row];
       });
 
+      const ellipsisGroups = ELLIPSIS_ROWS.map(([groupKey, titleKey, rows]) => h('div', {
+        className: 'dsrm-settings-group',
+        key: groupKey,
+      },
+        h('div', { className: 'dsrm-settings-group-title' }, t(titleKey)),
+        h('div', { className: 'dsrm-settings-list' }, 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: ellipsis[key] === true,
+              label: t(labelKey),
+              onChange: (next) => setEllipsis(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,
         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-groups' }, ellipsisGroups),
       );
     }
 
@@ -1352,16 +1617,20 @@ window.__ModuleLoader__.load({
      * 工作区行右键菜单。官方 Menu 的 items 只认单层条目，不支持子菜单，
      * 所以这里自绘 panel；普通行仍用 MenuItemButton，分隔线与菜单外观和官方一致。
      */
-    function WorkspaceRowMenu({ x, y, props, onClose }) {
+    function WorkspaceRowMenu({ x, y, props, onClose, mode = 'context' }) {
       const t = localeOf(rootCtx);
       const items = useItems();
+      const ellipsis = useEllipsis();
       const apps = useApps();
       usePinned();
       useChildren();
       const hostRef = useRef(null);
       const [pos, setPos] = useState(null);
 
-      const openWithOn = items.openWith !== false;
+      const ellipsisMode = mode === 'ellipsis';
+      /** 右键菜单永远显示；「…」菜单只在对应开关打开时显示（内置项除外）。 */
+      const show = (key) => !ellipsisMode || ellipsis[key] === true;
+      const openWithOn = items.openWith !== false && show('openWith');
 
       useEffect(() => {
         if (openWithOn) ensureApps();
@@ -1411,6 +1680,26 @@ window.__ModuleLoader__.load({
         });
       };
 
+      const requestWorkspaceDelete = () => {
+        if (workspaceId === '') {
+          toast(t('actionFailed'));
+          return;
+        }
+        const snapshot = serviceOf(rootCtx, 'workspaces')?.list?.getSnapshot?.();
+        const entry = Array.isArray(snapshot?.items)
+          ? snapshot.items.find((candidate) => candidate?.workspaceId === workspaceId)
+          : undefined;
+        const sessionIds = Array.isArray(entry?.sessionIds)
+          ? entry.sessionIds.filter((id) => typeof id === 'string' && id !== '')
+          : [];
+        const title = typeof group.label === 'string' && group.label !== ''
+          ? group.label
+          : typeof group.title === 'string' && group.title !== ''
+            ? group.title
+            : cwd;
+        requestDelete({ mode: 'workspace', workspaceId, sessionIds, displayTitle: title });
+      };
+
       const run = (id) => {
         if (id === 'new-session') {
           try {
@@ -1436,6 +1725,10 @@ window.__ModuleLoader__.load({
           }
           return;
         }
+        if (id === 'delete-sessions') {
+          requestWorkspaceDelete();
+          return;
+        }
         if (id === 'tab') {
           Promise.resolve().then(() => tabs.openWorkspaceInTab(workspaceId)).catch((reason) => {
             console.warn('[dsh-sidebar-row-menu] open in tab failed:', reason);
@@ -1453,7 +1746,7 @@ window.__ModuleLoader__.load({
       };
 
       const rows = [];
-      if (typeof props.onCreate === 'function') {
+      if (typeof props.onCreate === 'function' && show('newSession')) {
         rows.push(jsx(MenuItemButton, {
           key: 'new-session',
           onSelect: () => {
@@ -1495,17 +1788,19 @@ window.__ModuleLoader__.load({
         }));
       }
 
-      rows.push(jsx(MenuItemButton, {
-        key: 'copy-path',
-        separatorBefore: !openWithOn,
-        onSelect: () => {
-          onClose();
-          run('copy-path');
-        },
-        icon: jsx(IconCopyOutlineRegular, { size: 14 }),
-        children: t('copyPath'),
-      }));
-      if (canOpenInTab) {
+      if (show('copyPath')) {
+        rows.push(jsx(MenuItemButton, {
+          key: 'copy-path',
+          separatorBefore: !openWithOn,
+          onSelect: () => {
+            onClose();
+            run('copy-path');
+          },
+          icon: jsx(IconCopyOutlineRegular, { size: 14 }),
+          children: t('copyPath'),
+        }));
+      }
+      if (canOpenInTab && show('openInTab')) {
         rows.push(jsx(MenuItemButton, {
           key: 'tab',
           onSelect: () => {
@@ -1527,6 +1822,18 @@ window.__ModuleLoader__.load({
         icon: jsx(IconTrashOutlineRegular, {}),
         children: t('deleteWorkspace'),
       }));
+      if (show('deleteSessions')) {
+        rows.push(jsx(MenuItemButton, {
+          key: 'delete-sessions',
+          danger: true,
+          onSelect: () => {
+            onClose();
+            run('delete-sessions');
+          },
+          icon: jsx(IconTrashOutlineRegular, {}),
+          children: t('deleteWorkspaceSessions'),
+        }));
+      }
 
       return h('div', {
         className: 'dsrm-menu',
@@ -1539,8 +1846,8 @@ window.__ModuleLoader__.load({
       }, h(MenuSurface, { role: 'group', className: 'dsrm-menu-surface' }, rows));
     }
 
-    /** 在 (x, y) 处挂出工作区菜单。 */
-    function showWorkspaceMenu(props, x, y) {
+    /** 在 (x, y) 处挂出工作区菜单。mode='ellipsis' 表示从行尾「…」按钮打开。 */
+    function showWorkspaceMenu(props, x, y, mode = 'context') {
       closeMenu();
       menuHost = document.createElement('div');
       menuHost.setAttribute(MENU_ATTR, '1');
@@ -1551,6 +1858,7 @@ window.__ModuleLoader__.load({
         x,
         y,
         props,
+        mode,
         onClose: () => closeMenu(),
       }));
     }
@@ -1565,9 +1873,44 @@ window.__ModuleLoader__.load({
     }
 
     /** 工作区行右键菜单（没有 slot 可复用，只能自己组）。 */
-    function openWorkspaceMenu(props, x, y) {
+    function openWorkspaceMenu(props, x, y, mode = 'context') {
       if (rootCtx === null) return;
-      showWorkspaceMenu(props, x, y);
+      showWorkspaceMenu(props, x, y, mode);
+    }
+
+    /**
+     * 行尾「…」按钮已经展开内置菜单时，用同一个按钮位置改挂本插件菜单。
+     * 只在用户为工作区行开启了至少一个「…」附加项时接管；否则原生菜单原样工作。
+     */
+    function onWorkspaceEllipsisClick(event) {
+      if (event.defaultPrevented || event.button !== 0) return;
+      if (event.target === null || event.target === undefined) return;
+      if (rootCtx === null || !workspaceEllipsisOn()) return;
+      const target = event.target;
+      if (typeof target.closest !== 'function') return;
+      const row = target.closest('[data-row-key]');
+      if (row === null) return;
+      const rowKey = row.getAttribute('data-row-key') ?? '';
+      if (!rowKey.startsWith('workspace:')) return;
+      const button = target.closest('button');
+      if (button === null || !row.contains(button)) return;
+      // 只接管行内第一个按钮（「…」）；新建会话按钮带快捷键标记，直接放行。
+      const buttons = row.querySelectorAll('button');
+      if (buttons.length === 0 || buttons[0] !== button) return;
+      if (button.getAttribute('aria-keyshortcuts') !== null) return;
+      const props = resolveWorkspaceRow(target);
+      if (props === null) return;
+      event.preventDefault();
+      event.stopPropagation();
+      event.stopImmediatePropagation?.();
+      // 再点一次「…」视为收起当前菜单。
+      if (menuHost !== null && ellipsisTrigger === button) {
+        closeMenu();
+        return;
+      }
+      const rect = button.getBoundingClientRect();
+      openWorkspaceMenu(props, rect.left + rect.width, rect.bottom + 4, 'ellipsis');
+      ellipsisTrigger = button;
     }
 
     /* ------------------------------------------------ 会话菜单的插件条目 */
@@ -1586,7 +1929,7 @@ window.__ModuleLoader__.load({
     /**
      * 会话菜单条目：
      *  - 置顶应用 + 「打开方式」子菜单（官方 open-in-app 路由）
-     *  - 「永久删除会话」「删除所有已归档会话」（仅已归档会话显示）
+     *  - 「永久删除会话」「删除所有已归档会话」（已归档会话显示；未归档会话需在设置里开启）
      * 目录从客户端服务里现取 —— 这样不依赖行组件的内部闭包。
      */
     function registerSessionMenu(ctx) {
@@ -1838,6 +2181,9 @@ window.__ModuleLoader__.load({
 .dsrm-app-icon{width:14px;height:14px;border-radius:3px;display:block;object-fit:contain}
 .dsrm-settings{max-width:820px;margin:0 auto;padding:2px 0 36px}
 .dsrm-settings-title{margin:0;font-size:16px;line-height:24px;font-weight:600}
+.dsrm-settings-subtitle{margin-top:28px}
+.dsrm-settings-groups{margin-top:10px;display:flex;flex-direction:column;gap:18px}
+.dsrm-settings-group-title{color:var(--dsw-alias-label-secondary);font-size:12px;line-height:18px;font-weight:600;margin-bottom:2px}
 .dsrm-settings-note{margin-top:8px;color:var(--dsw-alias-label-tertiary);font-size:12px;line-height:18px}
 .dsrm-settings-list{margin-top:10px;display:flex;flex-direction:column}
 .dsrm-settings-row{display:flex;align-items:center;justify-content:space-between;gap:24px;padding:14px 0;border-top:.5px solid var(--dsw-alias-border-l2)}
@@ -1912,9 +2258,11 @@ window.__ModuleLoader__.load({
 
     function install() {
       window.addEventListener('contextmenu', onContextMenu, true);
+      document.addEventListener('click', onWorkspaceEllipsisClick, true);
       console.info('[dsh-sidebar-row-menu] installed');
       return () => {
         window.removeEventListener('contextmenu', onContextMenu, true);
+        document.removeEventListener('click', onWorkspaceEllipsisClick, true);
         closeMenu();
         closeToast();
       };