dsh-remote 0.8.49 → 0.8.51

package/README.en.md

@@ -276,6 +276,7 @@ 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 |
+| `localTools` | string | `bootstrap` | which `rw_*` tools a LOCAL session (cwd outside every remote mirror) sees (issue #63): `bootstrap` keeps only the configuration loop `rw_machines`/`rw_connect`/`rw_pick_workspace` (the other 19 refuse a local session with "this session is LOCAL", so exposing them just wastes schema budget); `none` hides all `rw_*` (remote setup happens via the settings page only); `all` restores the legacy full surface. REMOTE sessions (cwd inside a mirror) always see everything; an invalid value degrades to `bootstrap` |
 
 > The authoritative list is the `Config` schema in `lib/index.js`; this table mirrors it.
 

package/README.md

@@ -53,6 +53,7 @@ DSH 的 Web 界面刻意只监听 `127.0.0.1`（CLI 为安全拒绝 `--host 0.0.
 - **Windows 主机** —— 自动探测平台并定位 Git Bash，命令经 `bash -s` 走 stdin 执行，不受引号/反斜杠转义困扰（`config.shell` 可指定或设 `native` 关闭）；`C:\Users\dev` 与 `/c/Users/dev` 两种写法都接受。
 - **长任务异步化** —— `rw_sync`/`rw_push` 传 `async: true` 返回 `taskId`，可查询进度/结果/取消。
 - **数据跟随 Harness 根目录** —— 机器清单与镜像在 `$DSH_HOME/remote-workspaces`；0.6 之前的数据首次启动自动迁移。
+- **`~/.ssh/config` 是连接四字段的唯一来源**（`0.8.50+`，issue #50）—— 保存机器时把 主机/用户/端口/私钥 写入 `~/.ssh/config` 的受管块（`# dsh-remote: managed` 标记，只动自己的块；你手写的同名 Host 块绝不覆盖，会提示冲突）。之后**改这个文件立即生效**：任何 Host 块点名的主机（含字面 IP），连接都按文件解析（裸 `Host *` 是通用默认，不算点名）；机器记录里的副本只做兜底，插件自己的状态（最近工作区/延迟等）仍存注册表。
 - **不改动 `dsh-workspace` 官方代码** —— 全部作为普通插件实现。
 
 ## 安装
@@ -257,6 +258,7 @@ 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 源；**留空沿用远端自己的配置**，不会覆盖内网镜像 |
+| `localTools` | string | `bootstrap` | 本地 session（cwd 不在远程镜像里）暴露哪些 `rw_*` 工具（issue #63）：`bootstrap`=只暴露配置闭环 `rw_machines`/`rw_connect`/`rw_pick_workspace`（其余 19 个在本地 session 必然报 "this session is LOCAL"，暴露只是白占 schema）；`none`=完全不暴露 `rw_*`（远程配置只能走设置页）；`all`=旧的 full 暴露。远程 session（cwd 在镜像里）不受影响，始终全量；非法值按 `bootstrap` 处理 |
 
 > 权威清单是 `lib/index.js` 里的 `Config` schema，本表与之一致。
 

package/lib/client.js

@@ -73,6 +73,7 @@ window.__ModuleLoader__.load({
         'settings.sshAliasHint': '别名模式：机器只记住「{alias}」这个名字，主机/用户/端口/私钥/跳板每次连接都从 ~/.ssh/config 实时解析（改配置立刻生效）。',
         'settings.useSshConfig': '使用 ~/.ssh/config 别名（只存别名，不存副本）',
         'settings.useSshConfigHint': '留空或保持默认的字段（用户 root、端口 22、私钥、跳板）将从 ~/.ssh/config 实时解析；填了非默认值则覆盖。',
+        'settings.saveWritesSshConfig': '保存时会把 主机/用户/端口/私钥 写入 ~/.ssh/config 的受管块（# dsh-remote: managed 标记）；此后该文件优先——直接改它立即生效。',
         'settings.sshResolvedTo': '→ {user}@{host}:{port}',
         'settings.sshResolvedNone': '~/.ssh/config 中没有匹配「{alias}」的 Host 条目',
         'settings.sshResolvedWarn': '注意：{msg}',
@@ -360,6 +361,7 @@ window.__ModuleLoader__.load({
         'settings.sshAliasHint': 'Alias mode: the machine remembers only the name "{alias}"; host/user/port/key/jump host are resolved from ~/.ssh/config at every connect, so editing that file takes effect immediately.',
         'settings.useSshConfig': 'Use a ~/.ssh/config alias (keep the alias, not a copy)',
         'settings.useSshConfigHint': 'Fields left empty or at their default (user root, port 22, key, jump host) come from ~/.ssh/config at connect time; a non-default value overrides it.',
+        'settings.saveWritesSshConfig': 'Saving writes host/user/port/key into a managed block in ~/.ssh/config (marked # dsh-remote: managed); the file then takes precedence — edit it directly and it takes effect at once.',
         'settings.sshResolvedTo': '→ {user}@{host}:{port}',
         'settings.sshResolvedNone': 'no ~/.ssh/config block matches "{alias}"',
         'settings.sshResolvedWarn': 'Heads-up: {msg}',
@@ -1269,9 +1271,12 @@ window.__ModuleLoader__.load({
                   React.createElement('div', { style: { display: 'flex', gap: 6, alignItems: 'center', flexWrap: 'wrap' } },
                     React.createElement('span', { style: { fontWeight: 600 } }, m.name),
                     React.createElement('code', { style: { fontSize: 12, opacity: 0.8 } },
-                      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,
+                      (m.sshConfigResolved && m.sshConfigResolved.matched)
+                        // Issue #50: shown for literal machines too — a Host
+                        // block naming this machine's host now drives it.
+                        ? (m.host + '  ' + tr('settings.sshResolvedTo', { user: m.sshConfigResolved.username || m.username || '?', host: m.sshConfigResolved.host, port: m.sshConfigResolved.port || m.port }))
+                        : (m.useSshConfig ? m.host : (m.username + '@' + m.host + ':' + m.port))),
+                    (m.useSshConfig || (m.sshConfigResolved && m.sshConfigResolved.matched)) ? 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.
@@ -1314,6 +1319,9 @@ window.__ModuleLoader__.load({
           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'),
           form.useSshConfig ? React.createElement('div', { style: { fontSize: 11, opacity: 0.8, marginBottom: 8, lineHeight: 1.5 } }, tr('settings.useSshConfigHint')) : null,
+          // Issue #50: a literal save also touches ~/.ssh/config (managed
+          // block) — say so where the choice is made.
+          !form.useSshConfig ? React.createElement('div', { style: { fontSize: 11, opacity: 0.8, marginBottom: 8, lineHeight: 1.5 } }, tr('settings.saveWritesSshConfig')) : null,
           form.useSshConfig ? (() => {
             // Preview where the alias points, from the same resolution the
             // connect path uses (the host list carries it — issue #38).

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 } from './sshconfig.js'
+import { importableEntries, 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'
@@ -99,6 +99,35 @@ export function win32FolderPickScript() {
   )
 }
 
+/** The rw_* tools a LOCAL session keeps under `localTools: 'bootstrap'`
+ *  (issue #63): exactly the configuration loop — list machines, connect, pick
+ *  a workspace. Every other rw_* tool needs a mirror-bound session and refuses
+ *  a local one with "this session is LOCAL", so keeping it visible only spends
+ *  schema budget. Exported so the test suite pins the set against the real
+ *  registrations. */
+export const LOCAL_BOOTSTRAP_TOOLS = ['rw_machines', 'rw_connect', 'rw_pick_workspace']
+
+/** Normalize the `localTools` config value (issue #63). Anything unrecognized
+ *  degrades to the safe default 'bootstrap' rather than disabling the filter
+ *  (a typo must not silently re-expose the dead surface the user asked to
+ *  hide) — mirroring how an unknown value would otherwise be mistaken for
+ *  'all'. */
+export function normalizeLocalTools(value) {
+  const v = String(value || '').trim().toLowerCase()
+  return v === 'none' || v === 'all' ? v : 'bootstrap'
+}
+
+/** rw_pick_workspace's closing "what next" sentence (issue #63). In a LOCAL
+ *  session `rw_sync` cannot run — the mirror path must be opened as a NEW
+ *  session first, because tool routing keys on the session's cwd and picking
+ *  a workspace does not change it. Only a mirror-bound (or caller-context-
+ *  less) session can sync right away. */
+export function pickWorkspaceNextStep(localSession) {
+  return localSession
+    ? 'NOTE: this session is LOCAL — rw_sync and the other remote tools refuse to run here. Open a session whose workspace IS the local mirror path above, then run rw_sync there to download the remote files.'
+    : 'Run rw_sync to download its files into the local mirror.'
+}
+
 // Web and Desktop share the SSH tools; each optional UI transport is attached
 // reactively below, so service startup order does not drop the JSON routes.
 export const inject = ['tools', 'systemPrompt']
@@ -235,6 +264,16 @@ export const Config = z.object({
   /** npm registry to install from. Empty uses the remote's own npm config, which
    *  is what an internal mirror needs to stay in effect. */
   webInstallRegistry: z.string().default(''),
+  /** Which rw_* tools a LOCAL session (session cwd is NOT a remote-workspaces
+   *  mirror) sees (issue #63): `bootstrap` (default) exposes only the
+   *  configuration loop — rw_machines / rw_connect / rw_pick_workspace — since
+   *  the other tools can never succeed there (they refuse with "this session
+   *  is LOCAL") and exposing them only spends ~4k tokens of schema per request;
+   *  `none` hides every rw_* tool (remote setup then happens via the settings
+   *  page only); `all` keeps the legacy full surface. A REMOTE session (cwd
+   *  inside a mirror) always sees all tools, and an invalid value falls back
+   *  to `bootstrap`. (schemastery 3.18 has no .enum — validated in code.) */
+  localTools: z.string().default('bootstrap'),
 })
 
 // ── shell / path helpers (pure implementations in lib/paths.js) ───────────
@@ -431,25 +470,49 @@ export async function apply(ctx, config) {
    * keychain lookups and the settings UI keep working.
    */
   const loggedSshWarnings = new Map()
-  const withSshConfig = (m) => {
-    // Short-circuit BEFORE reading ~/.ssh/config: a deployment with no alias
-    // machine must never touch that file, and the 2s text memo must not be
-    // primed by unrelated machines.
-    if (!m || !m.useSshConfig) return m
-    const resolved = resolveMachineSshConfig(m, { text: sshConfigText() })
-    if (!resolved) return m
-    // Warn once per distinct warning set: this runs on every tool call, and an
-    // unmatched alias would otherwise fill the log with the same line.
-    const signature = resolved.warnings.join(' | ')
-    if (signature && loggedSshWarnings.get(resolved.alias) !== signature) {
-      loggedSshWarnings.set(resolved.alias, signature)
+  const warnSshOnce = (alias, warnings) => {
+    // Warn once per distinct warning set: withSshConfig runs on every tool
+    // call, and an unmatched alias would otherwise fill the log with the same
+    // line.
+    const signature = warnings.join(' | ')
+    if (signature && loggedSshWarnings.get(alias) !== signature) {
+      loggedSshWarnings.set(alias, signature)
       try {
         const logger = typeof ctx.get === 'function' ? ctx.get('logger') : undefined
         if (logger && typeof logger.warn === 'function') {
-          logger.warn(`[dsh-remote] ssh-config alias "${resolved.alias}": ${resolved.warnings.join(' ')}`)
+          logger.warn(`[dsh-remote] ssh-config alias "${alias}": ${warnings.join(' ')}`)
         }
       } catch { /* logging is best-effort */ }
     }
+  }
+  const withSshConfig = (m) => {
+    if (!m) return m
+    // Issue #50: ~/.ssh/config wins for ANY host it names, not only alias
+    // machines. A literal machine's stored host/user/port/key is a COPY that
+    // goes stale the moment the file is edited; when a Host block names the
+    // machine's host (a bare `Host *` does not name it), the file's values
+    // take over and the record fills the gaps.
+    if (!m.useSshConfig) {
+      const lit = resolveLiteralSshConfig(m, { text: sshConfigText() })
+      if (!lit) return m
+      warnSshOnce(lit.alias, lit.warnings)
+      return {
+        ...m,
+        sshConfigMatched: true,
+        sshConfigWarnings: lit.warnings,
+        // The name the user typed, kept for the system-OpenSSH backend: ssh
+        // must match its Host blocks against exactly this (connectTargetFor).
+        sshConfigName: m.host,
+        host: lit.host || m.host,
+        port: lit.port || m.port,
+        username: lit.username || m.username,
+        privateKeyPath: lit.privateKeyPath || m.privateKeyPath,
+        proxy: lit.proxy || m.proxy,
+      }
+    }
+    const resolved = resolveMachineSshConfig(m, { text: sshConfigText() })
+    if (!resolved) return m
+    warnSshOnce(resolved.alias, resolved.warnings)
     return {
       ...m,
       sshAlias: resolved.alias,
@@ -483,7 +546,10 @@ export async function apply(ctx, config) {
    * @returns {{host: string, port: number, username: string, privateKeyPath: string, proxy: object|undefined, aliasNative: boolean}}
    */
   const connectTargetFor = (eff) => {
-    const aliasNative = !!(eff && eff.useSshConfig && isSystemOpenSshBackend(eff))
+    // Issue #50: a LITERAL machine whose host a Host block names is in the same
+    // position as an alias machine on the OpenSSH backend — ssh must match its
+    // blocks against the ORIGINAL name, so it is handed over verbatim too.
+    const aliasNative = !!(eff && isSystemOpenSshBackend(eff) && (eff.useSshConfig || eff.sshConfigMatched))
     if (!aliasNative) {
       return {
         host: String((eff && eff.host) || ''),
@@ -494,7 +560,7 @@ export async function apply(ctx, config) {
         aliasNative: false,
       }
     }
-    const alias = String((eff && (eff.sshAlias || eff.host)) || '')
+    const alias = String((eff && (eff.sshAlias || eff.sshConfigName || eff.host)) || '')
     return {
       // The alias itself; ssh expands HostName/User/Port/IdentityFile and every
       // other directive while matching that Host block.
@@ -511,13 +577,14 @@ export async function apply(ctx, config) {
   const aliasOf = (m) => (m && m.sshAlias) || (m && m.useSshConfig ? String(m.host || '') : '')
 
   /** Machines as the settings UI sees them: secrets stripped, plus the
-   *  ~/.ssh/config resolution of an alias machine so a row can show where the
-   *  alias actually points without duplicating those values in the registry
-   *  (issue #38). */
+   *  ~/.ssh/config resolution of an alias machine (issue #38) — and, since
+   *  issue #50, of a LITERAL machine whose host a Host block names, so the row
+   *  can show that the file now drives it. */
   const machinesForClient = () => machines.map((m) => ({
     ...sanitizeMachine(m),
-    // Read ~/.ssh/config only when a machine actually uses an alias.
-    sshConfigResolved: m.useSshConfig ? resolveMachineSshConfig(m, { text: sshConfigText() }) : null,
+    sshConfigResolved: m.useSshConfig
+      ? resolveMachineSshConfig(m, { text: sshConfigText() })
+      : resolveLiteralSshConfig(m, { text: sshConfigText() }),
   }))
 
   /**
@@ -1758,8 +1825,11 @@ export async function apply(ctx, config) {
         if (!b.bound) persistWorkspace(p)
         const local = ensureMirror(p, b.host, b.username, b.port, { alias: b.alias || "" })
         startAutoPush(local)
+        // The closing hint depends on where THIS session stands (issue #63):
+        // in a LOCAL session "Run rw_sync" is a dead instruction — rw_sync
+        // refuses a local session — so say the mirror must be OPENED first.
         return {
-          text: `Remote workspace set to ${shown} on ${b.username}@${b.host}.\nLocal mirror (native workspace path): ${local}\n\nRun rw_sync to download its files into the local mirror.`,
+          text: `Remote workspace set to ${shown} on ${b.username}@${b.host}.\nLocal mirror (native workspace path): ${local}\n\n${pickWorkspaceNextStep(b.local)}`,
         }
       },
     }),
@@ -2507,6 +2577,39 @@ export async function apply(ctx, config) {
     },
   })
 
+  // ── local-session tool visibility (issue #63) ────────────────────────────
+  // All rw_* tools register globally (at registration time there is no session
+  // to consult), but in a LOCAL session the operation tools can never succeed:
+  // bindingFor() refuses them with "this session is LOCAL". Exposing them
+  // anyway costs every local request a few thousand tokens of dead schema.
+  // The `system-prompt/assemble` waterfall is where the final per-request tool
+  // list passes with the calling agent attached, so the SAME cwd test the
+  // prompt section above already performs can trim the list there. A session
+  // whose cwd maps to a mirror keeps the full surface; anything else — a
+  // plain local directory, or a mirror whose meta is missing/unparsable
+  // (resolveMirror reports no binding; bindingFor refuses it as local too) —
+  // is reduced per config.localTools. An assembly without agent/cwd is left
+  // alone, matching bindingFor's "no caller context" semantics. `ctx.on` is
+  // cordis-core, but guard like the other
+  // optional surfaces: a minimal embedding (or a small test double) without
+  // event support simply keeps the legacy full surface.
+  if (typeof ctx.on === 'function') {
+    ctx.on('system-prompt/assemble', async (_assembly, assembleContext, next) => {
+      const assembled = await next()
+      const mode = normalizeLocalTools(config.localTools)
+      if (mode === 'all') return assembled
+      const agent = assembleContext && assembleContext.agent
+      const cwd = agent && agent.session && agent.session.header && agent.session.header.cwd
+      if (!cwd) return assembled // no caller context → not definitively local
+      const { remotePath, machine } = resolveMirrorForLocal(String(cwd))
+      if (remotePath && machine) return assembled // remote session → full surface
+      const tools = (assembled.tools || []).filter(
+        (t) => !t.name || !t.name.startsWith('rw_') || (mode === 'bootstrap' && LOCAL_BOOTSTRAP_TOOLS.includes(t.name)),
+      )
+      return { ...assembled, tools }
+    })
+  }
+
   // ── slash commands ─────────────────────────────────────────────────────────
   const commands = ctx.get('commands')
   if (commands !== undefined) {
@@ -3090,12 +3193,49 @@ export async function apply(ctx, config) {
               // alone, so a fresh registry stays "no choice yet" (not an
               // explicit none) and a previously-cleared registry stays cleared.
               saveMachines(machines, store.currentId, false)
+              // Issue #50: host/user/port/key have ONE home — ~/.ssh/config.
+              // Saving a literal machine upserts a marker-tagged Host block,
+              // so the file and the registry can never drift; the record's
+              // copy remains only as a fallback for a missing/renamed block.
+              // A Host block the USER wrote for the same name is never
+              // touched — the conflict is reported instead. Failures here are
+              // best-effort: the registry copy is already saved.
+              let sshConfigWarning = ''
+              if (!rec.useSshConfig) {
+                try {
+                  const raw = readRawSshConfig(sshConfigPath())
+                  let next = upsertManagedHostBlock(raw, {
+                    alias: rec.host,
+                    hostName: rec.host,
+                    user: rec.username,
+                    port: rec.port,
+                    identityFile: rec.privateKeyPath,
+                  })
+                  // A RENAMED machine leaves the old managed block behind, and
+                  // that block is the plugin's own artifact of the edit —
+                  // retire it. (Deleting a machine removes nothing: the Host
+                  // block is the user's ssh access, not plugin state.)
+                  if (prev && prev.host && prev.host !== rec.host && !prev.useSshConfig) {
+                    const rm = removeManagedHostBlock(next.text, prev.host)
+                    next = { status: rm.status === 'removed' && next.status === 'unchanged' ? 'updated' : next.status, text: rm.text }
+                  }
+                  if (next.status === 'conflict') {
+                    sshConfigWarning = `~/.ssh/config already names "${rec.host}" in a Host block that is not managed by dsh-remote — it was left untouched, and it now wins over the saved copy.`
+                  } else if (next.status === 'appended' || next.status === 'updated') {
+                    writeSshConfig(next.text, sshConfigPath())
+                    sshConfigCache = { text: '', at: 0 }
+                  }
+                } catch (sshErr) {
+                  sshConfigWarning = `could not update ~/.ssh/config (${String((sshErr && sshErr.message) || sshErr)}); the registry copy was saved.`
+                }
+              }
               return sendJson(res, 200, {
                 ok: true,
                 machine: sanitizeMachine(rec),
                 machines: machinesForClient(),
                 currentId: store.currentId,
                 ...(warning ? { warning, warningDetail } : {}),
+                ...(sshConfigWarning ? { sshConfigWarning } : {}),
               })
             }
             if (action === 'delete') {
@@ -3154,6 +3294,12 @@ export async function apply(ctx, config) {
                 useSshConfig: true,
               }, { text: sshConfigText() })
             : null
+          // Issue #50: a LITERAL host named by a Host block resolves through
+          // the file as well — the probe must dial what a real connect would.
+          const literalTarget = !body.useSshConfig
+            ? resolveLiteralSshConfig({ host: String(body.host || '') }, { text: sshConfigText() })
+            : null
+          const probeTarget = aliasTarget || literalTarget
           // Issue #51: on the system-OpenSSH backend an alias is handed to `ssh`
           // VERBATIM (see connectTargetFor) — resolving it here would stop the
           // `Host` block from matching, so the ~/.ssh/config settings the probe
@@ -3161,13 +3307,13 @@ export async function apply(ctx, config) {
           const probe = createPool({
             ...config,
             backend: probeBackend,
-            host: aliasTarget && !probeIsOpenssh ? aliasTarget.host : String(body.host || config.host),
-            port: aliasTarget && !probeIsOpenssh ? aliasTarget.port : (Number(body.port) || config.port),
-            username: aliasTarget && !probeIsOpenssh ? aliasTarget.username : String(body.username || config.username),
+            host: probeTarget && !probeIsOpenssh ? probeTarget.host : String(body.host || config.host),
+            port: (probeTarget && !probeIsOpenssh && probeTarget.port) ? probeTarget.port : (Number(body.port) || config.port),
+            username: (probeTarget && !probeIsOpenssh && probeTarget.username) ? probeTarget.username : String(body.username || config.username),
             password: String(body.password || ''),
-            privateKeyPath: (aliasTarget && !probeIsOpenssh) ? aliasTarget.privateKeyPath : String(body.privateKeyPath || config.privateKeyPath),
+            privateKeyPath: (probeTarget && !probeIsOpenssh && probeTarget.privateKeyPath) ? probeTarget.privateKeyPath : String(body.privateKeyPath || config.privateKeyPath),
             passphrase: String(body.passphrase || ''),
-            proxy: (aliasTarget && !probeIsOpenssh && aliasTarget.proxy) ? aliasTarget.proxy : (body.proxy && body.proxy.host ? {
+            proxy: (probeTarget && !probeIsOpenssh && probeTarget.proxy) ? probeTarget.proxy : (body.proxy && body.proxy.host ? {
               host: String(body.proxy.host),
               port: Number(body.proxy.port) || 22,
               username: String(body.proxy.username || ''),