dsh-remote 0.3.3 → 0.4.1

package/lib/client.js

@@ -1,13 +1,15 @@
 // dsh-remote — client half.
-// Settings → 远程工作区 + a unified workspace directory picker that fills
-// ui-workspace's two directory-flow holes (sidebar + conversation hero).
+// Settings → 远程工作区:	a multi-machine SSH registry (add/edit/select current;
+// password stored host-side and kept private). No workspace path here — the
+// path is picked at workspace-add time.
 //
-// The picker has two tabs, styled to match the harness:
-//   • 本机 — drives the SAME local Host backend as the official picker
-//     (ctx.workspaces.listDirectory), so local dirs still work.
-//   • 远程 — browses the remote over /dsh-remote/ls (SFTP); on confirm it asks
-//     the host to build a real LOCAL mirror (/dsh-remote/mirror) then
-//     onPicked(localMirror) so the DSH workspaceRegistry adopts the local dir.
+// A unified workspace directory picker fills ui-workspace's two directory-flow
+// holes (sidebar + conversation hero):
+//   • 本机 tab → opens the NATIVE OS folder chooser (ctx.workspaces.pickDirectory)
+//     and returns the picked local path (works with local workspaces).
+//   • 远程 tab → pick a machine (dropdown), list its directories over
+//     /dsh-remote/ls, choose or type a remote path → /dsh-remote/mirror builds a
+//     real LOCAL mirror → onPicked(localMirror) so host adopts it as a workspace.
 //
 // Client entries must be classic scripts registered via window.__ModuleLoader__.load
 // ({ id, factory }); the factory receives a synchronous `require`.
