dsh-remote-workspaces 0.2.0 → 0.3.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-remote-workspaces",
-  "version": "0.2.0",
+  "version": "0.3.0",
   "type": "module",
   "description": "Open folders on remote hosts over SSH as DeepSeek Harness workspaces — a non-invasive DSH bundle.",
   "license": "MIT",
@@ -14,19 +14,26 @@
   "main": "./src/index.js",
   "exports": {
     ".": "./src/index.js",
-    "./client": "./src/client.js"
+    "./client": "./lib/client.js"
   },
   "files": [
     "src",
     "cordis.patch.yml"
   ],
   "scripts": {
-    "test": "node test/unit-anchor-path.mjs && node test/unit-secrets-encryption.mjs && node test/unit-fs.mjs && node test/unit-shell.mjs && node test/unit-routing.mjs && node test/unit-remote-policy.mjs && node test/unit-search-registration.mjs && node test/unit-win-remote.mjs && node test/unit-registry-os.mjs",
+    "build:client": "node scripts/build-client.mjs",
+    "prepack": "node scripts/build-client.mjs",
+    "test": "node test/unit-anchor-path.mjs && node test/unit-secrets-encryption.mjs && node test/unit-fs.mjs && node test/unit-shell.mjs && node test/unit-routing.mjs && node test/unit-remote-policy.mjs && node test/unit-search-registration.mjs && node test/unit-win-remote.mjs && node test/unit-registry-os.mjs && node test/unit-local-browse.mjs && node test/unit-shell-sessions.mjs",
     "test:integration": "node test/integration-remote.mjs"
   },
   "dependencies": {
     "ssh2": "^1.17.0"
   },
