dsh-remote 0.8.63 → 0.8.65

package/lib/client.js

@@ -55,6 +55,10 @@ window.__ModuleLoader__.load({
         'settings.badgeKey': '私钥',
         'settings.openWorkspace': '选目录',
         'settings.openWorkspaceHint': '在这台机器上选一个远程目录作为工作区',
+        'settings.recentWorkspacesFor': '最近工作区（{n}）',
+        'settings.recentWorkspacesHint': '这台机器用过的远程目录，点开直接打开',
+        'settings.openWorkspaceHere': '打开',
+        'settings.openWorkspaceOnHint': '在 {host} 上打开这个目录（会创建/复用本地镜像）',
         'settings.workspaceOpened': '已打开远程工作区：{path}',
         'settings.addMachineManual': '手动添加（密码 / 私钥 / 跳板机）',
         // 列表的搜索、排序与连接状态（机器一多就要用）。
@@ -143,8 +147,6 @@ window.__ModuleLoader__.load({
         'settings.testConn': '测试连接',
         'settings.saving': '保存中…',
         'settings.save': '保存',
-        'settings.recentWorkspaces': '当前机器最近工作区（一键切换）',
-        'settings.switch': '切换',
         'settings.forwards': '端口转发（SSH 隧道）',
         'settings.fwdStop': '停止',
         'settings.fwdStart': '启动',
@@ -223,7 +225,6 @@ window.__ModuleLoader__.load({
         'settings.secretStoreRefused': '密码未能写入系统密钥库（{msg}），已放弃保存该密码（不会以明文落盘）。修复密钥库后重新保存，或把 credentialFallback 设为 plain 以接受明文回退。',
         'settings.cleared': '已取消当前远程机 — 本地会话不再自动使用远程上下文',
         'settings.filledSsh': '已从 ~/.ssh/config 填入（仅引用私钥路径，不读取内容）',
-        'settings.workspaceSwitched': '已切换到工作区 {path}',
         'settings.connOk': '连接成功',
         'settings.connOkWith': '连接成功（{user}@{host}，{latency}ms）{shell}',
         'settings.connFail': '连接失败',
@@ -382,6 +383,10 @@ window.__ModuleLoader__.load({
         'settings.badgeKey': 'key',
         'settings.openWorkspace': 'Folder',
         'settings.openWorkspaceHint': 'Pick a remote folder on this machine as the workspace',
+        'settings.recentWorkspacesFor': 'Recent folders ({n})',
+        'settings.recentWorkspacesHint': 'Remote folders this machine used before — open one directly',
+        'settings.openWorkspaceHere': 'Open',
+        'settings.openWorkspaceOnHint': 'Open this folder on {host} (creates or reuses the local mirror)',
         'settings.workspaceOpened': 'Opened remote workspace: {path}',
         'settings.addMachineManual': 'Add manually (password / key / jump host)',
         'settings.hostFilter': 'Search hosts (name / address / user)',
@@ -463,8 +468,6 @@ window.__ModuleLoader__.load({
         'settings.testConn': 'Test connection',
         'settings.saving': 'Saving…',
         'settings.save': 'Save',
-        'settings.recentWorkspaces': 'Recent workspaces of the current machine (one-click switch)',
-        'settings.switch': 'Switch',
         'settings.forwards': 'Port forwarding (SSH tunnels)',
         'settings.fwdStop': 'Stop',
         'settings.fwdStart': 'Start',
@@ -543,7 +546,6 @@ window.__ModuleLoader__.load({
         'settings.secretStoreRefused': 'The OS keychain refused the password ({msg}); the password was NOT saved (it will not be written to disk in plaintext). Repair the keychain and save again, or set credentialFallback to plain to accept the plaintext fallback.',
         'settings.cleared': 'Cleared current remote — local sessions no longer use remote context automatically',
         'settings.filledSsh': 'Filled from ~/.ssh/config (only references the private key path, never reads its content)',
-        'settings.workspaceSwitched': 'Switched to workspace {path}',
         'settings.connOk': 'Connection successful',
         'settings.connOkWith': 'Connection successful ({user}@{host}, {latency}ms){shell}',
         'settings.connFail': 'Connection failed',
@@ -1009,7 +1011,6 @@ window.__ModuleLoader__.load({
       const [forwards, setForwards] = React.useState([])
       const [fwdForm, setFwdForm] = React.useState({ listenPort: '', targetHost: '127.0.0.1', targetPort: '', direction: 'local', autoStart: false })
       const [auditLines, setAuditLines] = React.useState([])
-      const [workspaces, setWorkspaces] = React.useState([])
       const [advOpen, setAdvOpen] = React.useState(false) // 高级配置折叠
       // Collapsed by default: the forwards panel sits BELOW the host list and used to
       // push the update/audit cards far down the page for a feature most sessions
@@ -1046,6 +1047,8 @@ window.__ModuleLoader__.load({
       const [manualOpen, setManualOpen] = React.useState(false)
       const [dirPick, setDirPick] = React.useState(null) // { machineId } while the picker is open
       const [hostFilter, setHostFilter] = React.useState('')
+      // Which machine rows have their 最近工作区 list expanded (issue #73: host → folders).
+      const [openWs, setOpenWs] = React.useState({})
       // session's machine", which the host resolves from the session binding.
       React.useEffect(() => { ensureChromeCss() }, [])
 
@@ -1105,11 +1108,25 @@ window.__ModuleLoader__.load({
 
       const refresh = () => api('GET', '/dsh-remote/machines').then((r) => {
         setMachines(r.machines || []); setCurrentId(r.currentId || '')
-        const cur = (r.machines || []).find((m) => m.id === r.currentId)
-        setWorkspaces((cur && cur.recentWorkspaces) || [])
       })
       React.useEffect(() => { refresh() }, [])
 
+      // Issue #73 follow-up: the settings page must notice changes made ELSEWHERE —
+      // an agent calling rw_connect, or another tab switching machines — without the
+      // user reloading. A light poll of the registry (a local JSON read) plus a
+      // refresh on window focus; the ssh-config list is re-read on focus only, since
+      // that one touches the filesystem.
+      React.useEffect(() => {
+        const poll = () => { refresh().catch(() => {}) }
+        const timer = setInterval(poll, 5000)
+        const onFocus = () => { poll(); loadSshHosts() }
+        try { window.addEventListener('focus', onFocus) } catch { /* headless host */ }
+        return () => {
+          clearInterval(timer)
+          try { window.removeEventListener('focus', onFocus) } catch { /* headless host */ }
+        }
+      }, [])
+
       // ── update state ────────────────────────────────────────────────────────
       const [upd, setUpd] = React.useState(null) // { current, latest, updateAvailable, updateMode, updatedMarker }
       const [updBusy, setUpdBusy] = React.useState(false)
@@ -1403,10 +1420,25 @@ window.__ModuleLoader__.load({
           .finally(() => setConnectingKey(''))
       }
 
-      const setWorkspaceNow = (p) => {
-        api('POST', '/dsh-remote/workspace', { path: p })
-          .then(() => setMsg(tr('settings.workspaceSwitched', { path: p })))
+      /**
+       * Open a folder this machine used before — one click from the row's
+       * 「最近工作区」 list (issue #73: the VSCode shape is host → folders).
+       *
+       * Goes through /mirror rather than /workspace: /workspace only changes the
+       * ACTIVE machine's workspace, while the user may be clicking a folder that
+       * belongs to a machine they are not on. /mirror re-asserts the machine, creates
+       * (or reuses) the mirror and persists the choice on that machine.
+       */
+      const openWorkspaceOn = (machineId, path) => {
+        setBusy(true); setErr(''); setMsg('')
+        api('POST', '/dsh-remote/mirror', { path, machineId })
+          .then((r) => {
+            setCurrentId((r && r.currentId) || machineId)
+            setMsg(tr('settings.workspaceOpened', { path }))
+            refresh()
+          })
           .catch((e) => setErr(String((e && e.message) || e)))
+          .finally(() => setBusy(false))
       }
 
       // ── forwards panel ────────────────────────────────────────────────────
@@ -1575,7 +1607,31 @@ window.__ModuleLoader__.load({
                   (m.sshConfigResolved && m.sshConfigResolved.warnings && m.sshConfigResolved.warnings.length)
                     ? React.createElement('div', { style: { fontSize: 11, color: T.warn, marginTop: 2 } }, tr('settings.sshResolvedWarn', { msg: m.sshConfigResolved.warnings.join(' ') }))
                     : null,
-                  rowResult('machine:' + m.id)),
+                  rowResult('machine:' + m.id),
+                  // 最近工作区挂在这一行下面（host → folders，issue #73）：点一下就在这台
+                  // 机器上打开那个目录（走 /mirror，会建/复用镜像并记住选择）。
+                  (Array.isArray(m.recentWorkspaces) && m.recentWorkspaces.length)
+                    ? React.createElement('div', { style: { marginTop: 4 } },
+                      React.createElement('button', {
+                        type: 'button', className: 'dsh-rw-section-btn',
+                        style: { fontSize: 11, padding: 0 },
+                        title: tr('settings.recentWorkspacesHint'),
+                        onClick: () => setOpenWs((prev) => ({ ...prev, [m.id]: !prev[m.id] })),
+                      }, React.createElement('span', { style: { opacity: 0.7, width: 10, display: 'inline-block' } }, openWs[m.id] ? '▾' : '▸'),
+                      tr('settings.recentWorkspacesFor', { n: m.recentWorkspaces.length })),
+                      openWs[m.id]
+                        ? React.createElement('div', { style: { marginTop: 2, marginLeft: 16 } },
+                          m.recentWorkspaces.map((w, wi) => React.createElement('div', { key: w + wi, style: { display: 'flex', gap: 6, alignItems: 'center', padding: '1px 0' } },
+                            React.createElement('code', { style: { flex: 1, fontSize: 11, fontFamily: 'monospace', opacity: 0.85, wordBreak: 'break-all' } }, w),
+                            React.createElement('button', {
+                              type: 'button', className: 'dsh-rw-btn',
+                              style: { ...buttonS, fontSize: 11, padding: '1px 8px', whiteSpace: 'nowrap' },
+                              disabled: busy,
+                              title: tr('settings.openWorkspaceOnHint', { host: m.name }),
+                              onClick: () => openWorkspaceOn(m.id, w),
+                            }, tr('settings.openWorkspaceHere')))))
+                        : null)
+                    : null),
                 React.createElement('div', { style: { display: 'flex', gap: 6, flexShrink: 0 } },
                   React.createElement('button', { type: 'button', className: 'dsh-rw-btn', style: buttonS, onClick: () => startEdit(m) }, tr('settings.edit')),
                   React.createElement('button', { type: 'button', className: 'dsh-rw-btn', style: buttonS, onClick: () => del(m.id) }, tr('settings.delete')),
@@ -1723,12 +1779,8 @@ window.__ModuleLoader__.load({
           ),
           ) : null,
         ),
-        // 快捷切换工作区（该机器的最近工作区）
-        workspaces.length ? React.createElement('div', { style: boxS },
-          React.createElement('div', { style: { marginBottom: 6, fontSize: 13, fontWeight: 600 } }, tr('settings.recentWorkspaces')),
-          workspaces.map((w, i) => React.createElement('div', { key: w + i, style: { display: 'flex', gap: 8, alignItems: 'center', padding: '4px 0' } },
-            React.createElement('code', { style: { flex: 1, fontSize: 12, fontFamily: 'monospace' } }, w),
-            React.createElement('button', { type: 'button', className: 'dsh-rw-btn', style: { ...buttonS, padding: '2px 10px' }, onClick: () => setWorkspaceNow(w) }, tr('settings.switch'))))) : null,
+        // 最近工作区现在挂在各自的机器行下面（issue #73：host → folders 的树），
+        // 这个「只显示当前机器」的卡片就没有意义了。
         // 远程 DSH 界面（issue #46）
         React.createElement('div', { style: boxS },
           sectionToggle(webAttachOpen, setWebAttachOpen, tr('settings.webAttach')),
@@ -1941,7 +1993,11 @@ window.__ModuleLoader__.load({
               : React.createElement('div', { style: { opacity: 0.6, fontSize: 12 } }, tr('settings.auditEmpty')))
             : React.createElement('div', { style: { fontSize: 11, opacity: 0.55 } }, String(auditLines.length)),
         ),
-        err ? React.createElement('div', { style: { color: T.danger, fontSize: 13 } }, err) : null,
+        // Panel-level messages. They used to live ONLY inside the manual form, which is
+        // collapsed by default now — so "已打开远程工作区 …" and a failed 连接 were
+        // invisible after clicking something in the list.
+        msg ? React.createElement('div', { style: { color: T.ok, fontSize: 12, lineHeight: 1.5 } }, msg) : null,
+        err ? React.createElement('div', { style: { color: T.danger, fontSize: 13, lineHeight: 1.5 } }, err) : null,
         React.createElement('div', { style: boxS },
           React.createElement('div', { style: { marginBottom: 6, fontSize: 13, fontWeight: 600 } }, tr('settings.update')),
           React.createElement('div', { style: { display: 'flex', gap: 8, alignItems: 'center', flexWrap: 'wrap', fontSize: 12 } },
@@ -1992,17 +2048,18 @@ window.__ModuleLoader__.load({
             // 选目录 on a machine that is NOT current must browse THAT machine, not
             // whichever one happens to be current.
             initialMachineId: dirPick.machineId,
-            onPicked: (picked) => {
+            onPicked: (localMirror, remotePath) => {
               const target = dirPick.machineId
               setDirPick(null)
-              if (!picked) return
-              api('POST', '/dsh-remote/mirror', { path: picked, machineId: target })
-                .then((r) => {
-                  setMsg(tr('settings.workspaceOpened', { path: picked }))
-                  refresh()
-                  if (r && r.localMirror) setWorkspaces((w) => (w.includes(picked) ? w : [picked, ...w]))
-                })
-                .catch((e) => setErr(String((e && e.message) || e)))
+              // The picker already created the mirror; posting /mirror again would
+              // send a local path as if it were remote (see commitPath).
+              const shown = remotePath || localMirror
+              if (!shown) return
+              setCurrentId(target)
+              setMsg(tr('settings.workspaceOpened', { path: shown }))
+              // The mirror list is per machine now, so re-reading the registry is
+              // what makes the new folder appear under that machine's row.
+              refresh()
             },
             onCancel: () => setDirPick(null),
           })
@@ -2458,7 +2515,12 @@ window.__ModuleLoader__.load({
         // instead of trusting whichever happens to be active.
         ensureCurrent(machineId)
           .then(() => api('POST', '/dsh-remote/mirror', { path: target, machineId }))
-          .then((res) => (res && res.localMirror ? onPicked(res.localMirror) : setErr((res && res.error) || '')))
+          // `onPicked(localMirror, remotePath)`: the mirror is ALREADY created here.
+          // The sidebar opens the local mirror (1st arg); a caller that only wants to
+          // report/continue from the remote path uses the 2nd. Handing back only the
+          // local path made the settings page post /mirror a SECOND time with a
+          // Windows path as if it were remote ("not a directory (or unreachable)").
+          .then((res) => (res && res.localMirror ? onPicked(res.localMirror, res.path || target) : setErr((res && res.error) || '')))
           .catch((e) => setErr(String((e && e.message) || e)))
       }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-remote",
-  "version": "0.8.63",
+  "version": "0.8.65",
   "description": "Remote-work assistant for DeepSeek Harness: connect SSH (password/key/agent/keyboard-interactive, multi-hop ProxyJump), pick a remote workspace, operate on it with 22 rw_* tools, conflict-aware mirror sync, an embedded PTY terminal, one-click remote dsh deploy + web UI attach, port forwarding, host grouping, remote sandbox fencing, audit log, keychain passwords.",
   "license": "MIT",
   "author": "flymysql <flyphp@outlook.com>",
@@ -92,7 +92,7 @@
     "semver": "^7.8.5"
   },
   "scripts": {
-    "test": "node --import ./test/setup-telemetry-off.mjs --test --test-timeout=40000 --test-force-exit",
+    "test": "node --import ./test/setup-telemetry-off.mjs --test --test-timeout=40000 --test-force-exit --test-concurrency=8",
     "test:coverage": "node scripts/coverage-union.mjs",
     "test:coverage:gate": "node scripts/coverage-union.mjs --gate 70"
   }