fix(subscription,desktop): decouple OAuth from agent CLI install

Store Codex subscription OAuth in clovapi own subscription/codex.json, report login and model fetch without requiring agent CLI binaries, and show only installed agents in the tray quick-switch menu.

Co-authored-by: Cursor <cursoragent@cursor.com>

Author: joohw

core/internal/buildinfo/buildinfo.go

@@ -4,7 +4,7 @@ import "strings"
 
 // Set at link time via -ldflags (see .goreleaser.yaml).
 var (
-	Version = "dev0.1.54"
+	Version = "dev0.1.55"
 	Commit  = "none"
 	Date    = "unknown"
 )

core/internal/config/paths.go

@@ -60,6 +60,19 @@ func ClaudeSubscriptionAuthPath() (string, error) {
 	return filepath.Join(d, "claude.json"), nil
 }
 
+// CodexSubscriptionAuthPath returns clovapi's own Codex OAuth credentials file.
+//
+// This is intentionally independent from Codex CLI's ~/.codex/auth.json: clovapi
+// keeps its own access/refresh tokens here and never reads, writes, or overwrites
+// Codex CLI's auth file.
+func CodexSubscriptionAuthPath() (string, error) {
+	d, err := SubscriptionDir()
+	if err != nil {
+		return "", err
+	}
+	return filepath.Join(d, "codex.json"), nil
+}
+
 // CallLogsDir returns the directory for proxy call logs and system logs.
 func CallLogsDir() (string, error) {
 	d, err := Dir()

core/internal/desktop/models.go

@@ -6,7 +6,6 @@ import (
 	"io"
 	"net/http"
 	"os"
-	"path/filepath"
 	"strings"
 	"time"
 
@@ -60,16 +59,10 @@ func claudeAuthPath() (string, error) {
 	return config.ClaudeSubscriptionAuthPath()
 }
 
+// codexAuthPath returns clovapi's own Codex OAuth store (independent from
+// Codex CLI's ~/.codex/auth.json). Auth status and logout operate on this file only.
 func codexAuthPath() (string, error) {
-	codexHome := strings.TrimSpace(os.Getenv("CODEX_HOME"))
-	if codexHome == "" {
-		home, err := os.UserHomeDir()
-		if err != nil {
-			return "", err
-		}
-		codexHome = filepath.Join(home, ".codex")
-	}
-	return filepath.Join(codexHome, "auth.json"), nil
+	return config.CodexSubscriptionAuthPath()
 }
 
 func authPathForProvider(providerID string) (string, error) {
@@ -196,6 +189,8 @@ func providerLoggedIn(providerID string, data map[string]any) bool {
 }
 
 // AuthStatus reports subscription OAuth status for built-in providers.
+// Subscription login and model fetch are independent of whether the agent CLI
+// binary is installed; Installed is informational only.
 func AuthStatus() AuthStatusResult {
 	items := make([]AuthStatusItem, 0, len(authProviders))
 	for _, cfg := range authProviders {
@@ -211,21 +206,15 @@ func AuthStatus() AuthStatusResult {
 		if cmdPath != "" {
 			item.CommandPath = cmdPath
 		}
-		if !installed {
-			item.Summary = "CLI not installed"
-			items = append(items, item)
-			continue
-		}
 		authPath, err := authPathForProvider(cfg.ID)
-		if err != nil {
-			items = append(items, item)
-			continue
+		if err == nil {
+			if data, ok := readAuthJSON(authPath); ok {
+				item.LoggedIn = providerLoggedIn(cfg.ID, data)
+				item.Active = providerSubscriptionActive(cfg.ID, item.LoggedIn, data)
+				item.Summary = summarizeAuthStatus(cfg.ID, item.LoggedIn, data)
+			}
 		}
-		if data, ok := readAuthJSON(authPath); ok {
-			item.LoggedIn = providerLoggedIn(cfg.ID, data)
-			item.Active = providerSubscriptionActive(cfg.ID, item.LoggedIn, data)
-			item.Summary = summarizeAuthStatus(cfg.ID, item.LoggedIn, data)
-		} else if cfg.ID == provider.ClaudeCodeProviderID {
+		if !item.LoggedIn && cfg.ID == provider.ClaudeCodeProviderID {
 			if data, ok := profile.ClaudeAuthRoot(); ok {
 				item.LoggedIn = providerLoggedIn(cfg.ID, data)
 				item.Active = providerSubscriptionActive(cfg.ID, item.LoggedIn, data)

core/internal/desktop/models_test.go

@@ -0,0 +1,57 @@
+package desktop
+
+import (
+	"os"
+	"path/filepath"
+	"testing"
+
+	"github.com/clovapi/switcher/internal/config"
+	"github.com/clovapi/switcher/internal/provider"
+)
+
+func TestAuthStatusCodexLoggedInWithoutCLIInstalled(t *testing.T) {
+	root := t.TempDir()
+	configDir := filepath.Join(root, "clovapi")
+	config.SetDirOverride(configDir)
+	t.Cleanup(func() { config.SetDirOverride("") })
+
+	subDir := filepath.Join(configDir, "subscription")
+	if err := os.MkdirAll(subDir, 0o700); err != nil {
+		t.Fatal(err)
+	}
+	authBody := `{
+  "auth_mode": "chatgpt",
+  "tokens": {
+    "access_token": "test-access-token",
+    "account_id": "acct-123"
+  }
+}`
+	if err := os.WriteFile(filepath.Join(subDir, "codex.json"), []byte(authBody), 0o600); err != nil {
+		t.Fatal(err)
+	}
+
+	t.Setenv("HOME", root)
+	t.Setenv("USERPROFILE", root)
+	t.Setenv("PATH", root)
+
+	result := AuthStatus()
+	var codexItem *AuthStatusItem
+	for i := range result.Items {
+		if result.Items[i].ID == provider.CodexProviderID {
+			codexItem = &result.Items[i]
+			break
+		}
+	}
+	if codexItem == nil {
+		t.Fatal("codex auth status item not found")
+	}
+	if codexItem.Installed {
+		t.Fatal("expected codex CLI to be reported as not installed in isolated env")
+	}
+	if !codexItem.LoggedIn {
+		t.Fatalf("expected logged in from clovapi OAuth store without codex CLI; summary=%q", codexItem.Summary)
+	}
+	if !codexItem.Active {
+		t.Fatal("expected active codex subscription when logged in")
+	}
+}

core/internal/profile/subscription_auth.go

@@ -5,7 +5,6 @@ import (
 	"encoding/base64"
 	"encoding/json"
 	"os"
-	"path/filepath"
 	"strings"
 	"sync"
 	"time"
@@ -21,7 +20,7 @@ const (
 
 var (
 	claudeCredentialsPathOverride string
-	codexHomeOverride             string
+	codexCredentialsPathOverride  string
 	claudeRefreshMu               sync.Mutex
 )
 
@@ -30,9 +29,9 @@ func SetClaudeCredentialsPathOverride(path string) {
 	claudeCredentialsPathOverride = strings.TrimSpace(path)
 }
 
-// SetCodexHomeOverride pins Codex home directory (tests only).
-func SetCodexHomeOverride(dir string) {
-	codexHomeOverride = strings.TrimSpace(dir)
+// SetCodexCredentialsPathOverride pins Codex OAuth file path (tests only).
+func SetCodexCredentialsPathOverride(path string) {
+	codexCredentialsPathOverride = strings.TrimSpace(path)
 }
 
 type subscriptionCredentials struct {
@@ -69,18 +68,10 @@ func claudeCredentialsPath() (string, error) {
 }
 
 func codexAuthPath() (string, error) {
-	codexHome := codexHomeOverride
-	if codexHome == "" {
-		codexHome = strings.TrimSpace(os.Getenv("CODEX_HOME"))
-	}
-	if codexHome == "" {
-		home, err := os.UserHomeDir()
-		if err != nil {
-			return "", err
-		}
-		codexHome = filepath.Join(home, ".codex")
-	}
-	return filepath.Join(codexHome, "auth.json"), nil
+	if codexCredentialsPathOverride != "" {
+		return codexCredentialsPathOverride, nil
+	}
+	return config.CodexSubscriptionAuthPath()
 }
 
 func readJSONFile(path string, dest any) bool {

core/internal/profile/subscription_auth_test.go

@@ -64,6 +64,36 @@ func TestLoadClaudeSubscriptionCredentialsMissingStoreFails(t *testing.T) {
 	}
 }
 
+func TestLoadCodexSubscriptionCredentialsValid(t *testing.T) {
+	path := filepath.Join(t.TempDir(), "codex.json")
+	body := `{
+  "auth_mode": "chatgpt",
+  "tokens": {
+    "access_token": "codex-access",
+    "account_id": "acct-456"
+  }
+}`
+	if err := os.WriteFile(path, []byte(body), 0o600); err != nil {
+		t.Fatal(err)
+	}
+	SetCodexCredentialsPathOverride(path)
+	t.Cleanup(func() { SetCodexCredentialsPathOverride("") })
+
+	creds, ok := loadCodexSubscriptionCredentials()
+	if !ok {
+		t.Fatal("expected valid codex subscription credentials")
+	}
+	if creds.APIKey != "codex-access" {
+		t.Fatalf("unexpected api key: %q", creds.APIKey)
+	}
+	if creds.AccountID != "acct-456" {
+		t.Fatalf("unexpected account id: %q", creds.AccountID)
+	}
+	if creds.BaseURL != codexBackendBaseURL {
+		t.Fatalf("unexpected base url: %q", creds.BaseURL)
+	}
+}
+
 func itoa(v int64) string {
 	neg := v < 0
 	if neg {

core/internal/subscriptionauth/oauth.go

@@ -522,13 +522,14 @@ func claudeAuthPath() string {
 	return filepath.Join(home, ".config", "clovapi", "subscription", "claude.json")
 }
 
+// codexAuthPath returns clovapi's own Codex OAuth store. It never points at
+// Codex CLI's ~/.codex/auth.json — clovapi stays fully independent.
 func codexAuthPath() string {
-	codexHome := strings.TrimSpace(os.Getenv("CODEX_HOME"))
-	if codexHome == "" {
-		home, _ := os.UserHomeDir()
-		codexHome = filepath.Join(home, ".codex")
+	if p, err := config.CodexSubscriptionAuthPath(); err == nil {
+		return p
 	}
-	return filepath.Join(codexHome, "auth.json")
+	home, _ := os.UserHomeDir()
+	return filepath.Join(home, ".config", "clovapi", "subscription", "codex.json")
 }
 
 func codexAccountIDFromAccessToken(accessToken string) string {

core/internal/subscriptionlive/subscription_live_test.go

@@ -41,7 +41,7 @@ func claudeLiveSub(t *testing.T) (liveSub, bool) {
 	}
 	profile.HydrateSubscriptionCredentials(&p)
 	if strings.TrimSpace(p.BaseURL) == "" || strings.TrimSpace(p.APIKey) == "" {
-		t.Skip("Claude Code subscription credentials not found (~/.claude/.credentials.json)")
+		t.Skip("Claude Code subscription credentials not found (clovapi subscription/claude.json)")
 		return liveSub{}, false
 	}
 	model := strings.TrimSpace(os.Getenv("CLOVAPI_CLAUDE_MODEL"))
@@ -67,11 +67,11 @@ func codexLiveSub(t *testing.T) (liveSub, bool) {
 	}
 	profile.HydrateSubscriptionCredentials(&p)
 	if strings.TrimSpace(p.BaseURL) == "" || strings.TrimSpace(p.APIKey) == "" {
-		t.Skip("Codex subscription credentials not found (~/.codex/auth.json)")
+		t.Skip("Codex subscription credentials not found (clovapi subscription/codex.json)")
 		return liveSub{}, false
 	}
 	if strings.TrimSpace(p.AccountID) == "" {
-		t.Skip("Codex subscription missing account_id in auth.json")
+		t.Skip("Codex subscription missing account_id in clovapi subscription/codex.json")
 		return liveSub{}, false
 	}
 	model := strings.TrimSpace(os.Getenv("CLOVAPI_CODEX_MODEL"))

electron/main.js

@@ -233,6 +233,23 @@ async function readTrayDesktopState() {
   }
 }
 
+async function readTrayAgentInstallState() {
+  try {
+    const result = await clovapiDesktop.agentStatus();
+    return {
+      ok: Boolean(result?.ok),
+      agents: Array.isArray(result?.items) ? result.items : [],
+      error: String(result?.error || "").trim(),
+    };
+  } catch (error) {
+    return {
+      ok: false,
+      agents: [],
+      error: error instanceof Error ? error.message : "Failed to read agent install status",
+    };
+  }
+}
+
 async function switchTrayAgentModel(cliKind, providerId, modelId) {
   await applyTrayModelSwitch({
     desktop: clovapiDesktop,
@@ -247,7 +264,11 @@ async function switchTrayAgentModel(cliKind, providerId, modelId) {
 
 async function updateTrayMenu() {
   if (!tray) return;
-  const [state, desktop] = await Promise.all([readTrayProxyState(), readTrayDesktopState()]);
+  const [state, desktop, agentsState] = await Promise.all([
+    readTrayProxyState(),
+    readTrayDesktopState(),
+    readTrayAgentInstallState(),
+  ]);
   const model = buildTrayMenuModel({
     running: state.running,
     port: state.port,
@@ -256,6 +277,7 @@ async function updateTrayMenu() {
     error: state.error,
     profiles: desktop.profiles,
     active: desktop.active,
+    agents: agentsState.agents,
   });
   tray.setToolTip(trayTooltip(trayStatusSummary(state)));
   const template = [
@@ -311,7 +333,7 @@ async function updateTrayMenu() {
                 },
               ],
         }))
-      : [{ label: "No active agents configured", enabled: false }]),
+      : [{ label: model.noAgentsLabel, enabled: false }]),
     ...(model.canStartProxy
       ? [
           {

electron/package.json

@@ -1,7 +1,7 @@
 {
   "name": "clovapi-switcher",
   "private": true,
-  "version": "0.1.9",
+  "version": "0.1.10",
   "description": "ClovAPI Switcher desktop app",
   "main": "main.js",
   "type": "commonjs",