dsh-remote 0.8.42 → 0.8.44

package/README.en.md

@@ -57,6 +57,7 @@ The image above is the overview. What follows is only what the image does not ma
 The rest:
 
 - **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`.
+- **Tell local and remote Sessions apart in the sidebar** (`0.8.43+`) — a remote Session row carries a **green dot** and its hover card names `user@host:port` plus the remote path; opening it also shows a host chip in the conversation header (a local Session shows neither). A Session counts as remote only when its cwd sits inside a `$DSH_HOME/remote-workspaces/…` mirror, so a machine that is merely saved never labels a local Session.
 - **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.
@@ -242,6 +243,8 @@ Deploying to a product profile is a separate, explicit action (`./sync.sh`) for
 | `hostKeyMode` | string | `accept-new` | host-key policy: `accept-new` (TOFU), `verify` (reject unknown hosts), `off` (skip) |
 | `useAgent` | bool | `false` | authenticate via the OpenSSH agent (`SSH_AUTH_SOCK`) |
 | `keyboardInteractive` | bool | `false` | allow keyboard-interactive auth (OTP/MFA) with the configured password |
+| `backend` | string | `native` | SSH transport backend (issue #51). `native` = the built-in ssh2 client (password / private key / agent / OTP); `openssh` = **drive the local `ssh` command**, which is the only way to reach hosts whose sole authentication method is GSSAPI/Kerberos (log in once with `kinit`), and which also honours `ProxyCommand`, `PKCS11Provider`, `Match` blocks and the rest of `~/.ssh/config`. **Settable per machine.** The cost is a fresh connection per command (slower than native); SFTP still reuses one session. The host name is handed to ssh **verbatim** (so `~/.ssh/config` stays the single source of truth) and host keys are checked by ssh against your own `known_hosts` |
+| `sshBinary` | string | `''` | the `ssh` executable the `openssh` backend drives (empty = the `ssh` on PATH) |
 | `proxy` | object | — | jump host: `{ host, port?, username?, password?, privateKeyPath? }` |
 | `autoPush` | bool | `false` | auto-push edited mirror files back to the remote (watcher, debounced) |
 | `auditLog` | bool | `true` | append executed commands to `$DSH_HOME/remote-workspaces/audit.log` |
@@ -276,6 +279,8 @@ Deploying to a product profile is a separate, explicit action (`./sync.sh`) for
 
 **Cannot reach an internal machine** — set a jump host (or add the bastion as its own machine first).
 
+**The host only allows GSSAPI/Kerberos (`ssh` works after `kinit`, the plugin does not)** — in Settings → 远程工作区 → Advanced, switch **Backend** to `openssh` (drive the local `ssh`) and tick "use a ~/.ssh/config alias", with Host set to the **alias** in `~/.ssh/config` (not the IP). The login is then performed by your local ssh with your Kerberos ticket, and `ProxyCommand`, `GSSAPIAuthentication` etc. all apply per `~/.ssh/config` — **one source of truth for the configuration** (issues #50/#51). Command-line equivalent: `rw_connect(host="<alias>", useSshConfig=true, backend="openssh")`.
+
 **`rw_sync`/`rw_push` reports conflicts** — files changed on both sides are skipped and listed (never silently overwritten); merge manually and retry, or pass `force=true`.
 
 **Windows remotes** — everything goes over SFTP, no POSIX shell needed; read Chinese files with `encoding=gbk`.

package/README.md

@@ -46,6 +46,7 @@ DSH 的 Web 界面刻意只监听 `127.0.0.1`（CLI 为安全拒绝 `--host 0.0.
 其余要点：
 
 - **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`。
+- **会话列表里区分本地/远程**（`0.8.43+`）—— 远程会话的行首有一个**绿点**，悬停显示 `user@host:port` 与远端路径；打开该会话后，标题栏还会常显一个主机标签（本地会话两者都没有）。判定只看会话 cwd 是否落在 `$DSH_HOME/remote-workspaces/…` 镜像里，所以「保存过但没在用」的机器不会给本地会话打标。
 - **把远端机器的 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 远端都能列/读/写/搜索/同步。
@@ -224,6 +225,8 @@ scripts/dev-run.sh --status    # 是否在运行
 | `hostKeyMode` | string | `accept-new` | 主机指纹策略：`accept-new`（首次信任）、`verify`（拒绝未知主机）、`off`（跳过校验） |
 | `useAgent` | bool | `false` | 用 OpenSSH agent（`SSH_AUTH_SOCK`）认证 |
 | `keyboardInteractive` | bool | `false` | 允许 keyboard-interactive 认证（OTP/MFA）并复用配置的密码 |
+| `backend` | string | `native` | SSH 传输后端（issue #51）。`native`=内置 ssh2（密码/私钥/agent/动态码）；`openssh`=**调用本机 `ssh` 命令**，因此支持 GSSAPI/Kerberos（`kinit` 后免密）以及 `ProxyCommand`、`PKCS11Provider`、`Match` 等 OpenSSH 专有特性。**可按机器单独设置**。代价：每条命令新建一次连接（比 native 慢）；SFTP 仍复用单条长连接。主机名会被**原样**交给 ssh（`~/.ssh/config` 是配置唯一来源），主机密钥也由 ssh 用你自己的 `known_hosts` 校验 |
+| `sshBinary` | string | `''` | `openssh` 后端调用的 `ssh` 可执行文件（留空=用 PATH 里的 `ssh`） |
 | `proxy` | object | — | 跳板机：`{ host, port?, username?, password?, privateKeyPath? }` |
 | `autoPush` | bool | `false` | 镜像内文件被编辑后自动推回远端（watcher，带防抖） |
 | `auditLog` | bool | `true` | 把执行的命令追加到 `$DSH_HOME/remote-workspaces/audit.log` |
@@ -258,6 +261,8 @@ scripts/dev-run.sh --status    # 是否在运行
 
 **连不上内网机器** —— 填「跳板机」主机（也可先把跳板机本身配成一台机器）。
 
+**企业机器只允许 GSSAPI/Kerberos（`kinit` 后 `ssh` 能进，插件进不去）** —— 在设置 → 远程工作区 → 高级配置里把「连接后端」改成 **`openssh`**（调用本机 `ssh`），并勾选「使用 ssh_config 别名」，Host 填 `~/.ssh/config` 里那个**别名**（不是 IP）。这样登录由本机 ssh 用你的 Kerberos 票据完成，且 `ProxyCommand`、`GSSAPIAuthentication` 等全部照 `~/.ssh/config` 生效 —— **配置只有 `~/.ssh/config` 一个来源**（issue #50/#51）。命令行等价写法：`rw_connect(host="<别名>", useSshConfig=true, backend="openssh")`。
+
 **`rw_sync`/`rw_push` 报冲突** —— 两边都改过的文件会被跳过并列出（绝不静默覆盖）；手动合并后重试，或用 `force=true` 以一边为准。
 
 **Windows 远程** —— 全部走 SFTP，不依赖 POSIX shell；中文文件用 `encoding=gbk`。

package/lib/client.js

@@ -49,6 +49,15 @@ window.__ModuleLoader__.load({
         'settings.addMachine': '添加机器',
         'settings.editMachine': '编辑机器',
         'settings.badgeSshConfig': 'ssh cfg',
+        // Issue #51 — transport backend (GSSAPI/Kerberos via system OpenSSH).
+        'settings.badgeOpenssh': 'openssh',
+        'settings.backend': '连接后端',
+        'settings.backendNative': 'native（内置 ssh2：密码 / 私钥 / agent / 动态码）',
+        'settings.backendOpenssh': 'openssh（调用本机 ssh 命令）',
+        'settings.backendOpensshHint': '调用本机 ssh，因此完全遵循 ~/.ssh/config：支持 GSSAPI/Kerberos（kinit 后免密登录）、ProxyCommand、PKCS11Provider、Match 等 OpenSSH 专有特性；主机密钥由 ssh 用你自己的 known_hosts 校验。代价是每条命令都要新建一次连接（比 native 慢），文件浏览（SFTP）仍保持长连接。',
+        'settings.backendOpensshAliasOk': '已勾选「使用 ssh_config 别名」：主机名原样交给 ssh，端口/用户/私钥/跳板机一律由 ~/.ssh/config 的 Host 块决定，对应的输入框在 openssh 后端下填了也不生效（这就是「配置唯一来源」，issue #50）。密码/Passphrase 仍会通过 askpass 交给 ssh，仅当 Host 块里没有可用认证时才用得上。',
+        'settings.sshBinary': 'ssh 路径',
+        'settings.sshBinaryPlaceholder': '留空 = 用 PATH 里的 ssh',
         'settings.sshImport': '从 ~/.ssh/config 导入',
         'settings.sshCollapse': '收起',
         'settings.sshNoEntries': '~/.ssh/config 里没有可导入的 Host 条目',
@@ -257,6 +266,9 @@ window.__ModuleLoader__.load({
         'explorer.noRemoteWs': '未设置远程工作区',
         'explorer.sessionLocal': '当前会话未使用远程工作区',
         'explorer.localSession': '当前会话是本地工作区，未使用远程文件。\n\n如需访问远程，可在设置页将某台机器「设为当前」，再用上方「…」选择远程工作区。',
+        // issue #49：会话列表里标识「这是远程会话，连的是哪台机」
+        'session.remoteBadge': '远程会话：{target}',
+        'session.remoteHover': '远程主机：{target}',
         'explorer.loading': '加载中…',
         'explorer.dirMissing': '目录不存在或已被删除',
         'explorer.notConnected': '未连接远程主机（重启后需在设置中将机器「设为当前」，或刷新右侧列）',
@@ -315,6 +327,15 @@ window.__ModuleLoader__.load({
         'settings.addMachine': 'Add machine',
         'settings.editMachine': 'Edit machine',
         'settings.badgeSshConfig': 'ssh cfg',
+        // Issue #51 — transport backend (GSSAPI/Kerberos via system OpenSSH).
+        'settings.badgeOpenssh': 'openssh',
+        'settings.backend': 'Backend',
+        'settings.backendNative': 'native (built-in ssh2: password / key / agent / OTP)',
+        'settings.backendOpenssh': 'openssh (drive the local ssh command)',
+        'settings.backendOpensshHint': 'Delegates the transport to the local `ssh`, so the whole of ~/.ssh/config applies: GSSAPI/Kerberos (log in once with kinit and no secret is needed), ProxyCommand, PKCS11Provider, Match blocks… Host keys are checked by ssh against your own known_hosts. The cost is a fresh connection per command (slower than native); file browsing over SFTP still reuses one session.',
+        'settings.backendOpensshAliasOk': '"Use a ~/.ssh/config alias" is on: the name is handed to ssh verbatim, and Port/User/IdentityFile/ProxyJump come from that Host block — the matching fields below have no effect (this is the "one source of truth" case, issue #50). A password/passphrase is still offered to ssh through askpass, and is only used if the Host block has no usable authentication.',
+        'settings.sshBinary': 'ssh path',
+        'settings.sshBinaryPlaceholder': 'Empty = the ssh on PATH',
         'settings.sshImport': 'Import from ~/.ssh/config',
         'settings.sshCollapse': 'Collapse',
         'settings.sshNoEntries': 'No importable Host entries in ~/.ssh/config',
@@ -523,6 +544,9 @@ window.__ModuleLoader__.load({
         'explorer.noRemoteWs': 'No remote workspace set',
         'explorer.sessionLocal': 'This session does not use a remote workspace',
         'explorer.localSession': 'This session is a local workspace and does not use remote files.\n\nTo access remote, set a machine as "current" in Settings, then pick a remote workspace with the "…" button above.',
+        // issue #49: tell a remote Session apart in the Session list, and name its host.
+        'session.remoteBadge': 'Remote session: {target}',
+        'session.remoteHover': 'Remote host: {target}',
         'explorer.loading': 'Loading…',
         'explorer.dirMissing': 'Directory does not exist or was deleted',
         'explorer.notConnected': 'Not connected to the remote host (after a restart, set a machine as "current" in Settings, or refresh the right column)',
@@ -763,8 +787,40 @@ window.__ModuleLoader__.load({
         document.head.appendChild(el)
       } catch { /* vm tests / no DOM */ }
     }
+    /**
+     * Issue #52 — a backdrop may close its dialog only when the PRESS began on
+     * the backdrop itself.
+     *
+     * `click` is dispatched on the nearest common ancestor of the mousedown and
+     * mouseup targets. A gesture that pressed an element INSIDE the panel and
+     * released on the backdrop — because the panel re-laid-out mid-gesture (the
+     * remote autocomplete list used to sit in document flow, so expanding it
+     * pushed a centred panel's edges out from under the pointer) — is therefore
+     * reported as a click ON THE BACKDROP, and a bare `onClick` closed the whole
+     * dialog. Selecting a suggestion kicked the user out of the picker.
+     *
+     * Guarding on the press origin keeps "click outside to dismiss" while a
+     * drag that merely ENDS outside can no longer dismiss anything. The panel's
+     * own `stopPropagation` stays as a second line of defence.
+     *
+     * @returns {{onMouseDown: Function, onClick: (e: object) => boolean}} props to
+     *   spread on the backdrop; `onClick` reports whether the press started there.
+     */
+    function useBackdropGuard() {
+      const pressedOnBackdrop = React.useRef(false)
+      return {
+        onMouseDown: (e) => { pressedOnBackdrop.current = e.target === e.currentTarget },
+        onClick: (e) => {
+          const startedOnBackdrop = pressedOnBackdrop.current
+          pressedOnBackdrop.current = false
+          return startedOnBackdrop && e.target === e.currentTarget
+        },
+      }
+    }
+
     function PromptDialog(props) {
       const { title, initial, placeholder, onSubmit, onCancel } = props
+      const backdrop = useBackdropGuard()
       const [val, setVal] = React.useState(initial || '')
       React.useEffect(() => {
         try {
@@ -779,7 +835,10 @@ window.__ModuleLoader__.load({
       }, [val, onSubmit, onCancel])
       return React.createElement('div', {
         style: { position: 'fixed', inset: 0, zIndex: 1000000, background: 'rgba(0,0,0,0.45)', display: 'flex', alignItems: 'center', justifyContent: 'center', padding: 16 },
-        onClick: onCancel,
+        onMouseDown: backdrop.onMouseDown,
+        // Issue #52: only a press that STARTED here may dismiss (a gesture that
+        // began inside the panel and ended on the backdrop must not).
+        onClick: (e) => { if (backdrop.onClick(e)) onCancel() },
       },
         React.createElement('div', {
           className: 'dsh-rw-modal-panel',
@@ -890,6 +949,9 @@ window.__ModuleLoader__.load({
           host: form.host, port: Number(form.port) || 22, username: form.username || 'root',
           password: form.password, privateKeyPath: form.privateKeyPath, passphrase: form.passphrase,
           useSshConfig: !!form.useSshConfig,
+          // Issue #51: the probe must exercise the SAME backend the machine will
+          // use — a host reachable only via GSSAPI fails the native probe.
+          backend: form.backend || 'native',
           proxy: form.proxyHost ? { host: form.proxyHost, port: Number(form.proxyPort) || 22, username: form.proxyUser || '', password: form.proxyPassword || '', privateKeyPath: form.proxyKey || '' } : undefined,
         })
           .then((r) => {
@@ -1075,15 +1137,17 @@ window.__ModuleLoader__.load({
           encryptPassword: !!(m.credentialBackend && m.credentialBackend !== 'plain'),
           proxyHost: (m.proxy && m.proxy.host) || '', proxyPort: String((m.proxy && m.proxy.port) || 22),
           proxyUser: (m.proxy && m.proxy.username) || '', proxyPassword: '', proxyKey: (m.proxy && m.proxy.privateKeyPath) || '',
+          // Issue #51: the transport backend is per machine.
+          backend: m.backend === 'openssh' ? 'openssh' : 'native', sshBinary: m.sshBinary || '',
           id: m.id,
           useSshConfig: !!m.useSshConfig,
         })
-        // 编辑时若该机器用了高级配置(私钥/agent/跳板/钥匙串等),自动展开折叠区
-        if (m.privateKeyPath || m.useAgent || m.keyboardInteractive || m.workspace || (m.proxy && m.proxy.host) || (m.credentialBackend && m.credentialBackend !== 'plain')) {
+        // 编辑时若该机器用了高级配置(私钥/agent/跳板/钥匙串/系统 OpenSSH 后端),自动展开折叠区
+        if (m.privateKeyPath || m.useAgent || m.keyboardInteractive || m.workspace || (m.proxy && m.proxy.host) || m.backend === 'openssh' || (m.credentialBackend && m.credentialBackend !== 'plain')) {
           setAdvOpen(true)
         }
       }
-      const clearForm = () => setForm({ name: '', host: '', port: '22', username: 'root', password: '', privateKeyPath: '', passphrase: '', workspace: '', hostKeyMode: '', useAgent: false, keyboardInteractive: false, encryptPassword: false, proxyHost: '', proxyPort: '22', proxyUser: '', proxyPassword: '', proxyKey: '', id: '', useSshConfig: false })
+      const clearForm = () => setForm({ name: '', host: '', port: '22', username: 'root', password: '', privateKeyPath: '', passphrase: '', workspace: '', hostKeyMode: '', useAgent: false, keyboardInteractive: false, encryptPassword: false, proxyHost: '', proxyPort: '22', proxyUser: '', proxyPassword: '', proxyKey: '', backend: 'native', sshBinary: '', id: '', useSshConfig: false })
       const save = (action) => {
         setBusy(true); setErr(''); setMsg('')
         if (action === 'delete') {
@@ -1095,6 +1159,8 @@ window.__ModuleLoader__.load({
           username: form.username, password: form.password, privateKeyPath: form.privateKeyPath, passphrase: form.passphrase,
           workspace: form.workspace, hostKeyMode: form.hostKeyMode, useAgent: form.useAgent, keyboardInteractive: form.keyboardInteractive,
           encryptPassword: form.encryptPassword, useSshConfig: !!form.useSshConfig,
+          // Issue #51: the transport backend (and, for `openssh`, the executable).
+          backend: form.backend || 'native', sshBinary: form.sshBinary || '',
           proxy: form.proxyHost ? { host: form.proxyHost, port: Number(form.proxyPort) || 22, username: form.proxyUser || '', password: form.proxyPassword || '', privateKeyPath: form.proxyKey || '' } : undefined,
         }).then((r) => {
           refresh(); clearForm()
@@ -1185,6 +1251,10 @@ window.__ModuleLoader__.load({
                       m.useSshConfig ? (m.host + (m.sshConfigResolved && m.sshConfigResolved.matched ? '  ' + tr('settings.sshResolvedTo', { user: m.sshConfigResolved.username || '?', host: m.sshConfigResolved.host, port: m.sshConfigResolved.port }) : ''))
                         : (m.username + '@' + m.host + ':' + m.port)),
                     m.useSshConfig ? pill('', tr('settings.badgeSshConfig')) : null,
+                    // Issue #51: a machine on the system-OpenSSH backend behaves
+                    // differently enough (auth from ~/.ssh/config, GSSAPI) that
+                    // the row must say so.
+                    m.backend === 'openssh' ? pill('', tr('settings.badgeOpenssh')) : null,
                     m.id === currentId ? pill('is-ok', tr('settings.current')) : null,
                     m.passwordSet ? pill('', tr('settings.badgePwd')) : null,
                     (m.credentialBackend && m.credentialBackend !== 'plain') ? pill('', tr('settings.badgeKeychain')) : null,
@@ -1246,6 +1316,23 @@ window.__ModuleLoader__.load({
             style: { ...buttonS, width: '100%', marginBottom: advOpen ? 10 : 0, color: advOpen ? T.primary : 'inherit', fontWeight: advOpen ? 600 : 400, borderStyle: 'dashed' },
           }, advOpen ? tr('settings.advCollapse') : tr('settings.advExpand')),
           advOpen ? React.createElement('div', { key: 'adv', style: { paddingTop: 2 } },
+            // Issue #51 — transport backend. Placed FIRST in the advanced block
+            // because it changes what the fields below even mean: with the
+            // system-OpenSSH backend, host/user/port/key all come from
+            // ~/.ssh/config and only the machine name (an alias) matters.
+            row(tr('settings.backend'), React.createElement('select', { value: form.backend || 'native', onChange: setF('backend'), style: { ...inputS, maxWidth: 260 } },
+              React.createElement('option', { value: 'native' }, tr('settings.backendNative')),
+              React.createElement('option', { value: 'openssh' }, tr('settings.backendOpenssh'))), 'be'),
+            (form.backend === 'openssh')
+              ? React.createElement('div', { style: { fontSize: 11, opacity: 0.85, marginBottom: 8, marginLeft: LABEL_W + 8, lineHeight: 1.55 } },
+                  React.createElement('div', null, tr('settings.backendOpensshHint')),
+                  form.useSshConfig
+                    ? React.createElement('div', { style: { color: T.ok, marginTop: 2 } }, tr('settings.backendOpensshAliasOk'))
+                    : null)
+              : null,
+            (form.backend === 'openssh')
+              ? row(tr('settings.sshBinary'), React.createElement('input', { value: form.sshBinary || '', onChange: setF('sshBinary'), placeholder: tr('settings.sshBinaryPlaceholder'), style: inputS }), 'sb')
+              : null,
             row(tr('settings.privateKey'), React.createElement('input', { value: form.privateKeyPath, onChange: setF('privateKeyPath'), placeholder: 'Empty = password or agent', style: inputS }), 'k'),
             row(tr('settings.passphrase'), React.createElement('input', { type: 'password', value: form.passphrase, onChange: setF('passphrase'), placeholder: 'Encrypted private key passphrase', style: inputS }), 'pp'),
             row(tr('settings.workspace'), React.createElement('input', { value: form.workspace, onChange: setF('workspace'), placeholder: 'Optional: default remote dir for this machine', style: inputS }), 'ws'),
@@ -1608,6 +1695,13 @@ window.__ModuleLoader__.load({
       const [mkdirPrompt, setMkdirPrompt] = React.useState(false)
       const suggestTimer = React.useRef(null)
       const suggestRef = React.useRef(null)
+      // Issue #52 defect 1: the modal backdrop must dismiss only when the press
+      // STARTED on it (a suggestion click whose mouseup landed on the backdrop
+      // used to close the whole picker). The local-browse popup below is its own
+      // full-screen overlay, so it gets its own guard ref — sharing one ref
+      // would make a press on either backdrop arm the other.
+      const backdrop = useBackdropGuard()
+      const localBackdrop = useBackdropGuard()
       // Autocomplete performance (slow per-keystroke remote scans):
       //  - postedCurrentRef/currentPromiseRef: POST /current once per machine
       //    switch; concurrent callers share ONE in-flight promise and a failed
@@ -2037,7 +2131,8 @@ window.__ModuleLoader__.load({
         const parent = crumbs.length >= 2 ? crumbs[crumbs.length - 2].path : null
         return React.createElement('div', {
           style: { position: 'fixed', inset: 0, zIndex: 9999, background: 'rgba(0,0,0,0.5)', display: 'flex', alignItems: 'center', justifyContent: 'center', padding: 12 },
-          onClick: () => setLocalPop(null),
+          onMouseDown: localBackdrop.onMouseDown,
+          onClick: (e) => { if (localBackdrop.onClick(e)) setLocalPop(null) },
         },
           React.createElement('div', { style: { background: v('--dsw-alias-bg-overlay', '#1e1e1e'), border: '1px solid ' + T.borderStrong, borderRadius: 10, boxShadow: '0 10px 40px rgba(0,0,0,0.5)', width: 'min(560px, 94vw)', minWidth: 320, display: 'flex', flexDirection: 'column', maxHeight: 'min(460px, 84vh)', overflow: 'hidden' }, onClick: (e) => e.stopPropagation() },
             React.createElement('div', { style: { display: 'flex', gap: 6, alignItems: 'center', padding: '8px 12px', borderBottom: '1px solid ' + T.border } },
@@ -2148,7 +2243,15 @@ window.__ModuleLoader__.load({
         onClick: () => switchTab(t),
         style: { ...buttonS, fontWeight: tab === t ? 700 : 400, padding: '5px 14px' },
       }, lbl)
-      return React.createElement('div', { style: { position: 'fixed', inset: 0, zIndex: 9999, background: 'rgba(0,0,0,0.5)', display: 'flex', alignItems: 'center', justifyContent: 'center', padding: 16 }, onClick: () => { if (!busy && !mkdirPrompt) onCancel() } },
+      return React.createElement('div', {
+        style: { position: 'fixed', inset: 0, zIndex: 9999, background: 'rgba(0,0,0,0.5)', display: 'flex', alignItems: 'center', justifyContent: 'center', padding: 16 },
+        onMouseDown: backdrop.onMouseDown,
+        // Issue #52 defect 1: this was a bare onClick, so picking an autocomplete
+        // suggestion (mousedown inside the panel, panel re-laid-out, mouseup on
+        // the backdrop) closed the whole dialog. Only a press that began on the
+        // backdrop dismisses now.
+        onClick: (e) => { if (backdrop.onClick(e) && !busy && !mkdirPrompt) onCancel() },
+      },
         React.createElement('div', { className: 'dsh-rw-modal-panel', style: { background: v('--dsw-alias-bg-layer-1', '#18181b'), color: T.label, border: '1px solid ' + T.borderStrong, borderRadius: 12, boxShadow: '0 12px 48px rgba(0,0,0,0.5)', width: 'min(600px, 94vw)', maxHeight: 'min(680px, 92vh)', display: 'flex', flexDirection: 'column', padding: 16, boxSizing: 'border-box' }, onClick: (e) => e.stopPropagation() },
         React.createElement('div', { style: { display: 'flex', alignItems: 'center', justifyContent: 'space-between', marginBottom: 10 } },
           React.createElement('div', { style: { fontSize: 15, fontWeight: 650 } }, tr('picker.title')),
@@ -2169,7 +2272,7 @@ window.__ModuleLoader__.load({
               err ? React.createElement('div', { style: { color: T.danger, fontSize: 12 } }, err) : null,
               localPop ? renderLocalPopup() : null,
             )
-          : React.createElement('div', { style: { display: 'flex', flexDirection: 'column', gap: 8, minHeight: 0, overflowY: 'auto' } },
+          : React.createElement('div', { style: { display: 'flex', flexDirection: 'column', gap: 8, minHeight: 0, overflowY: suggestOpen ? 'visible' : 'auto' } },
               React.createElement('div', { style: { display: 'flex', gap: 6, alignItems: 'center' } },
                 React.createElement('label', { style: { fontSize: 12, opacity: 0.8, whiteSpace: 'nowrap' } }, tr('picker.remoteMachine')),
                 React.createElement('div', { ref: ddRef, style: { position: 'relative', display: 'inline-block' } },
@@ -2209,14 +2312,29 @@ window.__ModuleLoader__.load({
                   React.createElement('button', { type: 'button', className: 'dsh-rw-btn', style: { ...buttonS, whiteSpace: 'nowrap' }, onClick: pickHome, disabled: !machineId }, tr('picker.home')),
                 ),
                 (suggestOpen && suggest.length)
-                  ? React.createElement('div', { style: { marginTop: 6, background: v('--dsw-alias-bg-overlay', '#1e1e1e'), color: T.label, border: '1px solid ' + T.borderStrong, borderRadius: 8, maxHeight: 200, overflowY: 'auto', boxShadow: '0 6px 24px rgba(0,0,0,0.25)' } },
-                      suggest.map((s, i) => React.createElement('div', { key: s + i, className: 'dsh-rw-list-item', onMouseDown: () => selectSuggestion(s), style: { padding: '6px 10px', cursor: 'pointer', fontSize: 12, fontFamily: 'monospace', whiteSpace: 'nowrap', overflow: 'hidden', textOverflow: 'ellipsis' } }, s)),
+                  // Issue #52 defect 2: this used to be an in-flow block, so
+                  // expanding it pushed the 「设为远程工作区」 button down and the
+                  // user could never hit a button that was moving. It is now an
+                  // absolutely-positioned overlay hanging off `suggestRef`
+                  // (position: relative), which also keeps the modal's height —
+                  // and therefore its centred edges — stable while open (that
+                  // stability is what makes the press-origin guard above exact).
+                  // `paddingBottom` lets the last entries scroll clear of the
+                  // button row, which is lifted over the dropdown by zIndex.
+                  ? React.createElement('div', { style: { position: 'absolute', top: '100%', left: 0, right: 0, zIndex: 60, marginTop: 6, paddingBottom: 36, background: v('--dsw-alias-bg-overlay', '#1e1e1e'), color: T.label, border: '1px solid ' + T.borderStrong, borderRadius: 8, maxHeight: 200, overflowY: 'auto', boxShadow: '0 6px 24px rgba(0,0,0,0.25)' } },
+                      // Issue #52 defect 1, local belt-and-braces: swallow the
+                      // gesture so no ancestor (least of all the backdrop) can
+                      // observe a click that began on a suggestion.
+                      suggest.map((s, i) => React.createElement('div', { key: s + i, className: 'dsh-rw-list-item', onMouseDown: (e) => { e.preventDefault(); e.stopPropagation(); selectSuggestion(s) }, style: { padding: '6px 10px', cursor: 'pointer', fontSize: 12, fontFamily: 'monospace', whiteSpace: 'nowrap', overflow: 'hidden', textOverflow: 'ellipsis' } }, s)),
                     )
                   : null,
               ),
               popOpen ? renderDirPopup() : null,
               err ? React.createElement('div', { style: { color: T.danger, fontSize: 12 } }, err) : null,
-              React.createElement('div', { style: { display: 'flex', gap: 8, justifyContent: 'flex-end', alignItems: 'center' } },
+              // The action row rides ABOVE the dropdown (zIndex 70) on its own
+              // opaque layer, so the list slides out from behind it instead of
+              // covering 「设为远程工作区」.
+              React.createElement('div', { style: { display: 'flex', gap: 8, justifyContent: 'flex-end', alignItems: 'center', position: 'relative', zIndex: 70, background: v('--dsw-alias-bg-layer-1', '#18181b') } },
                 React.createElement('span', { style: { fontSize: 11, opacity: 0.75, fontFamily: 'monospace', overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap', flex: 1 } }, path ? tr('picker.selected', { path }) : ''),
                 React.createElement('button', { type: 'button', className: 'dsh-rw-btn dsh-rw-primary', style: primaryBtnS, onClick: () => commitPath(path), disabled: busy || !machineId || !path.trim() }, busy ? tr('picker.mirroring') : tr('picker.setRemoteWs')),
               ),
@@ -2275,6 +2393,199 @@ window.__ModuleLoader__.load({
         .catch(() => '')
     }
 
+    // ── which sessions are remote (issue #49) ────────────────────────────────
+    //
+    // The sidebar must say, at a glance, whether a Session row is a LOCAL
+    // session or one working on a remote host — and which host. The truth is
+    // already on the client: every Session summary carries its own cwd, and a
+    // cwd that lives inside a `$DSH_HOME/remote-workspaces/<host-user-port>/…`
+    // mirror IS a remote session bound to that mirror's recorded origin (the
+    // same invariant lib/binding.js uses host-side; see issue #13).
+    //
+    // So one GET /dsh-remote/bindings (the whole mirror registry, with each
+    // mirror's recorded host/port/user/path) answers every row, instead of one
+    // request per row. The active machine is deliberately NOT consulted: a saved
+    // machine that happens to be "current" must never label a local session.
+    //
+    // Failure is not fatal and not retried in a loop: no registry means no
+    // badge, which is exactly what a user with zero mirrors sees.
+
+    const MIRRORS = { list: [], loaded: false, error: '' }
+    const mirrorWatchers = new Set()
+    let mirrorLoad = null
+    let mirrorTimer = null
+
+    const notifyMirrors = () => {
+      for (const fn of mirrorWatchers) { try { fn() } catch { /* one watcher must not stop the rest */ } }
+    }
+    /** Load the mirror registry once (concurrent callers share the request). */
+    function ensureMirrors() {
+      if (MIRRORS.loaded) return Promise.resolve(MIRRORS)
+      if (mirrorLoad) return mirrorLoad
+      mirrorLoad = api('GET', '/dsh-remote/bindings')
+        .then((r) => {
+          MIRRORS.list = (r && Array.isArray(r.mirrors)) ? r.mirrors : []
+          MIRRORS.error = ''
+        })
+        .catch((e) => { MIRRORS.error = String((e && e.message) || e) })
+        .then(() => {
+          MIRRORS.loaded = true
+          mirrorLoad = null
+          notifyMirrors()
+          return MIRRORS
+        })
+      return mirrorLoad
+    }
+    /** Force a refresh (mirrors appear when a workspace is picked). */
+    function refreshMirrors() {
+      MIRRORS.loaded = false
+      return ensureMirrors()
+    }
+    /**
+     * The mirror containing a local path, or null.
+     *
+     * Separator-aware on purpose: `/a/mirror-2` must NOT be treated as living
+     * inside `/a/mirror` (the same trap lib/binding.js documents). The deepest
+     * match wins, so a future nested layout stays stable. Windows paths compare
+     * case-insensitively because the platform does.
+     */
+    function mirrorForCwd(cwd, mirrors) {
+      const raw = String(cwd || '')
+      if (!raw) return null
+      const list = Array.isArray(mirrors) ? mirrors : []
+      const isWin = raw.includes('\\')
+      const sep = isWin ? '\\' : '/'
+      const fold = (s) => (isWin ? s.toLowerCase() : s)
+      const base = fold(raw.replace(/[\\/]+$/, ''))
+      let best = null
+      for (const m of list) {
+        const dirRaw = String((m && m.dir) || '').replace(/[\\/]+$/, '')
+        if (!dirRaw) continue
+        const dir = fold(dirRaw)
+        if (base !== dir && !base.startsWith(dir + sep) && !base.startsWith(dir + '/')) continue
+        if (!best || dir.length > fold(String(best.dir).replace(/[\\/]+$/, '')).length) best = m
+      }
+      return best
+    }
+    /** `user@host:port` for a mirror record (port omitted when it is 22). */
+    function mirrorTarget(m) {
+      if (!m) return ''
+      const user = m.username ? m.username + '@' : ''
+      const port = Number(m.port) && Number(m.port) !== 22 ? ':' + m.port : ''
+      return user + String(m.host || '') + port
+    }
+    /** Host as the reader asked for it: the address, plus the saved machine name. */
+    function mirrorLabel(m) {
+      if (!m) return ''
+      const target = mirrorTarget(m)
+      return m.name && m.name !== m.host ? target + ' · ' + m.name : target
+    }
+    /**
+     * The remote binding of one Session row, read from that row's own cwd.
+     *
+     * A row with no cwd (a blank New Session) is not remote — a blank session
+     * has no workspace yet, and must never inherit the badge from a neighbor.
+     *
+     * Hook shape is CONSTANT: when the framework does not hand the entry a
+     * `useSessions` (older sidebar), a stable no-op hook is selected instead of
+     * skipping the call, so the hook count cannot change across renders (a
+     * conditional hook is a crash, not a degraded badge).
+     */
+    const NO_SELECT = () => undefined
+    function useSessionMirror(sessionId, useSessions) {
+      // `mirrorVersion` is only a re-render trigger: the registry arrives
+      // asynchronously, and every mounted mark must repaint when it does.
+      const [, bumpMirrorVersion] = React.useState(0)
+      const select = typeof useSessions === 'function' ? useSessions : NO_SELECT
+      const cwd = select((s) => (sessionId && s && s.byId && s.byId[sessionId] ? s.byId[sessionId].cwd : undefined))
+      React.useEffect(() => {
+        const fn = () => bumpMirrorVersion((n) => n + 1)
+        mirrorWatchers.add(fn)
+        ensureMirrors()
+        // Mirrors change when a remote workspace is picked in THIS tab; a slow
+        // poll covers a pick made in another tab without a per-render request.
+        if (!mirrorTimer && typeof setInterval === 'function') {
+          mirrorTimer = setInterval(refreshMirrors, 60000)
+        }
+        return () => {
+          mirrorWatchers.delete(fn)
+          if (!mirrorWatchers.size && mirrorTimer) { clearInterval(mirrorTimer); mirrorTimer = null }
+        }
+      }, [])
+      return mirrorForCwd(cwd, MIRRORS.list)
+    }
+
+    // Leading seat of a Session row: the 16px cell before the title. A green dot
+    // means "this session works on a remote host"; a local session renders
+    // nothing at all, so the cell stays blank exactly as before. The owner only
+    // mounts this seat while the row is idle (a running/pending row keeps its
+    // own status dot there) — the hover card below therefore carries the host
+    // for every row, running or not.
+    function RemoteSessionMark(props) {
+      const m = useSessionMirror(props.sessionId, props.useSessions)
+      if (!m) return null
+      const target = mirrorTarget(m)
+      return React.createElement('span', {
+        'data-dsh-remote-mark': '',
+        role: 'img',
+        'aria-label': tr('session.remoteBadge', { target }),
+        title: tr('session.remoteBadge', { target }) + (m.remotePath ? '\n' + m.remotePath : ''),
+        style: { width: 16, height: 20, display: 'inline-flex', alignItems: 'center', justifyContent: 'center', flexShrink: 0 },
+      }, React.createElement('span', {
+        'aria-hidden': 'true',
+        style: {
+          width: 8, height: 8, borderRadius: '50%',
+          background: 'var(--dsw-alias-state-success-primary, #4caf7d)',
+          boxShadow: '0 0 0 2px color-mix(in srgb, var(--dsw-alias-state-success-primary, #4caf7d) 22%, transparent)',
+        },
+      }))
+    }
+
+    // Hover-card section of a Session row, between its relative time and its
+    // trailing status line: names the remote host (and the remote path it
+    // works on) for a remote row. A local row renders nothing.
+    function RemoteSessionHover(props) {
+      const m = useSessionMirror(props.sessionId, props.useSessions)
+      if (!m) return null
+      return React.createElement('div', { 'data-dsh-remote-hover': '', style: { display: 'flex', flexDirection: 'column', gap: 2, fontSize: 12, lineHeight: '16px' } },
+        React.createElement('div', { style: { display: 'flex', alignItems: 'center', gap: 6 } },
+          React.createElement('span', {
+            'aria-hidden': 'true',
+            style: { width: 7, height: 7, borderRadius: '50%', flexShrink: 0, background: 'var(--dsw-alias-state-success-primary, #4caf7d)' },
+          }),
+          React.createElement('span', { style: { color: '#cfd3d6', overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap' } }, mirrorLabel(m)),
+        ),
+        m.remotePath
+          ? React.createElement('div', { style: { color: '#adb2b8', wordBreak: 'break-all', paddingLeft: 13 } }, m.remotePath)
+          : null,
+      )
+    }
+
+    // Conversation header chip for the CURRENT session: the one place the host
+    // can stay visible without hovering anything (the row's 16px cell is too
+    // narrow for an address). Renders nothing for a local session.
+    //
+    // This seat is session-scoped, so the owner hands the entry its `sessionId`
+    // (exactly like the shipped "open in app" utility) and the chip needs
+    // nothing from the sidebar.
+    function RemoteSessionChip(props) {
+      const m = useSessionMirror(props.sessionId, props.useSessions)
+      if (!m) return null
+      const target = mirrorTarget(m)
+      return React.createElement('span', {
+        'data-dsh-remote-chip': '',
+        className: 'dsh-rw-pill is-ok',
+        title: tr('session.remoteHover', { target }) + (m.remotePath ? '\n' + m.remotePath : ''),
+        style: { maxWidth: 220, overflow: 'hidden', textOverflow: 'ellipsis', display: 'inline-flex', alignItems: 'center', gap: 5 },
+      },
+        React.createElement('span', {
+          'aria-hidden': 'true',
+          style: { width: 7, height: 7, borderRadius: '50%', flexShrink: 0, background: 'var(--dsw-alias-state-success-primary, #4caf7d)' },
+        }),
+        React.createElement('span', { style: { overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap' } }, target),
+      )
+    }
+
     function readRemoteFile(path, maxBytes, sessionId) {
       return api('POST', '/dsh-remote/read', withSessionBody({ path, maxBytes }, sessionId)).catch((e) => {
         throw new Error(tr('file.readFail', { msg: ((e && e.message) || e) }))
@@ -3083,6 +3394,19 @@ window.__ModuleLoader__.load({
         inner.effect(() => registerSidebarIntegration(inner), 'dsh-remote.betterSidebar')
       })
       ctx.inject(['sidebarRightTabs'], registerNativeSidebar)
+      // Issue #49: mark the remote Sessions in the sidebar's own Session list.
+      // These three seats belong to the SHIPPED ui-workspace browser, so they
+      // are injected (not assumed): a composition with a replacement sidebar
+      // simply never declares them, and the mark is absent rather than broken.
+      slots.inject('sidebar.session.row.leading', () =>
+        slots.register({ name: 'sidebar.session.row.leading', id: 'dsh-remote-remote-mark', order: 5 }, RemoteSessionMark),
+      )
+      slots.inject('sidebar.session.row.hover', () =>
+        slots.register({ name: 'sidebar.session.row.hover', id: 'dsh-remote-remote-host', order: 5 }, RemoteSessionHover),
+      )
+      slots.inject('conversation.session.header.utilities', () =>
+        slots.register({ name: 'conversation.session.header.utilities', id: 'dsh-remote-remote-chip', order: 15 }, RemoteSessionChip),
+      )
     }
 
     exports.name = name

package/lib/forwards.js

@@ -155,6 +155,22 @@ export class ForwardManager {
   }
 
   _startReverse(d, client) {
+    // The system-OpenSSH backend (issue #51) cannot do ssh2's two-phase
+    // `forwardIn` + `tcpip`: the `ssh -R` CLI needs the final target as an
+    // argument, so it exposes `reverseForward()` instead. Prefer it when
+    // present — otherwise every reverse tunnel would fail on that backend.
+    if (typeof client.reverseForward === 'function') {
+      return client.reverseForward({
+        bindHost: '127.0.0.1',
+        listenPort: d.listenPort,
+        targetHost: d.targetHost,
+        targetPort: d.targetPort,
+      }).then((handle) => {
+        this.servers.set(d.id, { kind: 'reverse-cli', handle, client })
+      }).catch((err) => {
+        throw new Error(`远端监听 ${d.listenPort} 失败: ${(err && err.message) || err}`)
+      })
+    }
     return new Promise((resolve, reject) => {
       // ssh2 calls the remote TCP listen API `forwardIn` (NOT openssh_forwardIn,
       // which in ssh2 >= 1.16 is stream-local only).
@@ -170,6 +186,9 @@ export class ForwardManager {
   }
 
   _handleTcpip(info, accept, reject) {
+    // Only the ssh2 backend reaches here: `ssh -R` handles the remote listener
+    // and its targets entirely inside the CLI, so a 'reverse-cli' entry never
+    // produces a 'tcpip' event.
     for (const entry of this.servers.values()) {
       if (entry.kind === 'reverse' && Number(info.destPort) === Number(this._defFor(entry).listenPort)) {
         const channel = accept()
@@ -205,6 +224,9 @@ export class ForwardManager {
       if (entry.kind === 'local') {
         entry.server.close()
         for (const s of entry.sockets) { try { s.destroy() } catch {} }
+      } else if (entry.kind === 'reverse-cli') {
+        // The `ssh -R` child IS the tunnel: killing it closes the remote listener.
+        if (entry.handle && typeof entry.handle.close === 'function') entry.handle.close()
       } else if (entry.client && typeof entry.client.unforwardIn === 'function') {
         const d = this._defFor(entry)
         entry.client.unforwardIn('127.0.0.1', d.listenPort, () => {})