dsh-better-workspace 0.9.1 → 0.9.3

package/README.md

@@ -61,7 +61,7 @@ web/                 ← 虚拟分组(不是真实目录,纯命名层级)
 - **文件夹式收起**:点工作区行 = 收起/展开该工作区的全部会话(收起后行上保留会话数角标);会话分组同样可收起;搜索时自动全部展开。
 - **拖拽还原原版能力**:工作区行可拖拽——拖到另一工作区行上/下半即调整顺序(写回宿主 registry 序),拖到分组行则移动进该分组;会话行可拖拽——同工作区拖到另一会话上/下调整顺序,拖到会话子分组即移动进该分组。显示顺序 = 宿主手动序,拖拽结果立即生效。拖拽工作区期间,单链合并显示的行(如 工作/A)临时展开回文件夹树——路径里的每一级都是可投放的分组行,松手后自动合并回去。
 - **不丢原生能力**:会话行(打开/重命名/分叉/归档)、每工作区「新会话」(点 + 总是先展开该工作区,让新会话立刻可见)、当前会话高亮、官方状态灯(蓝色运行环 / 琥珀待交互 / 绿色完成提醒)、**状态呼吸灯**(折叠藏起的状态灯向外冒泡:工作区/分组行图标按状态色呼吸发光——琥珀待交互/绿完成,自定义过发光的标题一起呼吸;运行中只在会话行本层蓝色呼吸,不外渗;可在设置关闭)、**活跃定时任务角标**(有活动 Schedule 的会话显示闹钟图标,与官方行一致)、未分组会话兜底、中英双语跟随界面语言。
-- **URL/斜杠标题不拆层**:宿主自动生成的会话标题落地时若含 `/`(如复述了 URL),整串自动包上 `“”` 原样显示,绝不解析成层级;引号内(含手动添加)的 `/` 永不切分;无引号但含 URL 的旧标题也有平铺兜底。你手动命名的 `/` 分组标题不受影响。
+- **URL/斜杠标题不拆层**:宿主自动生成的会话标题落地时若含 `/`(如复述了 URL),整串自动包上 `“”` 原样显示,绝不解析成层级——只对本次启动后**新建的会话**生效,并等命名稳定(约 20 秒,让原生 AI 命名先落地)才处理;存量会话与你手动命名的 `/` 分组标题永不被改动。引号内(含手动添加)的 `/` 永不切分,孤立引号只当普通字符;无引号但含 URL 的旧标题也有平铺兜底。
 - **对话空态页同样生效**:会话空态页的「添加工作区」菜单走的也是本插件的拾取交互,同样带所属分组弹窗。
 
 ## 安装

package/README_EN.md

@@ -59,7 +59,7 @@ Session titles nest on `/` too (e.g. `test1/plugin maintenance`). Session groups
 - **Folder-style collapse**: clicking a workspace row collapses/expands all of its sessions (the row keeps a session counter when collapsed); session groups collapse too; search force-expands everything.
 - **Native drag restored**: drag a workspace row above/below another to reorder (writes back the host registry order) or onto a folder row to move it into that group; drag session rows to reorder within the same workspace or onto a session group to move. Display order = host manual order, drag results are visible immediately. While dragging a workspace, merged single-chain rows (e.g. work/A) temporarily re-expand into folder rows — every level of the path becomes a drop target, and chains merge back when the drag ends.
 - **Native capabilities kept**: open/rename/fork/archive sessions, per-workspace new-session (the + button always expands the workspace first so the new session is immediately visible), current-session highlight, official status dots (blue running ring / amber pending / green done), **status breathing lights** (dots hidden by collapse bubble outward: workspace/folder rows breathe on their icon in the status color — amber pending / green done, custom-glow labels breathe along; running breathes blue only on the session row itself and never relays; off-able in settings), **active-schedule badge** (alarm clock icon for sessions with active Schedule records, matching the official rows), ungrouped-session fallback, zh/en localization.
