feat: add agent install lifecycle support

Author: joohw

core/cmd/desktop.go

@@ -241,7 +241,7 @@ func cmdDesktopAgents() *cobra.Command {
 		Use:   "agents",
 		Short: "Detect local agent CLI installations",
 	}
-	c.AddCommand(cmdDesktopAgentsStatus(), cmdDesktopAgentsWhich())
+	c.AddCommand(cmdDesktopAgentsStatus(), cmdDesktopAgentsWhich(), cmdDesktopAgentsInstall(), cmdDesktopAgentsUninstall())
 	return c
 }
 
@@ -268,6 +268,31 @@ func cmdDesktopAgentsWhich() *cobra.Command {
 	return c
 }
 
+func cmdDesktopAgentsInstall() *cobra.Command {
+	var kind string
+	c := &cobra.Command{
+		Use:   "install",
+		Short: "Install one local agent CLI when supported",
+		RunE: func(cmd *cobra.Command, args []string) error {
+			return writeDesktopJSON(desktop.AgentInstall(kind))
+		},
+	}
+	c.Flags().StringVar(&kind, "cli", "", "Agent CLI kind to install")
+	return c
+}
+
+func cmdDesktopAgentsUninstall() *cobra.Command {
+	var kind string
+	c := &cobra.Command{
+		Use:   "uninstall",
+		Short: "Uninstall one local agent CLI when supported",
+		RunE: func(cmd *cobra.Command, args []string) error {
+			return writeDesktopJSON(desktop.AgentUninstall(kind))
+		},
+	}
+	c.Flags().StringVar(&kind, "cli", "", "Agent CLI kind to uninstall")
+	return c
+}
 func applyBindingSwitch(kind agentkind.Kind, binding string) error {
 	if err := desktop.ApplyBinding(kind, binding); err != nil {
 		return err

core/cmd/proxy_cmd.go

@@ -242,7 +242,7 @@ func shouldSkipAutoProxy(cmd *cobra.Command) bool {
 	}
 	for c := cmd; c != nil; c = c.Parent() {
 		switch c.Name() {
-		case "__proxy-daemon", "update", "version":
+		case "__proxy-daemon", "desktop", "update", "version":
 			return true
 		}
 	}

core/internal/apply/codex_home_test.go

@@ -1,7 +1,9 @@
 package apply
 
 import (
+	"os"
 	"path/filepath"
+	"runtime"
 	"testing"
 )
 
@@ -28,4 +30,28 @@ func TestCodexConfigPathUsesCODEX_HOME(t *testing.T) {
 	if got != want {
 		t.Fatalf("CodexConfigPath() = %q, want %q", got, want)
 	}
-}
+}
+func TestResolveCodexExecutableIgnoresWindowsStoreClient(t *testing.T) {
+	if runtime.GOOS != "windows" {
+		t.Skip("Windows Store Codex layout is Windows-only")
+	}
+	root := t.TempDir()
+	storeBin := filepath.Join(root, "WindowsApps", "OpenAI.Codex_1.0.0.0_x64__2p2nqsd0c76g0", "app", "resources")
+	if err := os.MkdirAll(storeBin, 0o755); err != nil {
+		t.Fatal(err)
+	}
+	if err := os.WriteFile(filepath.Join(storeBin, "codex.exe"), []byte(""), 0o755); err != nil {
+		t.Fatal(err)
+	}
+	t.Setenv("PATH", storeBin)
+	t.Setenv("HOME", root)
+	t.Setenv("USERPROFILE", root)
+	t.Setenv("APPDATA", filepath.Join(root, "AppData"))
+	t.Setenv("LOCALAPPDATA", filepath.Join(root, "LocalAppData"))
+	if got, ok := ResolveCodexExecutable(); ok {
+		t.Fatalf("ResolveCodexExecutable() = %q, true; want Windows Store client ignored", got)
+	}
+	if CodexInstalled() {
+		t.Fatal("CodexInstalled() = true for Windows Store client; want false")
+	}
+}

core/internal/apply/codex_install.go

@@ -31,6 +31,9 @@ func CodexSearchDirs(home string) []string {
 	}
 	addWindowsCodexSearchDirs(add)
 	addDarwinCodexSearchDirs(add, home)
+	if prefix, ok := npmGlobalPrefix(); ok {
+		add(prefix)
+	}
 	return dirs
 }
 
