dsh-remote 0.8.7 → 0.8.9

package/lib/client.js

@@ -86,6 +86,29 @@ window.__ModuleLoader__.load({
       return `${d.getFullYear()}-${pad(d.getMonth() + 1)}-${pad(d.getDate())} ${pad(d.getHours())}:${pad(d.getMinutes())}`
     }
 
+    // Write text to the clipboard. Prefers the async Clipboard API (works on
+    // http://127.0.0.1 secure contexts) and falls back to the legacy
+    // execCommand('copy') path, mirroring primitives' writeClipboard semantics.
+    function copyToClipboard(text) {
+      if (navigator.clipboard && window.isSecureContext) {
+        return navigator.clipboard.writeText(text).then(() => true).catch(() => false)
+      }
+      try {
+        const ta = document.createElement('textarea')
+        ta.value = String(text)
+        ta.style.position = 'fixed'
+        ta.style.opacity = '0'
+        document.body.appendChild(ta)
+        ta.focus()
+        ta.select()
+        const ok = document.execCommand('copy')
+        ta.remove()
+        return Promise.resolve(ok)
+      } catch (e) {
+        return Promise.resolve(false)
+      }
+    }
+
     let WORKSPACES = null // ctx.get('workspaces'), set in apply()
     let SESSIONS = null // ctx.get('sessions'), set in apply()
 
@@ -118,7 +141,10 @@ window.__ModuleLoader__.load({
           proxy: form.proxyHost ? { host: form.proxyHost, port: Number(form.proxyPort) || 22, username: form.proxyUser || '', password: form.proxyPassword || '', privateKeyPath: form.proxyKey || '' } : undefined,
         })
           .then((r) => {
-            if (r && r.ok) { setTst('ok'); setMsg(r.latencyMs != null ? `连接成功（${r.user}@${r.host}，${r.latencyMs}ms）` : '连接成功'); refresh() }
+            if (r && r.ok) {
+              const shellTag = r.platform === 'windows' ? (r.gitBash ? '（Windows · Git Bash）' : '（Windows · 未找到 Git Bash）') : (r.platform === 'posix' ? '（POSIX）' : '')
+              setTst('ok'); setMsg(r.latencyMs != null ? `连接成功（${r.user}@${r.host}，${r.latencyMs}ms）${shellTag}` : '连接成功'); refresh()
+            }
             else { setTst('failing'); setErr((r && r.error) || '连接失败') }
           })
           .catch((e) => { setTst('failing'); setErr(String((e && e.message) || e)) })
@@ -204,6 +230,9 @@ window.__ModuleLoader__.load({
         }).then((r) => { refresh(); clearForm(); setMsg(form.id ? '已保存更新' : '已添加 — 可设为当前') }).catch((e) => setErr(String((e && e.message) || e))).finally(() => setBusy(false))
       }
       const useNow = (id) => { setBusy(true); api('POST', '/dsh-remote/current', { id }).then((r) => { setCurrentId(r.currentId); setMsg('已切换为当前远程机') }).catch((e) => setErr(String((e && e.message) || e))).finally(() => setBusy(false)) }
