Every agent's model. One place. Codex on DeepSeek, Claude Code on Kimi, from the menu bar.
provider: signing in to a plugin again takes the lapsed mark off when the providers' list is empty too (#2748)
yetonec3b2e6109ba9
diff --git a/internal/provider/plugin_accounts.go b/internal/provider/plugin_accounts.goindex c5fb8af12..3febd1b24 100644--- a/internal/provider/plugin_accounts.go+++ b/internal/provider/plugin_accounts.go@@ -345,13 +345,19 @@ func pluginSignInAt() uint64 {// a request's 401 that ended clean took the mark off an account the// vendor had just refused.func notePluginLapseSince(pp plugin.Provider, key string, status int, began uint64) {+ notePluginLapseOf(pluginAgent(pp), key, status, began, func(user string) string { return lapsedText(pp, user) })+}++// notePluginLapseOf is notePluginLapseSince by the account's agent, so a+// mark can be cleared without the plugin's provider at hand.+func notePluginLapseOf(agent, key string, status int, began uint64, text func(user string) string) {refused := status == http.StatusUnauthorizedif !refused && (status < 200 || status > 299) {return}loginsMu.Lock()defer loginsMu.Unlock()- said := pluginAgent(pp) + "/" + key+ said := agent + "/" + keyif pluginSignInSaid[said] > began {return}@@ -362,10 +368,10 @@ func notePluginLapseSince(pp plugin.Provider, key string, status int, began uintpluginSignInSaid[said] = beganls := readLogins()for i, l := range ls {- if l.Agent == pluginAgent(pp) && l.Home == key {+ if l.Agent == agent && l.Home == key {want := ""if refused {- want = lapsedText(pp, l.User)+ want = text(l.User)}if l.Lapsed != want {ls[i].Lapsed = want@@ -387,11 +393,14 @@ func lapsedText(pp plugin.Provider, user string) string {// the built-in's did (#320). The account's kept usage reading goes too: it// was read under the old sign-in, and for a minute it would answer the// next reading with the old sign-in's "expired" without asking the plugin,-// and so without marking or clearing anything.+// and so without marking or clearing anything. The mark goes by the+// account alone: the providers' list is empty while another magpie's+// change to plugins.json is read again, and a sign-in finished then left+// the account saying "sign in again" (#2748).func clearPluginLapse(saved plugin.Saved) {+ notePluginLapseOf("plugin:"+saved.Provider, saved.Account, http.StatusOK, toldNow, nil)for _, pp := range plugin.Cached() {if pp.ID == saved.Provider {- notePluginLapse(pp, saved.Account, http.StatusOK)if user := pluginLabels(pp)[saved.Account]; user != "" {StaleAllowance(pluginAgent(pp), user)}diff --git a/internal/provider/plugin_fetch_lapse_test.go b/internal/provider/plugin_fetch_lapse_test.goindex 108e1fc11..9c5b828ea 100644--- a/internal/provider/plugin_fetch_lapse_test.go+++ b/internal/provider/plugin_fetch_lapse_test.go@@ -61,3 +61,28 @@ func TestPluginFetchSignInExpiredLapses(t *testing.T) {time.Sleep(50 * time.Millisecond)}}++// Signing in again takes the mark off by the account alone, when the+// providers' list is empty too: it is, while another magpie's change to+// plugins.json is read again, and a sign-in finished then left the+// account saying "sign in again" (#2748).+func TestPluginSignInClearsLapseWithoutTheList(t *testing.T) {+ claudeHome(t)+ saveLogins(t,+ savedLogin{Agent: "plugin:fakeco", User: "gone@fake", Home: "k-gone", On: true, Lapsed: "gone@fake's FakeCo sign-in has expired — sign in again"},+ savedLogin{Agent: "plugin:fakeco", User: "other@fake", Home: "k-other", On: true, Lapsed: "other@fake's FakeCo sign-in has expired — sign in again"},+ )+ if ps := plugin.Cached(); len(ps) != 0 {+ t.Fatalf("the list isn't empty: %d", len(ps))+ }+ clearPluginLapse(plugin.Saved{Provider: "fakeco", Account: "k-gone"})+ loginsMu.Lock()+ ls := readLogins()+ loginsMu.Unlock()+ if l := loginOf(t, ls, "plugin:fakeco", "gone@fake"); l.Lapsed != "" {+ t.Fatalf("signed in again, but still lapsed: %q", l.Lapsed)+ }+ if l := loginOf(t, ls, "plugin:fakeco", "other@fake"); l.Lapsed == "" {+ t.Fatal("the other account's mark went too")+ }+}