Every agent's model. One place. Codex on DeepSeek, Claude Code on Kimi, from the menu bar.
provider: an agent's accounts are listed without logins.json's lock unless one is to be written
yetone7fe11e380411
diff --git a/internal/provider/side_logins.go b/internal/provider/side_logins.goindex 71d4f7b2f..ef768ccf2 100644--- a/internal/provider/side_logins.go+++ b/internal/provider/side_logins.go@@ -32,9 +32,24 @@ func (l savedLogin) own() bool {// itself is signed in to, "" for no one; usable says a saved one of// magpie's is still signed in.func sideLogins(agent, ownUser string, usable func(savedLogin) bool) []sideLogin {- loginsMu.Lock()- defer loginsMu.Unlock()+ // read without the lock, which is taken only for a change to write:+ // a list that changes nothing, nearly every one, made and locked+ // logins.json.lock all the same (#1665: every page's read lists a+ // dozen agents' accounts, each a lock). logins.json is only ever+ // replaced whole (writePrivate), so the read is one write's file.ls := readLogins()+ if _, change := keepSideLogins(ls, agent, ownUser, true); change {+ loginsMu.Lock()+ ls, _ = keepSideLogins(readLogins(), agent, ownUser, false)+ loginsMu.Unlock()+ }+ return listSideLogins(ls, agent, ownUser, usable)+}++// keepSideLogins brings the agent's own sign-in into ls, and writes ls+// when that changed it; looking (look), it changes and writes nothing, and+// says whether it would. Written, it is called under loginsMu.+func keepSideLogins(ls []savedLogin, agent, ownUser string, look bool) ([]savedLogin, bool) {// moved onto its plugin, the agent's own sign-in is the plugin's: its// row, set aside, is kept for going backif ownUser != "" && !movedAgent(agent) {@@ -44,12 +59,18 @@ func sideLogins(agent, ownUser string, usable func(savedLogin) bool) []sideLoginfound = truechanged, renamed := false, falseif agent == "copilot" && copilotRenamed(ls[i].User, ownUser) {+ if look {+ return ls, true+ }// the same account, its host now in its name (#1220):// kept as it was, hidden or not, its settings with itls[i].renameTo(ownUser)renamed = renameDue()}if !strings.EqualFold(ls[i].User, ownUser) {+ if look {+ return ls, true+ }ls[i].User, ls[i].Seen = ownUser, time.Now().UTC().Truncate(time.Second)if agent == "copilot" {ls[i].Plan, ls[i].AccessSKU = "", ""@@ -61,6 +82,9 @@ func sideLogins(agent, ownUser string, usable func(savedLogin) bool) []sideLogin// else by another accountif ls[i].Hidden != "" {if m := ownMark(agent); m != "" && m != ls[i].Hidden || m == "" && ls[i].Hidden == hiddenNoMark && changed {+ if look {+ return ls, true+ }ls[i].Hidden = ""changed = true}@@ -73,6 +97,9 @@ func sideLogins(agent, ownUser string, usable func(savedLogin) bool) []sideLogin// one of magpie's that is the same account stands for it: it took// the agent's own over while that couldn't be read (addSideLogin)if !found && !slices.ContainsFunc(ls, func(l savedLogin) bool { return l.Agent == agent && strings.EqualFold(l.User, ownUser) }) {+ if look {+ return ls, true+ }ls = append(ls, savedLogin{Agent: agent, User: ownUser, Seen: time.Now().UTC().Truncate(time.Second)})_ = writeLogins(ls)}@@ -80,8 +107,16 @@ func sideLogins(agent, ownUser string, usable func(savedLogin) bool) []sideLogin// a saved account renamed as it was read (nameAlike) is written under// its new name, its settings moved to it, the first time it is listedif agent == "copilot" && renameDue() && slices.ContainsFunc(ls, func(l savedLogin) bool { return l.was != "" }) {+ if look {+ return ls, true+ }_ = writeLogins(slices.Clone(ls)) // sorted there: listed here as added}+ return ls, false+}++// listSideLogins is sideLogins' list, of ls as kept.+func listSideLogins(ls []savedLogin, agent, ownUser string, usable func(savedLogin) bool) []sideLogin {var out []sideLoginfirst := -1for _, l := range ls {diff --git a/internal/provider/side_logins_unlocked_test.go b/internal/provider/side_logins_unlocked_test.gonew file mode 100644index 000000000..076e4eb87--- /dev/null+++ b/internal/provider/side_logins_unlocked_test.go@@ -0,0 +1,46 @@+package provider++import (+ "slices"+ "testing"+ "time"+)++// #1665: sideLogins took loginsMu, and with it made and locked+// logins.json.lock, for every agent's list of accounts, though nearly every+// list changes nothing: ~55 locks in a start's first 20s, each a file an+// antivirus' filter driver works on. A list with nothing to write takes no+// lock: it returns while another holds it; one with a change still writes.+func TestSideLoginsNothingToChangeTakesNoLock(t *testing.T) {+ signIn(t)+ all := func(savedLogin) bool { return true }+ sideLogins("google", "[email protected]", all) // its own sign-in kept: a write++ loginsMu.Lock() // another, writing logins.json+ done := make(chan []sideLogin)+ go func() {+ var got []sideLogin+ for range 100 {+ got = sideLogins("google", "[email protected]", all)+ }+ done <- got+ }()+ var got []sideLogin+ select {+ case got = <-done:+ case <-time.After(5 * time.Second):+ loginsMu.Unlock()+ <-done+ t.Fatal("a list with nothing to change waited for logins.json's lock")+ }+ loginsMu.Unlock()+ if !slices.ContainsFunc(got, func(s sideLogin) bool { return s.User == "[email protected]" }) {+ t.Fatalf("the agent's own account isn't listed: %+v", got)+ }++ // signed in to another account, the change is written, under the lock+ sideLogins("google", "[email protected]", all)+ if !slices.ContainsFunc(readLogins(), func(l savedLogin) bool { return l.Agent == "google" && l.User == "[email protected]" }) {+ t.Fatalf("the agent's new account wasn't written: %+v", readLogins())+ }+}