dsh-remote 0.8.67 → 0.8.71

package/lib/client.js

@@ -47,7 +47,7 @@ window.__ModuleLoader__.load({
     const L = {
       zh: {
         'settings.title': '远程工作区（dsh-remote）',
-        'settings.intro': '下面直接列出 ~/.ssh/config 里的机器：点「连接」，再选一个远程目录就能开始。没有的机器可以手动添加（密码 / 私钥 / 跳板机）。',
+        'settings.intro': '下面直接列出 ~/.ssh/config 里的机器：点「连接」，再选一个远程目录就能开始。要加机器，点「打开配置文件」编辑这个文件，改完点「刷新」。',
         'settings.noMachines': '还没有保存的机器 —— 上面列出的是 ~/.ssh/config 里的主机，点「连接」即可。',
         // ── issue #73：首屏就是 ssh 配置里的主机列表（像 VSCode Remote-SSH）──
         'settings.pickHost': '选择远程机器',
@@ -55,15 +55,17 @@ window.__ModuleLoader__.load({
         'settings.hostListLoading': '正在读取 ~/.ssh/config…',
         'settings.hostListRefresh': '刷新',
         'settings.hostListRefreshHint': '重新读取 ~/.ssh/config（改完文件点这里，不用重开设置页）',
-        'settings.hostListEmpty': '没在 {file} 里找到主机。配好 ssh（Host 段）后点「刷新」，或在下面手动添加一台。',
+        'settings.hostListEmpty': '没在 {file} 里找到主机。写好 Host 段后点「刷新」。',
         'settings.hostListFailed': '读取失败：{msg}。这不是你的 ssh 配置有问题（文件根本没读到）——点「刷新」重试；一直失败说明插件版本与服务端不一致，重启 DSH 即可。',
         'settings.hostConnect': '连接',
         'settings.hostConnecting': '连接中…',
         'settings.hostConnectHint': '连上并设为当前机器（之后就能选远程目录）',
         'settings.hostConnected': '已连接 · {latency}',
         'settings.hostConnectedHint': '已连接，选择要打开的远程目录即可开始工作。',
-        'settings.hostFillForm': '填表',
-        'settings.hostFillFormHint': '需要密码或单独覆盖参数时，把它填进下方表单',
+        'settings.openSshConfig': '打开配置文件',
+        'settings.openSshConfigHint': '用本机编辑器打开 ~/.ssh/config。改完点「刷新」，新的 Host 会出现在列表里。',
+        'settings.sshConfigOpened': '已打开：{file}',
+        'settings.sshConfigOpenFailed': '无法自动打开（{msg}）——可以直接编辑这个文件：{file}',
         'settings.badgeKey': '私钥',
         'settings.openWorkspace': '选目录',
         'settings.openWorkspaceHint': '在这台机器上选一个远程目录作为工作区',
@@ -72,7 +74,6 @@ window.__ModuleLoader__.load({
         'settings.openWorkspaceHere': '打开',
         'settings.openWorkspaceOnHint': '在 {host} 上打开这个目录（会创建/复用本地镜像）',
         'settings.workspaceOpened': '已打开远程工作区：{path}',
-        'settings.addMachineManual': '手动添加（密码 / 私钥 / 跳板机）',
         // 列表的搜索、排序与连接状态（机器一多就要用）。
         'settings.hostFilter': '搜索主机（名字 / 地址 / 用户）',
         'settings.liveNow': '已连接',
@@ -87,7 +88,6 @@ window.__ModuleLoader__.load({
         'settings.currentMachine': '当前远程机：{name}',
         'settings.clearCurrent': '取消设为当前（active remote = none）',
         'settings.noActive': '当前没有活动远程机：保存的机器只是备用连接，不会自动进入会话上下文（本地会话不受影响）。',
-        'settings.addMachine': '添加机器',
         'settings.editMachine': '编辑机器',
         'settings.badgeSshConfig': 'ssh cfg',
         // Issue #51 — transport backend (GSSAPI/Kerberos via system OpenSSH).
@@ -219,7 +219,6 @@ window.__ModuleLoader__.load({
         'settings.secretStoreFailed': '密码未能写入系统密钥库（{msg}），已按 credentialFallback=plain 回退为明文保存在 machines.json。',
         'settings.secretStoreRefused': '密码未能写入系统密钥库（{msg}），已放弃保存该密码（不会以明文落盘）。修复密钥库后重新保存，或把 credentialFallback 设为 plain 以接受明文回退。',
         'settings.cleared': '已取消当前远程机 — 本地会话不再自动使用远程上下文',
-        'settings.filledSsh': '已从 ~/.ssh/config 填入（仅引用私钥路径，不读取内容）',
         'settings.connOk': '连接成功',
         'settings.connOkWith': '连接成功（{user}@{host}，{latency}ms）{shell}',
         'settings.connFail': '连接失败',
@@ -360,22 +359,24 @@ window.__ModuleLoader__.load({
       },
       en: {
         'settings.title': 'Remote workspace (dsh-remote)',
-        'settings.intro': 'Your ~/.ssh/config hosts are listed below: click Connect, then pick a remote folder. Anything not in that file can be added manually (password / key / jump host).',
+        'settings.intro': 'Your ~/.ssh/config hosts are listed below: click Connect, then pick a remote folder. To add a host, click Open config, edit the file, then Refresh.',
         'settings.noMachines': 'No saved machines yet — the list above comes from ~/.ssh/config; click 连接 to use one.',
         'settings.pickHost': 'Choose a remote machine',
         'settings.hostListSource': 'from ~/.ssh/config',
         'settings.hostListLoading': 'Reading ~/.ssh/config…',
         'settings.hostListRefresh': 'Refresh',
         'settings.hostListRefreshHint': 'Re-read ~/.ssh/config (no need to reopen this page)',
-        'settings.hostListEmpty': 'No hosts found in {file}. Add Host blocks to your ssh config and hit Refresh, or add a machine manually below.',
+        'settings.hostListEmpty': 'No hosts found in {file}. Add Host blocks, then hit Refresh.',
         'settings.hostListFailed': 'Could not read it: {msg}. This is NOT a problem with your ssh config (the file was never read) — hit Refresh; if it keeps failing the plugin versions are out of sync, so restart DSH.',
         'settings.hostConnect': 'Connect',
         'settings.hostConnecting': 'Connecting…',
         'settings.hostConnectHint': 'Connect and make it the current machine (then pick a remote folder)',
         'settings.hostConnected': 'Connected · {latency}',
         'settings.hostConnectedHint': 'Connected — pick the remote folder to start working.',
-        'settings.hostFillForm': 'Fill form',
-        'settings.hostFillFormHint': 'Needs a password or per-machine overrides? Load it into the form below',
+        'settings.openSshConfig': 'Open config',
+        'settings.openSshConfigHint': 'Open ~/.ssh/config in your editor. Hit Refresh afterwards and the new Host shows up here.',
+        'settings.sshConfigOpened': 'Opened: {file}',
+        'settings.sshConfigOpenFailed': 'Could not open it automatically ({msg}) — edit this file yourself: {file}',
         'settings.badgeKey': 'key',
         'settings.openWorkspace': 'Folder',
         'settings.openWorkspaceHint': 'Pick a remote folder on this machine as the workspace',
@@ -384,7 +385,6 @@ window.__ModuleLoader__.load({
         '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)',
         'settings.liveNow': 'Connected',
         'settings.lastConn': 'Last connected {when}{ms}',
@@ -398,7 +398,6 @@ window.__ModuleLoader__.load({
         'settings.currentMachine': 'Current remote: {name}',
         'settings.clearCurrent': 'Clear current (active remote = none)',
         'settings.noActive': 'No active remote machine: saved machines are standby connections and never enter a session context automatically (local sessions are unaffected).',
-        'settings.addMachine': 'Add machine',
         'settings.editMachine': 'Edit machine',
         'settings.badgeSshConfig': 'ssh cfg',
         // Issue #51 — transport backend (GSSAPI/Kerberos via system OpenSSH).
@@ -524,7 +523,6 @@ window.__ModuleLoader__.load({
         'settings.secretStoreFailed': 'The OS keychain refused the password ({msg}); credentialFallback=plain wrote it to machines.json in plaintext.',
         '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.connOk': 'Connection successful',
         'settings.connOkWith': 'Connection successful ({user}@{host}, {latency}ms){shell}',
         'settings.connFail': 'Connection failed',
@@ -1018,7 +1016,6 @@ window.__ModuleLoader__.load({
       const [sshError, setSshError] = React.useState('')
       const [connectingKey, setConnectingKey] = React.useState('')
       const [rowState, setRowState] = React.useState({}) // key → { ok, text }
-      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).
@@ -1046,6 +1043,24 @@ window.__ModuleLoader__.load({
       }
       React.useEffect(() => { loadSshHosts() }, [])
 
+      /** Open ~/.ssh/config in the local editor (issue #73). New hosts are Host
+       *  blocks in that file, not a form in this page. */
+      const openSshConfig = () => {
+        setErr('')
+        setMsg('')
+        return api('POST', '/dsh-remote/ssh-config', { action: 'open' })
+          .then((r) => {
+            const file = String((r && r.file) || sshFile || '~/.ssh/config')
+            if (r && r.file) setSshFile(file)
+            setMsg(tr('settings.sshConfigOpened', { file }))
+            return loadSshHosts()
+          })
+          .catch((e) => setErr(tr('settings.sshConfigOpenFailed', {
+            msg: String((e && e.message) || e),
+            file: sshFile || '~/.ssh/config',
+          })))
+      }
+
       const setRow = (key, next) => setRowState((prev) => ({ ...prev, [key]: next }))
 
       const testConn = () => {
@@ -1276,21 +1291,6 @@ window.__ModuleLoader__.load({
       const clearCurrent = () => { setBusy(true); api('POST', '/dsh-remote/current', { id: '' }).then((r) => { setCurrentId(''); setMsg(tr('settings.cleared')) }).catch((e) => setErr(String((e && e.message) || e))).finally(() => setBusy(false)) }
       const del = (id) => { if (window.confirm(tr('settings.deleteConfirm'))) { api('POST', '/dsh-remote/machines', { action: 'delete', id }).then(refresh).then(() => setMsg(tr('settings.deleted'))).catch((e) => setErr(String((e && e.message) || e))) } }
 
-      // Issue #73: the manual form's escape hatch from the host list. A host that
-      // needs a password (or any per-machine override) is filled into the form
-      // instead of being adopted as an alias — one click, no jargon, and the form
-      // opens with the values already in place.
-      const applySshEntry = (e) => {
-        const alias = String(e.alias || e.host)
-        setForm({
-          ...form,
-          name: alias, host: e.hostName || alias, port: String(e.port || 22),
-          username: e.user || 'root', privateKeyPath: e.identityFile || '', useSshConfig: false,
-        })
-        setManualOpen(true)
-        setMsg(tr('settings.filledSsh'))
-      }
-
       /**
        * Issue #73: connect to one row of the host list.
        *
@@ -1341,7 +1341,7 @@ window.__ModuleLoader__.load({
        */
       const openWorkspaceOn = (machineId, path) => {
         setBusy(true); setErr(''); setMsg('')
-        api('POST', '/dsh-remote/mirror', { path, machineId })
+        api('POST', '/dsh-remote/mirror', { path, machineId, registerWorkspace: false })
           .then((r) => {
             setCurrentId((r && r.currentId) || machineId)
             setMsg(tr('settings.workspaceOpened', { path }))
@@ -1443,9 +1443,18 @@ window.__ModuleLoader__.load({
             React.createElement('button', {
               type: 'button', className: 'dsh-rw-btn',
               style: { ...buttonS, fontSize: 11, padding: '2px 8px', marginLeft: 'auto' },
+              onClick: () => openSshConfig(),
+              title: tr('settings.openSshConfigHint'),
+            }, tr('settings.openSshConfig')),
+            React.createElement('button', {
+              type: 'button', className: 'dsh-rw-btn',
+              style: { ...buttonS, fontSize: 11, padding: '2px 8px' },
               onClick: () => loadSshHosts(),
               title: tr('settings.hostListRefreshHint'),
             }, tr('settings.hostListRefresh'))),
+          sshFile
+            ? React.createElement('div', { style: { fontSize: 11, opacity: 0.65, marginBottom: 6, fontFamily: 'monospace', wordBreak: 'break-all' } }, sshFile)
+            : null,
           // One search box for BOTH halves of the list — with a dozen hosts, "scroll
           // until you find it" stops working.
           React.createElement('input', {
@@ -1472,11 +1481,6 @@ window.__ModuleLoader__.load({
                       h.identityFile ? pill('', tr('settings.badgeKey')) : null),
                     rowResult(key)),
                   React.createElement('div', { style: { display: 'flex', gap: 6, flexShrink: 0 } },
-                    React.createElement('button', {
-                      type: 'button', className: 'dsh-rw-btn', style: { ...buttonS, fontSize: 11, padding: '2px 8px' },
-                      onClick: () => applySshEntry(h),
-                      title: tr('settings.hostFillFormHint'),
-                    }, tr('settings.hostFillForm')),
                     React.createElement('button', {
                       type: 'button', className: 'dsh-rw-btn dsh-rw-primary',
                       style: { ...primaryBtnS, padding: '4px 12px', whiteSpace: 'nowrap' },
@@ -1576,12 +1580,13 @@ window.__ModuleLoader__.load({
                 React.createElement('button', { type: 'button', className: 'dsh-rw-btn', style: { ...buttonS, padding: '2px 8px', fontSize: 12, marginLeft: 'auto' }, onClick: clearCurrent }, tr('settings.clearCurrent')))
             : React.createElement('div', { style: { paddingTop: 10, fontSize: 12, opacity: 0.6 } }, tr('settings.noActive')),
           ),
-        // Issue #73: the manual form is the SECONDARY path now — collapsed by
-        // default, and only forced open while editing a saved machine. Everything
-        // it can do (password / key / jump host / keychain / system-OpenSSH) stays.
-        React.createElement('div', { style: boxS },
-          sectionToggle(manualOpen || !!form.id, setManualOpen, form.id ? tr('settings.editMachine') : tr('settings.addMachineManual')),
-          (manualOpen || form.id) ? React.createElement(React.Fragment, null,
+        // Issue #73: there is no "add a machine" form. New hosts are Host blocks
+        // in ~/.ssh/config (打开配置文件, then 刷新). This card exists only while
+        // editing a saved machine — a password, or any override the file cannot
+        // store. Clicking 编辑 on a row is what opens it.
+        form.id ? React.createElement('div', { style: boxS },
+          React.createElement('div', { style: { fontSize: 13, fontWeight: 600, marginBottom: 8 } }, tr('settings.editMachine')),
+          React.createElement(React.Fragment, null,
           row(tr('settings.name'), React.createElement('input', { className: 'dsh-rw-input', value: form.name, onChange: setF('name'), placeholder: tr('settings.name') + ' (e.g. build-server)', style: inputS }), 'n'),
           row(tr('settings.host'), React.createElement('input', { className: 'dsh-rw-input', value: form.host, onChange: setF('host'), placeholder: form.useSshConfig ? tr('settings.sshImport') + ' Host 别名' : 'IP or hostname', style: inputS }), 'h'),
           row(tr('settings.useSshConfig'), React.createElement('input', { type: 'checkbox', checked: !!form.useSshConfig, onChange: setFb('useSshConfig') }), 'sshc'),
@@ -1690,8 +1695,8 @@ window.__ModuleLoader__.load({
               tst === 'testing' ? tr('settings.testing') : tst === 'ok' ? tr('settings.testOk') : tr('settings.testConn')),
             React.createElement('button', { type: 'button', className: 'dsh-rw-btn dsh-rw-primary', style: primaryBtnS, onClick: () => save(form.id ? 'update' : 'add'), disabled: busy || !form.host.trim(), title: form.host.trim() ? tr('settings.saveHint') : tr('settings.saveNeedsHost') }, busy ? tr('settings.saving') : tr('settings.save')),
           ),
-          ) : null,
-        ),
+          ),
+        ) : null,
         // 最近工作区现在挂在各自的机器行下面（issue #73：host → folders 的树），
         // 这个「只显示当前机器」的卡片就没有意义了。
         // 远程 DSH 界面（issue #46）
@@ -1868,6 +1873,8 @@ window.__ModuleLoader__.load({
             // 选目录 on a machine that is NOT current must browse THAT machine, not
             // whichever one happens to be current.
             initialMachineId: dirPick.machineId,
+            // Settings picks a default folder; it must not create a workspace.
+            registerWorkspace: false,
             onPicked: (localMirror, remotePath) => {
               const target = dirPick.machineId
               setDirPick(null)
@@ -1944,7 +1951,11 @@ window.__ModuleLoader__.load({
       // initialMachineId lets a caller open the picker FOR a specific machine. The
       // settings page needs it: 选目录 on a non-current machine must not silently
       // browse the current one.
-      const { open, busy, onPicked, onCancel, initialMachineId } = props
+      // registerWorkspace: this picker is the CORE's "Add workspace" directory
+      // flow, which adopts the returned mirror as a workspace right after we
+      // commit. The plugin's own pickers (settings, Remote Files) only choose a
+      // folder, so they pass false and never grow a stray workspace.
+      const { open, busy, onPicked, onCancel, initialMachineId, registerWorkspace } = props
       const [tab, setTab] = React.useState('local')
       const [machines, setMachines] = React.useState([])
       const [machineId, setMachineId] = React.useState('')
@@ -2334,7 +2345,7 @@ window.__ModuleLoader__.load({
         // looking at this one's tree. The host re-asserts the named machine
         // instead of trusting whichever happens to be active.
         ensureCurrent(machineId)
-          .then(() => api('POST', '/dsh-remote/mirror', { path: target, machineId }))
+          .then(() => api('POST', '/dsh-remote/mirror', { path: target, machineId, registerWorkspace: registerWorkspace !== false }))
           // `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
@@ -3406,7 +3417,7 @@ window.__ModuleLoader__.load({
           ? React.createElement('div', { style: { fontSize: 11, opacity: 0.7, padding: '4px 8px', wordBreak: 'break-all' } }, tr('explorer.remoteWs', { path: root, host: (status.host ? tr('explorer.hostTag', { user: status.username, host: status.host }) : '') }))
           : React.createElement('div', { style: { fontSize: 11, opacity: 0.7, padding: '4px 8px' } }, root ? tr('explorer.noRemoteWs') : tr('explorer.sessionLocal')),
         picker ? React.createElement('div', { style: { padding: 8 } }, React.createElement(DirPicker, {
-          open: true, busy: false, onPicked: () => { setPicker(false); refreshStatus() }, onCancel: () => setPicker(false),
+          open: true, busy: false, registerWorkspace: false, onPicked: () => { setPicker(false); refreshStatus() }, onCancel: () => setPicker(false),
         })) : null,
         React.createElement('div', { style: { flex: 1, overflowY: 'auto', minHeight: 0, padding: '2px 0' } },
           !root

package/lib/exec-job.js

@@ -111,6 +111,13 @@ export function startExecJob(registry, { pool, command, label, owner, jobDeadlin
       abort = ac
       const done = (async () => {
         let res
+        // Whether the backend actually streamed anything through the tap. A
+        // backend without an onData implementation (openssh before issue #80)
+        // leaves the ring EMPTY even though the command produced output — the
+        // only copy then lives in the return value below, which the callers of
+        // a job never see. Flush that copy into the ring at settle time, but
+        // ONLY when nothing streamed, or every line would arrive twice.
+        let sawStream = false
         try {
           res = await pool.exec(command, {
             // 0/undefined ⇒ no transport deadline: the job outlives the call.
@@ -124,12 +131,19 @@ export function startExecJob(registry, { pool, command, label, owner, jobDeadlin
             onData: (channel, chunk) => {
               const text = Buffer.isBuffer(chunk) ? chunk.toString('utf8') : String(chunk)
               if (!text) return
+              sawStream = true
               try { job.append(text, { channel }) } catch { /* settled: ring closed */ }
             },
           })
         } catch (err) {
           return { status: 'failed', detail: String((err && err.message) || err) }
         }
+        if (!sawStream) {
+          try {
+            if (res.stdout) job.append(String(res.stdout), { channel: 'stdout' })
+            if (res.stderr) job.append(String(res.stderr), { channel: 'stderr' })
+          } catch { /* settled: ring closed */ }
+        }
         if (res.signal === 'ABORTED' || cancelled) return { status: 'killed', detail: cancelled || 'cancelled' }
         if (res.signal === 'TIMEOUT') return { status: 'killed', detail: `timed out after ${jobDeadlineMs}ms` }
         const code = res.code