Skip to content

Every agent's model. One place. Codex on DeepSeek, Claude Code on Kimi, from the menu bar.

codex: an account switch restarts every one of the Codex app's own app-servers, and a reply that says the account is out switches at once (danzi002 on Discord)

yetonedd9828f2b858
diff --git a/internal/provider/codex_app_out.go b/internal/provider/codex_app_out.go
index f824b7598..67cd68436 100644
--- a/internal/provider/codex_app_out.go
+++ b/internal/provider/codex_app_out.go
@@ -2,6 +2,7 @@ package provider
import (
"context"
+ "log"
"strings"
"sync"
"sync/atomic"
@@ -30,11 +31,19 @@ var codexRecheck struct {
at time.Time
}
-// codexReadNow reads whether Codex's account is out; a var for tests.
+// codexReadNow reads whether Codex's account is out, and signs Codex in
+// to the next account with room when it is, as KeepOnAnAccountWithRoom's
+// look does: the Codex app greys its Send once its account is out, so no
+// request comes to tell magpie again, and that look could be five minutes
+// off (danzi002 on Discord restarted the app each time instead). A var
+// for tests.
var codexReadNow = func(user string) {
StaleAllowance("codex", user)
ctx, cancel := context.WithTimeout(context.Background(), time.Minute)
defer cancel()
+ if _, err := SwitchWhenSpent(ctx, "codex"); err != nil {
+ log.Printf("codex: switching to an account with room: %v", err)
+ }
noteCodexUsedUp(CodexUsedUp(ctx))
}
diff --git a/internal/provider/codex_app_out_test.go b/internal/provider/codex_app_out_test.go
index 949e9f042..5da81a23d 100644
--- a/internal/provider/codex_app_out_test.go
+++ b/internal/provider/codex_app_out_test.go
@@ -1,6 +1,10 @@
package provider
import (
+ "encoding/json"
+ "net/http"
+ "net/http/httptest"
+ "strings"
"testing"
"time"
)
@@ -61,3 +65,36 @@ func TestCodexMayBeUsedUpReadsAtOnce(t *testing.T) {
CodexMayBeUsedUp("[email protected]")
read("usage_limit_reached")
}
+
+// The reading a reply's word asks for signs Codex in to the next account
+// with room as soon as the one it is on is out, not at the loop's next
+// look up to five minutes on: the Codex app greys Send once it is out, so
+// no request comes to tell magpie again (danzi002 on Discord restarted the
+// app every time instead).
+func TestCodexReadNowSwitchesAtOnce(t *testing.T) {
+ home := signIn(t) // [email protected], acct-1
+ rememberLogins(true)
+ codexSignIn(t, home, "[email protected]", "r-new") // signed in to now
+ rememberLogins(true)
+ used := map[string]float64{"[email protected]": 100, "acct-1": 20}
+ reset := time.Now().Add(3 * time.Hour).Unix()
+ fake := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+ json.NewEncoder(w).Encode(map[string]any{"plan_type": "plus", "rate_limit": map[string]any{
+ "allowed": used[r.Header.Get("chatgpt-account-id")] < 100,
+ "primary_window": map[string]any{"used_percent": used[r.Header.Get("chatgpt-account-id")], "limit_window_seconds": 18000, "reset_at": reset}}})
+ }))
+ defer fake.Close()
+ old := CodexBase
+ CodexBase = fake.URL + "/backend-api/codex"
+ t.Cleanup(func() { CodexBase = old })
+ if err := SetLoginOn("codex", "[email protected]", true); err != nil {
+ t.Fatal(err)
+ }
+ t.Cleanup(func() { codexWasUsedUp.Store(false) })
+ codexReadNow("[email protected]")
+ for _, l := range Logins("codex") {
+ if l.Active && !strings.EqualFold(l.User, "[email protected]") {
+ t.Fatalf("out, with [email protected] at 20%%: Codex left on %s", l.User)
+ }
+ }
+}
diff --git a/internal/provider/codex_app_server.go b/internal/provider/codex_app_server.go
index adf0e7a92..8c1aadd53 100644
--- a/internal/provider/codex_app_server.go
+++ b/internal/provider/codex_app_server.go
@@ -146,6 +146,9 @@ var codexApp struct {
stale map[int]int
// stuck: one of them outlived codexAppTries ends, or may not be ended
stuck bool
+ // switched: Codex's ChatGPT account changed since the app-servers were
+ // last listed (codexAppAccountSwitched)
+ switched bool
}
// CodexAppStuck is whether a Codex app is left on the provider it started
@@ -157,7 +160,7 @@ func CodexAppStuck() bool {
return c.stuck
}
-// codexAppAccountLeft has the Codex app's app-server pid, left on the
+// codexAppAccountSwitched has the Codex app's own app-servers, left on the
// ChatGPT account Codex was switched away from (noteCodexSwitch), ended
// as a route change's are, once no Codex turn runs: the app starts
// another, which reads auth.json and the new account afresh, so the app
@@ -165,16 +168,20 @@ func CodexAppStuck() bool {
// (zhibukaixinyao on Discord: Windows has no Restart button). One
// switched away and back before then is restarted all the same, which
// costs the app nothing it shows.
-func codexAppAccountLeft(pid int) {
+//
+// They are listed at codexAppStep's next look, as a route change's are:
+// every one on Codex's home, by the test a route change uses, and listed
+// again at the look after when the listing fails. The pid the switch
+// itself saw was the first app-server-looking process in a five-second
+// listing, which was another program's (Miyi Helper's `--listen stdio://`
+// one, listed ahead of the app's on the owner's Mac) or none when ps was
+// slow, and then nothing was ended and the app stayed grey on the used-up
+// account till the user restarted it (danzi002 on Discord).
+func codexAppAccountSwitched() {
c := &codexApp
c.Lock()
defer c.Unlock()
- if c.stale == nil {
- c.stale = map[int]int{}
- }
- if _, ok := c.stale[pid]; !ok {
- c.stale[pid] = 0
- }
+ c.switched = true
}
// KeepCodexAppOnItsProvider runs codexAppStep every codexAppEvery till
@@ -212,7 +219,7 @@ func codexAppStep(ctx context.Context, now time.Time, busy func() (int, time.Tim
c.Lock()
// at the first look only a used-up account's app-servers are ended:
// what the others read before magpie started isn't known
- changed := !c.seen && out || c.seen && c.route != route
+ changed := !c.seen && out || c.seen && c.route != route || c.switched
if !changed {
c.seen, c.route = true, route
}
@@ -227,7 +234,7 @@ func codexAppStep(ctx context.Context, now time.Time, busy func() (int, time.Tim
return nil
}
c.Lock()
- c.seen, c.route = true, route
+ c.seen, c.route, c.switched = true, route, false
c.stale, c.stuck = map[int]int{}, false
for _, p := range pids {
c.stale[p] = 0
diff --git a/internal/provider/codex_app_server_test.go b/internal/provider/codex_app_server_test.go
index 243ee267d..844b3fbce 100644
--- a/internal/provider/codex_app_server_test.go
+++ b/internal/provider/codex_app_server_test.go
@@ -36,11 +36,11 @@ func stubCodexApp(t *testing.T) *codexAppStub {
t.Cleanup(func() {
CodexAppRoute, codexAppServersOn, endCodexAppServer, codexTurnRunning = oldOn, oldList, oldEnd, oldTurn
codexApp.Lock()
- codexApp.seen, codexApp.route, codexApp.stale, codexApp.stuck = false, "", nil, false
+ codexApp.seen, codexApp.route, codexApp.stale, codexApp.stuck, codexApp.switched = false, "", nil, false, false
codexApp.Unlock()
})
codexApp.Lock()
- codexApp.seen, codexApp.route, codexApp.stale, codexApp.stuck = false, "", nil, false
+ codexApp.seen, codexApp.route, codexApp.stale, codexApp.stuck, codexApp.switched = false, "", nil, false, false
codexApp.Unlock()
CodexAppRoute = func() (string, bool, bool) {
r := s.route
@@ -538,3 +538,76 @@ func TestRestartCodexAppWhenIdle(t *testing.T) {
t.Fatal("an app-server not ended isn't said")
}
}
+
+// codexMacAppServer is the macOS Codex app's own app-server, as ps listed
+// it on the owner's Mac (ChatGPT.app 26.1027).
+const codexMacAppServer = "/Applications/ChatGPT.app/Contents/Resources/codex-cli/CodexCLI.app/Contents/MacOS/codex -c features.code_mode_host=true app-server --analytics-default-enabled -c [email protected]_servers.codex_app.enabled=true"
+
+// After magpie switched Codex's ChatGPT account the Codex app stayed grey on
+// the used-up one until the user quit and opened it (danzi002 on Discord):
+// the switch handed over only the first app-server-looking process of a
+// five-second listing, which can be another program's --listen one (listed
+// ahead of the app's on the owner's Mac) or none when ps is slow. Every
+// one of the app's own on Codex's home is restarted, found at the next
+// look and again after a listing that failed.
+func TestCodexAppSwitchRestartsTheAppsOwnServers(t *testing.T) {
+ signIn(t)
+ t.Setenv("HOME", t.TempDir())
+ t.Setenv("USERPROFILE", t.TempDir())
+ s := stubCodexApp(t)
+ old := listProcesses
+ t.Cleanup(func() {
+ listProcesses = old
+ DismissCodexDaemon()
+ DismissCodexApp()
+ })
+ var listErr error
+ listProcesses = func(context.Context) ([]proc.Process, error) {
+ if listErr != nil {
+ return nil, listErr
+ }
+ // another program's app-server first, as ps lists by pid
+ ps := []proc.Process{{PID: 58, Args: "/Applications/ChatGPT.app/Contents/Resources/codex-cli/CodexCLI.app/Contents/MacOS/codex app-server --listen stdio://"}}
+ for _, p := range s.running {
+ ps = append(ps, proc.Process{PID: p, Args: codexMacAppServer})
+ }
+ return ps, nil
+ }
+ now := time.Now()
+ idle := func() (int, time.Time) { return 0, now.Add(-time.Minute) }
+ step := func() []int { return codexAppStep(context.Background(), now, idle) }
+
+ s.running = []int{221}
+ if got := step(); got != nil {
+ t.Fatalf("nothing changed: ended %v", got)
+ }
+ noteCodexSwitch("a@x", "b@x")
+ if got := step(); !slices.Equal(got, []int{221}) {
+ t.Fatalf("switched beside another program's app-server: ended %v, want [221]", got)
+ }
+ codexDaemonMu.Lock()
+ codexDaemonChecked = time.Time{}
+ codexDaemonMu.Unlock()
+ if got := CodexAppStale(); got != "" {
+ t.Fatalf("the app said to be on %q after its restart", got)
+ }
+
+ // ps too slow as the account changes, and again at the first look
+ s.running = []int{300, 301}
+ s.ended = nil
+ listErr = errors.New("ps: deadline exceeded")
+ noteCodexSwitch("b@x", "c@x")
+ s.listErr = listErr
+ if got := step(); got != nil {
+ t.Fatalf("app-servers not listed: ended %v", got)
+ }
+ s.listErr = nil
+ got := step()
+ slices.Sort(got)
+ if !slices.Equal(got, []int{300, 301}) {
+ t.Fatalf("switched while ps was slow: ended %v, want [300 301]", got)
+ }
+ if got := step(); got != nil {
+ t.Fatalf("the new app-servers read the new account as they started: ended %v", got)
+ }
+}
diff --git a/internal/provider/codex_daemon.go b/internal/provider/codex_daemon.go
index d636a6dba..8ab3d947a 100644
--- a/internal/provider/codex_daemon.go
+++ b/internal/provider/codex_daemon.go
@@ -167,6 +167,9 @@ const codexDaemonRecheck = 5 * time.Second
func noteCodexSwitch(from, to string) {
ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
defer cancel()
+ // the Codex app's app-servers are found and restarted on
+ // KeepCodexAppOnItsProvider's own look, whatever this listing finds
+ codexAppAccountSwitched()
ps, err := listProcesses(ctx)
known := err == nil
codexDaemonMu.Lock()
@@ -177,9 +180,6 @@ func noteCodexSwitch(from, to string) {
}
noteLeft(&codexDaemonLeft, findCodexDaemon(ps, codexHome()), from, to)
noteLeft(&codexAppLeft, findCodexApp(ps), from, to)
- if codexAppLeft.pid != 0 {
- codexAppAccountLeft(codexAppLeft.pid)
- }
}
// noteLeft updates what is known of the app-server pid, running as Codex's
@@ -269,7 +269,8 @@ func DismissCodexApp() {
// codex.
func findCodexApp(ps []proc.Process) int {
for _, p := range ps {
- if isCodexAppServer(p.Args) {
+ // not another program's, run from the app's codex with --listen
+ if isCodexAppOwnServer(p.Args) {
return p.PID
}
}