Files
tty7/crates
l0ng-ai d4643f0532 fix(ssh): offer keys in the order the user asked for them (#520)
Every public key offered spends one of the server's `MaxAuthTries` — six
by default — whether or not the server wants it, so the order decides who
gets locked out when the budget runs dry. Offering the `~/.ssh` defaults
before the agent, and offering them on top of a profile's own key rather
than instead of it, spent the budget on the keys least likely to be
accepted: three stale defaults in `~/.ssh` with the working key in a
loaded agent could exhaust the attempts before the agent was reached, and
a profile naming its own key came off worse than one naming none.

Order the sources by how plainly the user asked for the key:

  1. a key the profile names   — "use this one"
  2. the agent                 — "I loaded these"
  3. the ~/.ssh defaults       — nobody said anything, we are guessing

Steps 1 and 3 are the same leg, because the defaults now stand in for the
identity list only when the profile names no key of its own, the way
`IdentityFile`'s default works in ssh_config — verified against the local
OpenSSH: `ssh -G` lists five defaults with no IdentityFile and only the
named key with one. WezTerm and Tabby both replace rather than append too
(wezterm-ssh/src/config.rs:589, tabby-ssh/src/session/ssh.ts:194).

The file-vs-agent order has no single convention to follow — WezTerm asks
the agent first, Tabby reads files first, OpenSSH merges the two and
trims the agent's extras with `IdentitiesOnly`, which tty7 does not parse.
This order agrees with OpenSSH and Tabby when the user named a key and
with WezTerm when they did not.

Dedup by canonical path goes with it: the two lists are alternatives now,
so there is nothing to dedup between them. `auth_steps` and
`identity_offers` carry the two rules as pure functions, so both are unit
tested instead of living inside the async round. The GUI's keychain
preload follows the same rule, so both sides still key passphrases by the
same strings.

Closes #513.
2026-08-11 21:23:17 +08:00
..