dsh-remote 0.8.60 → 0.8.61

package/lib/index.js

@@ -34,7 +34,7 @@ import {
 import { createHostKeyGuard, isHostKeyKnown as _isHostKeyKnown } from './hostkey.js'
 import { compileIgnore, ignorePatternsFor, DEFAULT_IGNORE } from './ignore.js'
 import { friendlyMessage } from './errors.js'
-import { importableEntries, sshConfigPath, readSshConfigText, resolveMachineSshConfig, resolveLiteralSshConfig, readRawSshConfig, upsertManagedHostBlock, removeManagedHostBlock, writeSshConfig } from './sshconfig.js'
+import { listAliases, sshConfigPath, readSshConfigText, resolveMachineSshConfig, resolveLiteralSshConfig, readRawSshConfig, upsertManagedHostBlock, removeManagedHostBlock, writeSshConfig } from './sshconfig.js'
 import { createRemoteFileReference, installFileReferenceOverlay, DEFAULT_EXCLUDED_DIRECTORIES } from './file-reference.js'
 import { getSecret, deleteSecret, platformBackend, persistPassword } from './credential.js'
 import { syncTree, pushTree, loadSyncState, saveSyncState, pushOneFile } from './sync.js'
@@ -3816,6 +3816,62 @@ export async function apply(ctx, config) {
                 ...(sshConfigWarning ? { sshConfigWarning } : {}),
               })
             }
+            // Issue #73: one click on a host listed from ~/.ssh/config. The settings
+            // page no longer asks the user to understand "alias" vs "copy": it lists
+            // the file's hosts and this action adopts one — upsert an alias machine
+            // (never a duplicate), make it the current machine, and let the caller
+            // connect/probe next. Nothing about the user's file is rewritten here:
+            // the alias IS the source of truth (issue #50).
+            if (action === 'from-ssh-config') {
+              const alias = String(body.alias || body.host || '').trim()
+              if (!alias) return sendJson(res, 400, { ok: false, error: 'alias required' })
+              const known = listAliases(sshConfigText()).find((a) => a.alias === alias)
+              if (!known) {
+                return sendJson(res, 404, {
+                  ok: false,
+                  error: `~/.ssh/config 里没有 "${alias}"（改完文件后重新打开设置页即可刷新）`,
+                })
+              }
+              const existing = machines.find((m) => m.useSshConfig && String(m.host) === alias)
+              let rec = existing
+              if (!rec) {
+                rec = {
+                  id: machineId(),
+                  name: alias,
+                  host: alias,
+                  useSshConfig: true,
+                  port: Number(known.port) || 22,
+                  username: String(known.user || ''),
+                  password: '',
+                  privateKeyPath: '',
+                  passphrase: '',
+                  workspace: '',
+                  hostKeyMode: '',
+                  useAgent: false,
+                  keyboardInteractive: false,
+                  backend: 'native',
+                  sshBinary: '',
+                  credentialBackend: 'plain',
+                  recentWorkspaces: [],
+                  lastConnectedAt: null,
+                  latencyMs: null,
+                }
+                machines.push(rec)
+                saveMachines(machines, store.currentId, false)
+              }
+              // Making it current is the whole point of the click: the picker and
+              // every session route then act on this machine.
+              const okSet = await setCurrent(rec.id)
+              if (!okSet) return sendJson(res, 500, { ok: false, error: 'could not activate the machine' })
+              return sendJson(res, 200, {
+                ok: true,
+                created: !existing,
+                machine: sanitizeMachine(rec),
+                machines: machinesForClient(),
+                currentId: store.currentId,
+                ...status(),
+              })
+            }
             if (action === 'delete') {
               const i = machineIndex(String(body.id || ''))
               if (i < 0) return sendJson(res, 404, { ok: false, error: 'machine not found' })
@@ -4104,7 +4160,22 @@ export async function apply(ctx, config) {
         if (req.method !== 'GET') return sendJson(res, 405, { ok: false, error: 'method not allowed' })
         try {
           const text = readSshConfigText()
-          return sendJson(res, 200, { ok: true, file: sshConfigPath(), present: !!text, entries: importableEntries(text) })
+          // Issue #73: the settings page lists the hosts of ~/.ssh/config the way
+          // VSCode Remote-SSH does, so this must include EVERY concrete alias —
+          // `importableEntries` filtered out a bare `Host mybox` with no options,
+          // which is a perfectly normal entry to connect to. `host` is kept as an
+          // alias of `alias` so existing callers keep working.
+          const entries = listAliases(text).map((a) => ({
+            host: a.alias,
+            alias: a.alias,
+            hostName: a.hostName || a.alias,
+            user: a.user || '',
+            port: Number(a.port) || 22,
+            identityFile: a.identityFile || '',
+            proxyJump: a.proxyJump || '',
+            proxyCommand: a.proxyCommand || '',
+          }))
+          return sendJson(res, 200, { ok: true, file: sshConfigPath(), present: !!text, entries })
         } catch (err) {
           return sendJson(res, 500, { ok: false, error: String((err && err.message) || err) })
         }

package/package.json

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