@@ -54,31 +57,24 @@ func codexExecutableFile(path string) bool {
 
 // ResolveCodexExecutable finds the Codex CLI binary from PATH or common install roots.
 func ResolveCodexExecutable() (string, bool) {
-	if p, err := exec.LookPath("codex"); err == nil && strings.TrimSpace(p) != "" {
+	if p, err := exec.LookPath("codex"); err == nil && strings.TrimSpace(p) != "" && !codexClientExecutablePath(p) {
 		return p, true
 	}
 	home, _ := os.UserHomeDir()
 	for _, dir := range CodexSearchDirs(home) {
 		for _, name := range codexCommandNames() {
 			candidate := filepath.Join(dir, name)
-			if codexExecutableFile(candidate) {
+			if codexExecutableFile(candidate) && !codexClientExecutablePath(candidate) {
 				return candidate, true
 			}
 		}
 	}
-	for _, candidate := range codexExtraExecutableCandidates() {
-		if codexExecutableFile(candidate) {
-			return candidate, true
-		}
-	}
 	return "", false
 }
 
-// CodexInstalled reports whether Codex is usable (CLI on disk or Codex app install layout).
-// CLI and desktop app share CODEX_HOME; they are not distinguished here.
+// CodexInstalled reports whether the Codex CLI is available.
+// Desktop/Store app installs are intentionally ignored here.
 func CodexInstalled() bool {
-	if _, ok := ResolveCodexExecutable(); ok {
-		return true
-	}
-	return codexRuntimePresent()
+	_, ok := ResolveCodexExecutable()
+	return ok
 }

core/internal/apply/codex_install_other.go

@@ -5,6 +5,7 @@ package apply
 import (
 	"os"
 	"path/filepath"
+	"strings"
 )
 
 func addWindowsCodexSearchDirs(add func(string)) {}
@@ -16,6 +17,16 @@ func addDarwinCodexSearchDirs(add func(string), home string) {
 	add(filepath.Join(home, ".npm-global", "bin"))
 }
 
+func codexClientExecutablePath(path string) bool {
+	cleaned := filepath.Clean(path)
+	for _, appRoot := range darwinCodexAppRoots() {
+		if strings.HasPrefix(cleaned, filepath.Clean(appRoot)+string(filepath.Separator)) {
+			return true
+		}
+	}
+	return false
+}
+
 func codexExtraExecutableCandidates() []string {
 	var out []string
 	for _, appRoot := range darwinCodexAppRoots() {

core/internal/apply/codex_install_windows.go

@@ -9,16 +9,23 @@ import (
 )
 
 func addWindowsCodexSearchDirs(add func(string)) {
-	if localAppData := strings.TrimSpace(os.Getenv("LOCALAPPDATA")); localAppData != "" {
-		add(filepath.Join(localAppData, "Programs", "OpenAI", "Codex", "bin"))
-	}
 	if appData := strings.TrimSpace(os.Getenv("APPDATA")); appData != "" {
 		add(filepath.Join(appData, "npm"))
 	}
 }
 
 func addDarwinCodexSearchDirs(add func(string), home string) {}
 
+func codexClientExecutablePath(path string) bool {
+	cleaned := strings.ToLower(filepath.Clean(strings.TrimSpace(path)))
+	if cleaned == "" {
+		return false
+	}
+	return strings.Contains(cleaned, strings.ToLower(filepath.Clean(filepath.Join("WindowsApps", "OpenAI.Codex_")))) ||
+		strings.Contains(cleaned, strings.ToLower(filepath.Clean(filepath.Join("Packages", "OpenAI.Codex_")))) ||
+		strings.Contains(cleaned, strings.ToLower(filepath.Clean(filepath.Join("Programs", "OpenAI", "Codex"))))
+}
+
 func codexExtraExecutableCandidates() []string {
 	var out []string
 	if localAppData := strings.TrimSpace(os.Getenv("LOCALAPPDATA")); localAppData != "" {