Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion sdk/cliproxy/auth/auto_refresh_loop.go
Original file line number Diff line number Diff line change
Expand Up @@ -343,7 +343,7 @@ func nextRefreshCheckAt(now time.Time, auth *Auth, interval time.Duration) (time
return time.Time{}, false
}

if auth.AuthKind() == AuthKindAPIKey {
if auth.AuthKind() == AuthKindAPIKey || authRefreshedExternally(auth) {
return time.Time{}, false
}

Expand Down
17 changes: 17 additions & 0 deletions sdk/cliproxy/auth/conductor.go
Original file line number Diff line number Diff line change
Expand Up @@ -6015,7 +6015,24 @@ func authAccessToken(auth *Auth) string {
return authMetadataString(auth, "accessToken")
}

// pilotSentinelRefreshToken is the placeholder refresh token that account-pilot and
// the PC gateway write in place of the Pi's real one.
const pilotSentinelRefreshToken = "managed-by-usage-display-tray"

// authRefreshedExternally reports a credential that is kept fresh from the Pi.
// Refreshing it here can only fail and mark the auth unauthorized.
func authRefreshedExternally(auth *Auth) bool {
if authMetadataString(auth, "trayManagedAccount") != "" {
return true
}
return authMetadataString(auth, "refresh_token") == pilotSentinelRefreshToken ||
authMetadataString(auth, "refreshToken") == pilotSentinelRefreshToken
}

func authHasRefreshCredential(auth *Auth) bool {
if authRefreshedExternally(auth) {
return false
}
if authMetadataString(auth, "refresh_token") != "" {
return true
}
Expand Down
89 changes: 89 additions & 0 deletions sdk/cliproxy/auth/external_refresh_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,89 @@
package auth

import (
"context"
"testing"
"time"

"github.com/router-for-me/CLIProxyAPI/v7/internal/registry"
cliproxyexecutor "github.com/router-for-me/CLIProxyAPI/v7/sdk/cliproxy/executor"
)

type pilotAuthShape struct {
name string
marker bool
sentinel bool
}

var pilotManagedShapes = []pilotAuthShape{
{name: "marker", marker: true},
{name: "sentinel", sentinel: true},
}

func pilotCodexAuth(id string, expiry time.Time, shape pilotAuthShape) *Auth {
refresh := "real-refresh-token"
if shape.sentinel {
refresh = pilotSentinelRefreshToken
}
meta := map[string]any{
"type": "codex",
"access_token": "stale-access-token",
"refresh_token": refresh,
"expired": expiry.Format(time.RFC3339),
}
if shape.marker {
meta["trayManagedAccount"] = "codex"
}
return &Auth{ID: id, Provider: "codex", Metadata: meta}
}

func TestPilotManagedAuthIsNeverScheduledForBackgroundRefresh(t *testing.T) {
now := time.Date(2026, 11, 6, 17, 0, 0, 0, time.UTC)
lead := 5 * 24 * time.Hour
setRefreshLeadFactory(t, "codex", func() *time.Duration { return &lead })
expiry := now.Add(4 * 24 * time.Hour)

plain := pilotCodexAuth("plain", expiry, pilotAuthShape{})
if _, ok := nextRefreshCheckAt(now, plain, 15*time.Minute); !ok {
t.Fatalf("control: an unmanaged auth inside the refresh lead must be scheduled")
}

for _, shape := range pilotManagedShapes {
managed := pilotCodexAuth("managed-"+shape.name, expiry, shape)
if _, ok := nextRefreshCheckAt(now, managed, 15*time.Minute); ok {
t.Fatalf("%s: nextRefreshCheckAt scheduled a pilot-managed auth", shape.name)
}
}
}

func TestPilotManagedAuthSurfacesUnauthorizedWithoutRefreshing(t *testing.T) {
for _, shape := range pilotManagedShapes {
t.Run(shape.name, func(t *testing.T) {
model := "gpt-5.5"
auth := pilotCodexAuth("aa-managed-"+shape.name, time.Now().Add(96*time.Hour), shape)
executor := &unauthorizedRefreshExecutor{
id: "codex",
tokenInvalid: map[string]struct{}{"stale-access-token": {}},
}
m := NewManager(nil, nil, nil)
m.RegisterExecutor(executor)
reg := registry.GetGlobalRegistry()
reg.RegisterClient(auth.ID, "codex", []*registry.ModelInfo{{ID: model}})
t.Cleanup(func() { reg.UnregisterClient(auth.ID) })
if _, err := m.Register(context.Background(), auth); err != nil {
t.Fatalf("register: %v", err)
}

_, err := m.Execute(context.Background(), []string{"codex"}, cliproxyexecutor.Request{Model: model}, cliproxyexecutor.Options{})
if err == nil || !isUnauthorizedError(err) {
t.Fatalf("Execute error = %v, want the upstream 401", err)
}
if got := executor.RefreshCalls(); got != 0 {
t.Fatalf("Refresh calls = %d, want 0 for a pilot-managed auth", got)
}
if got := executor.ExecuteCalls(); len(got) != 1 {
t.Fatalf("Execute calls = %v, want exactly one attempt", got)
}
})
}
}
Loading