dsh-remote 0.8.40 → 0.8.42

package/README.en.md

@@ -39,7 +39,7 @@ The native **"Add workspace"** flow — a centered modal with two tabs, opening
 
 ## Features
 
-![Capabilities at a glance — multi-machine SSH, live alias resolution, the two-tab picker, three-way sync, remote @ completion, a remote DSH Web UI in your local browser, health check & one-click deploy, audit, port forwarding, sidebar editing, self-update, and the 24 rw_* tools](docs/shots/features.png)
+![Capabilities at a glance — multi-machine SSH, live alias resolution, the two-tab picker, three-way sync, remote @ completion, a remote DSH Web UI in your local browser, health check & one-click deploy, audit, port forwarding, sidebar editing, self-update, and the 22 rw_* tools](docs/shots/features.png)
 
 The image above is the overview. What follows is only what the image does not make obvious.
 
@@ -56,8 +56,7 @@ The image above is the overview. What follows is only what the image does not ma
 
 The rest:
 
-- **25 model tools** (listed so they can be copied or searched): `rw_info`, `rw_connect`, `rw_machines`, `rw_pick_workspace`, `rw_list_dir`, `rw_stat`, `rw_read_file`, `rw_write_file`, `rw_edit`, `rw_append`, `rw_mkdir`, `rw_remove`, `rw_move`, `rw_exec`, `rw_search`, `rw_download`, `rw_upload`, `rw_sync`, `rw_push`, `rw_backup`, `rw_backup_list`, `rw_restore`, `rw_forward`, `rw_disconnect`, `rw_deploy_probe`.
-- **Workspace backup / restore (two buttons, nothing to configure)** — the settings page offers just **Back up** and **Restore**: backing up archives **every remote workspace in the sidebar into ONE** `.tar.gz`, and restoring brings them all back from the point in time you pick. Dependency/build directories (`node_modules`, `.git`, `dist`, `build`, `target`, `__pycache__`, `.venv` … both top-level and nested) are excluded automatically. The model can do the same through `rw_backup` / `rw_backup_list` / `rw_restore`. **The archive is verified before anything is written — a corrupt or truncated archive is refused and nothing is touched**; each workspace's previous contents are moved aside first and restored automatically if the swap fails.
+- **22 model tools** (listed so they can be copied or searched): `rw_info`, `rw_connect`, `rw_machines`, `rw_pick_workspace`, `rw_list_dir`, `rw_stat`, `rw_read_file`, `rw_write_file`, `rw_edit`, `rw_append`, `rw_mkdir`, `rw_remove`, `rw_move`, `rw_exec`, `rw_search`, `rw_download`, `rw_upload`, `rw_sync`, `rw_push`, `rw_forward`, `rw_disconnect`, `rw_deploy_probe`.
 - **Open a remote machine's DSH Web UI locally** (`0.8.36+`) — nothing has to be exposed on the remote: the plugin SSHes out, starts a `dsh web` there that binds **`127.0.0.1` only**, and tunnels its port back to a loopback port on this machine. The URL carries a one-time login token, consumed once by a redirect.
 - **One-click health check & deploy** (`0.8.36+`) — **a failed connection is usually the remote dsh version or environment, not the plugin.** The read-only check reports platform / node / npm / dsh version / **whether the native module can load** / proxy and npm registry, with a suggested fix; "Deploy & verify" installs into a remote **private directory** (no system directory, no PATH change, no replacing the version you use — deleting it is a complete rollback) and verifies step by step. The button **no longer requires running the check first** (`0.8.40+`) — the deploy re-checks internally. If that still fails, the built-in `dsh-remote-deploy` skill takes over.
 - **Cross-platform remotes** — all file access is SFTP-protocol-level (no POSIX shell), so Linux/macOS/Windows remotes all work.
@@ -264,9 +263,6 @@ Deploying to a product profile is a separate, explicit action (`./sync.sh`) for
 | `webInstallPrefix` | string | `''` | where an automatic deployment installs dsh; empty means `$HOME/.dsh-remote/dsh` (no system directory, no PATH change) |
 | `webInstallVersion` | string | `0.1.5-rc.2` | dsh version an automatic deployment installs; the default is the first that can start the web surface on Linux |
 | `webInstallRegistry` | string | `''` | npm registry for the install; **empty keeps the remote's own config**, so an internal mirror is never overridden |
