dsh-ask-from-text 0.1.12 → 0.1.19

package/CHANGELOG.md

@@ -4,6 +4,109 @@ All notable changes to `dsh-ask-from-text` are documented here. The format is
 based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/), and this
 project follows [Semantic Versioning](https://semver.org/).
 
+## [0.1.19] - 2026-11-13
+
+### Fixed
+
+- Do not pin a selected branch row above the group. Only the root/main Session
+  is allowed above `追问分支`; clicking a branch keeps it in the group.
+
+## [0.1.18] - 2026-11-13
+
+### Fixed
+
+- Put the shared `追问分支` header before the topmost branch row in visual
+  document order, so collapsing/expanding no longer moves it below the group.
+
+## [0.1.17] - 2026-11-13
+
+### Fixed
+
+- Keep the shared branch-group header when the group is collapsed by ignoring
+  rows hidden by the plugin itself, while still ignoring rows hidden inside a
+  folded Workspace or a stale search tree.
+
+## [0.1.16] - 2026-11-13
+
+### Fixed
+
+- Restore the shared `追问分支` header by inserting it inside the first branch
+  row wrapper, where the sidebar animation layer participates in layout, and
+  keep only one header for all branch rows.
+
+## [0.1.15] - 2026-11-13
+
+### Fixed
+
+- Group all branch Session rows under one shared `追问分支` header even when
+  the sidebar gives each row its own animated wrapper, and keep the selected
+  main row above that shared header.
+
+## [0.1.14] - 2026-11-13
+
+### Fixed
+
+- Handle main and branch Sessions that the sidebar places in different
+  Workspace sections by moving the main section above the first branch section.
+
+## [0.1.13] - 2026-11-13
+
+### Fixed
+
+- README screenshots now use absolute CDN URLs so they render on the npm package page.
+
+## [0.1.19] - 2026-11-13
+
+### Fixed
+
+- Do not pin a selected branch row above the group. Only the root/main Session
+  is allowed above `追问分支`; clicking a branch keeps it in the group.
+
+## [0.1.18] - 2026-11-13
+
+### Fixed
+
+- Put the shared `追问分支` header before the topmost branch row in visual
+  document order, so collapsing/expanding no longer moves it below the group.
+
+## [0.1.17] - 2026-11-13
+
+### Fixed
+
+- Keep the shared branch-group header when the group is collapsed by ignoring
+  rows hidden by the plugin itself, while still ignoring rows hidden inside a
+  folded Workspace or a stale search tree.
+
+## [0.1.16] - 2026-11-13
+
+### Fixed
+
+- Restore the shared `追问分支` header by inserting it inside the first branch
+  row wrapper, where the sidebar animation layer participates in layout, and
+  keep only one header for all branch rows.
+
+## [0.1.15] - 2026-11-13
+
+### Fixed
+
+- Group all branch Session rows under one shared `追问分支` header even when
+  the sidebar gives each row its own animated wrapper, and keep the selected
+  main row above that shared header.
+
+## [0.1.14] - 2026-11-13
+
+### Fixed
+
+- Handle main and branch Sessions that the sidebar places in different
+  Workspace sections by moving the main section above the first branch section.
+
+## [0.1.13] - 2026-11-13
+
+### Fixed
+
+- Prefer the selected sidebar row when pinning the main conversation above its
+  branch group, and re-evaluate when the selected Session changes.
+
 ## [0.1.12] - 2026-11-13
 
 ### Changed
@@ -84,3 +187,17 @@ project follows [Semantic Versioning](https://semver.org/).
 [0.1.10]: https://github.com/gbn0219/dsh-ask-from-text/releases/tag/v0.1.10
 [0.1.11]: https://github.com/gbn0219/dsh-ask-from-text/releases/tag/v0.1.11
 [0.1.12]: https://github.com/gbn0219/dsh-ask-from-text/releases/tag/v0.1.12
+[0.1.13]: https://github.com/gbn0219/dsh-ask-from-text/releases/tag/v0.1.13
+[0.1.14]: https://github.com/gbn0219/dsh-ask-from-text/releases/tag/v0.1.14
+[0.1.15]: https://github.com/gbn0219/dsh-ask-from-text/releases/tag/v0.1.15
+[0.1.16]: https://github.com/gbn0219/dsh-ask-from-text/releases/tag/v0.1.16
+[0.1.17]: https://github.com/gbn0219/dsh-ask-from-text/releases/tag/v0.1.17
+[0.1.18]: https://github.com/gbn0219/dsh-ask-from-text/releases/tag/v0.1.18
+[0.1.19]: https://github.com/gbn0219/dsh-ask-from-text/releases/tag/v0.1.19
+[0.1.13]: https://github.com/gbn0219/dsh-ask-from-text/releases/tag/v0.1.13
+[0.1.14]: https://github.com/gbn0219/dsh-ask-from-text/releases/tag/v0.1.14
+[0.1.15]: https://github.com/gbn0219/dsh-ask-from-text/releases/tag/v0.1.15
+[0.1.16]: https://github.com/gbn0219/dsh-ask-from-text/releases/tag/v0.1.16
+[0.1.17]: https://github.com/gbn0219/dsh-ask-from-text/releases/tag/v0.1.17
+[0.1.18]: https://github.com/gbn0219/dsh-ask-from-text/releases/tag/v0.1.18
+[0.1.19]: https://github.com/gbn0219/dsh-ask-from-text/releases/tag/v0.1.19

package/README.md

@@ -2,7 +2,7 @@
 
 在 DeepSeek Harness 的回答里划选一句话，输入追问；回答会在独立的浮窗中继续，并保留原文标记。
 
-![多个追问与收起列表](docs/images/multi-branch.jpg)
+![多个追问与收起列表](https://cdn.jsdelivr.net/gh/gbn0219/dsh-ask-from-text@main/docs/images/multi-branch.jpg)
 
 > 界面示意图。当前版本新建追问时只弹出一个输入浮窗；发送后才会显示完整对话浮窗。
 
@@ -10,13 +10,13 @@
 
 需要 DeepSeek Harness 0.2.2-rc.x。
 
-### 从 GitHub 安装（当前可用）
+### 从 GitHub 安装
 
 ```sh
 dsh plugin --profile web add github:gbn0219/dsh-ask-from-text
 ```
 
-### 从 npm 安装（发布后可用）
+### 从 npm 安装
 
 ```sh
 dsh plugin --profile web add dsh-ask-from-text
@@ -80,7 +80,7 @@ dsh plugin --profile web add /absolute/path/to/dsh-ask-from-text
 - `↘ 还原为浮窗`：回到小浮窗；
 - `✕ 关闭`：回到主对话。
 
-![舞台与分支树](docs/images/stage-and-tree.jpg)
+![舞台与分支树](https://cdn.jsdelivr.net/gh/gbn0219/dsh-ask-from-text@main/docs/images/stage-and-tree.jpg)
 
 ### 6. 删除草稿
 
@@ -124,7 +124,7 @@ dsh plugin --profile web add /absolute/path/to/dsh-ask-from-text
 
 **Ask from Text** lets you select a sentence in a completed assistant answer and ask a question in a separate floating branch, while keeping the original text marked in place.
 
-![Multiple branches and the collapsed-branch list](docs/images/multi-branch.jpg)
+![Multiple branches and the collapsed-branch list](https://cdn.jsdelivr.net/gh/gbn0219/dsh-ask-from-text@main/docs/images/multi-branch.jpg)
 
 > Interface illustration. In the current version a new follow-up opens only an input window; the full conversation window appears after you send the first question.
 
@@ -132,13 +132,13 @@ dsh plugin --profile web add /absolute/path/to/dsh-ask-from-text
 
 Requires DeepSeek Harness 0.2.2-rc.x.
 
-#### From GitHub (available now)
+#### From GitHub
 
 ```sh
 dsh plugin --profile web add github:gbn0219/dsh-ask-from-text
 ```
 
-#### From npm (after the npm release)
+#### From npm
 
 ```sh
 dsh plugin --profile web add dsh-ask-from-text
@@ -202,7 +202,7 @@ The stage provides:
 - `↘ Restore to window` to return to the floating window.
 - `✕ Close` to return to the main chat.
 
-![Stage and branch tree](docs/images/stage-and-tree.jpg)
+![Stage and branch tree](https://cdn.jsdelivr.net/gh/gbn0219/dsh-ask-from-text@main/docs/images/stage-and-tree.jpg)
 
 #### 6. Delete a draft
 

package/client.js

@@ -1013,7 +1013,13 @@ window.__ModuleLoader__.load({
             })
             if (!own) scheduleProject()
           })
-          mutationObserver.observe(document.body, { childList: true, subtree: true, characterData: true })
+          mutationObserver.observe(document.body, {
+            childList: true,
+            subtree: true,
+            characterData: true,
+            attributes: true,
+            attributeFilter: ['aria-selected'],
+          })
         }
         scheduleProject()
         return () => {
@@ -1263,57 +1269,96 @@ window.__ModuleLoader__.load({
         const ids = new Set(state.order
           .map(id => state.branches[id]?.sessionId)
           .filter(Boolean))
-        const parents = new Map()
+        const rows = []
         for (const id of ids) {
           for (const row of document.querySelectorAll(`[data-row-key="session:${cssEscape(id)}"]`)) {
             if (row.closest('[data-ifu-root]')) continue
-            const parent = row.parentElement
-            if (!parent) continue
-            const list = parents.get(parent) || []
-            list.push(row)
-            parents.set(parent, list)
+            // Keep rows hidden by our own collapsed state in the group so the
+            // header stays clickable; skip rows hidden inside a folded
+            // Workspace or a stale search tree.
+            if (row.getClientRects().length === 0 && !row.classList.contains('ifu-sidebar-hidden')) continue
+            rows.push(row)
           }
         }
-        const activeParents = new Set(parents.keys())
-        for (const header of document.querySelectorAll('[data-ifu-sidebar-group]')) {
-          if (!activeParents.has(header.parentElement)) header.remove()
-        }
-        for (const [parent, rows] of parents) {
-          let header = parent.querySelector(':scope > [data-ifu-sidebar-group]')
-          if (!header) {
-            header = document.createElement('button')
-            header.type = 'button'
-            header.className = 'ifu-sidebar-group'
-            header.setAttribute('data-ifu-sidebar-group', '')
-            header.addEventListener('click', (event) => {
-              event.preventDefault()
-              event.stopPropagation()
-              toggleSidebarBranches()
-            })
-          }
-          const first = rows[0]
-          if (header.nextSibling !== first) parent.insertBefore(header, first)
-          const label = `${state.sidebarCollapsed ? '▸' : '▾'} 追问分支 · ${rows.length}`
-          if (header.textContent !== label) header.textContent = label
-          for (const row of rows) row.classList.toggle('ifu-sidebar-hidden', state.sidebarCollapsed)
-          // Keep the main conversation row above its branch rows even when the
-          // host sort places a recently used branch first. Moving the row at
-          // the React-owned DOM level is deliberate: the Session list is not a
-          // flex/order container, and the collapsible group header sits here.
-          const mainId = state.mainSessionId
-          const mainRow = mainId
-            ? parent.querySelector(`:scope > [data-row-key="session:${cssEscape(mainId)}"]`)
-            : null
-          if (mainRow && mainRow !== header
+        rows.sort((a, b) => a === b ? 0
+          : (a.compareDocumentPosition(b) & Node.DOCUMENT_POSITION_FOLLOWING) ? -1 : 1)
+        if (rows.length === 0) {
+          for (const header of document.querySelectorAll('[data-ifu-sidebar-group]')) header.remove()
+          for (const row of document.querySelectorAll('.ifu-sidebar-hidden')) row.classList.remove('ifu-sidebar-hidden')
+          return
+        }
+        const first = rows[0]
+        const firstParent = first.parentElement
+        if (!firstParent) return
+        let header = firstParent.querySelector(':scope > [data-ifu-sidebar-group]')
+        if (!header) {
+          header = document.createElement('button')
+          header.type = 'button'
+          header.className = 'ifu-sidebar-group'
+          header.setAttribute('data-ifu-sidebar-group', '')
+          header.addEventListener('click', (event) => {
+            event.preventDefault()
+            event.stopPropagation()
+            toggleSidebarBranches()
+          })
+        }
+        // Keep one shared header, inside the first branch wrapper. Putting it
+        // at the animated tree root would be clipped or ignored by the row
+        // animation layer; a wrapper child participates in the same layout as
+        // the original per-row header did.
+        for (const other of document.querySelectorAll('[data-ifu-sidebar-group]')) {
+          if (other !== header) other.remove()
+        }
+        if (header.nextSibling !== first) firstParent.insertBefore(header, first)
+        const label = `${state.sidebarCollapsed ? '▸' : '▾'} 追问分支 · ${rows.length}`
+        if (header.textContent !== label) header.textContent = label
+        for (const row of rows) row.classList.toggle('ifu-sidebar-hidden', state.sidebarCollapsed)
+
+        const branchSessionIds = ids
+        const rootSessionIds = new Set(state.order
+          .map(id => state.branches[id]?.rootSessionId)
+          .filter(Boolean))
+        const sessionIdOf = (row) => {
+          const key = row.getAttribute('data-row-key') || ''
+          return key.startsWith('session:') ? key.slice('session:'.length) : null
+        }
+        const selectedRow = Array.from(document.querySelectorAll('[data-row-key^="session:"][aria-selected="true"]'))
+          .find(row => row.getClientRects().length > 0) || null
+        // A branch row can be selected too (opening it as the main view). Only a
+        // root/main Session may be pinned above the branch group; otherwise
+        // clicking a branch would make that branch jump above its siblings.
+        const selectedMain = selectedRow && rootSessionIds.has(sessionIdOf(selectedRow))
+          ? selectedRow
+          : null
+        let mainId = state.mainSessionId
+        if (mainId && branchSessionIds.has(mainId)) {
+          mainId = branchBySession(mainId)?.rootSessionId || null
+        }
+        const mainRow = selectedMain || (mainId
+          ? Array.from(document.querySelectorAll(`[data-row-key="session:${cssEscape(mainId)}"]`))
+            .find(row => row.getClientRects().length > 0) || null
+          : null)
+        if (!mainRow) return
+        if (mainRow.parentElement === firstParent) {
+          if (mainRow !== header
             && (mainRow.compareDocumentPosition(header) & Node.DOCUMENT_POSITION_FOLLOWING) === 0) {
-            parent.insertBefore(mainRow, header)
+            firstParent.insertBefore(mainRow, header)
           }
+          return
         }
-        // Keep row classes correct even when no parent could be found this pass.
-        for (const id of ids) {
-          for (const row of document.querySelectorAll(`[data-row-key="session:${cssEscape(id)}"]`)) {
-            if (!row.closest('[data-ifu-root]')) row.classList.toggle('ifu-sidebar-hidden', state.sidebarCollapsed)
-          }
+        let common = mainRow.parentElement
+        while (common && !common.contains(firstParent)) common = common.parentElement
+        if (!common || common === document.body || common === document.documentElement) return
+        const directChild = (node) => {
+          let element = node
+          while (element && element.parentElement !== common) element = element.parentElement
+          return element && element.parentElement === common ? element : null
+        }
+        const mainChild = directChild(mainRow)
+        const branchChild = directChild(firstParent)
+        if (mainChild && branchChild && mainChild !== branchChild
+          && (mainChild.compareDocumentPosition(branchChild) & Node.DOCUMENT_POSITION_FOLLOWING) === 0) {
+          common.insertBefore(mainChild, branchChild)
         }
       }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-ask-from-text",
-  "version": "0.1.12",
+  "version": "0.1.19",
   "type": "module",
   "description": "Ask a follow-up from selected text in a DeepSeek Harness answer, in a real Session branch with a tree of context.",
   "exports": {