dsh-better-workspace 0.37.3 → 0.38.0

package/README.md

@@ -55,7 +55,7 @@
 <table>
 <tr>
 <td align="center" width="58%"><img src="docs/screenshots/5-context-menu.png" alt="右键菜单"/></td>
-<td valign="top"><b>右键菜单</b><br/>操作都收进右键:工作区行——重命名 / 删除 / 分叉 / 归档 / 自定义外观 / <b>修改工作区默认预设</b>(v0.32.0 起,改写该工作区常驻新会话所用的 agent 预设,走官方同一通道;内置预设显示官方本地化名——标准模式 / PTC 模式 / 极简模式 / 创造模式,v0.33.0 起;工作区暂无待命新会话时,确认后会预备一个带所选预设的新会话作为该工作区默认);工作区分组行——重命名分组(同步更新组内所有工作区名称)/ 自定义外观;会话与会话分组行——重命名 / 分叉 / 归档 / 自定义外观;会话行另有<b>复制 Session ID</b>(v0.30.0 起,对齐 dsh 0.2.1-alpha.5 官方会话菜单第五项——写剪贴板走宿主原语,复制成功与否均有提示)。</td>
+<td valign="top"><b>右键菜单</b><br/>操作都收进右键:工作区行——重命名 / 删除 / 分叉 / 归档 / 自定义外观 / <b>修改工作区默认预设</b>(v0.32.0 起,改写该工作区常驻新会话所用的 agent 预设,走官方同一通道;内置预设显示官方本地化名——标准模式 / PTC 模式 / 极简模式 / 创造模式,v0.33.0 起;工作区暂无待命新会话时,确认后会预备一个带所选预设的新会话作为该工作区默认);工作区分组行——重命名分组(同步更新组内所有工作区名称)/ 自定义外观;会话与会话分组行——重命名 / 分叉 / 归档 / 自定义外观;会话行另有<b>复制 Session ID</b>(v0.30.0 起,对齐 dsh 0.2.1-alpha.5 官方会话菜单第五项——写剪贴板走宿主原语,复制成功与否均有提示)。<br/><b>v0.38.0 起接入官方统一右键菜单</b>:会话/工作区行由宿主共享菜单渲染,官方条目与插件补充项(移动到分组 / 移出分组 / 自定义外观 / 修改默认预设,排在分隔线之后)同席,官方新增条目会自动出现;分组行仍用插件菜单,旧宿主回退原菜单。</td>
 </tr>
 </table>
 
@@ -124,6 +124,7 @@ DSH 的侧边栏浏览区是一个公开插槽 `sidebar.workspaces`(single),官
 - **dsh 0.1.6-alpha.1**:图标集与浏览器注入面都变了,本插件 **0.10.2 起自动适配**——图标网格只列本宿主真正导出的字形(退役的 `IconSendOutline16` 自动落到等价的 `IconSendOutline14`,已保存的旧选择不会变成空图标位),会话拖拽排序在宿主不再注入 `insertSessionBefore` 时改用浏览器本地顺序,**功能不丢**。升级 dsh 与升级插件谁先谁后都收敛。
 - **dsh 0.1.6-alpha.2**:设置页重组——本插件 **0.12.0 起双座位**注册设置卡片(旧宿主的 设置→插件 卡片 + 新宿主 插件面板 bundle 页,按包名挂载);工作区树新增**磁盘目录嵌套层**(官方 workspace-tree 语义),添加工作区回归官方目录流(原生选择器 / 官方应用内浏览器)。
 - **dsh 0.2.2-alpha.2**:自绘会话行渲染官方 `sidebar.session.row.trailing` 行尾座位(时间之后、置顶角标之前;空会话不渲染),官方实验性 worktree / PR 图标因此在插件接管侧栏后仍能出现;同时接受官方的空白会话复用语义(不传 `agentPreset` 时会复用同工作区任意 preset 的空白会话)。该座位按能力探测:老宿主没有它时行尾照常渲染,不会因此报错。兼容下限保持 `>=0.1.6-alpha.2`。