+      // Issue #13: "active remote = none" — saved machines stay, but no machine
+      // is current, so local sessions are never dragged into a remote context.
+      const clearCurrent = () => { setBusy(true); api('POST', '/dsh-remote/current', { id: '' }).then((r) => { setCurrentId(''); setMsg('已取消当前远程机 — 本地会话不再自动使用远程上下文') }).catch((e) => setErr(String((e && e.message) || e))).finally(() => setBusy(false)) }
       const del = (id) => { if (window.confirm('确定删除这台机器？')) { api('POST', '/dsh-remote/machines', { action: 'delete', id }).then(refresh).then(() => setMsg('已删除')).catch((e) => setErr(String((e && e.message) || e))) } }
 
       const importSsh = () => {
@@ -261,6 +290,11 @@ window.__ModuleLoader__.load({
                 React.createElement('button', { style: buttonS, onClick: () => del(m.id) }, '删除'),
                 React.createElement('button', { style: { ...buttonS, padding: '6px 10px', whiteSpace: 'nowrap' }, onClick: () => useNow(m.id), disabled: m.id === currentId }, '设为当前')))
             : React.createElement('div', { style: { opacity: 0.6, fontSize: 12 } }, '还没有机器。在下方添加。'),
+          currentId
+            ? React.createElement('div', { style: { display: 'flex', gap: 8, alignItems: 'center', paddingTop: 6, fontSize: 12, color: T.ok } },
+                '当前远程机：' + ((machines.find((m) => m.id === currentId) || {}).name || currentId),
+                React.createElement('button', { style: { ...buttonS, padding: '2px 8px', fontSize: 12, marginLeft: 'auto' }, onClick: clearCurrent }, '取消设为当前（active remote = none）'))
+            : React.createElement('div', { style: { paddingTop: 6, fontSize: 12, opacity: 0.6 } }, '当前没有活动远程机：保存的机器只是备用连接，不会自动进入会话上下文（本地会话不受影响）。'),
           ),
         React.createElement('div', { style: boxS },
           React.createElement('div', { style: { display: 'flex', justifyContent: 'space-between', alignItems: 'center', marginBottom: 6 } },
@@ -401,25 +435,40 @@ window.__ModuleLoader__.load({
       return out
     }
 
-    // Clickable breadcrumb of the current remote path.
-    function breadcrumb(active, cur, jumpTo) {
-      const norm = String(cur || '').replace(/\/+$/, '')
-      const segs = norm === '' || norm === '/' ? [] : norm.split('/')
+    // Clickable breadcrumb of the current remote path. Windows remotes show a
+    // "This PC" root and `\` separators (此电脑 / C:\ / Users / dev); POSIX `/`.
+    function breadcrumb(active, cur, win, jumpTo) {
+      const raw = String(cur || '')
+      const isWinPath = win && (raw === '' || /^[a-zA-Z]:/.test(raw))
+      const rootLabel = isWinPath ? '此电脑' : '/'
       const crumbs = []
-      crumbs.push(React.createElement('span', { key: 'root', style: { cursor: active ? 'pointer' : 'default', color: active ? T.ok : T.muted }, onClick: active ? () => jumpTo('/') : undefined }, '/'))
-      let acc = ''
-      for (const s of segs) {
-        if (!s) continue
-        acc += '/' + s
-        crumbs.push(React.createElement('span', { key: s + '|' + acc, style: { color: T.muted } }, '/'))
-        crumbs.push(React.createElement('span', {
-          key: acc,
-          style: { cursor: active ? 'pointer' : 'default', color: active ? T.label : T.muted, fontWeight: acc === norm ? 700 : 400, whiteSpace: 'nowrap' },
-          onClick: active ? () => jumpTo(acc) : undefined,
-        }, s))
+      const rootStyle = { cursor: active ? 'pointer' : 'default', color: active ? T.ok : T.muted, whiteSpace: 'nowrap' }
+      crumbs.push(React.createElement('span', { key: 'root', style: rootStyle, onClick: active ? () => jumpTo('') : undefined }, rootLabel))
+      if (isWinPath && raw !== '') {
+        const driveM = raw.match(/^([a-zA-Z]):(.*)$/)
+        const drive = driveM[1].toUpperCase() + ':\\'
+        crumbs.push(React.createElement('span', { key: 'sep0', style: { color: T.muted } }, '\\'))
+        crumbs.push(React.createElement('span', { key: 'drive', style: { cursor: active ? 'pointer' : 'default', color: active ? T.label : T.muted, fontWeight: raw === drive ? 700 : 400, whiteSpace: 'nowrap' }, onClick: active ? () => jumpTo(drive) : undefined }, drive))
+        let acc = drive
+        for (const s of (driveM[2] || '').split('\\')) {
+          if (!s) continue
+          acc += s + '\\'
+          const target = acc.slice(0, -1)
+          crumbs.push(React.createElement('span', { key: 's|' + target, style: { color: T.muted } }, '\\'))
+          crumbs.push(React.createElement('span', { key: target, style: { cursor: active ? 'pointer' : 'default', color: active ? T.label : T.muted, fontWeight: target === raw ? 700 : 400, whiteSpace: 'nowrap' }, onClick: active ? () => jumpTo(target) : undefined }, s))
+        }
+      } else if (!isWinPath && raw !== '' && raw !== '/') {
+        const segs = raw.replace(/\/+$/, '').split('/')
+        let acc = ''
+        for (const s of segs) {
+          if (!s) continue
+          acc += '/' + s
+          crumbs.push(React.createElement('span', { key: s + '|' + acc, style: { color: T.muted } }, '/'))
+          crumbs.push(React.createElement('span', { key: acc, style: { cursor: active ? 'pointer' : 'default', color: active ? T.label : T.muted, fontWeight: acc === raw ? 700 : 400, whiteSpace: 'nowrap' }, onClick: active ? () => jumpTo(acc) : undefined }, s))
+        }
       }
-      if (!crumbs.length) crumbs.push(React.createElement('span', { key: 'empty', style: { color: T.muted } }, '/'))
-      return React.createElement('span', { key: 'crumb' }, crumbs)
+      if (crumbs.length === 1) crumbs.push(React.createElement('span', { key: 'empty', style: { color: T.muted } }, isWinPath ? ' 选择驱动器' : ''))
+      return React.createElement('span', { key: 'crumb', style: { overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap', display: 'inline-block', maxWidth: '100%' } }, crumbs)
     }
 
     function DirPicker(props) {
@@ -436,6 +485,7 @@ window.__ModuleLoader__.load({
       const [suggest, setSuggest] = React.useState([])
       const [suggestOpen, setSuggestOpen] = React.useState(false)
       const [recent, setRecent] = React.useState([])
+      const [win, setWin] = React.useState(false) // remote platform: windows = Git-Bash host
       // 本机浏览浮层（browse 后端）：{ path, home, crumbs, entries, truncated }。
       const [localPop, setLocalPop] = React.useState(null)
       const [newDirName, setNewDirName] = React.useState('')
@@ -464,15 +514,29 @@ window.__ModuleLoader__.load({
         return dirs.concat(files)
       }
 
+      // Client-side full-path fallback: when the server did not attach a `path`
+      // (older host half), join base + name with the base's own separator.
+      const joinDisplay = (base, name) => {
+        const b = String(base || '')
+        const n = String(name || '')
+        if (!b || b === '/') return '/' + n
+        const sep = /^[a-zA-Z]:/.test(b) || b.includes('\\') ? '\\' : '/'
+        return b.replace(/[\\/]+$/, '') + sep + n
+      }
+
       const loadLevels = (id, p, toIndex) => {
         if (!id) return
         setLoading(true); setErr('')
         api('POST', '/dsh-remote/current', { id }).catch(() => {})
         .then(() => api('GET', '/dsh-remote/ls?path=' + encodeURIComponent(p || '')))
         .then((res) => {
+          setWin(res && res.platform === 'windows')
           const real = res && res.path ? res.path : (p || '')
+          // Server returns [{ type, name, size, mtime, path }] where `path` is
+          // the FULL display-form path (C:\Users\dev on Windows) — the client
+          // never joins paths itself, so drives and Windows paths just work.
           const list = Array.isArray(res && res.items)
-            ? res.items.map((it) => ({ name: it.name, dir: it.type === 'dir', size: it.size, mtime: it.mtime }))
+            ? res.items.map((it) => ({ name: it.name, dir: it.type === 'dir', size: it.size, mtime: it.mtime, path: it.path || joinDisplay(real, it.name), drive: !!it.drive }))
             : parseLs(res && res.text)
           const node = { path: real, dirs: sortItems(list.filter((it) => it.dir)), all: sortItems(list) }
           setLevels((prev) => {
@@ -488,6 +552,9 @@ window.__ModuleLoader__.load({
       }
 
       React.useEffect(() => { if (open) {
+        // Bug fix: the picker must NOT reopen with the previous selection's
+        // path — reset the path bar (and the browse state) on every open.
+        setPath(''); setLevels(null); setWin(false)
         setLocalPop(null); setNewDirName('')
         api('GET', '/dsh-remote/machines').then((r) => {
           setMachines(r.machines || [])
@@ -540,19 +607,47 @@ window.__ModuleLoader__.load({
 
       const switchTab = (t) => {
         setTab(t); setErr('')
+        // each tab keeps its own path — never leak the other tab's selection
+        setPath('')
         if (t === 'remote') {
+          // Windows remotes show a "This PC" drive view at the root; POSIX shows
+          // the filesystem root. Either way loadLevels('') lists that root.
           if (machineId) loadLevels(machineId, '', 0)
-          if (!path.trim()) { setPath('/'); loadSuggestions('/') }
         }
       }
 
-      const enterDir = (name) => {
-        if (busy || loading) return
+      // Parent path of a display-form remote path (client-side, both separators).
+      const parentOf = (p) => {
+        const t = String(p || '')
+        if (!t || t === '/') return null
+        const win = /^[a-zA-Z]:/.test(t)
+        if (win && /^[a-zA-Z]:\\?$/.test(t)) return null // drive root: no parent
+        const sep = win ? '\\' : '/'
+        const idx = t.lastIndexOf(sep)
+        if (idx <= 0) return null
+        const par = t.slice(0, idx)
+        if (win && /^[a-zA-Z]:$/.test(par)) return par + '\\'
+        return par || '/'
+      }
+
+      // enterDir(it): drive into the given entry — `it.path` is the FULL
+      // display-form path from the server (drives C:\, Windows and POSIX alike).
+      const enterDir = (it) => {
+        if (busy || loading || !it || !it.dir) return
+        loadLevels(machineId, it.path, (levels ? levels.length : 0))
+      }
+
+      // Navigate one level up in the browse popup. When the current level was
+      // opened directly at a deep path (levels.length === 1 — e.g. the popup
+      // was opened at the path bar's value) the parent is loaded as the new top
+      // level instead of being disabled.
+      const goUp = () => {
+        if (loading) return
         const last = levels && levels.length ? levels[levels.length - 1] : null
-        const base = last && last.path ? last.path : ''
-        const sep = base.includes('\\') ? '\\' : '/'
-        const next = base === '/' ? '/' + name : (base ? base + sep + name : name)
-        loadLevels(machineId, next, (levels ? levels.length : 0))
+        if (!last) return
+        if (levels.length > 1) { setLevels((p) => p.slice(0, p.length - 1)); return }
+        const par = parentOf(last.path)
+        if (par) loadLevels(machineId, par, 1)
       }
 
       const loadSuggestions = (raw, mid) => {
@@ -560,20 +655,23 @@ window.__ModuleLoader__.load({
         if (!id || !raw) { setSuggest([]); setSuggestOpen(false); return }
         const t = String(raw || '').trim()
         if (!t) { setSuggest([]); setSuggestOpen(false); return }
-        const isWin = t.includes('\\')
-        const sep = isWin ? '\\' : '/'
-        const slash = t.lastIndexOf(sep)
-        const parent = slash <= 0 ? (isWin ? t.match(/^[a-zA-Z]:\\?/) ? t : '' : '/') : t.slice(0, slash)
-        const lastSeg = slash < 0 ? t : t.slice(slash + 1)
+        // Separator-aware split: `\` when the input looks like a Windows path.
+        const backslash = t.includes('\\') || /^[a-zA-Z]:/.test(t)
+        const sep = backslash ? '\\' : '/'
+        const idx = t.lastIndexOf(sep)
+        let parent, lastSeg
+        if (idx < 0) { parent = backslash ? t + '\\' : '/'; lastSeg = backslash ? '' : t }
+        else if (idx === t.length - 1) { parent = t.slice(0, idx) || '/'; lastSeg = '' }
+        else { parent = t.slice(0, idx) || '/'; lastSeg = t.slice(idx + 1) }
         api('POST', '/dsh-remote/current', { id }).catch(() => {})
         .then(() => api('GET', '/dsh-remote/ls?path=' + encodeURIComponent(parent || '/')))
         .then((res) => {
           const list = Array.isArray(res && res.items)
-            ? res.items.map((it) => ({ name: it.name, dir: it.type === 'dir' }))
-            : parseLs(res && res.text)
-          const base = parent === '/' ? '/' : parent
-          const matches = list.filter((it) => it.name.toLowerCase().startsWith(String(lastSeg).toLowerCase()))
-            .slice(0, 40).map((it) => (base === '/' || !base ? sep + it.name : base + sep + it.name))
+            ? res.items.map((it) => ({ name: it.name, dir: it.type === 'dir', path: it.path || joinDisplay(parent, it.name) }))
+            : []
+          const matches = list
+            .filter((it) => it.dir && (!lastSeg || it.name.toLowerCase().startsWith(String(lastSeg).toLowerCase())))
+            .slice(0, 40).map((it) => it.path)
           setSuggest(matches)
           setSuggestOpen(!!matches.length)
         }).catch(() => { setSuggest([]); setSuggestOpen(false) })
@@ -588,23 +686,20 @@ window.__ModuleLoader__.load({
       const continueSuggest = (dir) => {
         if (!machineId || !dir) { setSuggest([]); setSuggestOpen(false); return }
         setSuggestOpen(false)
-        const sep = String(dir).includes('\\') ? '\\' : '/'
         api('POST', '/dsh-remote/current', { id: machineId }).catch(() => {})
         .then(() => api('GET', '/dsh-remote/ls?path=' + encodeURIComponent(String(dir).replace(/[\\/]+$/, '') || '/')))
         .then((res) => {
           const list = Array.isArray(res && res.items)
-            ? res.items.map((it) => ({ name: it.name, dir: it.type === 'dir' }))
-            : parseLs(res && res.text)
-          const base = String(dir).replace(/[\\/]+$/, '') === '' ? '/' : String(dir).replace(/[\\/]+$/, '')
-          // Show every entry (dirs + files), matching loadSuggestions — the
-          // previous dir-only filter made the next-level list look truncated.
-          const kids = list.slice(0, 40).map((it) => (base === '/' ? sep + it.name : base + sep + it.name))
+            ? res.items.map((it) => ({ name: it.name, dir: it.type === 'dir', path: it.path || joinDisplay(dir, it.name) }))
+            : []
+          const kids = list.slice(0, 40).map((it) => it.path)
           setSuggest(kids)
           setSuggestOpen(!!kids.length)
         }).catch(() => { setSuggest([]); setSuggestOpen(false) })
       }
 
       const selectSuggestion = (s) => {
+        if (!s) { setSuggestOpen(false); return }
         // Auto-append the trailing separator so the path reads as a directory
         // and the user can keep typing the next segment right away.
         const sep = String(s).includes('\\') ? '\\' : '/'
@@ -724,27 +819,27 @@ window.__ModuleLoader__.load({
         const entries = last.all || []
         return React.createElement('div', { style: { border: '1px solid ' + T.borderStrong, borderRadius: 10, background: v('--dsw-alias-bg-overlay', '#1e1e1e'), boxShadow: '0 8px 32px rgba(0,0,0,0.4)', display: 'flex', flexDirection: 'column', maxHeight: 'min(300px, 46vh)', overflow: 'hidden' } },
           React.createElement('div', { style: { display: 'flex', gap: 6, alignItems: 'center', padding: '6px 10px', borderBottom: '1px solid ' + T.border } },
-            React.createElement('button', { style: { ...buttonS, padding: '2px 8px' }, onClick: () => setLevels((p) => p && p.length > 1 ? p.slice(0, p.length - 1) : p), disabled: levels.length <= 1 || loading }, '回上一级 ▴'),
-            React.createElement('div', { style: { fontSize: 11, opacity: 0.75, fontFamily: 'monospace', overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap', flex: 1 } }, breadcrumb(machineId, last.path, (p) => setLevels((prev) => { const cut = (prev || []).findIndex((lv) => lv.path === p); return cut >= 0 ? prev.slice(0, cut + 1) : prev }))),
+            React.createElement('button', { style: { ...buttonS, padding: '2px 8px' }, onClick: goUp, disabled: loading || (levels.length <= 1 && !parentOf(last.path)) }, '回上一级 ▴'),
+            React.createElement('div', { style: { fontSize: 11, opacity: 0.75, fontFamily: 'monospace', overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap', flex: 1 } }, breadcrumb(!!machineId, last.path, win, (p) => setLevels((prev) => { const cut = (prev || []).findIndex((lv) => lv.path === p); return cut >= 0 ? prev.slice(0, cut + 1) : prev }))),
             React.createElement('button', { style: { ...buttonS, padding: '2px 8px' }, onClick: mkdirHere }, '新建目录'),
             React.createElement('button', { style: { ...buttonS, padding: '2px 8px' }, onClick: () => setPopOpen(false) }, '关闭 ✕'),
           ),
           React.createElement('div', { style: { overflowY: 'auto', overflowX: 'hidden' } },
             loading ? React.createElement('div', { style: { opacity: 0.7, padding: 12 } }, '加载中…')
               : (entries.length ? entries.slice(0, 400).map((it, i) => React.createElement('div', {
-                  key: i, title: (it.dir ? '进入 ' : '文件: ') + it.name,
-                  onClick: it.dir ? () => enterDir(it.name) : undefined,
+                  key: i, title: it.drive ? '进入驱动器 ' + it.name : (it.dir ? '进入 ' + it.name : '文件: ' + it.name),
+                  onClick: it.dir ? () => enterDir(it) : undefined,
                   style: { padding: '6px 10px', cursor: it.dir ? 'pointer' : 'default', color: T.label, whiteSpace: 'nowrap', overflow: 'hidden', textOverflow: 'ellipsis', display: 'flex', gap: 8, alignItems: 'center', fontSize: 13, borderBottom: '1px solid ' + T.border },
                 },
-                  React.createElement('span', { style: { flexShrink: 0, display: 'inline-flex', color: T.label } }, it.dir
+                  React.createElement('span', { style: { flexShrink: 0, display: 'inline-flex', color: T.label, fontSize: 13 } }, it.drive ? '💽' : (it.dir
                     ? React.createElement('svg', { width: 14, height: 14, viewBox: '0 0 16 16', fill: 'currentColor' }, React.createElement('path', { d: 'M1.5 3.5A1.5 1.5 0 0 1 3 2h3.2a1.5 1.5 0 0 1 1.06.44L8.5 3.7h4.5A1.5 1.5 0 0 1 14.5 5.2V12A1.5 1.5 0 0 1 13 13.5H3A1.5 1.5 0 0 1 1.5 12V3.5Zm2.5 1a.5.5 0 0 0 0 1h1.2a.5.5 0 0 0 0-1H4Z' }))
-                    : React.createElement('svg', { width: 14, height: 14, viewBox: '0 0 16 16', fill: 'currentColor', opacity: 0.85 }, React.createElement('path', { d: 'M3.5 1.5a1 1 0 0 0-1 1v11a1 1 0 0 0 1 1h9a1 1 0 0 0 1-1V5.2a1 1 0 0 0-.29-.7L10.5 1.79a1 1 0 0 0-.7-.29H3.5Zm1.5 3h2.25a.75.75 0 0 1 0 1.5H5a.75.75 0 0 1 0-1.5ZM5 9.5h6a.75.75 0 0 1 0 1.5H5a.75.75 0 0 1 0-1.5Zm0 2.25h4a.75.75 0 0 1 0 1.5H5a.75.75 0 0 1 0-1.5Z' }))),
+                    : React.createElement('svg', { width: 14, height: 14, viewBox: '0 0 16 16', fill: 'currentColor', opacity: 0.85 }, React.createElement('path', { d: 'M3.5 1.5a1 1 0 0 0-1 1v11a1 1 0 0 0 1 1h9a1 1 0 0 0 1-1V5.2a1 1 0 0 0-.29-.7L10.5 1.79a1 1 0 0 0-.7-.29H3.5Zm1.5 3h2.25a.75.75 0 0 1 0 1.5H5a.75.75 0 0 1 0-1.5ZM5 9.5h6a.75.75 0 0 1 0 1.5H5a.75.75 0 0 1 0-1.5Zm0 2.25h4a.75.75 0 0 1 0 1.5H5a.75.75 0 0 1 0-1.5Z' })))),
                   React.createElement('span', { style: { overflow: 'hidden', textOverflow: 'ellipsis', flex: 1 } }, it.name),
                   React.createElement('span', { style: { fontSize: 11, opacity: 0.55, flexShrink: 0, fontFamily: 'monospace' } }, it.dir ? '' : (humanSize(it.size) + (it.mtime ? '  ' + fmtTime(it.mtime) : ''))),
                 )) : React.createElement('div', { style: { opacity: 0.6, padding: 12 } }, '（空目录）')),
           ),
           React.createElement('div', { style: { display: 'flex', gap: 8, justifyContent: 'flex-end', alignItems: 'center', padding: '6px 10px', borderTop: '1px solid ' + T.border } },
-            React.createElement('span', { style: { fontSize: 11, opacity: 0.75, fontFamily: 'monospace', overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap', flex: 1 } }, '所选: ' + last.path),
+            React.createElement('span', { style: { fontSize: 11, opacity: 0.75, fontFamily: 'monospace', overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap', flex: 1 } }, '所选: ' + (last.path || (win ? '（驱动器根）' : '/'))),
             React.createElement('button', { style: { ...buttonS, fontWeight: 600 }, onClick: () => { acceptBrowserPick(last.path); setPopOpen(false) } }, '选用此路径'),
           ),
         )
@@ -783,7 +878,7 @@ window.__ModuleLoader__.load({
                   mOpen
                     ? React.createElement('div', { style: { position: 'absolute', top: '100%', left: 0, zIndex: 1000, marginTop: 2, minWidth: 300, maxHeight: 260, overflow: 'auto', background: v('--dsw-alias-bg-overlay', '#1f1f23'), border: '1px solid ' + T.border, borderRadius: T.radius, padding: 4 } },
                         machines.length
-                          ? machines.map((m) => React.createElement('div', { key: m.id, onClick: () => { setMachineId(m.id); setRecent(m.recentWorkspaces || []); setLevels(null); setMOpen(false); if (m.id) { loadLevels(m.id, '', 0); if (!path.trim()) { setPath('/'); loadSuggestions('/', m.id) } } }, style: { padding: '6px 8px', borderRadius: 4, cursor: 'pointer', color: m.id === machineId ? T.ok : 'inherit' } }, m.name + '  (' + m.username + '@' + m.host + ':' + m.port + ')'))
+                          ? machines.map((m) => React.createElement('div', { key: m.id, onClick: () => { setMachineId(m.id); setRecent(m.recentWorkspaces || []); setLevels(null); setPath(''); setMOpen(false); if (m.id) loadLevels(m.id, '', 0) }, style: { padding: '6px 8px', borderRadius: 4, cursor: 'pointer', color: m.id === machineId ? T.ok : 'inherit' } }, m.name + '  (' + m.username + '@' + m.host + ':' + m.port + ')'))
                           : React.createElement('div', { style: { padding: 6, opacity: 0.6 } }, '还没有机器，请先在设置里添加'),
                       )
                     : null,
@@ -795,8 +890,8 @@ window.__ModuleLoader__.load({
                 recent.map((w, i) => React.createElement('button', { key: w + i, onClick: () => { setPath(w); setErr(''); continueSuggest(w) }, style: { ...buttonS, padding: '2px 8px', fontSize: 11, fontFamily: 'monospace' } }, w))) : null,
               React.createElement('div', { ref: suggestRef, style: { position: 'relative' } },
                 React.createElement('div', { style: { display: 'flex', gap: 6, flexWrap: 'wrap' } },
-                  React.createElement('input', { value: path, onChange: (e) => onPathChange(e.target.value), onFocus: () => loadSuggestions(path), placeholder: (machineId ? '输入远程路径（自动补全）' : '先选远程机器'), disabled: !machineId, style: { ...inputS, flex: 1, minWidth: 120 } }),
-                  React.createElement('button', { style: { ...buttonS, whiteSpace: 'nowrap' }, onClick: () => { if (machineId) setPopOpen(true) }, disabled: !machineId }, '浏览…'),
+                  React.createElement('input', { value: path, onChange: (e) => onPathChange(e.target.value), onFocus: () => loadSuggestions(path), placeholder: (machineId ? (win ? '输入远程路径，如 C:\\Users\\…（自动补全）' : '输入远程路径（自动补全）') : '先选远程机器'), disabled: !machineId, style: { ...inputS, flex: 1, minWidth: 120 } }),
+                  React.createElement('button', { style: { ...buttonS, whiteSpace: 'nowrap' }, onClick: () => { if (!machineId) return; const p = path.trim(); loadLevels(machineId, p || '', 0); setPopOpen(true) }, disabled: !machineId }, '浏览…'),
                   React.createElement('button', { style: { ...buttonS, whiteSpace: 'nowrap' }, onClick: pickHome, disabled: !machineId }, '~ 主目录'),
                 ),
                 (suggestOpen && suggest.length)
@@ -830,10 +925,12 @@ window.__ModuleLoader__.load({
       return api('GET', '/dsh-remote/status').catch(() => null)
     }
 
-    // Resolve the remote path this session should show: prefer the session's
-    // own cwd (a remote mirror dir) mapped through /dsh-remote/resolve-mirror;
-    // fall back to the machine workspace when the session has no cwd or the
-    // host side has no mirror match.
+    // Resolve the remote path this session shows. Issue #13: the ONLY source
+    // of truth is the session's own cwd mapped through /dsh-remote/resolve-
+    // mirror — a cwd outside any mirror dir means "this session is NOT a
+    // remote session", and the sidebar must NOT fall back to the machine
+    // workspace (that made an unrelated saved machine leak into local
+    // sessions).
     function resolveSessionRemote(sessionId) {
       if (!sessionId) return Promise.resolve('')
       // 1) Prefer the client-side session list cwd (mirror dir under
@@ -906,6 +1003,8 @@ window.__ModuleLoader__.load({
       const [menu, setMenu] = React.useState(null) // { x, y, path, isDir, name }
       const [rootOpen, setRootOpen] = React.useState(true) // first level expanded by default
       const [hoverPath, setHoverPath] = React.useState('') // row hover highlight
+      /** Row whose path was just copied — shows a brief「已复制」label. */
+      const [copiedPath, setCopiedPath] = React.useState('')
       const expanded = Array.isArray(props.expanded) ? props.expanded : []
 
       const storeLevel = (path, level) => {
@@ -913,8 +1012,13 @@ window.__ModuleLoader__.load({
         setData(dataRef.current)
       }
 
-      const loadDir = React.useCallback((dir) => {
+      const loadDir = React.useCallback((dir, opts) => {
         const cur = dataRef.current
+        const existing = cur[dir]
+        // If we already have data (entries loaded) and this is a background
+        // refresh, keep what we have — don't flash a loading state over a
+        // populated tree.
+        if (existing && !existing.loading && opts && opts.keep) return
         if (cur[dir] !== undefined && !cur[dir].loading) return
         storeLevel(dir, { loading: true })
         listRemoteDir(dir)
@@ -927,7 +1031,17 @@ window.__ModuleLoader__.load({
             })
             storeLevel(dir, { entries: sorted })
           })
-          .catch((e) => storeLevel(dir, { error: String((e && e.message) || e) }))
+          .catch((e) => {
+            // Keep any previously-loaded entries under this dir (so a transient
+            // SFTP failure doesn't collapse the whole subtree); surface a
+            // message only when there was nothing to show before.
+            const prev = dataRef.current[dir]
+            if (prev && prev.entries) {
+              storeLevel(dir, { ...prev, softError: String((e && e.message) || e) })
+            } else {
+              storeLevel(dir, { error: String((e && e.message) || e) })
+            }
+          })
       }, [])
 
       // Resolve this session's remote root, then load it and every expanded dir.
@@ -936,13 +1050,32 @@ window.__ModuleLoader__.load({
       // own workspace dir.
       const scopeCwd = props.scope && props.scope.cwd
       const sessionId = props.scope && props.scope.sessionId
-      const refreshStatus = React.useCallback(() => {
-        const applyRoot = (r) => {
+      const rootRef = React.useRef('')
+      const refreshStatus = React.useCallback((opts) => {
+        const applyRoot = (r, connected) => {
+          const prevRoot = rootRef.current
+          rootRef.current = r
           setRoot(r)
-          setData({})
-          dataRef.current = {}
+          // Full reset ONLY when the session's remote root actually changed
+          // (different workspace / different conversation). When we just come
+          // back to this tab with the same workspace, keep the loaded tree so
+          // expanded dirs and their contents stay put.
+          const sameRoot = prevRoot && r && prevRoot === r
+          if (!sameRoot) {
+            setData({})
+            dataRef.current = {}
+          }
           if (r) {
-            storeLevel(r, { loading: true })
+            // Not connected (e.g. freshly restarted, machine no longer active):
+            // show a clear disconnected state instead of firing ls requests
+            // that all fail with AggregateError / 500 in a loop.
+            if (!connected) {
+              storeLevel(r, { error: '未连接远程主机（重启后需在设置中将机器「设为当前」，或刷新右侧列）' })
+              return
+            }
+            if (!sameRoot) {
+              storeLevel(r, { loading: true })
+            }
             listRemoteDir(r)
               .then((res) => {
                 const items = Array.isArray(res && res.items) ? res.items : []
@@ -951,10 +1084,19 @@ window.__ModuleLoader__.load({
                   if (a.type !== 'dir' && b.type === 'dir') return 1
                   return String(a.name).localeCompare(String(b.name))
                 })
-                storeLevel(r, { entries: sorted })
-                for (const dir of expanded) loadDir(dir)
+                storeLevel(r, { entries: sorted, missing: !!(res && res.missing) })
+                for (const dir of expanded) loadDir(dir, { keep: true })
+              })
+              .catch((e) => {
+                // Transient connection failure: keep the previously visible
+                // root level so the tree doesn't collapse to an error.
+                const prev = dataRef.current[r]
+                if (prev && prev.entries) {
+                  storeLevel(r, { ...prev, softError: String((e && e.message) || e) })
+                } else {
+                  storeLevel(r, { error: String((e && e.message) || e) })
+                }
               })
-              .catch((e) => storeLevel(r, { error: String((e && e.message) || e) }))
           }
         }
         const resolveRoot = () => {
@@ -969,20 +1111,47 @@ window.__ModuleLoader__.load({
         resolveRoot().then((r) => {
           fetchRemoteStatus().then((s) => {
             setStatus(s)
-            applyRoot(r || (s && s.workspace) || '')
+            // Issue #13: NEVER fall back to the machine-level workspace here —
+            // a session whose cwd is not a mirror is a LOCAL session and shows
+            // the "no remote workspace" empty state instead.
+            applyRoot(r || '', !!(s && s.connected))
           })
         })
       }, [scopeCwd, sessionId])
 
       React.useEffect(() => { refreshStatus() }, [refreshStatus])
-      React.useEffect(() => { if (props.visible) refreshStatus() }, [props.visible])
-      // Load dirs as they get expanded.
-      React.useEffect(() => { if (root) for (const dir of expanded) loadDir(dir) }, [root, expanded, loadDir])
+      React.useEffect(() => { if (props.visible) refreshStatus({ visible: true }) }, [props.visible])
+      // Load dirs as they get expanded (keep already-loaded content).
+      React.useEffect(() => { if (root) for (const dir of expanded) loadDir(dir, { keep: true }) }, [root, expanded, loadDir])
+      // ── Context-menu portal: append to document.body so the sidebar's
+      //    overflow/transform cannot clip it. Pure DOM, no React portal needed.
       React.useEffect(() => {
         if (!menu) return
-        const close = () => setMenu(null)
-        document.addEventListener('mousedown', close)
-        return () => document.removeEventListener('mousedown', close)
+        const host = document.createElement('div')
+        host.style.cssText = 'position:fixed;z-index:999999;pointer-events:auto'
+        const box = document.createElement('div')
+        box.style.cssText = 'position:fixed;left:' + menu.x + 'px;top:' + menu.y + 'px;z-index:999999;background:#1f1f23;border:1px solid rgba(128,128,128,0.5);border-radius:8px;padding:4px;box-shadow:0 8px 24px rgba(0,0,0,0.4);min-width:170;font-family:system-ui,sans-serif'
+        const mkItem = (label, danger, fn) => {
+          const d = document.createElement('div')
+          d.textContent = label
+          d.style.cssText = 'padding:6px 10px;cursor:pointer;font-size:12px;color:' + (danger ? '#e06c75' : '#e4e4e7') + ';border-radius:4px;white-space:nowrap;transition:background 0.1s'
+          d.onmouseenter = () => { d.style.background = 'rgba(128,128,128,0.14)' }
+          d.onmouseleave = () => { d.style.background = 'transparent' }
+          d.addEventListener('click', (e) => { e.stopPropagation(); setMenu(null); fn() })
+          return d
+        }
+        box.appendChild(mkItem(menu.isDir ? '📂 展开/收起' : '📄 打开文件', false, () => { if (menu.isDir) { if (props.onToggleDir) props.onToggleDir(menu.path) } else openFile(menu.path) }))
+        box.appendChild(mkItem('⬇ 下载到本地镜像', false, () => doFs('download', { path: menu.path })))
+        box.appendChild(mkItem('📋 复制相对地址', false, () => copyPath(relPath(menu.path), menu.path)))
+        box.appendChild(mkItem('📋 复制绝对地址', false, () => copyPath(menu.path, menu.path)))
+        box.appendChild(mkItem('✏ 重命名', false, () => { const nm = window.prompt('重命名为（新名字）', menu.name); if (nm && nm.trim() && nm.trim() !== menu.name) doFs('rename', { path: menu.path, dest: joinRemote(String(menu.path).replace(/[\\/][^\\/]*$/, ''), nm.trim()) }, true) }))
+        box.appendChild(mkItem('🗑 删除' + (menu.isDir ? '（含子目录）' : ''), true, () => { if (window.confirm('确认删除 ' + menu.path + '？')) doFs('remove', { path: menu.path }, true) }))
+        host.appendChild(box)
+        document.body.appendChild(host)
+        const close = (e) => { if (!box.contains(e.target)) { setMenu(null) } }
+        // Delay adding listener so the same mousedown that opened the menu doesn't close it
+        const tid = setTimeout(() => document.addEventListener('mousedown', close), 0)
+        return () => { clearTimeout(tid); document.removeEventListener('mousedown', close); host.remove() }
       }, [menu])
 
       const openFile = (p) => {
@@ -1015,6 +1184,32 @@ window.__ModuleLoader__.load({
         style: { padding: '6px 10px', cursor: 'pointer', fontSize: 12, color: danger ? '#e06c75' : '#e4e4e7', borderRadius: 4, whiteSpace: 'nowrap' },
       }, label)
 
+      // The path shown by「复制相对地址」: relative to this session's remote
+      // workspace root (mirror of the built-in local tree's cwd-relative copy).
+      const relPath = (p) => {
+        if (!root) return p
+        const r = String(root).replace(/[\\/]+$/, '')
+        const s = String(p)
+        if (s === r) return '.'
+        if (s.startsWith(r + '/')) return s.slice(r.length + 1)
+        if (s.startsWith(r + '\\')) return s.slice(r.length + 1)
+        return s
+      }
+      // Copy `text`, then briefly flag the row whose path was copied.
+      const copyPath = (text, path) => {
+        copyToClipboard(text).then((ok) => {
+          if (!ok) return
+          setCopiedPath(path)
+          window.setTimeout(() => {
+            setCopiedPath((cur) => (cur === path ? '' : cur))
+          }, 1200)
+        })
+      }
+      /** Trailing「已复制」feedback for a row (after a successful copy). */
+      const copiedMark = (path) => (copiedPath === path
+        ? React.createElement('span', { style: { fontSize: 11, opacity: 0.75, flexShrink: 0, color: T.ok } }, '已复制')
+        : null)
+
       // One tree row (dir toggles via the framework's onToggleDir; file opens).
       // Text uses the normal foreground (theme-following) — no accent green.
       const row = (entry, depth) => {
@@ -1042,6 +1237,7 @@ window.__ModuleLoader__.load({
             },
               React.createElement('span', { style: { flexShrink: 0, color: T.label, display: 'inline-flex' } }, IconFolder(isOpen)),
               React.createElement('span', { style: { overflow: 'hidden', textOverflow: 'ellipsis', flex: 1, fontWeight: 500 } }, entry.name),
+              copiedMark(entry.path),
             ),
             isOpen ? renderLevel(entry.path, depth + 1) : null,
           )
@@ -1058,7 +1254,11 @@ window.__ModuleLoader__.load({
         },
           React.createElement('span', { style: { flexShrink: 0, display: 'inline-flex' } }, IconFile()),
           React.createElement('span', { style: { overflow: 'hidden', textOverflow: 'ellipsis', flex: 1 } }, entry.name),
-          entry.size != null ? React.createElement('span', { style: { fontSize: 11, opacity: 0.55, flexShrink: 0, fontFamily: 'monospace' } }, humanSize(entry.size)) : null,
+          copiedMark(entry.path),
+          (entry.size != null || entry.mtime)
+            ? React.createElement('span', { style: { fontSize: 11, opacity: 0.55, flexShrink: 0, fontFamily: 'monospace' } },
+                humanSize(entry.size) + (entry.mtime ? '  ' + fmtTime(entry.mtime) : ''))
+            : null,
         )
       }
 
@@ -1067,12 +1267,21 @@ window.__ModuleLoader__.load({
         if (level === undefined || (level.loading && !level.entries)) {
           return React.createElement('div', { key: dir + ':loading', style: { display: 'flex', alignItems: 'center', gap: 6, padding: '5px 8px', paddingLeft: depth * 22 + 6, fontSize: 13, opacity: 0.6 } }, '加载中…')
         }
+        if (level.missing) {
+          return React.createElement('div', { key: dir + ':missing', style: { display: 'flex', alignItems: 'center', gap: 6, padding: '5px 8px', paddingLeft: depth * 22 + 6, fontSize: 13, opacity: 0.6 } }, '目录不存在或已被删除')
+        }
         if (level.error !== undefined) {
           return React.createElement('div', { key: dir + ':err', style: { display: 'flex', alignItems: 'center', gap: 6, padding: '5px 8px', paddingLeft: depth * 22 + 6, fontSize: 13, color: '#e06c75' } }, level.error)
         }
         const items = level.entries || []
-        if (!items.length) return null
-        return React.createElement('div', { key: dir + ':list' }, items.map((it) => row({ ...it, path: joinRemote(dir, it.name) }, depth)))
+        const soft = level.softError
+          ? React.createElement('div', { key: dir + ':softerr', style: { display: 'flex', alignItems: 'center', gap: 6, padding: '5px 8px', paddingLeft: depth * 22 + 6, fontSize: 11, opacity: 0.6, color: '#e6c07b' } }, '⚠ ' + level.softError + '（显示缓存，可点 ↻ 刷新）')
+          : null
+        if (!items.length) return soft || null
+        return React.createElement('div', { key: dir + ':list' },
+          items.map((it) => row({ ...it, path: joinRemote(dir, it.name) }, depth)),
+          soft,
+        )
       }
 
       const rootName = root ? String(root).split(/[\\/]/).filter(Boolean).pop() || root : ''
@@ -1087,15 +1296,15 @@ window.__ModuleLoader__.load({
           }, '新建目录'),
           React.createElement('button', { style: { ...buttonS, padding: '3px 8px', fontSize: 12 }, onClick: () => setPicker(true) }, '…'),
         ),
-        status && status.workspace
+        status && status.workspace && root
           ? React.createElement('div', { style: { fontSize: 11, opacity: 0.7, padding: '4px 8px', wordBreak: 'break-all' } }, '远程工作区: ' + root + (status.host ? '  (' + status.username + '@' + status.host + ')' : ''))
-          : React.createElement('div', { style: { fontSize: 11, opacity: 0.7, padding: '4px 8px' } }, '未设置远程工作区'),
+          : React.createElement('div', { style: { fontSize: 11, opacity: 0.7, padding: '4px 8px' } }, root ? '未设置远程工作区' : '当前会话未使用远程工作区'),
         picker ? React.createElement('div', { style: { padding: 8 } }, React.createElement(DirPicker, {
           open: true, busy: false, onPicked: () => { setPicker(false); refreshStatus() }, onCancel: () => setPicker(false),
         })) : null,
         React.createElement('div', { style: { flex: 1, overflowY: 'auto', minHeight: 0, padding: '2px 0' } },
           !root
-            ? React.createElement('div', { style: { opacity: 0.6, padding: 12, fontSize: 13 } }, '选择或设置一个远程工作区')
+            ? React.createElement('div', { style: { opacity: 0.6, padding: 12, fontSize: 13 } }, '当前会话是本地工作区，未使用远程文件。\n\n如需访问远程，可在设置页将某台机器「设为当前」，再用上方「…」选择远程工作区。')
             : React.createElement('div', { key: root },
                 React.createElement('div', {
                   role: 'button', tabIndex: 0,
@@ -1111,18 +1320,8 @@ window.__ModuleLoader__.load({
                 rootLevel && rootOpen ? renderLevel(root, 1) : null,
               ),
         ),
-        // context menu
-        menu ? React.createElement('div', { style: { position: 'fixed', left: menu.x, top: menu.y, zIndex: 9998, background: v('--dsw-alias-bg-overlay', '#1f1f23'), border: '1px solid ' + T.borderStrong, borderRadius: 8, padding: 4, boxShadow: '0 8px 24px rgba(0,0,0,0.4)', minWidth: 170 }, onClick: (e) => e.stopPropagation() },
-          ctxItem(menu.isDir ? '📂 展开/收起' : '📄 打开文件', false, () => { if (menu.isDir) { if (props.onToggleDir) props.onToggleDir(menu.path) } else openFile(menu.path) }),
-          ctxItem('⬇ 下载到本地镜像', false, () => doFs('download', { path: menu.path })),
-          ctxItem('✏ 重命名', false, () => {
-            const nm = window.prompt('重命名为（新名字）', menu.name)
-            if (nm && nm.trim() && nm.trim() !== menu.name) doFs('rename', { path: menu.path, dest: joinRemote(String(menu.path).replace(/[\\/][^\\/]*$/, ''), nm.trim()) }, true)
-          }),
-          ctxItem('🗑 删除' + (menu.isDir ? '（含子目录）' : ''), true, () => {
-            if (window.confirm('确认删除 ' + menu.path + '？')) doFs('remove', { path: menu.path }, true)
-          }),
-        ) : null,
+        // context menu — now rendered via DOM portal in useEffect above
+        null,
         err ? React.createElement('div', { style: { color: '#e06c75', fontSize: 12, padding: '4px 8px' } }, (busy ? '处理中… ' : '') + err) : null,
       )
     }
@@ -1243,6 +1442,10 @@ window.__ModuleLoader__.load({
         if (!snap || !snap.sessionId) return
         if (autoOpenedFor.has(snap.sessionId)) return
         const sessionId = snap.sessionId
+        // Issue #13: only auto-open the Remote Files tab for sessions that are
+        // genuinely remote (cwd inside a mirror). A plain local session must
+        // not get a remote tab popped open by a machine that happens to be
+        // saved as "current".
         resolveSessionRemote(sessionId).then((remotePath) => {
           if (!remotePath || autoOpenedFor.has(sessionId)) return
           autoOpenedFor.add(sessionId)