dsh-remote 0.8.48 → 0.8.50

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` 官方代码** —— 全部作为普通插件实现。
 
 ## 安装

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).
@@ -2382,8 +2390,9 @@ window.__ModuleLoader__.load({
     }
 
     // ── better-sidebar integration (optional) ────────────────────────────────
+    // One descriptor only: the explorer page. The per-file viewer is a native
+    // resource type, never a better-sidebar card (see registerSidebarIntegration).
     const SIDEBAR_EXPLORER_ID = 'dsh-remote:explorer'
-    const SIDEBAR_FILE_ID = 'dsh-remote:file'
 
     function fetchRemoteStatus(sessionId) {
       return api('GET', withSessionQuery('/dsh-remote/status', sessionId)).catch(() => null)
@@ -2989,10 +2998,27 @@ window.__ModuleLoader__.load({
         return () => { clearTimeout(tid); document.removeEventListener('mousedown', close); host.remove() }
       }, [menu])
 
+      // Open one remote file. The viewer is a RESOURCE tab type: the address
+      // names the file, and the HOST's tab registry picks the type that claims
+      // it (ours, `dsh-resource://dsh-remote/**`). That is the same call the
+      // native explorer makes through `onOpenFile`, so one file behaves
+      // identically in both compositions — and it needs no better-sidebar
+      // descriptor, whose only effect would have been a switch that unregisters
+      // the viewer.
       const openFile = (p) => {
-        const name = String(p).split(/[\\/]/).pop() || p
-        if (props.onOpenFile) props.onOpenFile(p)
-        else props.ctx.betterSidebar.openTab({ type: SIDEBAR_FILE_ID, title: name, path: p }, props.scope)
+        if (props.onOpenFile) { props.onOpenFile(p); return }
+        const sessionId = (props.scope && props.scope.sessionId) || ''
+        try {
+          const right = props.ctx && props.ctx.get && props.ctx.get('sidebarRight')
+          if (right && typeof right.openResource === 'function') {
+            right.openResource(remoteFileAddress(sessionId, p))
+            return
+          }
+        } catch (e) {
+          console.warn('[dsh-remote] remote file open failed:', e)
+          return
+        }
+        console.warn('[dsh-remote] no right-sidebar resource opener; remote file not opened')
       }
 
       const doFs = (op, payload, refreshParent) => {
@@ -3302,13 +3328,14 @@ window.__ModuleLoader__.load({
           // Issue #32: own the expansion state (see RemoteExplorerTabOwned).
           component: RemoteExplorerTabOwned,
         }))