-- **Slash-bearing titles never nest from URLs**: when a host-generated session title lands containing `/` (e.g. echoing a pasted URL), it is auto-wrapped in `“”` and shown verbatim — quotes (manual ones too) never split on `/`; unquoted URL tails still fall back flat. Your manually named `/` groupings are untouched.
+- **Slash-bearing titles never nest from URLs**: when a host-generated session title lands containing `/` (e.g. echoing a pasted URL), it is auto-wrapped in `“”` and shown verbatim — only for sessions **created after this launch**, and only once the name stays stable for ~20s (letting the native AI naming land first); pre-existing sessions and your manually named `/` groupings are never touched. Quotes (manual ones too) never split on `/`, and a lone quote is just an ordinary character; unquoted URL tails still fall back flat.
 - **Conversation hero too**: the empty-state “Add workspace” menu uses the same picking interaction with the same group popup.
 
 ## Install

package/dsh.plugin.json

@@ -1,6 +1,6 @@
 {
   "id": "dsh-external/dsh-better-workspace",
-  "version": "0.9.1",
+  "version": "0.9.3",
   "main": "./src/index.js",
   "description": "侧边栏工作区层级树:名称中的 / 即虚拟分组(web/前端 · web/后端),添加工作区的目录流附所属分组弹窗,重命名即时重排层级,可新建空分组。Hierarchy tree for the DSH sidebar workspace list.",
   "engines": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-better-workspace",
-  "version": "0.9.1",
+  "version": "0.9.3",
   "description": "DSH web plugin: a hierarchical workspace tree for the sidebar. Workspace titles containing \"/\" group into virtual folders (web/前端 · web/后端); the add-workspace directory flow gains a parent-group popup; renames re-derive the tree; a new-folder button creates empty levels.",
   "type": "module",
   "repository": {

package/src/client.js

@@ -237,12 +237,15 @@ window.__ModuleLoader__.load({
     }
 
     /**
-     * Title → hierarchy segments, QUOTE-AWARE: spans wrapped in “…” (or "…")
-     * are verbatim — slashes inside quotes never split. Quoted spans stay one
-     * leaf including the quotes; text between quoted spans splits through
-     * splitPlainSegs (URL-tail opaque). An unterminated opening quote makes
-     * the rest of the title one verbatim span. Grouping is a pure projection,
-     * so previously shredded titles re-flow on reload.
+     * Title → hierarchy segments, QUOTE-AWARE: a PAIRED “…” (or "…") span is
+     * verbatim — slashes inside quotes never split, the quotes stay part of
+     * the leaf. Text outside paired spans splits through splitPlainSegs
+     * (URL-tail opaque). A LONE quote character — an opener with no matching
+     * closer, or a closer without an opener — is an ORDINARY character and
+     * splits normally around it (0.9.1 swallowed the tail after an
+     * unterminated opener; the user wants lone quotes as plain text).
+     * Grouping is a pure projection, so previously shredded titles re-flow
+     * on reload.
      */
     const splitTitleSegs = (title) => {
       const s = String(title || '')
@@ -253,11 +256,16 @@ window.__ModuleLoader__.load({
       while (i < s.length) {
         const ch = s[i]
         if (ch === '"' || ch === '“') {
-          for (const seg of splitPlainSegs(plain)) out.push(seg)
-          plain = ''
           const close = ch === '“' ? '”' : '"'
           const j = s.indexOf(close, i + 1)
-          const end = j === -1 ? s.length : j + 1
+          if (j === -1) { // lone opener: ordinary character, keep scanning
+            plain += ch
+            i += 1
+            continue
+          }
+          for (const seg of splitPlainSegs(plain)) out.push(seg)
+          plain = ''
+          const end = j + 1
           const quoted = s.slice(i, end).trim()
           if (quoted !== '') out.push(quoted)
           i = end
@@ -1314,44 +1322,97 @@ window.__ModuleLoader__.load({
       // source element, and Chromium cancels the whole gesture. dragEnd clears
       // the timer so a same-tick cancel never leaves a ghost drag behind.
       const wsDragArmTimer = React.useRef(null)
-      // Session ids that have EVER had a durable title this mount. The
-      // blank→titled transition marks the host's automatic title landing
-      // (LLM provider or deterministic fallback — the wire shape is the
-      // same); user renames always happen AFTER landing and never re-trigger.
-      // The FIRST snapshot only registers: titles that predate this mount may
-      // be deliberate user groupings and must never be touched.
-      const titledSeenRef = React.useRef(null)
-
-      // Quote-on-land: when a freshly landed automatic title contains "/",
-      // wrap the WHOLE title in “…” so splitTitleSegs keeps it verbatim (the
-      // AI/fallback title echoing a URL must not nest). Idempotent — quoted
-      // titles and already-seen sessions are skipped — and best-effort: a
-      // failed rename never retries (the unquoted URL-tail fallback in
-      // splitPlainSegs still keeps the display flat).
+      // Quote-on-land eligibility sets (mount-scoped):
+      // - blankSeen: ids observed BLANK in any snapshot. A blank row is a
+      //   freshly created New Session, so ONLY these may ever receive an
+      //   automatic quote. A titled row missing from blankSeen — rows that
+      //   stream into the store after mount, fork children (born titled),
+      //   rows hidden by load-time filtering — predates this mount or was
+      //   named deliberately, and is NEVER touched. (0.9.1 keyed "fresh" off
+      //   the first snapshot instead, so late-arriving OLD sessions were
+      //   misquoted; blank is the only trustworthy birth mark.)
+      // - humanTouched: ids renamed through THIS component's user actions
+      //   (rename dialog, drag into a group, group prefix rewrite). A
+      //   user-written "/" is a deliberate grouping; a user-written quote
+      //   pair is the verbatim escape. The host pins user titles (a later
+      //   automatic name is superseded), so the mark is final.
+      // - autoStable: id → { title, since } for freshly landed automatic
+      //   titles waiting out the stabilization window below.
+      const blankSeenRef = React.useRef(null)
+      const humanTouchedRef = React.useRef(null)
+      const autoStableRef = React.useRef(null)
+      const stableTimerRef = React.useRef(null)
+      const [stableTick, setStableTick] = React.useState(0)
+      // The wire cannot tell the deterministic fallback title (first user
+      // message echo, "/"-prone) from the async LLM name that replaces it
+      // seconds later — SessionSummary carries no source field. So a landed
+      // "/"-bearing title is quoted only after it survives 20s unchanged;
+      // any rename resets the window, and the common slash-free LLM name
+      // simply releases the session untouched. Only the "new session
+      // auto-title stayed slashy" case gets wrapped.
+      const TITLE_STABLE_MS = 20000
+
+      // User-driven renames funnel through here: mark first so the
+      // quote-on-land effect never second-guesses a deliberate title.
+      const renameByUser = (sessionId, title) => {
+        if (humanTouchedRef.current === null) humanTouchedRef.current = new Set()
+        humanTouchedRef.current.add(String(sessionId))
+        if (autoStableRef.current) autoStableRef.current.delete(String(sessionId))
+        return renameSession(sessionId, title)
+      }
+
       React.useEffect(() => {
         if (!list || !list.byId || typeof renameSession !== 'function') return
-        let seen = titledSeenRef.current
-        const first = seen === null
-        if (first) { seen = new Set(); titledSeenRef.current = seen }
+        if (blankSeenRef.current === null) blankSeenRef.current = new Set()
+        if (humanTouchedRef.current === null) humanTouchedRef.current = new Set()
+        if (autoStableRef.current === null) autoStableRef.current = new Map()
+        const blankSeen = blankSeenRef.current
+        const touched = humanTouchedRef.current
+        const stable = autoStableRef.current
+        const now = Date.now()
         const fixes = []
+        let deadline = Infinity
         for (const id of Object.keys(list.byId)) {
           const summary = list.byId[id]
-          if (!summary || summary.blank) continue
-          const title = summary.title
-          if (!title || String(title).trim() === '') continue
-          if (seen.has(id)) continue
-          seen.add(id)
-          if (first) continue // pre-existing on load: register only
-          const text = String(title)
-          if (!text.includes('/')) continue
-          if (text.includes('“') || text.includes('"')) continue
-          fixes.push([id, '“' + text + '”'])
+          if (!summary) continue
+          if (summary.blank) { blankSeen.add(id); stable.delete(id); continue }
+          if (!blankSeen.has(id) || touched.has(id)) { stable.delete(id); continue }
+          const text = String(summary.title || '')
+          if (text.trim() === '' || text.includes('“') || text.includes('"') || !text.includes('/')) {
+            stable.delete(id) // quoted already, or the LLM name arrived slash-free: done
+            continue
+          }
+          const prev = stable.get(id)
+          if (prev && prev.title === text) {
+            if (now - prev.since >= TITLE_STABLE_MS) {
+              stable.delete(id)
+              fixes.push([id, '“' + text + '”'])
+            } else {
+              deadline = Math.min(deadline, prev.since + TITLE_STABLE_MS)
+            }
+            continue
+          }
+          stable.set(id, { title: text, since: now }) // new landing or fallback→LLM rename: reset
+          deadline = Math.min(deadline, now + TITLE_STABLE_MS)
+        }
+        for (const id of Array.from(stable.keys())) {
+          if (!list.byId[id]) stable.delete(id) // session vanished (archived/deleted): drop the wait
+        }
+        if (stableTimerRef.current !== null) { clearTimeout(stableTimerRef.current); stableTimerRef.current = null }
+        if (deadline !== Infinity) {
+          stableTimerRef.current = setTimeout(() => {
+            stableTimerRef.current = null
+            setStableTick(t => t + 1) // re-evaluate through the effect, never rename from a stale closure
+          }, Math.max(1, deadline - now))
         }
         if (fixes.length === 0) return
         Promise.resolve()
           .then(async () => { for (const [id, next] of fixes) await renameSession(id, next) })
-          .catch(() => { /* keep the flat fallback display */ })
-      }, [list])
+          .catch(() => { /* display-layer fallback keeps the row flat; a later snapshot re-evaluates */ })
+      }, [list, stableTick])
+      React.useEffect(() => () => {
+        if (stableTimerRef.current !== null) clearTimeout(stableTimerRef.current)
+      }, [])
       const normalizedQuery = query.trim().toLowerCase()
       const now = Date.now()
 
@@ -1730,7 +1791,7 @@ window.__ModuleLoader__.load({
         const newTitle = groupPath !== '' ? groupPath + '/' + source.leaf : source.leaf
         if (newTitle === source.title) return
         Promise.resolve()
-          .then(() => renameSession(source.sessionId, newTitle))
+          .then(() => renameByUser(source.sessionId, newTitle))
           .catch(fail)
       }
 
@@ -1756,7 +1817,7 @@ window.__ModuleLoader__.load({
         const title = String(nextTitle || '').trim()
         if (title === '' || title === session.title) { setDialog(null); return }
         Promise.resolve()
-          .then(() => renameSession(session.id, title))
+          .then(() => renameByUser(session.id, title))
           .then(() => setDialog(null))
           .catch(fail)
       }
@@ -1778,7 +1839,7 @@ window.__ModuleLoader__.load({
             for (const row of affected) {
               if (row.blank) continue
               const nextTitle = nextPath + row.title.slice(target.path.length)
-              await renameSession(row.id, nextTitle)
+              await renameByUser(row.id, nextTitle)
             }
           })
           .then(() => setDialog(null))
@@ -2233,7 +2294,6 @@ window.__ModuleLoader__.load({
       const sessions = ctx.get('sessions')
       const workspaces = ctx.get('workspaces')
       const uiWorkspace = ctx.get('uiWorkspace')
-      const connection = ctx.get('connection')
       if (!sessions || !workspaces || !uiWorkspace) {
         console.error('[dsh-better-workspace] required services missing', {
           sessions: !!sessions, workspaces: !!workspaces, uiWorkspace: !!uiWorkspace,
@@ -2293,7 +2353,6 @@ window.__ModuleLoader__.load({
         pickDirectory: () => uiWorkspace.pickDirectory(),
         hooks: {
           directoryFlow: flowSource(slots, 'sidebar.workspaces.directoryFlow'),
-          connectionGeneration: connection ? connection.generation : undefined,
         },
       })
       const flowInjected = (hole) => () => ({
@@ -2365,7 +2424,7 @@ window.__ModuleLoader__.load({
 
     return {
       name: 'dsh-better-workspace',
-      inject: ['slots', 'sessions', 'workspaces', 'locale', 'connection', 'uiWorkspace'],
+      inject: ['slots', 'sessions', 'workspaces', 'locale', 'uiWorkspace'],
       apply,
     }
   },