Packaged Netcatty launched from Finder often has process.cwd() === "/", so
merging .cursor/mcp.json failed silently and netcatty-remote-hosts never
mounted. Point CLI turns at Netcatty temp and fail loudly on merge errors.
Co-authored-by: Cursor <cursoragent@cursor.com>
OpenSSH keeps the first HostName value. Setting HostName to the jump
alias under the forced -F session config blocked later Include of
~/.ssh/config from resolving HostName aliases, and could diverge from
the vault snapshot built via ssh -G against the real config.
Drop the process-lifetime ssh -G cache so HostName/HostKeyAlias and
known_hosts path edits are observed on the next connect. Keep a
per-prepare Map only so target and jump discovery in one session can
share probes.
Reset Host context with Match all so Included user/system ssh_config
applies to every hop, not only the trailing jump Host stanza. Prepend
the ssh -F wrapper onto the session PATH from options.env so custom
ProxyCommand helpers remain available.
-F replaces both the per-user and system-wide ssh_config. Append
Include directives for the real ~/.ssh/config and system ssh_config
after session Host blocks so HostName aliases and other user settings
still apply while session ProxyJump/vault overrides keep first-match
priority.
Avoid removing the current target's system known_hosts entry when the
vault only contains unrelated pins, so strict ET stats probes keep
working for already-trusted hosts.
When rewriting vault pins under a resolved HostName, retain
[host]:port encoding for non-default ports so OpenSSH lookup finds the
vault key. HostKeyAlias continues to use the bare default-port form.
OpenSSH ignores $HOME for user config. When ET generates a private
config for ProxyJump and jump host-key policy, put a PATH-fronted ssh
wrapper that always passes -F so interactive ET and follow-up probes
both honor the vault-authoritative Host stanzas.
When the connection target is an SSH-config alias, OpenSSH records and
looks up host keys under the resolved HostName. Rewrite the vault pin
and filter selectors accordingly so accept-new cannot ignore the vault.
OpenSSH ignores $HOME for user config on POSIX, so pass -F to
execOnEtSession so ProxyJump host-key policy is actually loaded. Cache
real ssh -G probes briefly to limit main-process blocking.
Disable KnownHostsCommand when enforcing vault authority so dynamic trust
cannot override vault pins. Rewrite multi-host known_hosts lines instead
of dropping them so unpinned hop patterns remain trusted.
ET --ssh-option applies only to the destination hop. Keep vault-authoritative
UserKnownHostsFile and StrictHostKeyChecking in the ProxyJump Host stanza so
the separate jump OpenSSH process still enforces key verification.
Apply vault-authoritative known_hosts through --ssh-option so OpenSSH
enforces it even when a temp-HOME Host config is not read. Reject
fingerprint-only publicKey tokens when building vault pins.
Write vault pins under the effective HostKeyAlias when present, filter
system entries for both alias and hostname, and invoke ssh -G with -p/-l
so %p/%r known_hosts path tokens expand correctly.
Build separate authoritative known_hosts files for target and jump hops
using each hop's hostname for ssh -G discovery. Reuse the same vault
authority builder for requireTrustedHost exec probes so system pins
cannot override vault keys on stats/shell follow-ups.
Apply vault-authoritative known_hosts only on hops the vault pins, so
unpinned ET jump/target hops keep the persistent user known_hosts.
Also merge ssh -G UserKnownHostsFile paths and preserve spaced path
names when discovering configured trust files.
Discover administrator-configured global known_hosts paths via ssh -G
when building the vault-authoritative snapshot, so replacing
GlobalKnownHostsFile does not drop custom admin pins or revocations.
Evaluate OpenSSH positive/negative host patterns when filtering system
known_hosts so vault-covered hosts do not drop jump-host pins that use
negation. For ET follow-up ssh, do not prepend accept-new when the
session already set StrictHostKeyChecking (including verifyHostKeys=no).
Only switch to a session known_hosts snapshot when the vault pins the
active target or jump host, so ET accept-new still persists first-seen
keys otherwise. Filter OpenSSH wildcard patterns covering vault hosts
and keep @revoked markers so admin revocations remain authoritative.
OpenSSH accepts a match from any known_hosts source, so a rotated system
pin could override a vault pin. Build an authoritative snapshot that
keeps vault keys exclusive for vault-covered hosts, force Mosh
StrictHostKeyChecking=ask, and quote trust-file paths that contain
whitespace.
Preserve OpenSSH default global known_hosts when injecting vault pins by
merging both into a single GlobalKnownHostsFile. When verifyHostKeys is
off, neutralize UserKnownHostsFile and GlobalKnownHostsFile with an empty
file so StrictHostKeyChecking=no cannot still block password auth against
a stale pin.
Mosh and Eternal Terminal bootstrap via system OpenSSH, so Netcatty vault
known_hosts were ignored and a key rotated after a prior SSH connect could
still be accepted. Inject usable vault entries as GlobalKnownHostsFile and
honor verifyHostKeys=false so key-change interception matches SSH trust.
Closes#2501
PR #2509's TransferRuntime unify accidentally regressed per-task external
upload cancel (#2495), clipboard confirm close-before-upload (#2478), and
main SftpView interactive browse sessions (#2498). Restore those behaviors
on top of the process-level control plane, keep Pausing copy, and gate
broadcastGlobalTransferEvent so bare Node unit tests do not download Electron.
When Observer → Confirm/Auto → Observer, drop the inactive ask/agent
in-memory session so switch-back cannot resume a stale thread and skip
the intervening conversation history.
Stop falling back to bare `agent` on PATH so other CLIs (for example Grok)
cannot be mistaken for Cursor during auth probes, model presets, or turns.
Co-authored-by: Cursor <cursoragent@cursor.com>
Skip duplicate stream-json assistant flushes that include model_call_id, and
isolate Cursor CLI resume sessions by ask vs agent so switching Observer to
Confirm/Auto starts a writable turn instead of keeping Ask.
Pause and resume now go through one process-level control plane that survives
panel/terminal close: TransferRuntime + soft latches/epochs/walk registry,
soft-then-hard resume, dual-epoch-safe progress, and no-owner soft control.