claude-code: never write a lease over a login the manager was not handed

A login made on a node (while the tool runner was stopped, or before the
manager asked claude_code_grant for it) was overwritten by the next apply
of the binding's older grant: Apply took any refresh token in the file as
one already handed, and forced the write. The person's login was lost and
the session asked for a login again.

The node side now keeps the fingerprint of the login claude_code_grant last
sealed (state login-handed, never the token). Apply leaves a file whose
login is not that one untouched (applied false, reason login-not-adopted);
its report makes it the manager's candidate, and the successor the manager
hands back replaces it, as before without a refresh token.

Builds: ADR 0206, ADR 0209; design 39 §6 (the latest login wins, a login
moves its node); design 14 (a node never holds a refresh token).
This commit is contained in:
2026-11-20 14:02:37 +01:00
parent 8b91552f59
commit a7459c6e4f
3 changed files with 103 additions and 12 deletions
@@ -143,6 +143,7 @@ func HomeScopeRefused(p Paths, target string) string {
func (p Paths) credentials() string { return filepath.Join(p.Home, ".claude", ".credentials.json") }
func (p Paths) account() string { return filepath.Join(p.Home, ".claude.json") }
func (p Paths) binding() string { return filepath.Join(p.State, "licence.json") }
func (p Paths) handed() string { return filepath.Join(p.State, "login-handed") }
func (p Paths) apiKey() string { return filepath.Join(p.keyDir(), "api-key") }
func (p Paths) helper() string { return filepath.Join(p.keyDir(), "api-key-helper") }
@@ -418,9 +419,26 @@ func GrantFor(p Paths, managerPublicKey string) (GrantAnswer, error) {
if err != nil {
return GrantAnswer{}, err
}
// Which login was handed: only its successor may replace it (ADR 0206, ADR 0209). The fingerprint, never
// the token.
if err := fsys.MkdirAll(p.State, 0o700); err != nil {
return GrantAnswer{}, err
}
if err := fsys.WriteFile(p.handed(), []byte(Fingerprint(rt)+"\n"), 0o600); err != nil {
return GrantAnswer{}, err
}
return GrantAnswer{Sealed: &box, Identity: ReadIdentity(p.account()), Fingerprint: Fingerprint(rt)}, nil
}
// readHanded is the fingerprint of the login last handed to the manager, or "".
func readHanded(p Paths) string {
raw, err := fsys.ReadFile(p.handed())
if err != nil {
return ""
}
return strings.TrimSpace(string(raw))
}
// Pull asks the seat which licence this node holds, then the vault for that licence's access secret, sealed to this
// module's key, and applies it (§19).
func Pull(p Paths, ask Ask, write WriteManaged) (map[string]any, error) {
@@ -609,6 +627,12 @@ func Apply(p Paths, c Current, sealed SealedBox, write WriteManaged) (map[string
return nil, err
}
local := ReadCredentials(p.credentials())
// A login made here that the manager has not adopted yet stays whole: the grant handed is the old
// lineage's, and writing it would spend the person's login unseen (ADR 0206, ADR 0209). The manager
// asks claude_code_grant for it on this node's report; its successor then comes as a newer generation.
if LoginNotHanded(local, readHanded(p)) {
return map[string]any{"applied": false, "licence": c.Licence, "reason": "login-not-adopted"}, nil
}
// A login waiting here was handed to the manager first (ADR 0206): what comes back is its successor,
// and the refresh token in the file is the one the manager just spent.
d := DecideApply(GrantOf(local), g, switched || HoldsLogin(local))