-        disposers.push(bs.registerTab({
-          id: SIDEBAR_FILE_ID,
-          title: () => tr('explorer.tabTitle'),
-          hidden: true, // not in the + menu; opened from the explorer tree
-          dedupeKey: (tab) => tab.path,
-          component: (props) => React.createElement(RemoteFileTab, props),
-        }))
+        // No descriptor for the FILE viewer on purpose. It is a resource tab
+        // type (`dsh-remote/file`, registered with `patterns` on the native
+        // registry), not a page: it only means something once an address names
+        // the file, so it has no card to draw and no page to open. A
+        // descriptor here would put a card in better-sidebar's 侧边栏内容
+        // inventory whose switch could only ever unregister the viewer — the
+        // "switch does nothing" report this replaced. The tree hands the HOST
+        // an address instead and the host routes it to that type (openFile).
       } catch (e) {
         console.warn('[dsh-remote] better-sidebar integration skipped:', e)
         disposers.forEach((d) => { try { d() } catch {} })
@@ -3522,11 +3549,65 @@ window.__ModuleLoader__.load({
       // built-in local preview. This is a warm-up, not a dependency: a failure
       // just leaves the conservative behaviour in place.
       try { ensureMirrors() } catch { /* the registry is best-effort */ }
-      inner.effect(() => tabs.register({
-        id: NATIVE_EXPLORER, kind: NATIVE_EXPLORER,
-        title: () => tr('explorer.tabTitle'),
-        guide: [{ order: 55, title: () => tr('explorer.tabTitle') }],
-      }), 'dsh-remote.native-explorer-type')
+      // ── Who owns the 开始 card ────────────────────────────────────────────
+      // The 远程文件 card on the right sidebar's start page (开始) is the
+      // `guide` entry of a native tab type, and TWO providers can publish one:
+      // this plugin (below) and dsh-better-sidebar, which registers a native
+      // type per tab descriptor it hosts — our `dsh-remote:explorer` gets a
+      // guide row of its own there, governed by its side-card settings switch.
+      //
+      // Publishing both is what made that switch look broken: turning the type
+      // off removed better-sidebar's row and left ours, so the card never went
+      // away. The card therefore belongs to exactly ONE provider:
+      //   · better-sidebar in the composition → ITS descriptor owns the card
+      //     (its switch IS the switch for it), and this type is registered
+      //     without a guide entry. The type and its body stay: a tab opened by
+      //     kind still renders, and nothing else about the panel changes.
+      //   · plain install → the card is ours, always, exactly as before.
+      //
+      // `guide` is captured at registration time and an id may not be
+      // registered twice, so a handover means dispose-then-register inside one
+      // synchronous block: no render can observe the gap.
+      let betterSidebar = false
+      let disposed = false
+      let disposeExplorer = null
+      let guideListed = null
+      const syncExplorerType = () => {
+        const withGuide = !betterSidebar
+        if (guideListed === withGuide && disposeExplorer) return
+        const previous = disposeExplorer
+        disposeExplorer = null
+        if (previous) { try { previous() } catch { /* already released */ } }
+        disposeExplorer = tabs.register({
+          id: NATIVE_EXPLORER, kind: NATIVE_EXPLORER,
+          title: () => tr('explorer.tabTitle'),
+          ...(withGuide ? { guide: [{ order: 55, title: () => tr('explorer.tabTitle') }] } : {}),
+        })
+        guideListed = withGuide
+      }
+      inner.effect(() => {
+        syncExplorerType()
+        return () => {
+          disposed = true
+          const dispose = disposeExplorer
+          disposeExplorer = null
+          guideListed = null
+          if (dispose) { try { dispose() } catch { /* already released */ } }
+        }
+      }, 'dsh-remote.native-explorer-type')
+      // The two plugins may activate in EITHER order, so the service has to be
+      // followed rather than read once: the card moves to better-sidebar when
+      // it arrives, and comes back here if it goes away.
+      inner.inject(['betterSidebar'], (withSidebar) => {
+        betterSidebar = true
+        try { syncExplorerType() } catch (e) { console.warn('[dsh-remote] start-page card handover skipped:', e) }
+        if (!withSidebar || typeof withSidebar.effect !== 'function') return
+        withSidebar.effect(() => () => {
+          betterSidebar = false
+          if (disposed) return
+          try { syncExplorerType() } catch (e) { console.warn('[dsh-remote] start-page card handover skipped:', e) }
+        }, 'dsh-remote.start-card-owner')
+      })
       inner.effect(() => tabs.register({
         id: NATIVE_FILE, kind: NATIVE_FILE,
         patterns: ['dsh-resource://dsh-remote/**'],

package/lib/index.js

@@ -24,6 +24,7 @@ import { execFile } from 'node:child_process'
 import { readFileSync, mkdirSync, writeFileSync, existsSync, readdirSync, statSync, renameSync, copyFileSync, appendFileSync, watch, rmSync } from 'node:fs'
 import { homedir } from 'node:os'
 import path from 'node:path'
+import { fileURLToPath } from 'node:url'
 import iconv from 'iconv-lite'
 
 import {
@@ -33,11 +34,12 @@ 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'
 import { searchRemote } from './search.js'
+import { installTerminalShell } from './remote-shell.js'
 import { resolveMirror, poolKey, lookupSessionCwd, encodeSegmentSafe, readSessionHeaderCwd, requestSessionHint } from './binding.js'
 import { TaskManager } from './tasks.js'
 import { DeployTasks } from './deploy-tasks.js'
@@ -256,6 +258,30 @@ function mirrorRootFor(host, user, port) {
   return path.join(remoteWorkspacesRoot(), tag)
 }
 
+/** Generated terminal launchers. Deliberately NOT under `remote-workspaces`: a
+ * launcher there would sit next to the mirrors, where anything that scans the
+ * root for checkouts could pick it up as one. */
+function remoteTerminalRoot() {
+  return path.join(dshBase(), 'remote-terminal')
+}
+
+/**
+ * Every path the remote-shell contribution needs, resolved for this install.
+ *
+ * Split out from the registration itself so the wiring at the bottom of the
+ * plugin stays one readable line, and so the launcher path is a pure function
+ * of where the plugin lives.
+ *
+ * @returns {{ dir: string, childPath: string, machinesFile: string }}
+ */
+function remoteShellSpec() {
+  return {
+    dir: remoteTerminalRoot(),
+    childPath: fileURLToPath(new URL('./remote-shell-child.cjs', import.meta.url)),
+    machinesFile: machinesFile(),
+  }
+}
+
 /** Local mirror dir for a specific remote path (idempotent → returns same dir). */
 function mirrorDirFor(remotePath, host, user, port) {
   const base = remotePathBase(remotePath)
@@ -405,25 +431,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,
@@ -457,7 +507,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) || ''),
@@ -468,7 +521,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.
@@ -485,13 +538,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() }),
   }))
 
   /**
@@ -3064,12 +3118,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') {
@@ -3128,6 +3219,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
@@ -3135,13 +3232,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 || ''),
@@ -3731,6 +3828,17 @@ export async function apply(ctx, config) {
     registerDeploySkill(skillCtx)
   })
 
+  // ── remote terminal: one extra shell in the host terminal's own list ──────
+  // Additive and optional: a composition without `terminalController` simply
+  // keeps the terminal it already had.
+  //
+  // The callback argument is a *new context*, not the service — reading the
+  // service off it (as if it were the controller) is a silent no-op, because a
+  // context has no `config.shellCandidates`.
+  ctx.inject(['terminalController'], (inner) => {
+    installTerminalShell(ctx, inner.get('terminalController'), remoteShellSpec())
+  })
+
   // ── auto-update: check on load + on an interval; apply silently ───────────
   // Failures are swallowed (never break the plugin). The persisted override
   // (settings UI) wins over the profile-config default, which wins over