dsh-better-workspace 0.36.14 → 0.37.1

package/README.md

@@ -123,6 +123,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`。
 - **跨端**:web 与桌面共用同一套客户端资产;外观 / 开关可经设置卡片手动跨端同步,**折叠状态与会话本地序每端本地**(设计如此)。
 
 ## 限制与路线图

package/README_EN.md

@@ -100,6 +100,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`.
 - **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.36.14",
+  "version": "0.37.1",
   "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.36.14",
+  "version": "0.37.1",
   "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": {

package/src/client.js

@@ -4878,9 +4878,10 @@ window.__ModuleLoader__.load({
       // it is supposed to support.
       '.bw-row-count,.bw-row-time{-webkit-text-stroke-width:0}',
       '.bw-schedule-badge{flex:none;display:inline-flex;align-items:center;color:var(--dsw-alias-label-tertiary,#9a9a9a);margin:0 6px}',
+      '.bw-row-trailing{flex:none;display:inline-flex;align-items:center;gap:6px;color:var(--dsw-alias-label-tertiary,#9a9a9a)}',
       '.bw-row-actions{flex:none;display:none;align-items:center;gap:15px}',
       '.bw-row:hover .bw-row-actions,.bw-row.menu-open .bw-row-actions{display:flex}',
-      '.bw-row:hover .bw-row-time,.bw-row:hover .bw-row-count,.bw-row:hover .bw-schedule-badge,.bw-row:hover .bw-pin-indicator,.bw-row.menu-open .bw-row-time,.bw-row.menu-open .bw-row-count,.bw-row.menu-open .bw-schedule-badge,.bw-row.menu-open .bw-pin-indicator{display:none}',
+      '.bw-row:hover .bw-row-time,.bw-row:hover .bw-row-count,.bw-row:hover .bw-schedule-badge,.bw-row:hover .bw-row-trailing,.bw-row:hover .bw-pin-indicator,.bw-row.menu-open .bw-row-time,.bw-row.menu-open .bw-row-count,.bw-row.menu-open .bw-schedule-badge,.bw-row.menu-open .bw-row-trailing,.bw-row.menu-open .bw-pin-indicator{display:none}',
       '.bw-row-archived .bw-row-label{color:var(--dsw-alias-label-caption,#8a8a8a)}',
       '.bw-pin-indicator{flex:none;display:inline-flex;align-items:center;justify-content:center;width:16px;height:20px;color:var(--dsw-alias-label-caption,#adb2b8);margin:0 0 0 6px}',
       '.bw-overflow-row{display:block;width:100%;text-align:left;border:0;background:transparent;color:var(--dsw-alias-label-tertiary,#9a9a9a);font-size:12px;cursor:pointer;padding:4px 6px;font-family:inherit}',
@@ -6306,6 +6307,22 @@ window.__ModuleLoader__.load({
           t: scheduleSeat.t,
         }))
         : null
+      // Official alpha.2 row-trailing strip: a list seat nested INSIDE the
+      // row, between the time cell and the pin marker, hidden while the hover
+      // actions show. Officially populated by the experimental worktree/PR
+      // icon; rendering it here keeps that surface visible in our sidebar.
+      const trailingSeats = sessionActions && Array.isArray(sessionActions.trailingSeat)
+        ? sessionActions.trailingSeat
+        : []
+      const trailingNode = !node.blank && trailingSeats.length > 0
+        ? E('span', { className: 'bw-row-trailing' }, trailingSeats.map((seat, index) => E(QuietBoundary, {
+          key: 'trailing-seat-' + index,
+        }, E(ShippedSeatOccupant, {
+          seat,
+          ownerProps: { sessionId: node.id },
+          t: seat.t,
+        }))))
+        : null
       // Official mirror surface (dsh 0.1.7 Rows.tsx): pinned rows carry the
       // pin marker; archived rows render grayed and never open; the hover
       // strip hosts the "..." trigger and the pin/archive quick buttons.
@@ -6410,6 +6427,7 @@ window.__ModuleLoader__.load({
         // Official blank rows carry no time, no pin, no actions (a standing
         // "new session" placeholder, not a session).
         !node.blank ? E('span', { className: 'bw-row-time' }, timeLabel(node.updatedAt, now, t)) : null,
+        trailingNode,
         !node.blank && node.pinned ? E('span', { className: 'bw-pin-indicator', role: 'img', 'aria-label': pinnedTitle || undefined, title: pinnedTitle || undefined }, icon('IconPinFillRegular', 13)) : null,
         strip,
       )
@@ -7863,6 +7881,7 @@ window.__ModuleLoader__.load({
       // off the ledger like the schedule mark.
       const seatEntriesOf = typeof seatEntriesReader === 'function' ? seatEntriesReader : null
       const rowActionSeat = seatEntriesOf ? seatEntriesOf('sidebar.workspaces.session.row.action') : []
+      const trailingSeat = seatEntriesOf ? seatEntriesOf('sidebar.session.row.trailing') : []
       const hoverSeat = seatEntriesOf ? seatEntriesOf('sidebar.session.row.hover') : []
       /** Effective catalog row of one shipped command (current keybinding, label). */
       const shortcutRowOf = (id) => {
@@ -8565,6 +8584,7 @@ window.__ModuleLoader__.load({
         // reproduction cannot supply); the context menu keeps every entry
         // through sessionMenuEntriesFor + handleCtxPick.
         rowActionSeat,
+        trailingSeat,
         rename: (node) => setDialog({ kind: 'sess-rename', session: node }),
         hoverBody: (node, status) => sessionHoverBody(node, status),
         explainArchived: () => {
@@ -10617,29 +10637,6 @@ window.__ModuleLoader__.load({
 
       /* ---------------------------- render --------------------------- */
 
-      if (!wide) {
-        return E('div', { className: 'bw-rail' },
-          StyleNode(),
-          E('button', {
-            type: 'button',
-            className: 'bw-rail-btn',
-            'aria-label': shortcutLabel(t('rail.search'), 'session.search'),
-            'aria-keyshortcuts': shortcutAria('session.search'),
-            title: shortcutLabel(t('rail.search'), 'session.search'),
-            onClick: () => { expandSidebar(); setSearchOpen(true); setFocusPending(true) },
-          }, icon('IconSearchOutline16', 18)),
-          flowAvailable ? E('button', {
-            type: 'button',
-            className: 'bw-rail-btn',
-            'aria-label': shortcutLabel(t('rail.add'), 'workspace.add'),
-            'aria-keyshortcuts': shortcutAria('workspace.add'),
-            title: shortcutLabel(t('rail.add'), 'workspace.add'),
-            onClick: () => { expandSidebar(); startAddFlow() },
-            disabled: flowBusy,
-          }, icon('IconProjectAddOutline16', 18)) : null,
-        )
-      }
-
       const dialogElement = (() => {
         if (dialog === null) return null
         if (dialog.kind === 'ws-rename') return E(TextDialog, {
@@ -10860,6 +10857,29 @@ window.__ModuleLoader__.load({
       // definition: the ref is the one stable handle it can call.
       startAddFlowRef.current = startAddFlow
 
+      if (!wide) {
+        return E('div', { className: 'bw-rail' },
+          StyleNode(),
+          E('button', {
+            type: 'button',
+            className: 'bw-rail-btn',
+            'aria-label': shortcutLabel(t('rail.search'), 'session.search'),
+            'aria-keyshortcuts': shortcutAria('session.search'),
+            title: shortcutLabel(t('rail.search'), 'session.search'),
+            onClick: () => { expandSidebar(); setSearchOpen(true); setFocusPending(true) },
+          }, icon('IconSearchOutline16', 18)),
+          flowAvailable ? E('button', {
+            type: 'button',
+            className: 'bw-rail-btn',
+            'aria-label': shortcutLabel(t('rail.add'), 'workspace.add'),
+            'aria-keyshortcuts': shortcutAria('workspace.add'),
+            title: shortcutLabel(t('rail.add'), 'workspace.add'),
+            onClick: () => { expandSidebar(); startAddFlow() },
+            disabled: flowBusy,
+          }, icon('IconProjectAddOutline16', 18)) : null,
+        )
+      }
+
       // v0.18.0 — "drag it OUT" must never land on nothing. The row level
       // already covers the workspace row and the root-level session rows; this
       // catches everything else (the empty space below the tree, the header