+- **dsh 0.2.2-alpha.3**:会话/工作区行接入官方统一右键菜单(`contextMenus`)——官方条目与插件补充项同席,插件条目 order 700、排在其后并以分隔线隔开,官方今后新增的条目会自动出现。工作区分组 / 会话分组行是插件私有虚拟对象,仍用插件菜单;没有该服务的旧宿主整体回退本地菜单,兼容下限保持 `>=0.1.6-alpha.2`。
 - **跨端**:web 与桌面共用同一套客户端资产;外观 / 开关可经设置卡片手动跨端同步,**折叠状态与会话本地序每端本地**(设计如此)。
 
 ## 限制与路线图

package/README_EN.md

@@ -55,7 +55,7 @@ Session titles nest on `/` too (e.g. `test1/plugin maintenance`). Session groups
 <table>
 <tr>
 <td align="center" width="58%"><img src="docs/screenshots/5-context-menu.png" alt="Context menu"/></td>
-<td valign="top"><b>Context menu everywhere</b><br/>Actions live in the right-click menu: workspace rows — rename / delete / fork / archive / customize; folder rows — rename group (updates all descendant workspaces) / customize; session &amp; session-group rows — rename / fork / archive / customize; session rows also get <b>Copy Session ID</b> (v0.30.0, mirroring dsh 0.2.1-alpha.5's fifth official menu entry — the clipboard write rides the host primitive, with a notice either way).</td>
+<td valign="top"><b>Context menu everywhere</b><br/>Actions live in the right-click menu: workspace rows — rename / delete / fork / archive / customize; folder rows — rename group (updates all descendant workspaces) / customize; session &amp; session-group rows — rename / fork / archive / customize; session rows also get <b>Copy Session ID</b> (v0.30.0, mirroring dsh 0.2.1-alpha.5's fifth official menu entry — the clipboard write rides the host primitive, with a notice either way).<br/><b>Since v0.38.0 the shared host context menu owns session/workspace rows</b>: official entries and this plugin's extras (move to group / move out / customize / default preset, after a separator) share one popup, and future official entries appear automatically; group rows keep the plugin menu and older hosts fall back to it.</td>
 </tr>
 </table>
 
@@ -101,6 +101,7 @@ Same `dsh-better-*` family, zero overlap: [dsh-better-sidebar](https://github.co
 - **dsh 0.1.6-alpha.1**: both the primitives icon set and the browser injection face changed; this plugin **adapts automatically since 0.10.2**. The icon grid only lists glyphs this host actually exports (the retired `IconSendOutline16` resolves to the equivalent `IconSendOutline14`, so a previously saved choice never turns into an empty icon slot), and session drag-to-reorder falls back to a browser-local order when the host no longer injects `insertSessionBefore` — **no feature is lost**. Either upgrade order (plugin first or dsh first) converges.
 - **dsh 0.1.6-alpha.2**: the settings pages were reworked — since **0.12.0** this plugin registers its settings card on **both seats** (the pre-alpha.2 Settings → Plugins card and the alpha.2+ Plugins panel's bundle page, keyed by package name); the tree gains the **disk-nesting layer** (official workspace-tree semantics) and add-workspace rides the official directory flow (native chooser / official in-app browser).
 - **dsh 0.2.2-alpha.2**: the hand-drawn session rows now render the shipped `sidebar.session.row.trailing` seat (after the time, before the pin badge; blank rows skip it), so the official experimental worktree / PR icons still appear after this plugin takes over the sidebar. The plugin also accepts the host's blank-session reuse semantics (without `agentPreset`, a blank from any preset in the same workspace may be reused). The seat is capability-probed: hosts without it keep rendering the row tail and never error. The compatibility floor stays `>=0.1.6-alpha.2`.
+- **dsh 0.2.2-alpha.3**: session/workspace rows join the shipped unified context menu (`contextMenus`) — official entries and this plugin's extras share one popup, the extras sit at order 700 after a separator, and future official entries appear automatically. Workspace-group / session-group rows are plugin-private virtual objects and keep the plugin menu; older hosts without the service fall back to the local menu, and the compatibility floor stays `>=0.1.6-alpha.2`.
 - **Across surfaces**: web and desktop share one set of client assets; appearance / switches sync manually through the settings card, while **collapse state and the local session order stay per-browser** by design.
 
 ## Limitations / roadmap

package/dsh.plugin.json

@@ -1,6 +1,6 @@
 {
   "id": "dsh-external/dsh-better-workspace",
-  "version": "0.37.3",
+  "version": "0.38.0",
   "main": "./src/index.js",
   "description": "侧边栏工作区树:按官方磁盘目录嵌套(官方 workspace-tree 语义),可选按名称中的 / 分组(默认关闭,设置里开启);新会话页的工作区选择器同树。Workspace tree for the DSH sidebar workspace list, nested by official disk folders with optional \"/\"-name grouping; the New Session workspace picker shows the same tree.",
   "engines": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-better-workspace",
-  "version": "0.37.3",
+  "version": "0.38.0",
   "description": "侧边栏工作区树:按官方磁盘目录嵌套(官方 workspace-tree 语义),可选按名称中的 / 分组(默认关闭,设置里开启);新会话页的工作区选择器同树(同一份视图选项即时同步);添加工作区走官方目录流。Workspace tree for the DSH sidebar: disk-path nesting (official workspace-tree semantics), with optional \"/\"-name grouping (off by default), and the same tree in the New Session workspace picker; add-workspace rides the official directory flow.",
   "type": "module",
   "repository": {
@@ -31,7 +31,8 @@
         "@deepseek-ai/dsh-client-ui-slots",
         "@deepseek-ai/dsh-client-ui-conversation",
         "@deepseek-ai/dsh-client-modules",
-        "@deepseek-ai/dsh-api-remotes"
+        "@deepseek-ai/dsh-api-remotes",
+        "@deepseek-ai/dsh-client-ui-context-menu"
       ],
       "platform": "web"
     }

package/src/client.js

@@ -5366,6 +5366,42 @@ window.__ModuleLoader__.load({
         )
         : HOST_SNAP_UNAVAILABLE
     }
+    // dsh 0.2.2-alpha.3: the shared context menu owns the popup, so its
+    // captured target (not our local ctx) decides which row keeps the open
+    // state. Capability probing stays inside the callbacks — old hosts have
+    // no service and the hook degrades to a stable null.
+    // Late-arriving shared menu: the row highlight subscribes to face.active,
+    // but the face itself can be adopted AFTER the first render (soft inject).
+    // A tiny module-level revision bus re-renders those rows once, so the
+    // highlight starts following the official target without waiting for an
+    // unrelated store tick.
+    const menuFaceListeners = new Set()
+    const subscribeMenuFace = (listener) => {
+      menuFaceListeners.add(listener)
+      return () => { menuFaceListeners.delete(listener) }
+    }
+    const notifyMenuFace = () => {
+      for (const listener of Array.from(menuFaceListeners)) {
+        try { listener() } catch { /* one stale row must not stop the rest */ }
+      }
+    }
+    const useActiveContextMenu = (faceOf) => {
+      const [, bumpFace] = React.useState(0)
+      React.useEffect(() => {
+        if (typeof faceOf === 'function' && faceOf()) return undefined
+        return subscribeMenuFace(() => bumpFace((value) => value + 1))
+      }, [])
+      const face = typeof faceOf === 'function' ? faceOf() : null
+      const active = face && face.active
+      return HAS_USE_SYNC_EXTERNAL_STORE
+        ? React.useSyncExternalStore(
+          (onChange) => (active && typeof active.subscribe === 'function' ? active.subscribe(onChange) : () => {}),
+          () => {
+            try { return active && typeof active.getSnapshot === 'function' ? active.getSnapshot() : null } catch { return null }
+          },
+        )
+        : null
+    }
 
     // MANUAL cross-device sync (user-chosen, never automatic): the settings
     // card offers a pull button ("从客户端获取" on the web / "从 Web 获取" in
@@ -6125,6 +6161,23 @@ window.__ModuleLoader__.load({
       }
     }
 
+    // dsh 0.2.2-alpha.3 keyboard trigger, mirroring the shared menu's own
+    // getTriggerProps: ContextMenu or Shift+F10 opens the row menu and the
+    // row itself is reachable with Tab. Kept local (not the official helper)
+    // so the SAME openCtx path still owns the target payload and the fallback
+    // to the local menu on hosts without the service.
+    const menuTriggerProps = (onContextMenu) => typeof onContextMenu !== 'function' ? {} : {
+      tabIndex: 0,
+      onKeyDown: (event) => {
+        if (!event || event.repeat || event.isComposing || event.ctrlKey || event.altKey || event.metaKey) return
+        if (event.key !== 'ContextMenu' && !(event.shiftKey && event.key === 'F10')) return
+        event.preventDefault()
+        event.stopPropagation()
+        try { event.currentTarget.focus() } catch { /* detached row */ }
+        onContextMenu(event)
+      },
+    }
+
     function FolderRow({ node, depth, expanded, onToggle, onContextMenu, dropInto, dropSlot, dragEvents, custStyle, iconMode, pulse, active, dataRowKey, t }) {
       const total = countWorkspaces(node)
       const iconEl = iconOf(iconMode, expanded)
@@ -6149,6 +6202,7 @@ window.__ModuleLoader__.load({
         role: 'treeitem',
         'aria-expanded': expanded,
         ...(dragEvents || {}),
+        ...menuTriggerProps(onContextMenu),
       },
         // Official projectRow duality (Rows.module.css): the chevron hides
         // until hover, swapping in for the folder glyph; the arrow spins
@@ -6179,6 +6233,7 @@ window.__ModuleLoader__.load({
         role: 'treeitem',
         'aria-expanded': sessionsOpen,
         ...(dragEvents || {}),
+        ...menuTriggerProps(onContextMenu),
       },
         // Official projectRow duality (Rows.module.css): the chevron hides
         // until hover, swapping in for the folder glyph; the arrow spins
@@ -6429,6 +6484,7 @@ window.__ModuleLoader__.load({
         role: 'treeitem',
         'aria-description': node.archived ? archivedTitle || undefined : undefined,
         ...(dragEvents || {}),
+        ...menuTriggerProps(onContextMenu),
       },
         E('span', { className: 'bw-row-icon', title: status ? status.title : undefined },
           status && typeof ui.StateDot === 'function'
@@ -6486,6 +6542,7 @@ window.__ModuleLoader__.load({
         role: 'treeitem',
         'aria-expanded': expanded,
         ...(dragEvents || {}),
+        ...menuTriggerProps(onContextMenu),
       },
         // Session groups are a plugin concept: their chevron stays visible
         // (only the official container rows hide it until hover).
@@ -7666,6 +7723,7 @@ window.__ModuleLoader__.load({
         shippedBrowserFace, scheduleSeatReader, seatEntriesReader,
         officialT,
         presetFaceOf,
+        contextMenuFaceOf, setMenuBridge,
         t,
       } = props
       // Issue #13: local reads and writes go through OUR store instance, never
@@ -7684,6 +7742,10 @@ window.__ModuleLoader__.load({
       // Every consumer below keeps reading this local, so a late-arriving
       // agent-preset service is picked up by the next render's menu build.
       const presetFace = typeof presetFaceOf === 'function' ? presetFaceOf() : null
+      // Official menu integration (alpha.3): the active target drives the
+      // workspace row's open state, while the bridge carries the live bw
+      // extras into the apply-level contribution.
+      const activeContextMenu = useActiveContextMenu(contextMenuFaceOf)
 
       if (typeof useWorkspaces !== 'function' || typeof useSessions !== 'function') {
         console.error('[dsh-better-workspace] standard snapshot hooks missing; browser renders nothing')
@@ -8521,9 +8583,53 @@ window.__ModuleLoader__.load({
       const sessionsOpenOf = (workspaceId) => (sessionsExpandedMap ? sessionsExpandedMap[workspaceId] !== false : true)
       const sessionGroupOpen = (key) => (sessionGroupsMap ? sessionGroupsMap[key] !== false : true)
 
+      // Keyboard triggers carry clientX/clientY = 0. Mirror the shared menu's
+      // own trigger: (0,0) anchors the popup at the focused row's bottom-left
+      // instead of the viewport corner. Pointer events pass their point
+      // through untouched.
+      const menuPointOf = (e) => {
+        const x = e && Number.isFinite(e.clientX) ? e.clientX : 0
+        const y = e && Number.isFinite(e.clientY) ? e.clientY : 0
+        if (x !== 0 || y !== 0) return { x, y }
+        const target = e && e.currentTarget
+        const rect = target && typeof target.getBoundingClientRect === 'function' ? target.getBoundingClientRect() : null
+        return rect ? { x: rect.left, y: rect.bottom } : { x, y }
+      }
       const openCtx = (kind, payload, e) => {
         if (e) e.preventDefault()
-        setCtx({ kind, payload, x: e.clientX, y: e.clientY })
+        const point = menuPointOf(e)
+        // dsh 0.2.2-alpha.3: session and workspace are official target
+        // families, so the shared popup owns their entries (official ones
+        // plus our order-700 extras). Folder/session-group rows are virtual
+        // objects with no official family and keep the local menu. Hosts
+        // without the service keep the local menu for everything.
+        if (e && (kind === 'session' || kind === 'workspace')) {
+          const face = typeof contextMenuFaceOf === 'function' ? contextMenuFaceOf() : null
+          if (face && typeof face.open === 'function') {
+            try {
+              if (kind === 'session') {
+                face.open({
+                  kind: 'session',
+                  value: { sessionId: payload.id, displayTitle: String(payload.title || '') },
+                }, point)
+              } else {
+                face.open({
+                  kind: 'workspace',
+                  value: {
+                    workspaceId: payload.workspaceId,
+                    path: String(payload.path || ''),
+                    displayTitle: String(payload.title || payload.leaf || ''),
+                  },
+                }, point)
+              }
+              setCtx(null)
+              return
+            } catch (error) {
+              console.warn('[dsh-better-workspace] official context menu open failed; using local menu', error)
+            }
+          }
+        }
+        setCtx({ kind, payload, ...point })
       }
 
       // Session-action surface (v0.20.0, official mirror): the right-click
@@ -10233,8 +10339,13 @@ window.__ModuleLoader__.load({
           // The in-row ellipsis is retired; the ctx surface stays the
           // right-click path. While the menu is open the row still pins
           // (hover fill + visible actions), matching the official menuOpen
-          // state.
-          menuOpen: !!(ctx && ctx.kind === 'workspace' && ctx.payload && ctx.payload.workspaceId === workspace.workspaceId),
+          // state — the shared popup reports its captured target through
+          // contextMenus.active, while older hosts keep the local ctx.
+          menuOpen: !!(
+            (ctx && ctx.kind === 'workspace' && ctx.payload && ctx.payload.workspaceId === workspace.workspaceId)
+            || (activeContextMenu && activeContextMenu.kind === 'workspace'
+              && activeContextMenu.value && activeContextMenu.value.workspaceId === workspace.workspaceId)
+          ),
           hoverBody: workspaceHoverBody,
           dropHalf: wsDropHalf(workspace.workspaceId),
           dropInto: wsRootDropActive(workspace.workspaceId) || wsGroupIntoActive(workspace.workspaceId),
@@ -10497,6 +10608,13 @@ window.__ModuleLoader__.load({
           customizeEntry,
         ]
       }
+      // One group-LEAVING implementation for the local menu and the official
+      // contribution: retitle to the leaf and let the user-touch wrapper pin it.
+      const moveSessionOut = (payload) => {
+        const title = String(payload.title || '')
+        const leaf = leafOf(title)
+        if (leaf !== title) Promise.resolve().then(() => renameByUser(payload.id, leaf)).catch(fail)
+      }
       const pickSessionAction = (payload, id) => {
         if (id === 'rename') { setDialog({ kind: 'sess-rename', session: payload }); return true }
         if (id === 'fork') { forkSession(payload.id); return true }
@@ -10536,13 +10654,48 @@ window.__ModuleLoader__.load({
         }
         // Plain retitle back to the leaf: the row leaves its group and
         // returns to the top level of its workspace (v0.18.0).
-        if (id === 'move-out') {
-          const leaf = leafOf(String(payload.title || ''))
-          if (leaf !== payload.title) Promise.resolve().then(() => renameByUser(payload.id, leaf)).catch(fail)
-          return true
-        }
+        if (id === 'move-out') { moveSessionOut(payload); return true }
         return false
       }
+      // Shared workspace-preset flow: the local menu and the official
+      // contribution both land here, so the blank-session rules cannot drift.
+      const openWorkspacePresetDialog = (payload) => {
+        if (!presetFace) return
+        // Freeze the target NOW (the dialog outlives the menu ctx): the
+        // blank lookup mirrors the official createInWorkspace rule — a
+        // standing blank IS the workspace default (its preset projection
+        // is what the hero chip shows). With NO standing blank the edit
+        // still applies: ClientSessions.create prepares one WITH the
+        // picked preset (the same channel as the official new-session
+        // button), which makes it the workspace default. Creating a
+        // session here is deliberate, not a side effect — the host has
+        // no other per-workspace default store (agent-preset-registry
+        // selectedDefault is GLOBAL; the standing blank IS the carrier).
+        const raw = (storedItems || []).find((item) => item.workspaceId === payload.workspaceId)
+        const blankIds = raw && Array.isArray(raw.sessionIds) ? raw.sessionIds : []
+        const blankId = raw && raw.path
+          ? (list.ids || []).find((sid) => {
+            const summary = list.byId[sid]
+            return summary && summary.blank === true && summary.cwd === raw.path
+              && blankIds.indexOf(sid) !== -1 && !archivedSet.has(sid)
+          })
+          : undefined
+        const blankSummary = blankId !== undefined ? list.byId[blankId] : undefined
+        const projection = blankSummary ? blankSummary.projectionValues : undefined
+        setDialog({
+          kind: 'ws-preset',
+          hasBlank: blankId !== undefined,
+          applyPreset: blankId !== undefined
+            ? (presetId) => presetFace.select(blankId, presetId)
+            // Reuse declined / no draft to reuse: create WITH the preset.
+            // Shape matches select's { ok } contract; a SessionCreateError
+            // lands in the dialog as an inline refusal line.
+            : (presetId) => Promise.resolve()
+              .then(() => sessions.create({ cwd: raw.path, agentPreset: presetId }))
+              .then(() => ({ ok: true }), (reason) => ({ ok: false, refusal: reason instanceof Error ? reason.message : String(reason || 'session create failed') })),
+          current: projection && typeof projection.agentPreset === 'string' ? projection.agentPreset : undefined,
+        })
+      }
       const menuEntries = () => {
         if (ctx === null) return []
         const customizeEntry = { id: 'customize', label: t('custom.title'), icon: icon('IconPersonalizationOutline16', 16) }
@@ -10624,42 +10777,7 @@ window.__ModuleLoader__.load({
         else if (kind === 'sgroup' && id === 'delete-sgroup') setDialog({ kind: 'sgroup-delete', target: payload })
         else if (kind === 'workspace' && id === 'rename') setDialog({ kind: 'ws-rename', workspace: payload })
         else if (kind === 'workspace' && id === 'delete') setDialog({ kind: 'ws-delete', workspace: payload })
-        else if (kind === 'workspace' && id === 'ws-preset' && presetFace) {
-          // Freeze the target NOW (the dialog outlives the menu ctx): the
-          // blank lookup mirrors the official createInWorkspace rule — a
-          // standing blank IS the workspace default (its preset projection
-          // is what the hero chip shows). With NO standing blank the edit
-          // still applies: ClientSessions.create prepares one WITH the
-          // picked preset (the same channel as the official new-session
-          // button), which makes it the workspace default. Creating a
-          // session here is deliberate, not a side effect — the host has
-          // no other per-workspace default store (agent-preset-registry
-          // selectedDefault is GLOBAL; the standing blank IS the carrier).
-          const raw = (storedItems || []).find((item) => item.workspaceId === payload.workspaceId)
-          const blankIds = raw && Array.isArray(raw.sessionIds) ? raw.sessionIds : []
-          const blankId = raw && raw.path
-            ? (list.ids || []).find((sid) => {
-              const summary = list.byId[sid]
-              return summary && summary.blank === true && summary.cwd === raw.path
-                && blankIds.indexOf(sid) !== -1 && !archivedSet.has(sid)
-            })
-            : undefined
-          const blankSummary = blankId !== undefined ? list.byId[blankId] : undefined
-          const projection = blankSummary ? blankSummary.projectionValues : undefined
-          setDialog({
-            kind: 'ws-preset',
-            hasBlank: blankId !== undefined,
-            applyPreset: blankId !== undefined
-              ? (presetId) => presetFace.select(blankId, presetId)
-              // Reuse declined / no draft to reuse: create WITH the preset.
-              // Shape matches select's { ok } contract; a SessionCreateError
-              // lands in the dialog as an inline refusal line.
-              : (presetId) => Promise.resolve()
-                .then(() => sessions.create({ cwd: raw.path, agentPreset: presetId }))
-                .then(() => ({ ok: true }), (reason) => ({ ok: false, refusal: reason instanceof Error ? reason.message : String(reason || 'session create failed') })),
-            current: projection && typeof projection.agentPreset === 'string' ? projection.agentPreset : undefined,
-          })
-        }
+        else if (kind === 'workspace' && id === 'ws-preset' && presetFace) openWorkspacePresetDialog(payload)
         else if (kind === 'sgroup' && id === 'rename-sgroup') setDialog({ kind: 'sgroup-rename', target: payload })
         else if (kind === 'session') {
           // The shared dispatcher owns every session verb (see
@@ -10668,6 +10786,40 @@ window.__ModuleLoader__.load({
         }
       }
 
+      // The official contribution runs outside this component, so it gets a
+      // live bridge to the SAME action implementations (dialogs included).
+      // The effect republishes after every render: slash switches, the preset
+      // face and the current session inventory all feed availability.
+      const menuBridgeValue = {
+        slashes: { session: sessionSlash, workspace: workspaceSlash },
+        hasPreset: () => !!presetFace,
+        groupPrefix: (title) => groupPrefixOf(title),
+        label: (key) => t(key),
+        customize: (kind, payload) => {
+          const name = kind === 'workspace' ? (payload.title || payload.leaf) : payload.title
+          setCustomize({ kind, entryKey: keyOf(kind, payload), name })
+        },
+        moveGroup: (kind, payload) => {
+          const title = kind === 'workspace' ? (payload.title || payload.leaf) : payload.title
+          const target = kind === 'workspace'
+            ? { kind: 'workspace', id: payload.workspaceId, title }
+            : { kind: 'session', id: payload.id, title }
+          setDialog({
+            kind: 'group-move',
+            target,
+            initial: groupPrefixOf(target.title),
+            groupPaths: collectGroupPaths(kind),
+          })
+        },
+        moveOut: moveSessionOut,
+        workspacePreset: (payload) => openWorkspacePresetDialog(payload),
+      }
+      React.useEffect(() => {
+        if (typeof setMenuBridge !== 'function') return undefined
+        setMenuBridge(menuBridgeValue)
+        return () => setMenuBridge(null)
+      })
+
       /* --------------------------- dialogs --------------------------- */
       // TextDialog / ConfirmDialog are module-level components: a per-render
       // inline definition would remount on every parent tick and drop input.
@@ -11161,6 +11313,17 @@ window.__ModuleLoader__.load({
       // the handle before any flow can open.
       pickerState.api = uiWorkspace
 
+      // dsh 0.2.2-alpha.3 context menus. The service is acquired SOFTLY for
+      // the same reason as remote.agentPresets: a hard inject would pend the
+      // whole bundle forever on older hosts. The bridge is written by the
+      // browser seat through browserInjected (a stable getter), so the
+      // contribution resolves against the same dialogs and switches the
+      // local menu uses.
+      let contextMenus = null
+      let menuBridge = null
+      let menusRegistered = false
+      const setMenuBridge = (bridge) => { menuBridge = bridge }
+
       // The OFFICIAL browser's own dictionary (NS 'workspace'), bound so the
       // context menu COPY follows upstream wording automatically — the menu
       // mirrors the official row menus item-for-item (Rows.tsx), and this
@@ -11263,6 +11426,126 @@ window.__ModuleLoader__.load({
         }
       }
 
+      // The official shared menu owns session/workspace rows from alpha.3 on.
+      // The built-in contributions cover pin/rename/fork/copy/archive and
+      // workspace rename/delete; these two bring the bw-only verbs (name
+      // groups, Customize appearance, the workspace default preset) after
+      // them. The first extra carries the separator, so the popup keeps the
+      // same grouping the retired local menu had.
+      const withMenuSeparator = (actions) => actions.map((action, index) => index === 0
+        ? Object.assign({}, action, { separatorBefore: true })
+        : action)
+      const registerContextMenus = (menus) => {
+        if (!menus || menusRegistered) return
+        if (typeof menus.register !== 'function' || typeof menus.open !== 'function') return
+        menusRegistered = true
+        const sessionExtras = {
+          id: 'bw-session-extras',
+          target: 'session',
+          order: 700,
+          resolve: (target) => {
+            const bridge = menuBridge
+            if (!bridge) return []
+            const title = String((target && target.displayTitle) || '')
+            const actions = []
+            if (bridge.slashes && bridge.slashes.session) {
+              actions.push({
+                id: 'bw-move-group',
+                label: bridge.label('menu.moveToGroup'),
+                run: () => bridge.moveGroup('session', { id: target.sessionId, title }),
+              })
+            }
+            if (bridge.groupPrefix && bridge.groupPrefix(title) !== '') {
+              actions.push({
+                id: 'bw-move-out',
+                label: bridge.label('menu.moveOutGroup'),
+                run: () => bridge.moveOut({ id: target.sessionId, title }),
+              })
+            }
+            actions.push({
+              id: 'bw-customize',
+              label: bridge.label('custom.title'),
+              run: () => bridge.customize('session', { id: target.sessionId, title }),
+            })
+            return withMenuSeparator(actions)
+          },
+        }
+        const workspaceExtras = {
+          id: 'bw-workspace-extras',
+          target: 'workspace',
+          order: 700,
+          resolve: (target) => {
+            const bridge = menuBridge
+            if (!bridge) return []
+            const title = String((target && target.displayTitle) || '')
+            const payload = { workspaceId: target.workspaceId, path: target.path, title, leaf: title }
+            const actions = []
+            if (bridge.slashes && bridge.slashes.workspace) {
+              actions.push({
+                id: 'bw-move-group',
+                label: bridge.label('menu.moveToGroup'),
+                run: () => bridge.moveGroup('workspace', payload),
+              })
+            }
+            actions.push({
+              id: 'bw-customize',
+              label: bridge.label('custom.title'),
+              run: () => bridge.customize('workspace', payload),
+            })
+            if (bridge.hasPreset && bridge.hasPreset()) {
+              actions.push({
+                id: 'bw-ws-preset',
+                label: bridge.label('menu.workspacePreset'),
+                run: () => bridge.workspacePreset(payload),
+              })
+            }
+            return withMenuSeparator(actions)
+          },
+        }
+        try {
+          ctx.effect(() => {
+            const disposers = []
+            try { disposers.push(menus.register(sessionExtras)) } catch (registerError) {
+              console.warn('[dsh-better-workspace] session context menu registration failed', registerError)
+            }
+            try { disposers.push(menus.register(workspaceExtras)) } catch (registerError) {
+              console.warn('[dsh-better-workspace] workspace context menu registration failed', registerError)
+            }
+            return () => {
+              for (const dispose of disposers) {
+                try { dispose() } catch { /* already withdrawn */ }
+              }
+            }
+          }, 'better-workspace: context menu contributions')
+        } catch (effectError) {
+          console.warn('[dsh-better-workspace] context menu effect failed', effectError)
+        }
+      }
+      const adoptContextMenus = (candidate) => {
+        if (!candidate || typeof candidate.register !== 'function' || typeof candidate.open !== 'function') return
+        const changed = contextMenus !== candidate
+        contextMenus = candidate
+        registerContextMenus(candidate)
+        if (changed) notifyMenuFace()
+      }
+      try { adoptContextMenus(ctx.get('contextMenus')) } catch (contextMenuProbeError) {
+        console.warn('[dsh-better-workspace] context menu probe failed', contextMenuProbeError)
+      }
+      if (!contextMenus && ctx && typeof ctx.inject === 'function') {
+        // Late arrival: the shared menu service mounts after this bundle on
+        // some boots. A soft child fiber waits for it; old hosts simply keep
+        // the fiber pending and the local menu stays in charge.
+        try {
+          ctx.inject(['contextMenus'], (fctx) => {
+            try { adoptContextMenus(fctx && fctx.contextMenus) } catch (lateError) {
+              console.warn('[dsh-better-workspace] context menu late face failed', lateError)
+            }
+          })
+        } catch (injectError) {
+          console.warn('[dsh-better-workspace] context menu soft inject failed', injectError)
+        }
+      }
+
       if (ctx.locale && typeof ctx.locale.register === 'function') {
         ctx.effect(() => {
           try {
@@ -11346,6 +11629,12 @@ window.__ModuleLoader__.load({
         // closure live, so every render and every menu build re-asks; hosts
         // without the service keep returning null, which simply hides the row.
         presetFaceOf: () => presetFace,
+        // dsh 0.2.2-alpha.3: the shared context-menu service (getter for the
+        // same late-arrival reason as presetFaceOf; null on older hosts, which
+        // keep the local menu) and the live action bridge its contribution
+        // reads. The getter is what openCtx probes on every right-click.
+        contextMenuFaceOf: () => contextMenus,
+        setMenuBridge,
         // Issue #13: the PRIVATE store face — a stable getter like presetFaceOf
         // (the slot renderer caches inject results; keep the same discipline
         // even though this face never changes).