+  "devDependencies": {
+    "@xterm/addon-fit": "^0.11.0",
+    "@xterm/xterm": "^5.5.0",
+    "esbuild": "^0.25.12"
+  },
   "dsh": {
     "bundle": {
       "patch": "./cordis.patch.yml"

package/src/client.js

@@ -3,20 +3,29 @@
  *
  * 1. A "远程工作区" settings section — a multi-machine SSH registry (add /
  *    edit / delete / test) with `~/.ssh/config` as a one-click form-fill
- *    convenience. NO remote browsing here.
+ *    convenience.
  *
  * 2. A composed directory-flow picker registered into the harness's two
  *    workspace-add holes (`conversation.hero.workspace.directoryFlow` and
  *    `sidebar.workspaces.directoryFlow`) at a lower priority so it shadows the
- *    native chooser and offers BOTH "本地文件夹" (delegates to the host
- *    chooser) and "远程目录" (pick a machine → browse the remote → open it as
- *    a remote workspace → hand the anchor path back through `onPicked`).
+ *    native chooser and offers BOTH "本地文件夹" and "远程目录".
  *
- * Served verbatim as a classic script, so it self-registers through
- * `window.__ModuleLoader__` in factory form (no ESM import/export); `react` is
- * a platform seed word resolved via `require("react")`.
+ * 3. A "Shell" tab type (kind `shell`, guide entry on the 开始/Start page)
+ *    whose body renders a real xterm terminal backed by a local PTY session.
+ *
+ * Built by `scripts/build-client.mjs` (esbuild) into `lib/client.js`: the
+ * bundle registers `window.__ModuleLoader__.load({id, factory})`, keeps `react`
+ * as a platform seed word (resolved by the factory's injected `require`), and
+ * INLINES `@xterm/xterm` + its CSS. `exports["./client"]` points at the built
+ * artifact, so no deepseek-harness source is modified.
  */
 
+import { Terminal } from '@xterm/xterm'
+import { FitAddon } from '@xterm/addon-fit'
+import xtermCss from '@xterm/xterm/css/xterm.css'
+
+var React = require('react')
+
 // ---------------------------------------------------------------------------
 // Remote contract (must match src/index.js). Parameters carry strict codecs
 // with a pass-through `parse` (the client `$mount` face rejects `src-json`).
@@ -56,7 +65,16 @@ var INVOCATIONS = [
   invocation('sshAliasDetail', [jsonParameter('alias')]),
   invocation('testConnection', [jsonParameter('machine')]),
   invocation('listRemoteDir', [jsonParameter('machine'), jsonParameter('path')]),
+  invocation('listLocalDir', [jsonParameter('path')]),
   invocation('openRemoteWorkspace', [jsonParameter('machine'), jsonParameter('path')]),
+  invocation('openShellLocal', [jsonParameter('opts')]),
+  invocation('openShellRemote', [jsonParameter('machine'), jsonParameter('opts')]),
+  invocation('openShellAt', [jsonParameter('cwd'), jsonParameter('opts')]),
+  invocation('shellWrite', [jsonParameter('id'), jsonParameter('data')]),
+  invocation('shellRead', [jsonParameter('id')]),
+  invocation('shellResize', [jsonParameter('id'), jsonParameter('rows'), jsonParameter('cols')]),
+  invocation('shellClose', [jsonParameter('id')]),
+  invocation('shellList'),
 ]
 
 function unwrapRemote(res) {
@@ -68,13 +86,6 @@ function unwrapRemote(res) {
   return res.value || { ok: false, error: '空结果' }
 }
 
-window.__ModuleLoader__.load({
-  id: PACKAGE,
-  factory: (require) => {
-    var module = { exports: {} }
-    var exports = module.exports
-    var React = require('react')
-
     var sectionStyle = { padding: 16, fontSize: 14, lineHeight: 1.6, maxWidth: 820, color: 'inherit' }
     var labelStyle = { color: '#8b8f98', margin: 0, fontSize: 12.5 }
     var monoStyle = { fontFamily: 'ui-monospace, SFMono-Regular, Menlo, Consolas, monospace', fontSize: 12.5 }
@@ -541,6 +552,156 @@ window.__ModuleLoader__.load({
       return idx <= 0 ? '/' : s.slice(0, idx)
     }
 
+    // -----------------------------------------------------------------------
+    // Remote-access discrimination for the LOCAL folder tab (pure origin rule,
+    // plugin-agnostic — any remote proxy/portal serves the page from its own
+    // non-loopback host, so only a page direct from the host's own loopback is
+    // treated as local). Mirrors dsh's own isLoopbackHostname semantics.
+    // -----------------------------------------------------------------------
+    function isLoopbackHostname(hostname) {
+      var h = String(hostname || '').toLowerCase()
+      if (h === 'localhost' || h === '[::1]' || h === '::1') return true
+      var parts = h.split('.')
+      return parts.length === 4 && parts[0] === '127'
+        && parts.every(function (part) { return /^\d{1,3}$/.test(part) && Number(part) <= 255 })
+    }
+
+    // True when the page is NOT served from the host's own loopback: remote
+    // access (e.g. via the dsh gateway portal) — the OS chooser would open on
+    // an unattended desktop, so the local tab must browse in-app instead.
+    function pageIsRemote() {
+      try {
+        if (typeof location === 'undefined' || location === null || !location.hostname) return true
+        return !isLoopbackHostname(location.hostname)
+      } catch (e) { return true }
+    }
+
+    // Local browse keeps paths in '/' canonical form (the host resolves either
+    // separator); '..' requests walk up through the host's platform resolver.
+    function canonicalLocal(p) { return String(p || '').replace(/\\/g, '/') }
+    function localUpPath(p) { return canonicalLocal(p).replace(/\/+$/, '') + '/..' }
+    function localIsDriveRoot(p) { return /^[A-Za-z]:\/$/.test(canonicalLocal(p)) }
+
+    // Virtual Windows drive-selection level (keep in sync with src/local-browse.js).
+    var LOCAL_DRIVES_REQUEST = '::drives::'
+
+    // In-app browser for the LOCAL filesystem (shown when the page is NOT
+    // served from the host's own loopback — remote access cannot see an OS
+    // chooser that opens on the host desktop). Same interaction as the remote
+    // pane: path bar + one-level listing + 上一级/跳转, open adopts the path.
+    function LocalDirectoryBrowse(props) {
+      var getRemote = props.getRemote
+      var onPicked = props.onPicked
+      var busy = props.busy
+      var isMobile = props.isMobile
+      var browseState = React.useState(null)
+      var browse = browseState[0]
+      var setBrowse = browseState[1]
+      var pathInputState = React.useState('')
+      var pathInput = pathInputState[0]
+      var setPathInput = pathInputState[1]
+
+      function load(path) {
+        var ns = getRemote()
+        if (!ns) {
+          setBrowse({ loading: false, error: 'Remote 命名空间未就绪', path: '', entries: [], truncated: false })
+          return
+        }
+        setBrowse({ loading: true, error: null, path: typeof path === 'string' && path !== '' ? canonicalLocal(path) : '', entries: [], truncated: false })
+        // Always pass exactly one argument (Typert counts arguments): '' = home.
+        ns.listLocalDir(typeof path === 'string' && path !== '' ? path : '').then(
+          function (res) {
+            var b = unwrapRemote(res)
+            setBrowse(function (prev) {
+              if (!prev || !prev.loading) return prev
+              if (b.ok) return { loading: false, error: null, path: canonicalLocal(b.path), virtual: !b.path, entries: b.entries || [], truncated: !!b.truncated }
+              return { loading: false, error: b.error || '列出目录失败', path: '', entries: [], truncated: false }
+            })
+          },
+          function (err) {
+            setBrowse(function (prev) {
+              if (!prev || !prev.loading) return prev
+              return { loading: false, error: err && err.message ? err.message : String(err), path: '', entries: [], truncated: false }
+            })
+          },
+        )
+      }
+
+      // Fresh listing of the host home directory on open ('' = home).
+      React.useEffect(function () { load('') }, [])
+
+      // Keep the path input in sync with the listed directory.
+      React.useEffect(function () {
+        if (browse && browse.path !== undefined && browse.path !== null) setPathInput(browse.path)
+        else setPathInput('')
+      }, [browse && browse.path])
+
+      function navigate(name) {
+        if (!browse) return
+        // Virtual drive level: its rows ARE drive roots ('C:' → 'C:/').
+        if (browse.virtual) { load(name + '/'); return }
+        if (!browse.path) return
+        load(browse.path.replace(/\/+$/, '') + '/' + name)
+      }
+      function goUp() {
+        if (!browse || !browse.path || browse.virtual) return
+        // At a Windows drive root there is no real '..' (it resolves back to the
+        // same root): step up to the virtual drive-selection level instead.
+        if (localIsDriveRoot(browse.path)) { load(LOCAL_DRIVES_REQUEST); return }
+        load(localUpPath(browse.path))
+      }
+      function jumpTo() {
+        var v = pathInput.trim()
+        if (v !== '') load(v)
+      }
+      function confirmOpen() {
+        if (browse && browse.path && !browse.loading && !busy) onPicked(browse.path)
+      }
+
+      var disabled = !browse || browse.loading
+      var atFilesystemTop = !browse || browse.virtual || !browse.path || canonicalLocal(browse.path) === '/'
+      var rows = (browse ? browse.entries : []) || []
+      return React.createElement('div', { style: { border: '1px solid ' + borderColor, borderRadius: 6, padding: 10 } },
+        React.createElement('div', { style: { display: 'flex', alignItems: 'center', gap: 8, marginBottom: 8, flexWrap: 'wrap' } },
+          React.createElement('input', {
+            type: 'text',
+            value: pathInput,
+            onChange: function (e) { setPathInput(e.target.value) },
+            onKeyDown: function (e) { if (e.key === 'Enter') jumpTo() },
+            placeholder: '输入绝对路径，或 ~ 回到主目录',
+            spellCheck: false,
+            style: Object.assign({}, monoStyle, isMobile
+              ? { flex: '1 1 100%', minWidth: 0, padding: '9px 8px', fontSize: 16, boxSizing: 'border-box' }
+              : { flex: 1, minWidth: 0, padding: '5px 8px', fontSize: 13, boxSizing: 'border-box' }),
+          }),
+          React.createElement('button', { type: 'button', onClick: jumpTo, disabled: disabled, style: Object.assign({}, btnStyle, isMobile ? { flex: 1 } : {}, isMobile ? mobileBtnStyle : {}) }, '跳转'),
+          React.createElement('button', { type: 'button', onClick: goUp, disabled: disabled || atFilesystemTop, style: Object.assign({}, btnStyle, isMobile ? { flex: 1 } : {}, isMobile ? mobileBtnStyle : {}) }, '上一级'),
+        ),
+        browse && browse.loading
+          ? React.createElement('div', { style: labelStyle }, '加载中…')
+          : browse && browse.error
+            ? React.createElement('div', { style: { color: dangerColor, margin: 0 } }, browse.error)
+            : browse
+              ? React.createElement('div', { style: { maxHeight: 220, overflow: 'auto', border: '1px solid ' + borderColor, borderRadius: 6 } },
+                  rows.slice().sort(function (a, b) {
+                    if (a.dir !== b.dir) return a.dir ? -1 : 1
+                    var an = a.name.toLowerCase()
+                    var bn = b.name.toLowerCase()
+                    return an < bn ? -1 : an > bn ? 1 : 0
+                  }).map(function (e) {
+                    return React.createElement(EntryRow, { key: (e.dir ? 'd:' : 'f:') + e.name, entry: e, onOpen: navigate })
+                  }),
+                )
+              : null,
+        browse && browse.truncated
+          ? React.createElement('div', { style: Object.assign({}, labelStyle, { marginTop: 6 }) }, '目录项过多，仅显示前 1000 条')
+          : null,
+        React.createElement('div', { style: { marginTop: 10 } },
+          React.createElement('button', { type: 'button', onClick: confirmOpen, disabled: disabled || busy || !browse || !browse.path, style: Object.assign({}, btnPrim, isMobile ? { width: '100%' } : {}, isMobile ? btnPrimMob : {}) }, '打开此目录'),
+        ),
+      )
+    }
+
     // One remote directory/file row: directories render first with a folder
     // icon and are clickable; files render below with a muted style.
     function EntryRow(props) {
@@ -610,6 +771,9 @@ window.__ModuleLoader__.load({
       var pathInput = pathInputState[0]
       var setPathInput = pathInputState[1]
       var isMobile = useIsMobile()
+      // Not served from the host's own loopback (remote access): the OS folder
+      // chooser would open on an unattended desktop — use the in-app browser.
+      var remoteAccess = pageIsRemote()
 
       // Reset per open edge, then load machines.
       React.useEffect(function () {
@@ -730,10 +894,12 @@ window.__ModuleLoader__.load({
             React.createElement('button', { type: 'button', onClick: function () { setMode('remote') }, style: Object.assign({}, btnStyle, isMobile ? { flex: 1 } : {}, isMobile ? mobileBtnStyle : {}, mode === 'remote' ? { background: '#6e56cf', color: '#fff', border: '1px solid transparent' } : {}) }, '远程目录'),
           ),
           mode === 'local'
-            ? React.createElement('div', {},
-                React.createElement('p', { style: { margin: '0 0 12px' } }, '在本机打开系统文件夹选择器，选取一个本地目录作为工作区。'),
-                React.createElement('button', { type: 'button', onClick: doLocal, disabled: localPicking || busy, style: Object.assign({}, btnStyle, isMobile ? { width: '100%' } : {}, isMobile ? mobileBtnStyle : {}) }, localPicking ? '等待选择…' : '选择本地文件夹'),
-              )
+            ? remoteAccess
+              ? React.createElement(LocalDirectoryBrowse, { getRemote: getRemote, onPicked: onPicked, busy: busy, isMobile: isMobile })
+              : React.createElement('div', {},
+                  React.createElement('p', { style: { margin: '0 0 12px' } }, '在本机打开系统文件夹选择器，选取一个本地目录作为工作区。'),
+                  React.createElement('button', { type: 'button', onClick: doLocal, disabled: localPicking || busy, style: Object.assign({}, btnStyle, isMobile ? { width: '100%' } : {}, isMobile ? mobileBtnStyle : {}) }, localPicking ? '等待选择…' : '选择本地文件夹'),
+                )
             : React.createElement('div', {},
                 React.createElement('div', { style: { marginBottom: 8 } }, '选择 SSH 主机（在「设置 → 远程工作区」中配置）：'),
                 machinesLoaded && machines.length === 0
@@ -796,7 +962,309 @@ window.__ModuleLoader__.load({
       )
     }
 
-    exports.inject = ['slots', 'remote', 'uiWorkspace']
+    // =========================================================================
+    // Shell tab: a real xterm terminal opened directly AT the current workspace
+    // cwd — no local/remote chooser. The host resolves the cwd to a local PTY
+    // or to a remote shell channel on the matching anchor machine.
+    //
+    // A shell session is KEPT ALIVE across session switches: the tab body
+    // unmounts when its session leaves the screen but its occurrence signal is
+    // NOT aborted, so the host session persists and the next mount re-attaches
+    // to it (no reconnect, no "连接中").
+    // =========================================================================
+    var shellSessionCache = {}
+
+    function ShellBody(props) {
+      var getRemote = props.getRemote
+      var getCwd = props.getCwd
+      var getSessionId = props.getSessionId
+      var useTabInfo = props.useTabInfo
+      return React.createElement(TerminalPane, { getRemote: getRemote, getCwd: getCwd, getSessionId: getSessionId, useTabInfo: useTabInfo })
+    }
+
+    function TerminalPane(props) {
+      var getRemote = props.getRemote
+      var getCwd = props.getCwd
+      var getSessionId = props.getSessionId
+      var useTabInfo = props.useTabInfo
+      var info = useTabInfo ? useTabInfo() : null
+      var tabSignal = info ? info.tab.signal : null
+      var tabId = info && info.tab ? info.tab.id : 'shell'
+      var containerRef = React.useRef(null)
+      var termRef = React.useRef(null)
+      var sessionRef = React.useRef(null)
+      var kindRef = React.useRef(null)
+      var timerRef = React.useRef(null)
+      var statusState = React.useState('connecting')
+      var status = statusState[0]
+      var setStatus = statusState[1]
+      var errState = React.useState(null)
+      var err = errState[0]
+      var setErr = errState[1]
+      var labelState = React.useState('终端')
+      var label = labelState[0]
+      var setLabel = labelState[1]
+
+      React.useEffect(function () {
+        var disposed = false
+        var el = containerRef.current
+        if (!el) return undefined
+
+        var fg = resolveShellFg()
+
+        var term = new Terminal({
+          cursorBlink: true,
+          fontSize: 13,
+          fontFamily: 'ui-monospace, SFMono-Regular, Menlo, Consolas, monospace',
+          scrollback: 2000,
+          convertEol: false,
+          allowTransparency: true,
+          theme: { background: 'transparent', foreground: fg, cursor: fg, cursorAccent: 'transparent' },
+        })
+        var fitAddon = new FitAddon()
+        term.loadAddon(fitAddon)
+        termRef.current = term
+        term.open(el)
+        term.focus()
+
+        // Follow theme switches (dark <-> light): the pane background is
+        // transparent, so the foreground must re-resolve or light-mode text
+        // turns white-on-white.
+        var themeObserver = null
+        if (typeof MutationObserver !== 'undefined' && document.body) {
+          themeObserver = new MutationObserver(function () {
+            if (disposed) return
+            var next = resolveShellFg()
+            try { term.options.theme = { background: 'transparent', foreground: next, cursor: next, cursorAccent: 'transparent' } } catch (e2) { /* noop */ }
+          })
+          themeObserver.observe(document.body, { attributes: true, attributeFilter: ['data-ds-dark-theme'] })
+        }
+
+        var ns = getRemote()
+        if (!ns) {
+          setStatus('error')
+          setErr('Remote 命名空间未就绪')
+          term.writeln('\x1b[31m[shell] Remote 命名空间未就绪\x1b[0m')
+          return undefined
+        }
+
+        // Stable per-(session, tab) key derived from the session id + the dock
+        // tab id. Both survive a page refresh (the session is resumed and the
+        // layout restores the tab id), so a re-mount — or a re-load — re-attaches
+        // to the same host session instead of reconnecting or leaking a new one.
+        var key = (getSessionId ? getSessionId() : 's') + ':' + tabId
+
+        var opened = false
+        var ro = null
+        var rafId = 0
+        var resizePending = false
+
+        function openWithFittedSize() {
+          if (disposed || opened) return
+          opened = true
+          if (rafId) { cancelAnimationFrame(rafId); rafId = 0 }
+          try { fitAddon.fit() } catch (e) { /* keep default rows/cols */ }
+          var cached = shellSessionCache[key]
+          if (cached && cached.id) {
+            // Re-attaching to a kept-alive session: show connected at once,
+            // and the full scrollback replays when the attach resolves below.
+            setLabel(cached.label || '本机')
+            setStatus('open')
+          }
+          var opts = { rows: term.rows, cols: term.cols, key: key }
+          var cwd = getCwd ? getCwd() : undefined
+          ns.openShellAt(cwd, opts).then(
+            function (res) {
+              if (disposed) return
+              var b = unwrapRemote(res)
+              if (!b.ok) {
+                setStatus('error')
+                setErr(b.error || '打开失败')
+                term.writeln('\x1b[31m[shell] ' + (b.error || '打开失败') + '\x1b[0m')
+                return
+              }
+              // Attach replays the capped scrollback so the terminal is not blank.
+              if (b.attached && b.history) term.write(b.history)
+              sessionRef.current = b.id
+              kindRef.current = b.kind || null
+              setLabel(b.label || (b.kind === 'remote' ? '远程' : '本机'))
+              setStatus('open')
+              shellSessionCache[key] = { id: b.id, kind: b.kind || null, label: b.label || (b.kind === 'remote' ? '远程' : '本机') }
+              timerRef.current = setTimeout(tick, 60)
+            },
+            function (e) {
+              if (disposed) return
+              setStatus('error')
+              setErr(e && e.message ? e.message : String(e))
+              term.writeln('\x1b[31m[shell] ' + (e && e.message ? e.message : String(e)) + '\x1b[0m')
+            },
+          )
+        }
+
+        function tick() {
+          if (disposed) return
+          var id = sessionRef.current
+          if (!id) return
+          ns.shellRead(id).then(
+            function (r) {
+              if (disposed) return
+              var out = unwrapRemote(r)
+              if (out.ok) {
+                if (out.text) term.write(out.text)
+                if (out.eof) { endSession('会话已结束'); return }
+              } else if (/session not found/.test(out.error || '')) {
+                endSession('会话已结束')
+                return
+              }
+              timerRef.current = setTimeout(tick, 60)
+            },
+            function () {
+              if (disposed) return
+              timerRef.current = setTimeout(tick, 60)
+            },
+          )
+        }
+
+        function endSession(msg) {
+          if (disposed || sessionRef.current === null) return
+          var id = sessionRef.current
+          sessionRef.current = null
+          if (timerRef.current) { clearTimeout(timerRef.current); timerRef.current = null }
+          term.writeln('\r\n\x1b[2m[shell] ' + msg + '\x1b[0m')
+          setStatus('ended')
+          delete shellSessionCache[key]
+          if (id) ns.shellClose(id)
+        }
+
+        function scheduleFit() {
+          if (disposed || !opened || sessionRef.current === null) return
+          if (resizePending) return
+          resizePending = true
+          requestAnimationFrame(function () {
+            resizePending = false
+            if (disposed || !opened || sessionRef.current === null) return
+            var beforeR = term.rows
+            var beforeC = term.cols
+            try { fitAddon.fit() } catch (e) { /* noop */ }
+            if (term.rows !== beforeR || term.cols !== beforeC) {
+              var id = sessionRef.current
+              if (kindRef.current === 'remote') ns.shellResize(id, term.rows, term.cols)
+            }
+          })
+        }
+
+        // Fit once when the flex chain gives real dimensions, then re-fit live
+        // on resize. Remote sessions push the new rows/cols to the PTY via
+        // setWindow; local sessions only re-fit the view (no seam resize — S0).
+        if (typeof ResizeObserver !== 'undefined') {
+          ro = new ResizeObserver(function (entries) {
+            var r = entries[0] && entries[0].contentRect
+            if (!r || r.height <= 0 || r.width <= 0) return
+            if (opened) scheduleFit()
+            else openWithFittedSize()
+          })
+          ro.observe(el)
+        }
+        var attempt = function () {
+          if (disposed || opened) return
+          if (el.clientHeight > 0 && el.clientWidth > 0) { openWithFittedSize(); return }
+          rafId = requestAnimationFrame(attempt)
+        }
+        rafId = requestAnimationFrame(attempt)
+
+        var dataDisposable = term.onData(function (data) {
+          var id = sessionRef.current
+          if (id && ns) ns.shellWrite(id, data)
+        })
+
+        return function () {
+          disposed = true
+          if (ro !== null) ro.disconnect()
+          if (themeObserver !== null) themeObserver.disconnect()
+          if (rafId) cancelAnimationFrame(rafId)
+          if (timerRef.current) clearTimeout(timerRef.current)
+          if (dataDisposable && dataDisposable.dispose) dataDisposable.dispose()
+          var id = sessionRef.current
+          // Close the host session only when the tab is genuinely removed
+          // (occurrence signal aborted). A session switch unmounts the body
+          // WITHOUT aborting, so the shell stays alive for the next re-attach.
+          var removed = tabSignal ? tabSignal.aborted : true
+          if (id && ns && removed) {
+            delete shellSessionCache[key]
+            ns.shellClose(id)
+          }
+          if (termRef.current) { try { termRef.current.dispose() } catch (e2) { /* noop */ } }
+          termRef.current = null
+          sessionRef.current = null
+        }
+      }, [])
+
+      return React.createElement(
+        'div',
+        { className: 'dsh-rw-shell', style: { display: 'flex', flexDirection: 'column', height: '100%', minHeight: 0, overflow: 'hidden' } },
+        React.createElement('div', { style: { flex: '0 0 auto', display: 'flex', alignItems: 'center', gap: 8, padding: '4px 10px', borderBottom: '1px solid ' + borderColor, fontSize: 12, color: '#8b8f98' } },
+          React.createElement('span', { style: { flex: 1, minWidth: 0, overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap' } },
+            status === 'open' ? label + ' · 已连接' : status === 'ended' ? label + ' · 已结束' : status === 'error' ? label + ' · 出错' : '连接中…'),
+          React.createElement('button', {
+            type: 'button',
+            title: '新建 Shell',
+            onClick: function () {
+              try { if (info && info.tab && info.tab.actions) info.tab.actions.openTab(info.tab.kind, { revealIfOpened: false }) } catch (e2) { /* noop */ }
+            },
+            style: { padding: '2px 8px', fontSize: 11.5, cursor: 'pointer', background: 'rgba(127,127,127,0.12)', color: 'inherit', border: '1px solid rgba(127,127,127,0.3)', borderRadius: 4, whiteSpace: 'nowrap' },
+          }, '＋ 新建'),
+        ),
+        err !== null
+          ? React.createElement('div', { style: { flex: '0 0 auto', padding: '6px 10px', color: '#e5484d', fontFamily: 'ui-monospace, monospace', fontSize: 12, whiteSpace: 'pre-wrap' } }, err)
+          : null,
+        React.createElement('div', { ref: containerRef, style: { flex: 1, minHeight: 0, width: '100%' } }),
+      )
+    }
+
+    // Terminal glyph for the 开始 page entry box (drawn at 16px; color rides currentColor).
+    function ShellIcon(props) {
+      var size = props && props.size ? props.size : 16
+      return React.createElement('svg', {
+        width: size,
+        height: size,
+        viewBox: '0 0 16 16',
+        fill: 'none',
+        stroke: 'currentColor',
+        strokeWidth: 1.5,
+        strokeLinecap: 'round',
+        strokeLinejoin: 'round',
+        'aria-hidden': 'true',
+        xmlns: 'http://www.w3.org/2000/svg',
+      },
+        React.createElement('rect', { x: 1.5, y: 2.5, width: 13, height: 11, rx: 2 }),
+        React.createElement('path', { d: 'M4.5 5.5 L7 8 L4.5 10.5' }),
+        React.createElement('line', { x1: 8, y1: 10.5, x2: 11.5, y2: 10.5 }),
+      )
+    }
+
+    // Foreground for the xterm: the theme's primary label color, with a
+    // dark/light fallback. `--dsw-alias-label-primary` is dark in light mode
+    // and light in dark mode; resolving it through a real DOM probe follows the
+    // active theme exactly, while the attribute fallback keeps the shell
+    // readable if the probe ever fails (or the token is unavailable).
+    function resolveShellFg() {
+      var dark = false
+      try { dark = document.body !== null && document.body.hasAttribute('data-ds-dark-theme') } catch (e) { /* default light */ }
+      var fallback = dark ? '#e6edf3' : '#0f1115'
+      try {
+        if (typeof document !== 'undefined' && typeof getComputedStyle === 'function' && document.body) {
+          var probe = document.createElement('div')
+          probe.style.color = 'var(--dsw-alias-label-primary)'
+          document.body.appendChild(probe)
+          var resolved = getComputedStyle(probe).color
+          document.body.removeChild(probe)
+          if (resolved && resolved !== 'rgba(0, 0, 0, 0)' && resolved !== 'transparent') return resolved
+        }
+      } catch (e) { /* use fallback */ }
+      return fallback
+    }
+
+    exports.inject = ['slots', 'remote', 'uiWorkspace', 'sidebarRightTabs', 'sessions']
 
     exports.apply = function apply(ctx) {
       // Inject a small set of theme-aware control styles (hover / focus /
@@ -821,8 +1289,37 @@ window.__ModuleLoader__.load({
         document.head.appendChild(styleEl)
       }
 
+      // Inject xterm's stylesheet (inlined as text by the esbuild build).
+      if (typeof document !== 'undefined' && document.head && xtermCss && !document.getElementById('dsh-rw-xterm')) {
+        var xtermStyle = document.createElement('style')
+        xtermStyle.id = 'dsh-rw-xterm'
+        xtermStyle.textContent = xtermCss
+          + '\n.dsh-rw-shell .xterm{height:100%}'
+          + '\n.dsh-rw-shell .xterm-viewport{background-color:transparent!important}'
+          + '\n.dsh-rw-shell .xterm-screen{background-color:transparent!important}'
+        document.head.appendChild(xtermStyle)
+      }
+
       var mount = ctx.remote.$mount({ package: PACKAGE, descriptors: INVOCATIONS })
       var getRemote = function () { return ctx.get('remote.' + NAMESPACE) }
+      var getCwd = function () {
+        try {
+          var sessions = ctx.sessions
+          if (!sessions || !sessions.list || typeof sessions.list.getSnapshot !== 'function') return undefined
+          var snap = sessions.list.getSnapshot()
+          var id = snap && snap.current
+          var row = id && snap.byId ? snap.byId[id] : undefined
+          return row ? row.cwd : undefined
+        } catch (e) { return undefined }
+      }
+      var getSessionId = function () {
+        try {
+          var sessions = ctx.sessions
+          if (!sessions || !sessions.list || typeof sessions.list.getSnapshot !== 'function') return undefined
+          var snap = sessions.list.getSnapshot()
+          return snap && snap.current ? String(snap.current) : undefined
+        } catch (e) { return undefined }
+      }
 
       // Settings section: machines + open remote workspaces (grouped by host).
       ctx.slots.inject('settings.section', function () {
@@ -837,6 +1334,30 @@ window.__ModuleLoader__.load({
         )
       })
 
+      // Shell tab type + body (real xterm terminal; S0 = local shell only).
+      var SHELL_KIND = 'shell'
+      var SHELL_ID = 'dsh-remote-workspaces/shell'
+      ctx.effect(function () {
+        return ctx.sidebarRightTabs.register({
+          id: SHELL_ID,
+          kind: SHELL_KIND,
+          priority: 'extension',
+          title: function () { return 'Shell' },
+          guide: [{
+            order: 20,
+            title: function () { return 'Shell' },
+            description: function () { return '打开当前工作区的交互终端' },
+            icon: ShellIcon,
+          }],
+        })
+      })
+      ctx.slots.inject('sidebar.right.pane.tab', function () {
+        return ctx.slots.register(
+          { name: 'sidebar.right.pane.tab', key: SHELL_ID, inject: function () { return { getRemote: getRemote, getCwd: getCwd, getSessionId: getSessionId } } },
+          ShellBody,
+        )
+      })
+
       // Composed workspace-add picker (shadows the native chooser at a lower priority).
       var flowInjected = function () {
         return {
@@ -857,7 +1378,3 @@ window.__ModuleLoader__.load({
         })
       })
     }
-
-    return module.exports
-  },
-})