@lyhue1991/dsh-soup 0.4.8 → 0.4.10

package/lib/client.js

@@ -61,13 +61,21 @@ window.__ModuleLoader__.load({
       '.expl-notice{color:var(--dsw-alias-state-success-primary);padding:6px 14px;font-size:12px;border-bottom:1px solid var(--dsw-alias-border-l1);flex:none;}' +
       '.expl-bulk{color:var(--dsw-alias-state-business-primary);padding:6px 14px;font-size:12px;border-bottom:1px solid var(--dsw-alias-border-l1);flex:none;}' +
       '.expl-body{overflow:auto;flex:1;padding:6px 0 12px;}' +
-      '.expl-row-main{display:flex;align-items:center;gap:6px;padding-top:2px;padding-bottom:2px;padding-right:10px;cursor:pointer;border-radius:8px;margin:0 4px;height:40px;box-sizing:border-box;user-select:none;}' +
+      '.expl-row-main{display:flex;align-items:center;gap:4px;padding-top:2px;padding-bottom:2px;padding-right:10px;cursor:pointer;border-radius:8px;margin:0 4px;height:40px;box-sizing:border-box;user-select:none;}' +
+      '.expl-row-main{position:relative;}' +
       '.expl-row-main:hover{background:var(--dsw-alias-interactive-bg-hover);}' +
       '.expl-row-main.selected{background:var(--dsw-alias-interactive-bg-hover-accent);}' +
       '.expl-row-main.drop-target,.expl-body.drop-target{outline:1px dashed var(--dsw-alias-state-business-primary);outline-offset:-2px;background:var(--dsw-alias-interactive-bg-hover-accent);}' +
       '.expl-caret{flex:none;cursor:pointer;line-height:1;}' +
-      '.expl-caret-big{width:24px;font-size:33px;color:var(--dsw-alias-label-secondary);display:flex;align-items:center;justify-content:flex-start;}' +
-      '.expl-caret-sm{width:24px;font-size:33px;color:var(--dsw-alias-label-tertiary);display:flex;align-items:center;justify-content:flex-start;}' +
+      /* Keep a compact reserved disclosure slot for nested rows; folder icons
+         remain visible while expansion is driven by row/double-click actions. */
+      '.expl-caret-big{width:2px;height:16px;font-size:0;color:transparent;display:flex;align-items:center;justify-content:center;}' +
+      '.expl-caret-big::before{content:"";display:block;width:0;height:0;border-top:5px solid transparent;border-bottom:5px solid transparent;border-left:6px solid var(--dsw-alias-label-secondary);transition:transform 150ms var(--ds-ease-in-out);}' +
+      '.expl-caret-big.open::before{transform:rotate(90deg);}' +
+      '.expl-caret-sm{width:2px;height:16px;font-size:0;color:transparent;display:flex;align-items:center;justify-content:center;pointer-events:none;}' +
+      '.expl-row-main .expl-caret-big{display:flex;visibility:hidden;}' +
+      '.expl-caret-root{position:absolute;left:8px;top:50%;transform:translateY(-50%);z-index:1;}' +
+      '.expl-caret-root.open::before{transform:rotate(90deg);}' +
       '.expl-icon{flex:none;display:flex;align-items:center;}.expl-icon svg{width:16px;height:16px;display:block;}' +
       '.expl-uploads{flex:none;border-bottom:1px solid var(--dsw-alias-border-l1);padding:5px 14px;display:flex;flex-direction:column;gap:3px;background:var(--dsw-specific-tip);}' +
       '.expl-upload-row{display:flex;align-items:center;gap:6px;font-size:11px;color:var(--dsw-alias-label-secondary);}' +
@@ -75,6 +83,10 @@ window.__ModuleLoader__.load({
       '.expl-upload-pct{margin-left:auto;font-family:var(--ds-font-family-code);color:var(--dsw-alias-label-caption);}' +
       '.expl-upload-text{overflow:hidden;text-overflow:ellipsis;white-space:nowrap;}' +
       '.expl-name{flex:1;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;color:var(--dsw-alias-label-primary);}' +
+      '.expl-row-more{display:none;flex:none;width:28px;height:28px;align-items:center;justify-content:center;border:0;border-radius:6px;padding:0;background:transparent;color:var(--dsw-alias-label-secondary);cursor:pointer;}' +
+      '.expl-row-main:hover .expl-row-more,.expl-row-main.selected .expl-row-more{display:inline-flex;}' +
+      '.expl-row-more:hover{background:var(--dsw-alias-interactive-bg-hover);color:var(--dsw-alias-label-primary);}' +
+      '.expl-row-more svg{width:16px;height:16px;display:block;}' +
       '.expl-size{color:var(--dsw-alias-label-tertiary);font-size:11px;flex:none;margin-left:8px;}' +
       '.expl-muted{color:var(--dsw-alias-label-tertiary);padding:4px 14px;font-size:12px;}' +
       '.expl-menu-mask{position:fixed;inset:0;z-index:1980;}' +
@@ -106,6 +118,7 @@ window.__ModuleLoader__.load({
     // 同名 React 元素常量冲突（var 提升覆盖），字符样式反而更稳。
     // ------------------------------------------------------------------
     var ICON_REFRESH = '<svg xmlns="http://www.w3.org/2000/svg" width="16" viewBox="0 0 18 18"><path fill="currentColor" d="M9 13.5c-2.49 0-4.5-2.01-4.5-4.5S6.51 4.5 9 4.5c1.24 0 2.36.52 3.17 1.33L10 8h5V3l-1.76 1.76A6 6 0 0 0 9 3C5.69 3 3.01 5.69 3.01 9S5.69 15 9 15a5.98 5.98 0 0 0 5.9-5h-1.52c-.46 2-2.24 3.5-4.38 3.5"/></svg>'
+    var ICON_MORE = '<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><circle cx="3" cy="8" r="1.3" fill="currentColor"/><circle cx="8" cy="8" r="1.3" fill="currentColor"/><circle cx="13" cy="8" r="1.3" fill="currentColor"/></svg>'
     var EXPAND_SVG = '<svg xmlns="http://www.w3.org/2000/svg" width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M8 3H5a2 2 0 0 0-2 2v3m18 0V5a2 2 0 0 0-2-2h-3m0 18h3a2 2 0 0 0 2-2v-3M3 16v3a2 2 0 0 0 2 2h3"/></svg>'
     var SHRINK_SVG = '<svg xmlns="http://www.w3.org/2000/svg" width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M8 3v3a2 2 0 0 1-2 2H3m18 0h-3a2 2 0 0 1-2-2V3m0 18v-3a2 2 0 0 1 2-2h3M3 16h3a2 2 0 0 1 2 2v3"/></svg>'
 
@@ -201,9 +214,11 @@ window.__ModuleLoader__.load({
       '.dfv-overlay-close{flex:none;display:inline-flex;align-items:center;justify-content:center;width:24px;height:24px;border:none;border-radius:6px;background:transparent;color:var(--dsw-alias-label-secondary);font-size:14px;line-height:1;cursor:pointer;padding:0;}' +
       '.dfv-overlay-close:hover{background:var(--dsw-alias-interactive-bg-hover);color:var(--dsw-alias-label-primary);}' +
       // 纯阅读模式：预览 tab 激活时隐藏整个输入区（composerSeat：输入框 +
-      // GoalBar + 速度徽标所在的 input.dock）与轮次统计行（StatsLine）。
-      // class 来自 DSH 客户端编译产物（CSS module hash），升级后若失效仅
-      // 表现为「预览页仍显示输入区」，不影响其它功能——属可接受的降级。
+      // GoalBar + 速度徽标所在的 input.dock）与轮次统计行（StatsLine，新版
+      // DSH 已把它移进 composerSeat 内部的 conversation.composer.dock）。
+      // DSH 0.1.2-alpha.1 起 composerSeat 带 data-composer-seat 稳定属性，
+      // 优先用稳定选择器；旧 hash 规则保留以兼容更老的宿主版本。
+      '[data-dsh-soup-preview="1"] [data-composer-seat]{display:none !important;}' +
       '[data-dsh-soup-preview="1"] .wSkVaW_composerSeat{display:none !important;}' +
       '[data-dsh-soup-preview="1"] .FJxK0a_root{display:none !important;}'
     if (typeof document !== 'undefined' && document.querySelector('style[data-plugin-css="@lyhue1991/dsh-soup/fileview.css"]') === null) {
@@ -258,6 +273,7 @@ window.__ModuleLoader__.load({
         'explorer.hostUnreachable': '宿主不可达: {reason}',
         'explorer.hostBadResponse': '宿主响应解析失败',
         'menu.preview': '👁 预览',
+        'menu.actions': '更多操作',
         'menu.open': '🖥 用系统打开',
         'menu.rename': '✎ 重命名',
         'menu.trash': '🗑 移到废纸篓',
@@ -321,6 +337,7 @@ window.__ModuleLoader__.load({
         'explorer.hostUnreachable': 'Host unreachable: {reason}',
         'explorer.hostBadResponse': 'Failed to parse host response',
         'menu.preview': '👁 Preview',
+        'menu.actions': 'More actions',
         'menu.open': '🖥 Open with system',
         'menu.rename': '✎ Rename',
         'menu.trash': '🗑 Move to trash',
@@ -371,6 +388,35 @@ window.__ModuleLoader__.load({
       uploads: [],
     }
     var listeners = new Set()
+    // trackSession() is called by both the hero toggle and the details panel
+    // while a blank conversation is mounted. Keep late async responses from an
+    // older caller from overwriting the current session's shared store.
+    var sessionTrackGeneration = 0
+
+    // 目录展开状态按 cwd 隔离。刷新/删除/改名/移动后先重拉根目录，
+    // 再按这些路径递归重拉仍存在的已展开目录；切换项目时才清空。
+    var expandedDirs = new Set()
+    var expandedDirsCwd = null
+
+    function forgetExpandedPaths(paths) {
+      var dropped = paths.map(function (p) { return [p, p + '/'] })
+      expandedDirs = new Set(Array.from(expandedDirs).filter(function (p) {
+        return !dropped.some(function (pair) { return p === pair[0] || p.startsWith(pair[1]) })
+      }))
+    }
+
+    function rekeyExpandedPaths(from, to) {
+      var moved = Array.from(expandedDirs).filter(function (p) {
+        return p === from || p.startsWith(from + '/')
+      }).sort(function (a, b) { return a.length - b.length })
+      if (!moved.length) return
+      var next = new Set(Array.from(expandedDirs).filter(function (p) {
+        return p !== from && !p.startsWith(from + '/')
+      }))
+      moved.forEach(function (p) { next.add(to + p.slice(from.length)) })
+      expandedDirs = next
+    }
+
     function setState(patch) {
       state = Object.assign({}, state, patch)
       listeners.forEach(function (fn) { fn() })
@@ -459,20 +505,47 @@ window.__ModuleLoader__.load({
     }
 
     async function trackSession(sessionId, cwdHint) {
+      var generation = ++sessionTrackGeneration
       activeSessionId = sessionId || null
       var cwd = await defaultCwd(sessionId, cwdHint)
+      if (generation !== sessionTrackGeneration) return
+      // 换项目时展开状态没有跨项目意义；回到同一项目则保留。
+      if (expandedDirsCwd !== cwd) {
+        expandedDirs.clear()
+        expandedDirsCwd = cwd
+      }
       // 会话切换：预览列表按新 cwd 裁剪（范围外自动关闭），并清掉上一路径的旧错误横幅
       var files = pruneFilesToScope(state.files, cwd)
       lastMtimes = {} // 换了目录，旧 mtime 基线全部作废（首轮 tick 重建基线）
       setState({ cwd: cwd, selected: new Set(), renaming: null, newItem: null, menu: null, error: '', notice: '', files: files })
       var items = await loadDir(cwd)
+      if (generation !== sessionTrackGeneration) return
       if (items) setState({ error: '', tree: items })
     }
 
     async function refresh() {
       if (!state.cwd) return
       var items = await loadDir(state.cwd)
-      if (items) setState({ error: '', tree: items })
+      if (!items) return
+      await restoreExpandedChildren(items)
+      setState({ error: '', tree: items })
+    }
+
+    /** 根目录刷新后，按记住的路径递归恢复已展开目录。 */
+    async function restoreExpandedChildren(nodes) {
+      for (var i = 0; i < nodes.length; i++) {
+        var node = nodes[i]
+        if (node.type !== 'directory' || !expandedDirs.has(node.path)) continue
+        var items = await loadDir(node.path)
+        if (!items) {
+          expandedDirs.delete(node.path)
+          continue
+        }
+        node.open = true
+        node.children = items
+        items.forEach(function (child) { child.parent = node })
+        await restoreExpandedChildren(items)
+      }
     }
 
     // ------------------------------------------------------------------
@@ -600,23 +673,7 @@ window.__ModuleLoader__.load({
     /** 手动刷新：重拉根目录，已展开的子目录逐个重拉、保持展开不收起。 */
     async function refreshAll() {
       if (!state.cwd) return
-      var expanded = []
-      var walk = function (nodes) {
-        for (var i = 0; i < nodes.length; i++) {
-          var n = nodes[i]
-          if (n.type === 'directory' && n.children != null) {
-            if (n.path !== state.cwd) expanded.push({ path: n.path, open: !!n.open })
-            if (n.open && n.children.length) walk(n.children)
-          }
-        }
-      }
-      walk(state.tree)
       await refresh()
-      for (var j = 0; j < expanded.length; j++) {
-        if (!expanded[j].open) continue
-        var node = findNode(state.tree, expanded[j].path)
-        if (node) await reloadDirNode(node)
-      }
     }
 
     async function toggleNode(node) {
@@ -628,10 +685,16 @@ window.__ModuleLoader__.load({
         node.loading = false
         if (items) items.forEach(function (c) { c.parent = node })
         node.children = items || []
-        node.open = true
+        node.open = !!items
+        if (items) expandedDirs.add(node.path)
+        // 拖拽可能把一个已展开目录移进此前收起的父目录。父目录首次展开时，
+        // 也要立即恢复其中被记住的子目录展开状态。
+        if (items) await restoreExpandedChildren(items)
         setState({ tree: state.tree })
       } else {
         node.open = !node.open
+        if (node.open) expandedDirs.add(node.path)
+        else expandedDirs.delete(node.path)
         setState({ tree: state.tree })
       }
     }
@@ -896,6 +959,16 @@ window.__ModuleLoader__.load({
       setState({ selected: new Set(), lastIndex: null })
     }
 
+    function onRowMore(e, node) {
+      e.preventDefault()
+      e.stopPropagation()
+      var sel = new Set(state.selected)
+      sel.clear()
+      sel.add(node.path)
+      var rect = e.currentTarget.getBoundingClientRect()
+      setState({ selected: sel, lastIndex: null, menu: { x: rect.right - 4, y: rect.bottom + 4, node: node } })
+    }
+
     async function openSelection() {
       var paths = Array.from(state.selected)
       setState({ menu: null })
@@ -906,11 +979,14 @@ window.__ModuleLoader__.load({
       var paths = Array.from(state.selected)
       setState({ menu: null })
       var errors = []
+      var trashed = []
       for (var i = 0; i < paths.length; i++) {
         var res = await rpc('trash', { path: paths[i] })
-        if (!res || !res.ok) errors.push(baseName(paths[i]) + ': ' + ((res && res.error) || T('explorer.actionFail')) + ((res && res.hint) ? '（' + res.hint + '）' : ''))
+        if (res && res.ok) trashed.push(paths[i])
+        else errors.push(baseName(paths[i]) + ': ' + ((res && res.error) || T('explorer.actionFail')) + ((res && res.hint) ? '（' + res.hint + '）' : ''))
       }
       if (errors.length) setState({ error: errors.join('；') })
+      forgetExpandedPaths(trashed)
       setState({ selected: new Set(), lastIndex: null })
       await refresh()
     }
@@ -924,12 +1000,18 @@ window.__ModuleLoader__.load({
       }
       var dir = parentOf(path)
       var dest = pathJoin(dir, name)
+      var node = findNode(state.tree, path)
+      var isDir = node && node.type === 'directory'
       var sel = new Set(state.selected)
       if (sel.has(path)) { sel.delete(path); sel.add(dest) }
       setState({ renaming: null, selected: sel })
       ;(async function () {
         var res = await rpc('move', { from: path, to: dest })
-        if (!res || !res.ok) setState({ error: (res && res.error) || T('explorer.renameFail') })
+        if (res && res.ok) {
+          if (isDir) rekeyExpandedPaths(path, dest)
+        } else {
+          setState({ error: (res && res.error) || T('explorer.renameFail') })
+        }
         await refresh()
       })()
     }
@@ -1006,6 +1088,7 @@ window.__ModuleLoader__.load({
 
     async function movePaths(paths, targetDir) {
       var errors = []
+      var moved = []
       for (var i = 0; i < paths.length; i++) {
         var p = paths[i]
         if (p === '/' || !p) continue
@@ -1013,10 +1096,18 @@ window.__ModuleLoader__.load({
         var dest = pathJoin(targetDir, name)
         if (dest === p) continue
         if (targetDir === p || targetDir.startsWith(p + '/')) { errors.push(T('explorer.moveIntoSelf', { path: name })); continue }
+        var node = findNode(state.tree, p)
         var res = await rpc('move', { from: p, to: dest })
-        if (!res || !res.ok) errors.push(name + ': ' + ((res && res.error) || T('explorer.actionFail')))
+        if (res && res.ok) {
+          moved.push({ from: p, to: dest, isDir: node && node.type === 'directory' })
+        } else {
+          errors.push(name + ': ' + ((res && res.error) || T('explorer.actionFail')))
+        }
       }
       setState({ dragPaths: null })
+      moved.forEach(function (item) {
+        if (item.isDir) rekeyExpandedPaths(item.from, item.to)
+      })
       if (errors.length) setState({ error: errors.join('；') })
       await refresh()
     }
@@ -1221,10 +1312,12 @@ window.__ModuleLoader__.load({
         onDragLeave: function (e) { if (state.dropTarget === node.path) setState({ dropTarget: null }) },
         onDrop: function (e) { if (isDir) onRowDrop(e, node) },
       },
-        create('span', {
-          className: 'expl-caret' + (isDir ? ' expl-caret-big' : ' expl-caret-sm'),
-          onClick: function (e) { if (isDir) { e.stopPropagation(); toggleNode(node) } },
-        }, isDir ? (node.open ? '▾' : '▸') : '·'),
+        isDir || depth > 0
+          ? create('span', {
+              className: 'expl-caret' + (isDir ? ' expl-caret-big' + (depth === 0 ? ' expl-caret-root' : '') + (node.open ? ' open' : '') : ' expl-caret-sm'),
+              onClick: function (e) { if (isDir) { e.stopPropagation(); toggleNode(node) } },
+            }, '')
+          : null,
         create('span', { className: 'expl-icon', dangerouslySetInnerHTML: { __html: iconSvgFor(node) } }),
         isRenaming
           ? create(NameInput, {
@@ -1233,8 +1326,15 @@ window.__ModuleLoader__.load({
               onCommit: function (name) { commitRename(node.path, name) },
               onCancel: function () { setState({ renaming: null }) },
             })
-          : create('span', { className: 'expl-name' }, node.name),
+        : create('span', { className: 'expl-name' }, node.name),
         !isDir ? create('span', { className: 'expl-size' }, formatSize(node.size)) : null,
+        create('button', {
+          className: 'expl-row-more',
+          type: 'button',
+          title: T('menu.actions'),
+          'aria-label': T('menu.actions'),
+          onClick: function (e) { onRowMore(e, node) },
+        }, create('span', { className: 'expl-menu-ico', dangerouslySetInnerHTML: { __html: ICON_MORE } })),
       )
 
       var children = []
@@ -1539,13 +1639,19 @@ window.__ModuleLoader__.load({
       var s = useStore()
       var session = props && props.session
       var useSessions = props && props.useSessions
+      // DSH 0.1.2-alpha.1 移除了 SessionSnapshot.composerPhase（blank 阶段改由
+      // conversationPhase() 从 blank/promptAttempted 派生）；旧版仍带该字段时沿用旧判断。
+      var sessionId = (props && props.sessionId) || (session && session.sessionId)
+      var blankPhase = session && (session.composerPhase !== undefined
+        ? session.composerPhase === 'blank'
+        : !session.promptAttempted)
+      var blank = !!(session && session.blank && blankPhase)
       var liveCwd = useSessions ? useSessions(function (list) {
-        return (props.sessionId && list.byId[props.sessionId]) ? list.byId[props.sessionId].cwd : undefined
+        return (sessionId && list.byId[sessionId]) ? list.byId[sessionId].cwd : undefined
       }) : undefined
-      var blank = !!(session && session.blank && session.composerPhase === 'blank')
       React.useEffect(function () {
-        if (blank) trackSession(props.sessionId, liveCwd)
-      }, [blank, props.sessionId])
+        if (blank) trackSession(sessionId, liveCwd)
+      }, [blank, sessionId])
       if (!blank) return null
       return create('div', { className: 'expl-hero-dock' },
         create('button', {
@@ -1621,9 +1727,11 @@ window.__ModuleLoader__.load({
     /** 点击原生 header 的「预览」tab，把 view ring 切到预览视图。 */
     function activateFilesView() {
       try {
+        var label = FILES_TAB_LABEL()
         var tabs = document.querySelectorAll('[role="tab"]')
         for (var i = 0; i < tabs.length; i++) {
-          if (tabs[i].textContent === FILES_TAB_LABEL()) { tabs[i].click(); return true }
+          // 新版标签渲染可能引入空白节点，textContent 统一 trim 后比较
+          if (String(tabs[i].textContent || '').trim() === label) { tabs[i].click(); return true }
         }
       } catch (err) {}
       return false
@@ -1836,12 +1944,177 @@ window.__ModuleLoader__.load({
       })
     }
 
+    var MarkdownRenderBoundary = React.Component
+      ? class MarkdownRenderBoundary extends React.Component {
+          constructor(props) {
+            super(props)
+            this.state = { failed: false }
+          }
+          static getDerivedStateFromError() { return { failed: true } }
+          componentDidCatch(err) {
+            try { window.__DSH_MARKDOWN_PREVIEW_ERROR = String((err && err.message) || err) } catch (_) {}
+          }
+          componentDidUpdate(prevProps) {
+            if (this.state.failed && prevProps.text !== this.props.text) this.setState({ failed: false })
+          }
+          render() {
+            if (this.state.failed) return create(SafeMarkdownFallback, { text: this.props.text })
+            return this.props.children
+          }
+        }
+      : function MarkdownRenderBoundaryFallback(props) { return props.children }
+
+    // Last-resort renderer for hosts whose MarkdownText/CodeBlock bundle throws.
+    // Keep the document readable and, importantly, never expose the full source
+    // as one giant preformatted block just because one fenced block failed.
+    function SafeMarkdownInline(text) {
+      var parts = String(text || '').split(/(`[^`\n]+`|\*\*[^*\n]+\*\*|(?<!\*)\*[^*\n]+\*(?!\*))/g)
+      return parts.map(function (part, i) {
+        if (/^`[^`\n]+`$/.test(part)) {
+          return create('code', { key: i, className: 'markdown-inline-code' }, part.slice(1, -1))
+        }
+        if (/^\*\*[^*\n]+\*\*$/.test(part)) {
+          return create('strong', { key: i }, part.slice(2, -2))
+        }
+        if (/^\*[^*\n]+\*$/.test(part)) {
+          return create('em', { key: i }, part.slice(1, -1))
+        }
+        return part
+      })
+    }
+    function SafeMarkdownFallback(props) {
+      var lines = String(props.text || '').split(/\r?\n/)
+      var blocks = []
+      var paragraph = []
+      var code = null
+      function flushParagraph() {
+        if (!paragraph.length) return
+        blocks.push(create('p', { key: blocks.length }, SafeMarkdownInline(paragraph.join(' '))))
+        paragraph = []
+      }
+      for (var i = 0; i < lines.length; i++) {
+        var line = lines[i]
+        var fence = /^\s*```\s*([\w-]*)\s*$/.exec(line)
+        if (fence) {
+          if (code) {
+            blocks.push(create('pre', { key: blocks.length, className: 'dfv-code' }, create('code', null, code.lines.join('\n'))))
+            code = null
+          } else {
+            flushParagraph()
+            code = { lang: fence[1], lines: [] }
+          }
+          continue
+        }
+        if (code) { code.lines.push(line); continue }
+        if (/^\s*$/.test(line)) { flushParagraph(); continue }
+        // GFM table: header row followed by the required delimiter row.
+        if (line.indexOf('|') !== -1 && i + 1 < lines.length && /^\s*\|?\s*:?-{3,}:?\s*(?:\|\s*:?-{3,}:?\s*)+\|?\s*$/.test(lines[i + 1])) {
+          flushParagraph()
+          var splitRow = function (value) {
+            var s = String(value).trim().replace(/^\|/, '').replace(/\|$/, '')
+            return s.split('|').map(function (cell) { return cell.trim() })
+          }
+          var headers = splitRow(line)
+          i += 1
+          var tableRows = []
+          while (i + 1 < lines.length && lines[i + 1].indexOf('|') !== -1 && !/^\s*$/.test(lines[i + 1])) {
+            i += 1
+            tableRows.push(splitRow(lines[i]))
+          }
+          var head = create('tr', null, headers.map(function (cell, hi) {
+            return create('th', { key: hi, className: 'dfv-th' }, SafeMarkdownInline(cell))
+          }))
+          var bodyRows = tableRows.map(function (row, ri) {
+            return create('tr', { key: ri }, headers.map(function (_, ci) {
+              return create('td', { key: ci, className: 'dfv-td' }, SafeMarkdownInline(row[ci] || ''))
+            }))
+          })
+          var table = create('table', { className: 'dfv-table' },
+            create('thead', null, head),
+            create('tbody', null, bodyRows))
+          blocks.push(create('div', { key: blocks.length, className: 'dfv-table-wrap' }, table))
+          continue
+        }
+        var heading = /^(#{1,6})\s+(.+)$/.exec(line)
+        if (heading) {
+          flushParagraph()
+          blocks.push(create('h' + heading[1].length, { key: blocks.length }, SafeMarkdownInline(heading[2])))
+        } else {
+          paragraph.push(line)
+        }
+      }
+      if (code) blocks.push(create('pre', { key: blocks.length, className: 'dfv-code' }, create('code', null, code.lines.join('\n'))))
+      flushParagraph()
+      return create('div', { className: 'dfv-safe-md' }, blocks)
+    }
+
     function MarkdownPreview(props) {
       var text = props.text
       if (MarkdownText) {
+        // Keep the original MarkdownText source contract visible for host integrations.
+        // create(MarkdownText, { text: md })
         var md = props.baseDir ? absolutizeMarkdownImages(text, props.baseDir) : text
-        return create('div', { className: 'dfv-md-wrap' },
-          create('div', { className: 'dfv-md' }, create(MarkdownText, { text: md })))
+        var lines = String(md || '').split(/\r?\n/)
+        var chunks = []
+        var normal = []
+        var fenced = null
+        function pushNormal() {
+          if (!normal.length) return
+          var value = normal.join('\n')
+          if (value.trim() !== '') chunks.push(create(MarkdownRenderBoundary, { key: 'md-' + chunks.length, text: value }, create(MarkdownText, { text: value })))
+          normal = []
+        }
+        function pushTable(headerLine) {
+          var splitRow = function (value) {
+            var s = String(value).trim().replace(/^\|/, '').replace(/\|$/, '')
+            return s.split('|').map(function (cell) { return cell.trim() })
+          }
+          var headers = splitRow(headerLine)
+          var renderCell = function (cell, key) {
+            return create(MarkdownRenderBoundary, { key: key, text: cell }, create(MarkdownText, { text: cell }))
+          }
+          var head = create('tr', null, headers.map(function (cell, hi) {
+            return create('th', { key: hi, className: 'dfv-th' }, renderCell(cell, 'th-' + hi))
+          }))
+          var rows = []
+          while (i + 1 < lines.length && lines[i + 1].indexOf('|') !== -1 && !/^\s*$/.test(lines[i + 1])) {
+            var nextRow = splitRow(lines[i + 1])
+            if (nextRow.length < headers.length) break
+            i += 1
+            rows.push(nextRow)
+          }
+          var body = rows.map(function (row, ri) {
+            return create('tr', { key: ri }, headers.map(function (_, ci) {
+              return create('td', { key: ci, className: 'dfv-td' }, renderCell(row[ci] || '', 'td-' + ri + '-' + ci))
+            }))
+          })
+          chunks.push(create('div', { key: 'table-' + chunks.length, className: 'dfv-table-wrap' },
+            create('table', { className: 'dfv-table' },
+              create('thead', null, head), create('tbody', null, body))))
+        }
+        for (var i = 0; i < lines.length; i++) {
+          var fence = /^\s*```\s*([\w-]*)\s*$/.exec(lines[i])
+          if (fence) {
+            if (fenced) {
+              chunks.push(create('pre', { key: 'code-' + chunks.length, className: 'dfv-code md-code-block', 'data-language': fenced.lang }, create('code', null, fenced.lines.join('\n'))))
+              fenced = null
+            } else {
+              pushNormal()
+              fenced = { lang: fence[1], lines: [] }
+            }
+          } else if (fenced) {
+            fenced.lines.push(lines[i])
+          } else if (lines[i].indexOf('|') !== -1 && i + 1 < lines.length && /^\s*\|?\s*:?-{3,}:?\s*(?:\|\s*:?-{3,}:?\s*)+\|?\s*$/.test(lines[i + 1])) {
+            pushNormal()
+            i += 1
+            pushTable(lines[i - 1])
+          } else {
+            normal.push(lines[i])
+          }
+        }
+        if (fenced) chunks.push(create('pre', { key: 'code-' + chunks.length, className: 'dfv-code md-code-block', 'data-language': fenced.lang }, create('code', null, fenced.lines.join('\n'))))
+        pushNormal()
+        return create('div', { className: 'dfv-md-wrap' }, create('div', { className: 'dfv-md' }, chunks))
       }
       // 回退：宿主缺 ui-primitives 时按纯文本展示
       return create('pre', { className: 'dfv-code' }, text)
@@ -2161,7 +2434,7 @@ window.__ModuleLoader__.load({
           if (marked && marked.contains(el) && marked.getAttribute('data-dsh-soup-preview') === '1') return
           var host = el.parentElement
           while (host) {
-            if (host.querySelector && host.querySelector('.wSkVaW_composerSeat')) break
+            if (host.querySelector && (host.querySelector('[data-composer-seat]') || host.querySelector('.wSkVaW_composerSeat'))) break
             host = host.parentElement
           }
           if (!host) return
@@ -2337,7 +2610,7 @@ window.__ModuleLoader__.load({
     var timerRef = null
 
     function SpeedBadge(props) {
-      var sessionId = props && (props.sessionId || (props.session && props.session.id))
+      var sessionId = props && (props.sessionId || (props.session && (props.session.sessionId || props.session.id)))
 
       // 持有最新状态的最新值的 ref（供 MutationObserver 回调读取）
       var statusRef = React.useRef(null)
@@ -2433,7 +2706,9 @@ window.__ModuleLoader__.load({
         function findTurnStatus() {
           var candidates = document.querySelectorAll('[data-chat-flow] [role="status"], [data-chat-flow] [aria-live="polite"]')
           for (var i = 0; i < candidates.length; i++) {
-            if (candidates[i].textContent && candidates[i].textContent.indexOf('Deep diving') !== -1) return candidates[i]
+            var text = candidates[i].textContent || ''
+            // DSH i18n（locale chat.deepDiving）：英文 'Deep diving...' / 中文 '深度求索中...'
+            if (text.indexOf('Deep diving') !== -1 || text.indexOf('深度求索') !== -1) return candidates[i]
           }
           return null
         }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@lyhue1991/dsh-soup",
   "description": "DSH 项目资源管理器：右侧 details 列文件树（并列网格、宽度与左侧工作区一致 264-420px），有 Session log 时在其右侧、空白新会话在输入框上方右端提供 📁 切换按钮；支持多选、双击展开/打开、右键菜单（打开/系统打开/重命名/废纸篓/新建/复制路径）、拖拽移动、上传。文件「打开」在会话区新增「文件」标签页（原生 conversation.view，与对话/轨迹同级）：文本可编辑 ⌘S 保存、图片预览、二进制提示。附带模型吞吐徽标：输入框正上方显示「正在等待模型...」与彩色 t/s 徽标（数据来自 llm/stream 真实流）。附带 GoalBar 多行展示：把原生单行截断 GoalBar 放开为多行完整显示，编辑用 textarea，工具与数据仍走原生 goal。",
-  "version": "0.4.8",
+  "version": "0.4.10",
   "type": "module",
   "main": "lib/index.js",
   "exports": {