-| `backupDir` | string | `''` | Where backup archives are written **on the remote**; empty means `$HOME/.dsh-remote/backups` (resolved on the remote, never guessed from this machine's home) |
-| `backupExcludes` | string[] | `[]` | Extra paths excluded **on top of the built-in set** (gitignore-style). No longer surfaced in the UI; the built-in set covers `node_modules`/`.git`/`dist`/`build`/`target`/`__pycache__`/`.venv` and friends, top-level and nested |
-| `maxBackupTransferBytes` | int | `2147483648` | Cap (bytes) on moving an archive between this machine and the remote; **the remote archive is never truncated** — this only bounds the optional cross-machine copy. 0 = unlimited |
 
 > The authoritative list is the `Config` schema in `lib/index.js`; this table mirrors it.
 

package/README.md

@@ -39,14 +39,13 @@ DSH 的 Web 界面刻意只监听 `127.0.0.1`（CLI 为安全拒绝 `--host 0.0.
 
 ## 功能
 
-![核心能力总览 — 多机 SSH / 别名实时解析 / 双 tab 选择器 / 三路同步 / 远程 @ 补全 / 远端 DSH 界面挂到本机 / 体检与一键部署 / 安全审计 / 端口转发 / 侧栏编辑 / 自动更新，以及 25 个 rw_* 工具](docs/shots/features.png)
+![核心能力总览 — 多机 SSH / 别名实时解析 / 双 tab 选择器 / 三路同步 / 远程 @ 补全 / 远端 DSH 界面挂到本机 / 体检与一键部署 / 安全审计 / 端口转发 / 侧栏编辑 / 自动更新，以及 22 个 rw_* 工具](docs/shots/features.png)
 
 上图是能力总览；下面只列**上图没说清、但用起来需要知道**的部分。
 
 其余要点：
 
-- **25 个模型工具**（便于复制/检索）：`rw_info`、`rw_connect`、`rw_machines`、`rw_pick_workspace`、`rw_list_dir`、`rw_stat`、`rw_read_file`、`rw_write_file`、`rw_edit`、`rw_append`、`rw_mkdir`、`rw_remove`、`rw_move`、`rw_exec`、`rw_search`、`rw_download`、`rw_upload`、`rw_sync`、`rw_push`、`rw_backup`、`rw_backup_list`、`rw_restore`、`rw_forward`、`rw_disconnect`、`rw_deploy_probe`。
-- **工作区备份 / 恢复（一个按钮就够）** —— 设置页里只有「备份」和「恢复」两个按钮：**备份**把侧边栏里的所有远程工作区打包成**一个** `.tar.gz`，**恢复**用选中的那个时间点把全部工作区还原。依赖/构建目录（`node_modules`、`.git`、`dist`、`build`、`target`、`__pycache__`、`.venv`… 顶层与嵌套）自动排除，不需要你配置。模型侧仍可用 `rw_backup` / `rw_backup_list` / `rw_restore` 做同样的事。**恢复前先校验归档可读，归档损坏或截断就拒绝执行、目标一个字节都不动**；每个工作区的旧目录会先移到一旁，换入失败会自动还原。
+- **22 个模型工具**（便于复制/检索）：`rw_info`、`rw_connect`、`rw_machines`、`rw_pick_workspace`、`rw_list_dir`、`rw_stat`、`rw_read_file`、`rw_write_file`、`rw_edit`、`rw_append`、`rw_mkdir`、`rw_remove`、`rw_move`、`rw_exec`、`rw_search`、`rw_download`、`rw_upload`、`rw_sync`、`rw_push`、`rw_forward`、`rw_disconnect`、`rw_deploy_probe`。
 - **把远端机器的 DSH 界面挂到本机**（`0.8.36+`）—— 不用在远端开任何端口：插件主动 SSH 连过去，在远端**只监听 `127.0.0.1`** 地起一个 `dsh web`，再把端口经隧道搬回本机的一个 loopback 端口。地址带一次性登录令牌，只在本机这次跳转里用一次。
 - **连不上时一键体检与部署**（`0.8.36+`）—— **连不上大多不是插件的问题，而是远端 dsh 的版本或环境不对**。体检（只读）会报出平台/node/npm/dsh 版本、**原生模块能否启动**、代理与 npm 源，并给出修复建议；「部署并验证」把它装到远端**私有目录**（不写系统目录、不改 PATH、不覆盖你在用的版本，删目录即回滚）并逐步校验。按钮**不再需要先体检**——直接点即可（`0.8.40+`），部署过程自己会重新体检。失败还能交给内置的 `dsh-remote-deploy` 技能排查。
 - **远端跨平台** —— 文件访问走 SFTP 协议层（不依赖 POSIX shell），Linux/macOS/Windows 远端都能列/读/写/搜索/同步。
@@ -246,9 +245,6 @@ scripts/dev-run.sh --status    # 是否在运行
 | `webInstallPrefix` | string | `''` | 自动部署装到远端的哪个目录；留空用 `$HOME/.dsh-remote/dsh`（不写系统目录、不改 PATH） |
 | `webInstallVersion` | string | `0.1.5-rc.2` | 自动部署安装的 dsh 版本；默认值是第一个在 Linux 上能启动 web 的版本 |
 | `webInstallRegistry` | string | `''` | 安装用的 npm 源；**留空沿用远端自己的配置**，不会覆盖内网镜像 |
-| `backupDir` | string | `''` | 备份归档在**远端**的存放目录；留空用 `$HOME/.dsh-remote/backups`（在远端解析，不用本机 home 猜） |
-| `backupExcludes` | string[] | `[]` | 在**内置排除集之外**额外排除的路径（gitignore 风格）。设置页不再暴露此项；内置集已覆盖 `node_modules`/`.git`/`dist`/`build`/`target`/`__pycache__`/`.venv` 等（顶层与嵌套） |
-| `maxBackupTransferBytes` | int | `2147483648` | 归档在本机与远端之间搬运的大小上限（字节）；**远端的归档从不截断**，只约束可选的对拷。0 = 不限 |
 
 > 权威清单是 `lib/index.js` 里的 `Config` schema，本表与之一致。
 

package/lib/client.js

@@ -134,6 +134,14 @@ window.__ModuleLoader__.load({
         'settings.deployUseCommand': '将使用的 dsh',
         'settings.deploySteps': '安装步骤',
         'settings.deployDone': '部署完成，已记录该机器使用的 dsh',
+        'settings.deployFailed': '部署失败',
+        'settings.deployResumed': '已有部署任务在运行，已恢复显示其进度',
+        'settings.deployTaskTitle': '部署任务',
+        'settings.deployTaskRunning': '进行中',
+        'settings.deployTaskDone': '已完成',
+        'settings.deployTaskFailed': '失败',
+        'settings.deployTaskCancelled': '已取消',
+        'settings.deployCancel': '取消',
         'settings.deployInvestigateStarted': '已创建排查会话，请在会话里跟进。',
         'settings.badgePwd': '密码',
         'settings.badgeKeychain': '钥匙串',
@@ -187,33 +195,6 @@ window.__ModuleLoader__.load({
         'settings.modeAuto': '自动',
         'settings.modeOff': '关闭',
         'settings.modeManual': '手动',
-        // ── 工作区备份（rw_backup / rw_restore）────────────────────────────
-        'settings.backup': '工作区备份',
-        'settings.backupHint': '一键把侧边栏里的所有远程工作区打包成一个 .tar.gz；恢复时用同一个归档把全部工作区还原。依赖/构建目录（node_modules、.git、dist、build…）会自动排除。',
-        'settings.backupCreate': '备份',
-        'settings.backupCreating': '备份中…',
-        'settings.backupRestore': '恢复',
-        'settings.backupRestoring': '恢复中…',
-        'settings.backupPickOne': '— 选择要恢复的备份时间点 —',
-        'settings.backupCovers': '本次将备份 {n} 个工作区：',
-        'settings.backupDirLabel': '远端备份目录：{dir}',
-        'settings.backupNone': '还没有备份。点「备份」创建第一个。',
-        'settings.backupCount': '{n} 个备份',
-        'settings.backupEntries': '{n} 个条目',
-        'settings.backupDownload': '下载到本机',
-        'settings.backupDelete': '删除',
-        'settings.backupVerify': '校验',
-        'settings.backupRestoreConfirm': '要用 {file} 恢复全部工作区吗？归档里没有的文件会被删除（原目录会先移到一旁，换入失败会自动还原）。',
-        'settings.backupDeleteConfirm': '删除备份 {file}？此操作不可撤销。',
-        'settings.backupVerified': '校验通过：sha256 {sha}',
-        'settings.backupVerifyMismatch': '校验失败：哈希与记录不一致（归档可能已损坏）',
-        'settings.backupRestored': '已从 {file} 恢复：{target}',
-        'settings.backupCreatedN': '已备份 {n} 个工作区 → {file}',
-        'settings.backupDownloaded': '已下载到本机：{path}',
-        'settings.backupDeleted': '已删除 {file}',
-        'settings.backupFailed': '备份操作失败：{msg}',
-        'settings.backupMachine': '机器',
-        'settings.backupPickMachine': '— 选择机器 —',
         'picker.title': '选择工作目录',
         'picker.close': '关闭 ✕',
         'picker.tabLocal': '本机',
@@ -419,6 +400,14 @@ window.__ModuleLoader__.load({
         'settings.deployUseCommand': 'dsh that will be used',
         'settings.deploySteps': 'Install steps',
         'settings.deployDone': 'Deployed; this machine now records the dsh it uses',
+        'settings.deployFailed': 'Deploy failed',
+        'settings.deployResumed': 'A deploy is already running — re-attached to its progress',
+        'settings.deployTaskTitle': 'Deploy task',
+        'settings.deployTaskRunning': 'running',
+        'settings.deployTaskDone': 'done',
+        'settings.deployTaskFailed': 'failed',
+        'settings.deployTaskCancelled': 'cancelled',
+        'settings.deployCancel': 'Cancel',
         'settings.deployInvestigateStarted': 'A session was created — follow up there.',
         'settings.badgePwd': 'password',
         'settings.badgeKeychain': 'keychain',
@@ -472,33 +461,6 @@ window.__ModuleLoader__.load({
         'settings.modeAuto': 'Auto',
         'settings.modeOff': 'Off',
         'settings.modeManual': 'Manual',
-        // ── workspace backup (rw_backup / rw_restore) ──────────────────────
-        'settings.backup': 'Workspace backup',
-        'settings.backupHint': 'One click archives every remote workspace in the sidebar into a single .tar.gz; restore brings them all back from that archive. Dependency/build directories (node_modules, .git, dist, build…) are excluded automatically.',
-        'settings.backupCreate': 'Back up',
-        'settings.backupCreating': 'Backing up…',
-        'settings.backupRestore': 'Restore',
-        'settings.backupRestoring': 'Restoring…',
-        'settings.backupPickOne': '— choose a backup point in time —',
-        'settings.backupCovers': 'This will back up {n} workspace(s):',
-        'settings.backupDirLabel': 'Remote backup directory: {dir}',
-        'settings.backupNone': 'No backups yet. Click "Back up" to create the first one.',
-        'settings.backupCount': '{n} backup(s)',
-        'settings.backupEntries': '{n} entries',
-        'settings.backupDownload': 'Download',
-        'settings.backupDelete': 'Delete',
-        'settings.backupVerify': 'Verify',
-        'settings.backupRestoreConfirm': 'Restore ALL workspaces from {file}? Files not present in the archive will be removed (each target is moved aside first, and restored automatically if the swap fails).',
-        'settings.backupDeleteConfirm': 'Delete the backup {file}? This cannot be undone.',
-        'settings.backupVerified': 'Verified: sha256 {sha}',
-        'settings.backupVerifyMismatch': 'Verification FAILED: the digest does not match the recorded one (the archive may be corrupt)',
-        'settings.backupRestored': 'Restored from {file}: {target}',
-        'settings.backupCreatedN': 'Backed up {n} workspace(s) → {file}',
-        'settings.backupDownloaded': 'Downloaded locally: {path}',
-        'settings.backupDeleted': 'Deleted {file}',
-        'settings.backupFailed': 'Backup action failed: {msg}',
-        'settings.backupMachine': 'Machine',
-        'settings.backupPickMachine': '— choose a machine —',
         'picker.title': 'Select working directory',
         'picker.close': 'Close ✕',
         'picker.tabLocal': 'Local',
@@ -914,19 +876,11 @@ window.__ModuleLoader__.load({
       const [deployBusy, setDeployBusy] = React.useState('')
       const [deployErr, setDeployErr] = React.useState('')
       const [deployOpen, setDeployOpen] = React.useState(false)
-      // ── workspace backup (rw_backup / rw_restore) ──────────────────────────
-      // Machine-scoped like the deploy card: `backupMachine` empty means "this
+      // The HOST-SIDE deploy task (resumable across window close/reopen). This
+      // is the object the poll keeps fresh; it survives because the work runs
+      // on the host, not in this tab.
+      const [deployTask, setDeployTask] = React.useState(null)
       // session's machine", which the host resolves from the session binding.
-      const [backupOpen, setBackupOpen] = React.useState(false)
-      const [backupData, setBackupData] = React.useState(null)
-      const [backupBusy, setBackupBusy] = React.useState('')
-      const [backupMsg, setBackupMsg] = React.useState('')
-      const [backupErr, setBackupErr] = React.useState('')
-      // `backupPick` is the archive the Restore/Verify/Delete buttons act on. A
-      // timestamp picker replaced the old per-row buttons: restoring is the rare
-      // action, and one selector is all it needs.
-      const [backupPick, setBackupPick] = React.useState('')
-      const [backupMachine, setBackupMachine] = React.useState('')
       React.useEffect(() => { ensureChromeCss() }, [])
 
       const testConn = () => {
@@ -1016,56 +970,34 @@ window.__ModuleLoader__.load({
       const refreshForwards = () => api('GET', '/dsh-remote/forwards').then((r) => setForwards(r.forwards || [])).catch(() => {})
       React.useEffect(() => { refreshForwards(); api('GET', '/dsh-remote/audit?limit=30').then((r) => setAuditLines(r.lines || [])).catch(() => {}) }, [])
 
-      // ── 工作区备份 ────────────────────────────────────────────────────────
-      // Reads/writes go through /dsh-remote/backup. The list carries BOTH the
-      // remote archives and any pulled locally, so one refresh answers the panel.
-      const backupQuery = (extra) => {
-        const q = backupMachine ? 'machineId=' + encodeURIComponent(backupMachine) : ''
-        return q ? (extra ? q + '&' + extra : q) : (extra || '')
-      }
-      const refreshBackups = () => api('GET', '/dsh-remote/backup' + (backupQuery('') ? '?' + backupQuery('') : ''))
-        .then((r) => { setBackupData(r); setBackupErr('') })
-        .catch((e) => setBackupErr(String((e && e.message) || e)))
-      React.useEffect(() => { refreshBackups() }, [backupMachine])
-      const backupAction = (action, body) => {
-        setBackupBusy(action); setBackupMsg(''); setBackupErr('')
-        return api('POST', '/dsh-remote/backup', Object.assign({ action }, backupMachine ? { machineId: backupMachine } : {}, body || {}))
-          .then((r) => {
-            if (r) {
-              setBackupData(r)
-              // Keep the picker pointing at something real after a list refresh
-              // (a delete/restore changes the set): prefer the current choice,
-              // else the newest archive.
-              const names = (r.entries || []).map((e) => e.name)
-              setBackupPick((cur) => (cur && names.includes(cur) ? cur : (names[0] || '')))
-            }
-            if (action === 'create' && r && r.created) {
-              setBackupMsg(tr('settings.backupCreatedN', { n: (r.created.workspaces || []).length, file: r.created.name }))
-            } else if (action === 'restore' && r && r.restored) {
-              setBackupMsg(tr('settings.backupRestored', { file: r.restored.file, target: (r.restored.targets || []).join('、') })
-                + (r.warning ? ' — ' + r.warning : ''))
-            } else if (action === 'delete') {
-              setBackupMsg(tr('settings.backupDeleted', { file: body.file }))
-            } else if (action === 'download' && r && (r.localPath || (r.restored && r.restored.file))) {
-              setBackupMsg(tr('settings.backupDownloaded', { path: r.localPath || body.file }))
-            } else if (action === 'verify' && r) {
-              setBackupMsg(r.matches === false || r.verified === false
-                ? tr('settings.backupVerifyMismatch')
-                : tr('settings.backupVerified', { sha: String(r.sha256 || '').slice(0, 16) }))
-            }
-            return r
-          })
-          .catch((e) => { setBackupErr(tr('settings.backupFailed', { msg: String((e && e.message) || e) })); return null })
-          .then((r) => { setBackupBusy(''); return r })
-      }
-
       // ── 远程 DSH 界面（issue #46）─────────────────────────────────────────
       // The remote never opens an inbound port; we SSH out and carry the remote
       // loopback web UI back to a local port. One tunnel per machine.
+      //
+      // This SAME poll carries the deploy-task state, so a REOPENED window picks
+      // up an in-flight install on the first tick (15s worst case — plus the
+      // install button itself resumes). When a deploy is running the interval
+      // tightens so step progress looks live.
       const refreshWebAttaches = () => api('GET', '/dsh-remote/web-attach')
-        .then((r) => setWebAttaches(r.attaches || []))
+        .then((r) => {
+          setWebAttaches(r.attaches || [])
+          const t = (r.deploys || []).find((d) => d.machineId === webAttachMachine) || r.deploy || null
+          if (t && (t.status === 'running' || t.status === 'queued')) {
+            setDeployTask(t)
+            setDeployBusy('install')
+          } else if (t) {
+            setDeployTask(t)
+          }
+          return t
+        })
         .catch(() => {})
-      React.useEffect(() => { refreshWebAttaches(); const t = setInterval(refreshWebAttaches, 15000); return () => clearInterval(t) }, [])
+      React.useEffect(() => {
+        refreshWebAttaches()
+        const t = setInterval(() => {
+          refreshWebAttaches()
+        }, 15000)
+        return () => clearInterval(t)
+      }, [])
       const webAttachAction = (action, machineId, extra) => {
         setWebAttachBusy(machineId + ':' + action); setWebAttachErr('')
         return api('POST', '/dsh-remote/web-attach', { action, machineId, ...(extra || {}) })
@@ -1077,23 +1009,60 @@ window.__ModuleLoader__.load({
       // ── 远程部署：体检 / 部署并验证 / 让 AI 排查 ───────────────────────────
       // The probe is read-only, so it is safe to run before the user agrees to
       // anything; the install requires an explicit second click (confirm: true).
+      //
+      // Install is a HOST-SIDE BACKGROUND TASK: the call returns immediately
+      // with a task handle, and progress arrives by polling. Closing the window
+      // loses nothing — reopening picks the task back up from the periodic
+      // web-attach poll (which carries the deploy state), and clicking 部署并验证
+      // again while one runs RESUMES it rather than starting a second npm.
+      const deployPoll = () => api('GET', '/dsh-remote/web-attach')
+        .then((r) => {
+          if (!r) return null
+          // Refresh the attach list like before…
+          setWebAttaches(r.attaches || [])
+          // …and adopt any deploy task for the selected machine.
+          const t = r.deploy || (r.deploys || []).find((d) => d.machineId === webAttachMachine) || null
+          if (t) {
+            setDeployTask(t)
+            if (t.status === 'running' || t.status === 'queued') {
+              setDeployBusy('install')
+            } else if (deployBusy === 'install') {
+              // The task settled since the last poll.
+              setDeployBusy('')
+              if (t.status === 'done') setDeployMsg(tr('settings.deployDone'))
+              if (t.status === 'failed') setDeployErr(t.error || tr('settings.deployFailed'))
+            }
+          }
+          return t
+        })
+        .catch(() => null)
+
       const deployAction = (action, machineId, extra) => {
-        setDeployBusy(action); setDeployErr('')
+        setDeployBusy(action); setDeployErr(''); setDeployMsg('')
         return api('POST', '/dsh-remote/web-attach', { action, machineId, ...(extra || {}) })
           .then((r) => {
             if (action === 'probe') setDeploy({ kind: 'probe', ...r, at: Date.now() })
-            if (action === 'install') setDeploy({ kind: 'install', ...r, at: Date.now() })
+            if (action === 'install') {
+              // The task is running on the host NOW. Adopt it immediately so the
+              // steps appear without waiting for the first poll tick.
+              if (r && r.task) setDeployTask(r.task)
+              if (r && r.resumed) setDeployMsg(tr('settings.deployResumed'))
+            }
             if (action === 'investigate') setDeploy({ kind: 'investigate', ...r, at: Date.now() })
             return r
           })
           .catch((e) => {
             const msg = String((e && e.message) || e)
             setDeployErr(msg)
-            // Keep the failing step list so the operator sees WHERE it stopped.
             setDeploy({ kind: action, ok: false, error: msg, at: Date.now() })
             return null
           })
-          .then((r) => { setDeployBusy(''); refreshWebAttaches(); return r })
+          .then((r) => {
+            if (action !== 'install') setDeployBusy('')
+            // install keeps busy='install' until the task settles (poll clears it).
+            refreshWebAttaches()
+            return r
+          })
       }
 
       const setF = (k) => (ev) => setForm({ ...form, [k]: ev.target.value })
@@ -1382,6 +1351,46 @@ window.__ModuleLoader__.load({
                 disabled: !!deployBusy || !webAttachMachine,
                 onClick: () => deployAction('probe', webAttachMachine) },
                 deployBusy === 'probe' ? tr('settings.deployProbing') : tr('settings.deployProbe'))),
+            // ── live deploy task (resumable; survives window close) ─────────
+            deployTask
+              ? React.createElement('div', { style: { marginTop: 6, fontSize: 12, lineHeight: 1.6, border: '1px solid ' + T.border, borderRadius: 8, padding: 8 } },
+                  React.createElement('div', { style: { fontWeight: 600, marginBottom: 4 } },
+                    tr('settings.deployTaskTitle')
+                    + ' — ' + (deployTask.status === 'running' || deployTask.status === 'queued'
+                      ? tr('settings.deployTaskRunning')
+                      : deployTask.status === 'done' ? tr('settings.deployTaskDone')
+                        : deployTask.status === 'cancelled' ? tr('settings.deployTaskCancelled')
+                          : tr('settings.deployTaskFailed'))),
+                  // The in-flight step: the one thing a re-attached user most
+                  // wants to see ("现在装到哪了").
+                  deployTask.current && (deployTask.status === 'running')
+                    ? React.createElement('div', { style: { fontSize: 12, color: T.warn, marginBottom: 4 } }, '▶ ' + deployTask.current)
+                    : null,
+                  (deployTask.steps || []).length
+                    ? React.createElement('div', null,
+                        React.createElement('div', { style: { fontWeight: 600, marginBottom: 2, fontSize: 11, opacity: 0.8 } }, tr('settings.deploySteps')),
+                        deployTask.steps.map((s) => React.createElement('div', { key: s.id, style: { fontSize: 11, fontFamily: 'monospace', display: 'flex', gap: 6 } },
+                          React.createElement('span', { style: { color: s.ok ? T.ok : T.danger } }, s.ok ? '✓' : '✗'),
+                          React.createElement('span', null, s.title),
+                          !s.ok && s.output ? React.createElement('span', { style: { opacity: 0.75, whiteSpace: 'pre-wrap', wordBreak: 'break-all' } }, ' — ' + String(s.output).slice(0, 300)) : null)))
+                    : null,
+                  deployTask.status === 'running' || deployTask.status === 'queued'
+                    ? React.createElement('div', { style: { display: 'flex', gap: 8, alignItems: 'center', marginTop: 6 } },
+                        React.createElement('span', { style: { fontSize: 11, opacity: 0.7 } },
+                          (deployTask.progress && deployTask.progress.doneSteps || 0) + '/' + (deployTask.progress && deployTask.progress.totalSteps || '?')),
+                        React.createElement('button', { type: 'button', className: 'dsh-rw-btn', style: { ...buttonS, padding: '2px 10px' },
+                          onClick: () => deployAction('install-cancel', webAttachMachine) }, tr('settings.deployCancel')))
+                    : null,
+                  // A finished task: continue the journey — connect & open.
+                  deployTask.status === 'done'
+                    ? React.createElement('div', { style: { marginTop: 6, color: T.ok, fontSize: 12 } },
+                        tr('settings.deployDone')
+                        + (deployTask.result && deployTask.result.command ? ' · ' + deployTask.result.command : ''))
+                    : null,
+                  deployTask.status === 'failed'
+                    ? React.createElement('div', { style: { marginTop: 6, color: T.danger, fontSize: 12, wordBreak: 'break-all' } }, deployTask.error || tr('settings.deployFailed'))
+                    : null)
+              : null,
             // Verdict from the last probe/install, rendered as findings with the
             // severity the backend assigned — the UI never re-classifies them.
             deploy ? React.createElement('div', { style: { fontSize: 12, lineHeight: 1.6 } },
@@ -1426,9 +1435,13 @@ window.__ModuleLoader__.load({
             // reason to run. The host action re-probes internally anyway, so it is
             // safe to offer directly; clicking it is the explicit consent.
             React.createElement('button', { type: 'button', className: 'dsh-rw-btn dsh-rw-primary', style: { ...primaryBtnS, marginTop: 6 },
-              disabled: !!deployBusy || !webAttachMachine,
+              disabled: !webAttachMachine,
               onClick: () => { if (window.confirm(tr('settings.deployConfirm'))) deployAction('install', webAttachMachine, { confirm: true }) } },
-              deployBusy === 'install' ? tr('settings.deployInstalling') : tr('settings.deployInstall')),
+              // While a task runs, the button is the RESUME affordance (disabled
+              // — the poll renders live state; a second click must not restart).
+              (deployTask && (deployTask.status === 'running' || deployTask.status === 'queued'))
+                ? tr('settings.deployInstalling')
+                : deployBusy === 'install' ? tr('settings.deployInstalling') : tr('settings.deployInstall')),
             // The AI escape hatch: offered after a failure, and ONLY on click —
             // it costs a model call, so it is never automatic.
             (deployErr || (deploy && deploy.ok === false))
@@ -1444,80 +1457,6 @@ window.__ModuleLoader__.load({
             deployErr ? React.createElement('div', { style: { color: T.danger, fontSize: 12, marginTop: 6, wordBreak: 'break-all' } }, deployErr) : null,
           ) : React.createElement('div', { style: { fontSize: 11, opacity: 0.55 } }, deploy && deploy.verdict ? (deploy.verdict.ok ? tr('settings.deployOk') : tr('settings.deployBlocked')) : ''),
         ),
-        // 工作区备份（rw_backup / rw_backup_list / rw_restore）
-        //
-        // TWO buttons and a timestamp picker on purpose. The first version exposed
-        // excludes / destination / per-archive verify-download-upload-delete, which
-        // turned "keep a copy of my workspaces" into a configuration exercise.
-        // Everything that needed deciding now lives in code (the exclude set) or
-        // is derived (which workspaces = whatever the sidebar shows).
-        React.createElement('div', { style: boxS },
-          sectionToggle(backupOpen, setBackupOpen, tr('settings.backup'),
-            backupData ? React.createElement('span', { style: { marginLeft: 'auto', fontSize: 11, opacity: 0.6 } },
-              tr('settings.backupCount', { n: (backupData.entries || []).length })) : null),
-          backupOpen ? React.createElement(React.Fragment, null,
-            React.createElement('div', { style: { opacity: 0.65, fontSize: 11, lineHeight: 1.5, marginBottom: 6 } }, tr('settings.backupHint')),
-            // Say exactly what will be included, before the click.
-            backupData && (backupData.covers || []).length
-              ? React.createElement('div', { style: { fontSize: 11, opacity: 0.8, marginBottom: 6, wordBreak: 'break-all' } },
-                  tr('settings.backupCovers', { n: (backupData.covers || []).length }) + ' ' + (backupData.covers || []).join('、'))
-              : null,
-            backupData && backupData.backupDir
-              ? React.createElement('div', { style: { fontSize: 11, opacity: 0.6, marginBottom: 8, wordBreak: 'break-all' } },
-                  tr('settings.backupDirLabel', { dir: backupData.backupDir }))
-              : null,
-            // Machine selector: empty means "this session's machine". Kept because
-            // the panel is reachable from a local session, where there is no
-            // session binding to resolve.
-            React.createElement('div', { style: { display: 'flex', gap: 6, alignItems: 'center', marginBottom: 8, flexWrap: 'wrap' } },
-              React.createElement('span', { style: { fontSize: 12, opacity: 0.8 } }, tr('settings.backupMachine') + ':'),
-              React.createElement('select', { className: 'dsh-rw-input', value: backupMachine, onChange: (e) => setBackupMachine(e.target.value), style: { ...inputS, maxWidth: 220 } },
-                React.createElement('option', { value: '' }, tr('settings.backupPickMachine')),
-                machines.map((m) => React.createElement('option', { key: m.id, value: m.id }, `${m.name || m.host} (${m.username}@${m.host})`)))),
-            // ── the two buttons ───────────────────────────────────────────────
-            React.createElement('div', { style: { display: 'flex', gap: 8, alignItems: 'center', flexWrap: 'wrap' } },
-              React.createElement('button', {
-                type: 'button', className: 'dsh-rw-btn dsh-rw-primary', style: { ...primaryBtnS },
-                disabled: !!backupBusy,
-                onClick: () => backupAction('create'),
-              }, backupBusy === 'create' ? tr('settings.backupCreating') : tr('settings.backupCreate')),
-              React.createElement('select', {
-                className: 'dsh-rw-input',
-                value: backupPick,
-                onChange: (e) => setBackupPick(e.target.value),
-                style: { ...inputS, flex: '1 1 260px', minWidth: 200, maxWidth: 380 },
-              },
-                React.createElement('option', { value: '' }, tr('settings.backupPickOne')),
-                (backupData && backupData.entries ? backupData.entries : []).map((e, i) => React.createElement('option', { key: e.name, value: e.name },
-                  `${e.createdAt ? e.createdAt.replace('T', ' ').slice(0, 19) : e.mtime || ''}  ·  ${humanSize(e.bytes)}  ·  ${tr('settings.backupEntries', { n: e.members == null ? '?' : e.members })}  ·  ${e.name}`))),
-              React.createElement('button', {
-                type: 'button', className: 'dsh-rw-btn',
-                style: { ...buttonS },
-                disabled: !!backupBusy || !backupPick,
-                onClick: () => {
-                  if (!window.confirm(tr('settings.backupRestoreConfirm', { file: backupPick }))) return
-                  backupAction('restore', { file: backupPick, confirm: true })
-                },
-              }, backupBusy === 'restore' ? tr('settings.backupRestoring') : tr('settings.backupRestore'))),
-            // Housekeeping stays available but out of the way: verify and delete
-            // whatever the picker has selected.
-            backupPick
-              ? React.createElement('div', { style: { marginTop: 6, display: 'flex', gap: 8, alignItems: 'center', flexWrap: 'wrap' } },
-                  React.createElement('button', { type: 'button', className: 'dsh-rw-btn', style: { ...buttonS, padding: '2px 10px' }, disabled: !!backupBusy,
-                    onClick: () => backupAction('verify', { file: backupPick }) }, tr('settings.backupVerify')),
-                  React.createElement('button', { type: 'button', className: 'dsh-rw-btn', style: { ...buttonS, padding: '2px 10px' }, disabled: !!backupBusy,
-                    onClick: () => backupAction('download', { file: backupPick }) }, tr('settings.backupDownload')),
-                  React.createElement('button', { type: 'button', className: 'dsh-rw-btn', style: { ...buttonS, padding: '2px 10px', color: T.dangerText }, disabled: !!backupBusy,
-                    onClick: () => { if (window.confirm(tr('settings.backupDeleteConfirm', { file: backupPick }))) backupAction('delete', { file: backupPick }) } }, tr('settings.backupDelete')))
-              : null,
-            backupMsg ? React.createElement('div', { style: { marginTop: 8, fontSize: 12, color: T.ok, wordBreak: 'break-all' } }, backupMsg) : null,
-            backupErr ? React.createElement('div', { style: { marginTop: 8, fontSize: 12, color: T.danger, wordBreak: 'break-all' } }, backupErr) : null,
-            !backupData || !(backupData.entries || []).length
-              ? React.createElement('div', { style: { marginTop: 8, opacity: 0.6, fontSize: 12 } }, tr('settings.backupNone'))
-              : null,
-          ) : backupData ? React.createElement('div', { style: { fontSize: 11, opacity: 0.55 } },
-              tr('settings.backupCount', { n: (backupData.entries || []).length })) : null,
-        ),
         // 端口转发面板
         React.createElement('div', { style: boxS },
           sectionToggle(fwdOpen, setFwdOpen, tr('settings.forwards')),

package/lib/deploy-tasks.js

@@ -0,0 +1,142 @@
+// dsh-remote — host-side deploy task manager.
+//
+// WHY THIS EXISTS: `install` used to be a single long HTTP request (npm can
+// legitimately take minutes). If the browser tab closed — or the fetch was
+// cancelled — the RESPONSE was lost and, with it, every trace of what the
+// deploy did: the user could not see the progress again, could not tell whether
+// it succeeded, and clicking the button again would start a SECOND concurrent
+// npm install into the same prefix. High availability here means:
+//
+//   · the deploy runs on the HOST, not tied to any request lifecycle;
+//   · every step's outcome is recorded as it happens;
+//   · the UI can re-attach at any time and see the live state;
+//   · a second click while one is running RE-ATTACHES instead of restarting;
+//   · the result (including the machine's webAttachCommand) is recorded even
+//     if no client ever polls for it.
+//
+// One deploy per machine at a time — npm --prefix into the same directory from
+// two processes corrupts the tree. A NEW request for a machine that already has
+// a running or finished deploy returns the EXISTING task (resume semantics);
+// `force: true` starts a fresh one after the previous is finished.
+
+/** A deploy task's lifecycle: queued → running → done | failed | cancelled. */
+export class DeployTasks {
+  constructor() {
+    /** @type {Map<string, object>} machineId → task */
+    this.byMachine = new Map()
+    /** @type {Map<string, object>} taskId → task (for stable polling) */
+    this.byId = new Map()
+    this.nextId = 1
+  }
+
+  /**
+   * The task for a machine, if one exists in ANY state.
+   * @returns {object|null}
+   */
+  forMachine(machineId) {
+    return this.byMachine.get(String(machineId || '')) || null
+  }
+
+  get(id) {
+    return this.byId.get(String(id || '')) || null
+  }
+
+  /**
+   * Start a deploy for a machine, unless one is already running.
+   *
+   * @param {string} machineId
+   * @param {Function} fn - async (ctx) => result. ctx = { progress(patch) }.
+   * @returns {{task: object, reused: boolean}} the task plus whether it already
+   *   existed (caller reports "resumed" so the UI does not claim a fresh start).
+   */
+  start(machineId, label, fn) {
+    const mid = String(machineId || '')
+    const existing = this.byMachine.get(mid)
+    if (existing && (existing.status === 'queued' || existing.status === 'running')) {
+      return { task: existing, reused: true }
+    }
+    const id = `deploy-${this.nextId++}`
+    const task = {
+      id,
+      machineId: mid,
+      kind: 'deploy',
+      label: String(label || ''),
+      status: 'queued',
+      // Steps are appended as they finish; `steps` is what the UI renders.
+      steps: [],
+      // The current in-flight step, so a re-attached UI can show "正在安装…"
+      // rather than a stale list with no hint that more is coming.
+      current: '',
+      progress: {},
+      result: null,
+      error: null,
+      startedAt: null,
+      finishedAt: null,
+      cancelled: false,
+    }
+    this.byMachine.set(mid, task)
+    this.byId.set(id, task)
+    // Deliberately NOT queued through the shared TaskManager: that one is
+    // single-flight across ALL tasks (one sync at a time), while deploys to
+    // DIFFERENT machines must run in parallel.
+    task.status = 'running'
+    task.startedAt = new Date().toISOString()
+    const ctx = {
+      progress: (p) => { task.progress = { ...task.progress, ...p } },
+      get cancelled() { return !!task.cancelled },
+    }
+    Promise.resolve()
+      .then(() => fn(ctx))
+      .then((result) => {
+        task.result = result || null
+        task.status = task.cancelled ? 'cancelled' : 'done'
+      })
+      .catch((err) => {
+        task.error = String((err && err.message) || err)
+        // A step-level failure carries the step list (and hints) as structured
+        // data so the UI can render exactly what the old single-response flow
+        // rendered — re-attaching must lose nothing.
+        if (err && err.detail && typeof err.detail === 'object') task.detail = err.detail
+        task.status = task.cancelled ? 'cancelled' : 'failed'
+      })
+      .finally(() => {
+        task.current = ''
+        task.finishedAt = new Date().toISOString()
+      })
+    return { task, reused: false }
+  }
+
+  /** Cooperative cancel (a running npm step still finishes; later steps stop). */
+  cancel(machineId) {
+    const t = this.byMachine.get(String(machineId || ''))
+    if (!t) return false
+    if (t.status === 'queued' || t.status === 'running') {
+      t.cancelled = true
+      return true
+    }
+    return false
+  }
+
+  /** Serializable view for the UI. */
+  describe(t) {
+    if (!t) return null
+    return {
+      id: t.id,
+      machineId: t.machineId,
+      kind: t.kind,
+      status: t.status,           // queued | running | done | failed | cancelled
+      steps: t.steps,             // [{id,title,ok,code,output}]
+      current: t.current,         // in-flight step title ('' when none)
+      progress: t.progress,
+      result: t.result,
+      error: t.error,
+      detail: t.detail || null,
+      startedAt: t.startedAt,
+      finishedAt: t.finishedAt,
+    }
+  }
+
+  list() {
+    return [...this.byMachine.values()].map((t) => this.describe(t))
+  }
+}