@@ -23,111 +25,92 @@ window.__ModuleLoader__.load({
 
     async function api(method, path, body) {
       const opts = { method, headers: {} }
-      if (body) {
-        opts.headers['Content-Type'] = 'application/json'
-        opts.body = JSON.stringify(body)
-      }
+      if (body) { opts.headers['Content-Type'] = 'application/json'; opts.body = JSON.stringify(body) }
       const res = await fetch(path, opts)
       const data = await res.json().catch(() => ({}))
       if (!res.ok) throw new Error((data && (data.error || data.message)) || 'HTTP ' + res.status)
       return data
     }
 
-    const T = { bg: 'rgba(128,128,128,0.07)', border: 'rgba(128,128,128,0.35)', danger: '#e06c75', ok: '#4caf7d', radius: 8 }
-
+    const T = { bg: 'rgba(128,128,128,0.07)', border: 'rgba(128,128,128,0.35)', danger: '#e06c75', ok: '#4caf7d', radius: 8, muted: 'rgba(128,128,128,0.7)' }
     const inputS = { flex: 1, padding: '6px 10px', borderRadius: T.radius, border: '1px solid ' + T.border, background: T.bg }
     const buttonS = { padding: '6px 12px', borderRadius: T.radius, border: '1px solid ' + T.border, background: T.bg, cursor: 'pointer' }
+    const box = { border: '1px solid ' + T.border, borderRadius: T.radius, background: T.bg, padding: 10 }
+    const boxS = box
+
+    let WORKSPACES = null // ctx.get('workspaces'), set in apply()
 
-    // ── Settings → 远程工作区 ────────────────────────────────────────────────
+    // ── Settings → 远程工作区 (machine registry) ─────────────────────────────
     function RemoteWorkspacePage() {
-      const [status, setStatus] = React.useState(null)
-      const [form, setForm] = React.useState({ host: '', port: '22', username: '', password: '', privateKeyPath: '' })
+      const [machines, setMachines] = React.useState([])
+      const [currentId, setCurrentId] = React.useState('')
+      const [form, setForm] = React.useState({ name: '', host: '', port: '22', username: 'root', password: '', privateKeyPath: '', id: '' })
       const [busy, setBusy] = React.useState(false)
-      const [browse, setBrowse] = React.useState({ path: '', out: '' })
-      const [error, setError] = React.useState('')
-      const [okMsg, setOkMsg] = React.useState('')
-
-      const loadStatus = () => api('GET', '/dsh-remote/status').then(setStatus).catch((e) => setError(String((e && e.message) || e)))
-      React.useEffect(() => { loadStatus() }, [])
-
-      const setField = (k) => (ev) => setForm({ ...form, [k]: ev.target.value })
-
-      const connect = () => {
-        setBusy(true); setError(''); setOkMsg('')
-        api('POST', '/dsh-remote/connect', {
-          host: form.host.trim(), port: Number(form.port) || 22, username: form.username.trim() || 'root',
-          password: form.password || undefined, privateKeyPath: form.privateKeyPath.trim() || undefined,
-        })
-          .then((res) => { setStatus(res); if (res && res.workspace) setBrowse({ path: res.workspace, out: '' }); setOkMsg(res.ok ? '已连接 ✓ 可浏览远程目录。' : '') })
-          .catch((e) => setError(String((e && e.message) || e)))
-          .finally(() => setBusy(false))
-      }
+      const [msg, setMsg] = React.useState('')
+      const [err, setErr] = React.useState('')
 
-      const doBrowse = (p) => {
-        const target = p !== undefined ? p : browse.path.trim()
-        setBusy(true); setError('')
-        api('GET', '/dsh-remote/ls?path=' + encodeURIComponent(target || ''))
-          .then((res) => setBrowse({ path: target, out: res.text }))
-          .catch((e) => setError(String((e && e.message) || e)))
-          .finally(() => setBusy(false))
-      }
+      const refresh = () => api('GET', '/dsh-remote/machines').then((r) => { setMachines(r.machines || []); setCurrentId(r.currentId || '') })
+      React.useEffect(() => { refresh() }, [])
 
-      const setWorkspace = () => {
-        const p = browse.path.trim(); if (!p) return
-        setBusy(true); setError(''); setOkMsg('')
-        api('POST', '/dsh-remote/workspace', { path: p })
-          .then((res) => { setStatus(res); setOkMsg('远程工作区已设为 ' + p) })
-          .catch((e) => setError(String((e && e.message) || e)))
-          .finally(() => setBusy(false))
+      const setF = (k) => (ev) => setForm({ ...form, [k]: ev.target.value })
+      const startEdit = (m) => setForm({ name: m.name, host: m.host, port: String(m.port || 22), username: m.username || 'root', password: '', privateKeyPath: m.privateKeyPath || '', id: m.id })
+      const save = (action) => {
+        setBusy(true); setErr(''); setMsg('')
+        if (action === 'delete') {
+          api('POST', '/dsh-remote/machines', { action: 'delete', id: form.id }).then(refresh).then(() => { setForm({ name: '', host: '', port: '22', username: 'root', password: '', privateKeyPath: '', id: '' }); setMsg('已删除') }).catch((e) => setErr(String((e && e.message) || e))).finally(() => setBusy(false))
+          return
+        }
+        api('POST', '/dsh-remote/machines', {
+          action: form.id ? 'update' : 'add', id: form.id || undefined, name: form.name, host: form.host, port: Number(form.port) || 22,
+          username: form.username, password: form.password, privateKeyPath: form.privateKeyPath,
+        }).then((r) => { refresh(); setForm({ name: '', host: '', port: '22', username: 'root', password: '', privateKeyPath: '', id: '' }); 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)) }
 
-      const row = (t, v, k) => React.createElement(
-        'div', { key: k },
-        React.createElement('label', { style: { fontSize: 12, opacity: 0.75 } }, t + ': '), v,
-      )
+      const row = (label, ctrl, k) => React.createElement('div', { key: k, style: { display: 'flex', gap: 6, alignItems: 'center' } },
+        React.createElement('label', { style: { width: 76, fontSize: 12, opacity: 0.8 } }, label), ctrl)
 
-      return React.createElement(
-        'div',
-        { style: { padding: 16, display: 'flex', flexDirection: 'column', gap: 12, maxWidth: 720 } },
-        React.createElement('div', { style: { fontWeight: 600, fontSize: 15 } }, '远程工作区（dsh-remote）'),
+      return React.createElement('div', { style: { padding: 16, display: 'flex', flexDirection: 'column', gap: 12, maxWidth: 760 } },
+        React.createElement('div', { style: { fontSize: 15, fontWeight: 600 } }, '远程工作区（dsh-remote）'),
         React.createElement('div', { style: { fontSize: 12, opacity: 0.8 } },
-          '连接远程主机后即可用 rw_* 工具操作；选中的远程目录会镜像成一个本地工作区（可与本地工作区并存）。'),
-        status
-          ? React.createElement('div', { style: { display: 'flex', gap: 14, flexWrap: 'wrap', fontSize: 13 } },
-              React.createElement('span', null, '远程: ', React.createElement('code', null, (status.username || '?') + '@' + (status.host || '?'))),
-              React.createElement('span', null, '连接: ', React.createElement('code', null, status.connected ? '是' : '否')),
-              React.createElement('span', null, '工作区: ', React.createElement('code', null, status.workspace || '（未设置）')),
-              status.localMirror ? React.createElement('span', null, '本地镜像: ', React.createElement('code', null, status.localMirror)) : null,
-            )
-          : null,
-        React.createElement('div', { style: { display: 'grid', gridTemplateColumns: '1fr 1fr', gap: 10 } },
-          row('主机', React.createElement('input', { value: form.host, onChange: setField('host'), placeholder: 'IP 或 hostname', style: inputS }), 'h'),
-          row('端口', React.createElement('input', { value: form.port, onChange: setField('port'), placeholder: '22', style: { ...inputS, width: 70 } }), 'p'),
-          row('用户', React.createElement('input', { value: form.username, onChange: setField('username'), placeholder: 'root', style: inputS }), 'u'),
-          row('私钥路径', React.createElement('input', { value: form.privateKeyPath, onChange: setField('privateKeyPath'), placeholder: '如 C:/Users/me/.ssh/id_rsa', style: inputS }), 'k'),
-          row('密码', React.createElement('input', { type: 'password', value: form.password, onChange: setField('password'), placeholder: 'SSH 无 key 时用', style: inputS }), 'w'),
+          '维护多台 SSH 机器。路径不在设置里配置 —— 新建/选择工作区时，「本机」走系统文件夹对话框；「远程」选一台机器在远程目录中选择。'),
+        React.createElement('div', { style: boxS },
+          React.createElement('div', { style: { marginBottom: 6, fontSize: 13, fontWeight: 600 } }, '已配置的机器'),
+          machines.length
+            ? machines.map((m) => React.createElement('div', { key: m.id, style: { display: 'flex', gap: 8, alignItems: 'center', padding: '6px 0', borderBottom: '1px solid ' + T.border } },
+                React.createElement('div', { style: { flex: 1, fontSize: 13 } },
+                  m.name + '  ',
+                  React.createElement('code', { style: { fontSize: 12, opacity: 0.8 } }, m.username + '@' + m.host + ':' + m.port),
+                  m.passwordSet ? ' 🔒' : '',
+                  m.id === currentId ? React.createElement('span', { style: { color: T.ok, fontSize: 12 } }, ' · 当前') : null),
+                React.createElement('button', { style: buttonS, onClick: () => startEdit(m) }, '编辑'),
+                React.createElement('button', { style: buttonS, onClick: () => useNow(m.id), disabled: m.id === currentId }, '设为当前')))
+            : React.createElement('div', { style: { opacity: 0.6, fontSize: 12 } }, '还没有机器。在下方添加。'),
+          ),
+        React.createElement('div', { style: boxS },
+          React.createElement('div', { style: { marginBottom: 6, fontSize: 13, fontWeight: 600 } }, form.id ? '编辑机器' : '添加机器'),
+          row('名称', React.createElement('input', { value: form.name, onChange: setF('name'), placeholder: '例如 编译机', style: inputS }), 'n'),
+          row('主机', React.createElement('input', { value: form.host, onChange: setF('host'), placeholder: 'IP 或 hostname', style: inputS }), 'h'),
+          row('端口', React.createElement('input', { value: form.port, onChange: setF('port'), placeholder: '22', style: { ...inputS, width: 70 } }), 'p'),
+          row('用户', React.createElement('input', { value: form.username, onChange: setF('username'), placeholder: 'root', style: inputS }), 'u'),
+          row('密码', React.createElement('input', { type: 'password', value: form.password, onChange: setF('password'), placeholder: 'SSH 无 key 时用（不回显、仅保存）', style: inputS }), 'w'),
+          row('私钥路径', React.createElement('input', { value: form.privateKeyPath, onChange: setF('privateKeyPath'), placeholder: '留空用默认 key', style: inputS }), 'k'),
+          React.createElement('div', { style: { display: 'flex', gap: 8, justifyContent: 'flex-end', alignItems: 'center' } },
+            msg ? React.createElement('span', { style: { color: T.ok, fontSize: 12, marginRight: 'auto' } }, msg) : null,
+            form.id ? React.createElement('button', { style: buttonS, onClick: () => save('delete') }, '删除') : null,
+            React.createElement('button', { style: buttonS, onClick: () => { setForm({ name: '', host: '', port: '22', username: 'root', password: '', privateKeyPath: '', id: '' }); setErr('') } }, form.id ? '取消编辑' : '清空'),
+            React.createElement('button', { style: { ...buttonS, fontWeight: 700 }, onClick: () => save(form.id ? 'update' : 'add'), disabled: busy || !form.host.trim() }, busy ? '保存中…' : '保存'),
+          ),
         ),
-        React.createElement('button', { onClick: connect, disabled: busy, style: { ...buttonS, alignSelf: 'flex-start' } }, busy ? '连接中…' : '连接远程'),
-        React.createElement('div', { style: { display: 'flex', gap: 8 } },
-          React.createElement('input', { value: browse.path, onChange: (e) => setBrowse({ ...browse, path: e.target.value }), placeholder: '远程路径，如 /home/dev/project', style: inputS }),
-          React.createElement('button', { onClick: () => doBrowse(), disabled: busy, style: buttonS }, '列目录'),
-          React.createElement('button', { onClick: setWorkspace, disabled: busy || !browse.path.trim(), style: buttonS }, '设为远程工作区'),
-        ),
-        error ? React.createElement('div', { style: { color: T.danger, whiteSpace: 'pre-wrap', fontSize: 13 } }, error) : null,
-        okMsg ? React.createElement('div', { style: { color: T.ok, fontSize: 13 } }, okMsg) : null,
-        browse.out
-          ? React.createElement('pre', { style: { fontSize: 12, background: T.bg, padding: 10, borderRadius: T.radius, maxHeight: 320, overflow: 'auto', whiteSpace: 'pre-wrap' } }, browse.out)
-          : null,
+        err ? React.createElement('div', { style: { color: T.danger, fontSize: 13 } }, err) : null,
       )
     }
 
-    // ── Unified workspace directory picker (fills the directory-flow holes) ──
-    let LOCAL_WORKSPACES = null // ctx.workspaces, bound in apply()
-
+    // ── Unified picker (fill the directory-flow holes) ───────────────────
     function parseLs(text) {
       const out = []
       for (const ln of String(text || '').split('\n')) {
-        const m = ln.match(/^(d[-r][rwx-]{8})\s+[^ ]+\s+[^ ]+\s+[^ ]+\s+[^ ]+\s+\d{4,}-\d{2}-\d{2}([T ]+\S+)?\s+(.+)$/)
+        const m = ln.match(/^(d[-r][rwx-]{9})\s+[^ ]+\s+[^ ]+\s+[^ ]+\s+[^ ]+\s+\d{4}-\d{2}-\d{2}([T ]+\S+)?\s+(.+)$/)
         if (!m) continue
         out.push((m[1].charAt(0) === 'd' ? '📁' : '📄') + m[3])
       }
@@ -138,100 +121,109 @@ window.__ModuleLoader__.load({
     function DirPicker(props) {
       const { open, busy, onPicked, onCancel } = props
       const [tab, setTab] = React.useState('local')
+      const [machines, setMachines] = React.useState([])
+      const [machineId, setMachineId] = React.useState('')
       const [path, setPath] = React.useState('')
       const [items, setItems] = React.useState(null)
       const [err, setErr] = React.useState('')
       const [loading, setLoading] = React.useState(false)
 
-      const load = (target, useLocal) => {
-        const p = target !== undefined ? target : path
-        setLoading(true); setErr('')
-        if (useLocal) {
-          const w = LOCAL_WORKSPACES || {}
-          const list = w.listDirectory || (() => Promise.reject(new Error('本机目录服务不可用')))
-          Promise.resolve(list(p || undefined)).then((lv) => {
-            const names = (lv && lv.entries) || (lv && lv.children) || (lv && lv.list) || []
-            setPath(p || (lv && lv.path) || '')
-            setItems((Array.isArray(names) ? names : []).map((e) => (e && e.name ? e.name : String(e))))
-          }).catch((e) => setErr(String((e && e.message) || e))).finally(() => setLoading(false))
+      React.useEffect(() => { if (open) { api('GET', '/dsh-remote/machines').then((r) => { setMachines(r.machines || []); setMachineId(r.currentId || (r.machines && r.machines[0] && r.machines[0].id) || '') }) } }, [open])
+
+      const chooseLocal = () => {
+        const w = WORKSPACES || {}
+        const pick = w.pickDirectory || w.openDirectory || w.pickPath
+        if (typeof pick === 'function') {
+          setLoading(true); setErr('')
+          Promise.resolve(pick()).then((p) => { if (p) onPicked(String(p)); }).catch((e) => setErr(String((e && e.message) || e))).finally(() => setLoading(false))
         } else {
-          api('GET', '/dsh-remote/ls?path=' + encodeURIComponent(p || '')).then((res) => {
-            setPath(res && res.path ? res.path : p)
-            setItems(parseLs(res && res.text))
-          }).catch((e) => setErr(String((e && e.message) || e))).finally(() => setLoading(false))
+          setErr('本机系统选择器不可用，请在对话框中输入本机路径或使用远程tab')
         }
       }
 
-      React.useEffect(() => { if (open) load('', tab === 'local') }, [open])
-
-      const switchTab = (t) => { setTab(t); setPath(''); setItems(null); setErr(''); load('', t === 'local') }
-      const goUp = () => {
-        const sep = tab === 'local' ? '\\' : '/'
-        const idx = String(path).replace(/[\\/]+$/, '').lastIndexOf(sep)
-        const parent = idx <= 0 ? (tab === 'local' ? (path.slice(0, 3) || 'C:\\') : '/') : String(path).slice(0, idx)
-        load(parent, tab === 'local')
+      const switchTab = (t) => { setTab(t); setErr(''); if (t === 'remote' && machineId) loadRemote(machineId, '') }
+      const useMachine = (id) => { setMachineId(id); loadRemote(id, '') }
+      const loadRemote = (id, target) => {
+        setLoading(true); setErr('')
+        api('POST', '/dsh-remote/current', { id }).catch(() => {})
+        .then(() => api('GET', '/dsh-remote/ls?path=' + encodeURIComponent(target || '')))
+        .then((res) => { setPath(res && res.path ? res.path : target || ''); setItems(parseLs(res && res.text)) })
+        .catch((e) => setErr(String((e && e.message) || e)))
+        .finally(() => setLoading(false))
+      }
+      const enter = (n) => {
+        const base = String(path).replace(/\/+$/, '')
+        const next = (base ? base : '') + '/' + String(n).replace(/^📁/, '')
+        loadRemote(machineId, next)
       }
-      const enter = (name) => {
-        const sep = tab === 'local' ? '\\' : '/'
-        const np = path === '' || path.endsWith(sep) ? path + name : path + sep + name
-        load(np, tab === 'local')
+      const goUp = () => {
+        const base = String(path).replace(/\/+$/, '')
+        const idx = base.lastIndexOf('/')
+        loadRemote(machineId, idx <= 0 ? '/' : base.slice(0, idx))
       }
-      const pickCurrent = () => {
-        if (loading || busy) return
-        if (tab === 'local') { onPicked(path); return }
-        api('POST', '/dsh-remote/mirror', { path })
-          .then((res) => (res && res.localMirror ? onPicked(res.localMirror) : setErr((res && res.error) || '')))
-          .catch((e) => setErr(String((e && e.message) || e)))
+      const pickRemote = () => {
+        if (busy || loading) return
+        api('POST', '/dsh-remote/mirror', { path }).then((res) => (res && res.localMirror ? onPicked(res.localMirror) : setErr((res && res.error) || ''))).catch((e) => setErr(String((e && e.message) || e)))
       }
 
       if (!open) return null
-      const isDir = (label) => String(label || '').charAt(0) === '📁'
-      const cell = { ...buttonS, textAlign: 'center' }
-      const active = { ...cell, fontWeight: 700 }
-      return React.createElement(
-        'div', { style: { padding: 14, minWidth: 440, maxWidth: 680 } },
+      const tabBtn = (t, lbl) => React.createElement('button', { onClick: () => switchTab(t), style: { ...buttonS, fontWeight: tab === t ? 700 : 400 } }, lbl)
+      return React.createElement('div', { style: { padding: 14, minWidth: 460, maxWidth: 720 } },
         React.createElement('div', { style: { display: 'flex', gap: 6, marginBottom: 8 } },
-          React.createElement('button', { onClick: () => switchTab('local'), style: tab === 'local' ? active : cell }, '本机'),
-          React.createElement('button', { onClick: () => switchTab('remote'), style: tab === 'remote' ? active : cell }, '远程'),
-        ),
-        React.createElement('div', { style: { display: 'flex', gap: 6, marginBottom: 8 } },
-          React.createElement('input', { value: path, onChange: (e) => setPath(e.target.value), placeholder: tab === 'local' ? '本机目录路径' : '远程路径，如 /home/dev/project', style: inputS }),
-          React.createElement('button', { onClick: () => load(path, tab === 'local'), style: buttonS }, '载入'),
-          React.createElement('button', { onClick: goUp, style: buttonS }, '上一级'),
-        ),
-        err ? React.createElement('div', { style: { color: T.danger, marginBottom: 6, fontSize: 12 } }, err) : null,
-        React.createElement(
-          'div', { style: { border: '1px solid ' + T.border, borderRadius: T.radius, padding: 8, maxHeight: 280, overflow: 'auto', fontSize: 13 } },
-          loading
-            ? '加载中…'
-            : (items && items.length
-                ? items.slice(0, 400).map((n, i) => React.createElement('div', { key: i, onClick: () => (isDir(n) ? enter(n.slice(2)) : null), style: { padding: '3px 6px', borderRadius: 4, cursor: isDir(n) ? 'pointer' : 'default', color: isDir(n) ? T.ok : 'inherit' } }, isDir(n) ? n : '   ' + n))
-                : React.createElement('div', { style: { opacity: 0.6 } }, items === null ? '（输入路径后点「载入」）' : '（空）')),
-        ),
-        React.createElement('div', { style: { display: 'flex', gap: 8, marginTop: 8, justifyContent: 'flex-end' } },
-          React.createElement('button', { onClick: onCancel, style: { background: 'transparent' } }, '取消'),
-          React.createElement('button', { onClick: pickCurrent, disabled: loading || busy || !path.trim(), style: buttonS }, busy ? '处理中…' : tab === 'local' ? '选用此目录' : '设为远程工作区'),
+          tabBtn('local', '本机'),
+          tabBtn('remote', '远程'),
         ),
+        tab === 'local'
+          ? React.createElement('div', { style: { display: 'flex', flexDirection: 'column', gap: 8 } },
+              React.createElement('div', { style: { fontSize: 12, opacity: 0.8 } }, '系统选择器优先；不可用时直接输入本机目录。'),
+              React.createElement('div', { style: { display: 'flex', gap: 6 } },
+                React.createElement('input', { value: path, onChange: (e) => setPath(e.target.value), placeholder: '本机目录，如 C:\\Users\\you\\project', style: inputS }),
+                React.createElement('button', { style: buttonS, onClick: () => (path.trim() ? onPicked(path) : undefined), disabled: !path.trim() }, '选用此本地路径'),
+              ),
+              React.createElement('button', { style: buttonS, onClick: chooseLocal, disabled: loading }, '打开系统文件夹选择器'),
+            )
+          : React.createElement('div', { style: { display: 'flex', flexDirection: 'column', gap: 8 } },
+              React.createElement('div', { style: { display: 'flex', gap: 6, alignItems: 'center' } },
+                React.createElement('label', { style: { fontSize: 12, opacity: 0.8 } }, '远程机器:'),
+                React.createElement('select', { value: machineId, onChange: (e) => useMachine(e.target.value), style: inputS },
+                  React.createElement('option', { value: '' }, '— 选择 —'),
+                  machines.map((m) => React.createElement('option', { key: m.id, value: m.id }, m.name + ' (' + m.username + '@' + m.host + ')')),
+                ),
+              ),
+              React.createElement('div', { style: { display: 'flex', gap: 6 } },
+                React.createElement('input', { value: path, onChange: (e) => setPath(e.target.value), placeholder: '远程目录，如 /home/dev/project', style: inputS }),
+                React.createElement('button', { style: buttonS, onClick: () => loadRemote(machineId, path), disabled: !machineId || loading }, '载入'),
+                React.createElement('button', { style: buttonS, onClick: goUp, disabled: !machineId || loading }, '上一级'),
+              ),
+              err ? React.createElement('div', { style: { color: T.danger, fontSize: 12 } }, err) : null,
+              React.createElement('div', { style: boxS, ...{ minHeight: 150 } },
+                loading ? '加载中…'
+                  : (items && items.length ? items.slice(0, 400).map((n, i) => { const isDir = n.indexOf('📁') === 0; return React.createElement('div', { key: i, onClick: () => (isDir ? enter(n.slice(2)) : null), style: { padding: '3px 6px', borderRadius: 4, cursor: isDir ? 'pointer' : 'default', color: isDir ? T.ok : 'inherit' } }, isDir ? n : '  ' + n) }) : React.createElement('div', { style: { opacity: 0.6 } }, '先选机器，再点「载入」或输入路径')),
+              ),
+              React.createElement('div', { style: { display: 'flex', gap: 8, justifyContent: 'flex-end' } },
+                React.createElement('button', { style: { background: 'transparent' }, onClick: onCancel }, '取消'),
+                React.createElement('button', { style: { ...buttonS, fontWeight: 600 }, onClick: pickRemote, disabled: busy || loading || !machineId || !path.trim() }, busy ? '镜像中…' : '设为远程工作区'),
+              ),
+            ),
+        (tab === 'local') ? React.createElement('div', { style: { display: 'flex', gap: 8, justifyContent: 'flex-end' } }, React.createElement('button', { style: { background: 'transparent' }, onClick: onCancel }, '取消')) : null,
       )
     }
 
     function apply(ctx) {
       const slots = ctx.get('slots')
       if (slots === undefined) return
-      // workspaces is a client service: read it lazily via ctx.get (the direct
-      // property form needs an inject declaration, which a bare plugin can't rely
-      // on; the official picker injects the service, we resolve it here instead).
-      LOCAL_WORKSPACES = (ctx && ctx.get && ctx.get('workspaces')) || null
+      WORKSPACES = (ctx && ctx.get && ctx.get('workspaces')) || null
       slots.inject('settings.section', () =>
         slots.register({ name: 'settings.section', id: 'dsh-remote', priority: 40, label: () => '远程工作区' }, () => React.createElement(RemoteWorkspacePage, null)),
       )
       slots.inject(
         'conversation.hero.workspace.directoryFlow',
-        () =>
-          slots.inject('sidebar.workspaces.directoryFlow', function* () {
+        () => slots.inject('sidebar.workspaces.directoryFlow',
+          function* () {
             yield slots.register({ name: 'conversation.hero.workspace.directoryFlow', id: 'dsh-remote', priority: -100 }, DirPicker)
             yield slots.register({ name: 'sidebar.workspaces.directoryFlow', id: 'dsh-remote', priority: -100 }, DirPicker)
-          }),
+          },
+        ),
       )
     }
 

package/lib/index.js

@@ -193,6 +193,38 @@ async function pushTree(sftp, localDir, remoteDir, remoteBaseDir, maxFiles) {
   return { files, pushed }
 }
 
+// ── persistent multi-machine registry ─────────────────────────────────────
+const MACHINES_FILE = 'machines.json'
+const machinesFile = () => path.join(homedir(), '.dsh', 'remote-workspaces', MACHINES_FILE)
+function loadMachines() {
+  try {
+    const j = JSON.parse(readFileSync(machinesFile(), 'utf8'))
+    if (Array.isArray(j.list)) return { list: j.list, currentId: j.currentId || (j.list[0] && j.list[0].id) || null }
+  } catch {}
+  return { list: [], currentId: null }
+}
+function saveMachines(list, currentId) {
+  try { mkdirSync(path.dirname(machinesFile()), { recursive: true }) } catch {}
+  writeFileSync(machinesFile(), JSON.stringify({ list, currentId }, null, 2))
+}
+function sanitizeMachine(m) {
+  if (!m) return m
+  const { password, ...rest } = m
+  return { ...rest, passwordSet: !!(m.password && m.password.length) }
+}
+/** Apply a machine's fields onto the live config object (pool + tools read it). */
+function applyMachine(config, m) {
+  if (!m) return
+  config.host = m.host
+  config.port = Number(m.port) || 22
+  config.username = m.username || ''
+  config.password = m.password || ''
+  config.privateKeyPath = m.privateKeyPath || ''
+  config.passphrase = m.passphrase || ''
+  config.workspace = m.workspace || (config.workspace || '')
+}
+function machineId() { return 'm-' + Date.now().toString(36) + '-' + Math.random().toString(36).slice(2, 6) }
+
 // ── SSH pool (key OR password) ──────────────────────────────────────────────
 
 class SshPool {
@@ -371,6 +403,34 @@ export async function apply(ctx, config) {
   const pool = new SshPool(config)
   ctx.effect(() => () => pool.close(), 'dsh-remote.close')
 
+  // ── machine registry (multi-host) ─────────────────────────────────────────
+  const store = loadMachines()
+  const machines = store.list
+  const machineIndex = (id) => machines.findIndex((m) => m.id === id)
+  const currentMachine = () => {
+    if (store.currentId) {
+      const i = machineIndex(store.currentId)
+      if (i >= 0) return machines[i]
+    }
+    // fall back to config-derived default (host set via cordis config)
+    if (config.host) return { id: machineId(), name: config.host, host: config.host, port: config.port, username: config.username, password: config.password, privateKeyPath: config.privateKeyPath, passphrase: config.passphrase }
+    return null
+  }
+  const setCurrent = (id) => {
+    const i = machineIndex(id)
+    if (i < 0) return false
+    store.currentId = id
+    saveMachines(machines, id)
+    applyMachine(config, machines[i])
+    pool.setTarget({ host: config.host, port: config.port, username: config.username, password: config.password, privateKeyPath: config.privateKeyPath, passphrase: config.passphrase })
+    return true
+  }
+  // If no stored current, adopt a CLI-provided default as the active machine.
+  {
+    const cur = currentMachine()
+    if (cur && cur.host) applyMachine(config, cur)
+  }
+
   const run = async (cmd, opts = {}) => {
     const res = await pool.exec(cmd, opts.timeoutMs)
     const parts = []
@@ -393,6 +453,8 @@ export async function apply(ctx, config) {
     connected: !!pool.client,
     workspace: wsPath(),
     localMirror: wsPath() ? mirrorDirFor(wsPath(), config.host, config.username, config.port) : '',
+    currentId: store.currentId || null,
+    machines: machines.map(sanitizeMachine),
   })
 
   // ── tools ─────────────────────────────────────────────────────────────────
@@ -762,6 +824,69 @@ export async function apply(ctx, config) {
         }
       },
     },
+    {
+      kind: 'exact',
+      path: '/dsh-remote/machines',
+      handler: async (req, res) => {
+        if (req.method === 'GET') {
+          return sendJson(res, 200, { machines: machines.map(sanitizeMachine), currentId: store.currentId })
+        }
+        if (req.method === 'POST') {
+          try {
+            const body = JSON.parse((await readBody(req)) || '{}')
+            const action = body.action || 'add'
+            if (action === 'add' || action === 'update') {
+              const host = String(body.host || '').trim()
+              if (!host) return sendJson(res, 400, { ok: false, error: 'host required' })
+              const rec = {
+                id: body.id || machineId(),
+                name: String(body.name || '').trim() || host,
+                host,
+                port: Number(body.port) || 22,
+                username: String(body.username || '').trim() || 'root',
+                password: body.password || '',
+                privateKeyPath: String(body.privateKeyPath || '').trim(),
+                passphrase: body.passphrase || '',
+                workspace: String(body.workspace || '').trim(),
+              }
+              const i = machineIndex(rec.id)
+              if (i >= 0) machines[i] = rec; else machines.push(rec)
+              if (!store.currentId) { store.currentId = rec.id }
+              saveMachines(machines, store.currentId)
+              if (store.currentId === rec.id) applyMachine(config, rec)
+              return sendJson(res, 200, { ok: true, machine: sanitizeMachine(rec), machines: machines.map(sanitizeMachine), currentId: store.currentId })
+            }
+            if (action === 'delete') {
+              const i = machineIndex(String(body.id || ''))
+              if (i < 0) return sendJson(res, 404, { ok: false, error: 'machine not found' })
+              machines.splice(i, 1)
+              if (store.currentId === body.id) store.currentId = machines[0] ? machines[0].id : null
+              saveMachines(machines, store.currentId)
+              return sendJson(res, 200, { ok: true, machines: machines.map(sanitizeMachine), currentId: store.currentId })
+            }
+            return sendJson(res, 400, { ok: false, error: 'unknown action' })
+          } catch (err) {
+            return sendJson(res, 500, { ok: false, error: String((err && err.message) || err) })
+          }
+        }
+        return sendJson(res, 405, { ok: false, error: 'method not allowed' })
+      },
+    },
+    {
+      kind: 'exact',
+      path: '/dsh-remote/current',
+      handler: async (req, res) => {
+        if (req.method !== 'POST') return sendJson(res, 405, { ok: false, error: 'method not allowed' })
+        try {
+          const body = JSON.parse((await readBody(req)) || '{}')
+          const okSet = setCurrent(String(body.id || ''))
+          if (!okSet) return sendJson(res, 404, { ok: false, error: 'machine not found' })
+          return sendJson(res, 200, { ok: true, ...status() })
+        } catch (err) {
+          return sendJson(res, 500, { ok: false, error: String((err && err.message) || err) })
+        }
+      },
+    },
   ]
 
   const disposers = routes.map((r) => webServer.register(r))

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-remote",
-  "version": "0.3.3",
+  "version": "0.4.1",
   "description": "Remote-work assistant for DeepSeek Harness: connect SSH (password or key), pick a remote workspace, operate on it with rw_pick_workspace / rw_list_dir / rw_read_file / rw_exec / rw_sync tools, and mirror it to a real local directory (SFTP) so the DSH native workspace can adopt it.",
   "keywords": [
     "deepseek-harness",