Add Windows Codex++ uninstall flow

hereww · hereww · commit b4c6da883ef9 · 2026-05-30T22:30:16.000+08:00
diff --git a/docs/releases/CodexTools-1.1.20-windows-arm64-setup.exe b/docs/releases/CodexTools-1.1.20-windows-arm64-setup.exe
diff --git a/docs/releases/CodexTools-1.1.20-windows-arm64.sha256 b/docs/releases/CodexTools-1.1.20-windows-arm64.sha256
@@ -1,2 +1,2 @@
-8a16b6f2f67b4cb361f8fc18b1f8ed2fa67427a925f3f405d636d3475b6b60f2  CodexTools-1.1.20-windows-arm64-setup.exe
-ce9abaea41343c06ed685cd03cd82a52894cdbe9ca9d354e3edf97b24e319455  CodexTools-1.1.20-windows-arm64.zip
+f79bd4ad55643b3637bd101ec4d90f93d9c950df4a615cd0182d655fe5cdd15d  CodexTools-1.1.20-windows-arm64-setup.exe
+10cd5dc6d775bdb4a0faf1b72a29103aa5e422a59d9fcb55f538cd1c2b340194  CodexTools-1.1.20-windows-arm64.zip
diff --git a/docs/releases/CodexTools-1.1.20-windows-arm64.zip b/docs/releases/CodexTools-1.1.20-windows-arm64.zip
diff --git a/docs/releases/CodexTools-1.1.20-windows-x64-setup.exe b/docs/releases/CodexTools-1.1.20-windows-x64-setup.exe
diff --git a/docs/releases/CodexTools-1.1.20-windows-x64.sha256 b/docs/releases/CodexTools-1.1.20-windows-x64.sha256
@@ -1,2 +1,2 @@
-d14016db990c5d57ab1b49311db3e3e7af0d5ffba3082f58c9cd60c785a2d73d  CodexTools-1.1.20-windows-x64-setup.exe
-c4c3285cb9bace46452381970b00d4c1011b45cc713334140a6bda225081c435  CodexTools-1.1.20-windows-x64.zip
+bbea05955200c7c83e1fd3342b48597167f93546b454e803072b11ab125341f2  CodexTools-1.1.20-windows-x64-setup.exe
+4bb88312eea2e8bd6c113ba78c5fbb7ea501d63683769e819464e7cb7b7adb5b  CodexTools-1.1.20-windows-x64.zip
diff --git a/docs/releases/CodexTools-1.1.20-windows-x64.zip b/docs/releases/CodexTools-1.1.20-windows-x64.zip
diff --git a/entrypoints.go b/entrypoints.go
@@ -49,6 +49,29 @@ func (s *server) uninstallEntrypoints(args map[string]any) commandResult {
 	return installActionResult("ok", "入口已卸载。")
 }
 
+func (s *server) uninstallCodexTools(args map[string]any) commandResult {
+	payload := codexToolsUninstallPayload()
+	if runtime.GOOS != "windows" {
+		return failed("Codex++ 卸载功能仅支持 Windows 安装包。", payload)
+	}
+	options := mapArg(args, "options")
+	removeOwnedData := boolArg(options, "removeOwnedData")
+	removeWindowsWatcherInstall()
+	cleanupWindowsCodexToolsEntrypoints()
+	if removeOwnedData {
+		_ = os.RemoveAll(stateDir())
+	}
+	uninstaller := windowsCodexToolsUninstallerPath()
+	payload = codexToolsUninstallPayload()
+	if uninstaller == "" {
+		return ok("未找到 Windows 安装器卸载程序；已移除入口和 watcher。若使用便携版，请手动删除当前 CodexTools 文件夹。", payload)
+	}
+	if err := startWindowsCodexToolsUninstaller(uninstaller); err != nil {
+		return failed("启动 Windows 卸载程序失败："+err.Error(), payload)
+	}
+	return ok("已启动 Windows 卸载程序，请按提示完成卸载。", payload)
+}
+
 func installActionResult(status, message string) commandResult {
 	return commandResult{
 		"status":              status,
@@ -92,6 +115,132 @@ func uninstallEntrypoints() error {
 	return firstErr
 }
 
+const windowsCodexToolsUninstallKey = `HKCU\Software\Microsoft\Windows\CurrentVersion\Uninstall\CodexTools`
+
+func codexToolsUninstallPayload() map[string]any {
+	uninstaller := windowsCodexToolsUninstallerPath()
+	return map[string]any{
+		"platform":        runtime.GOOS,
+		"supported":       runtime.GOOS == "windows",
+		"uninstallerPath": uninstaller,
+		"installerFound":  uninstaller != "",
+	}
+}
+
+func cleanupWindowsCodexToolsEntrypoints() {
+	_ = uninstallEntrypoints()
+	if runtime.GOOS != "windows" {
+		return
+	}
+	if startMenu := windowsCodexToolsStartMenuDir(); startMenu != "" {
+		_ = os.RemoveAll(startMenu)
+	}
+}
+
+func removeWindowsWatcherInstall() {
+	if runtime.GOOS != "windows" {
+		return
+	}
+	_ = windowsRegDeleteCurrentUserValue(watcherRunKey, watcherRunName)
+	if shortcut := watcherStartupShortcutPath(); shortcut != "" {
+		_ = os.Remove(shortcut)
+	}
+}
+
+func windowsCodexToolsStartMenuDir() string {
+	appdata := os.Getenv("APPDATA")
+	if appdata == "" {
+		return ""
+	}
+	return filepath.Join(appdata, "Microsoft", "Windows", "Start Menu", "Programs", "CodexTools")
+}
+
+func windowsCodexToolsUninstallerPath() string {
+	if runtime.GOOS != "windows" {
+		return ""
+	}
+	var candidates []string
+	add := func(path string) {
+		path = strings.TrimSpace(path)
+		if path != "" {
+			candidates = append(candidates, path)
+		}
+	}
+	if executable, err := os.Executable(); err == nil {
+		add(filepath.Join(filepath.Dir(executable), "Uninstall.exe"))
+	}
+	if localAppData := os.Getenv("LOCALAPPDATA"); localAppData != "" {
+		add(filepath.Join(localAppData, "CodexTools", "Uninstall.exe"))
+	}
+	if installLocation := windowsRegistryString(windowsCodexToolsUninstallKey, "InstallLocation"); installLocation != "" {
+		add(filepath.Join(strings.Trim(installLocation, `"`), "Uninstall.exe"))
+	}
+	if uninstallString := windowsRegistryString(windowsCodexToolsUninstallKey, "UninstallString"); uninstallString != "" {
+		add(windowsExecutableFromCommand(uninstallString))
+	}
+	for _, candidate := range candidates {
+		if fileExists(candidate) {
+			return candidate
+		}
+	}
+	return ""
+}
+
+func windowsRegistryString(key, name string) string {
+	if runtime.GOOS != "windows" {
+		return ""
+	}
+	cmd := exec.Command("reg", "query", key, "/v", name)
+	hideSubprocessWindow(cmd)
+	output, err := cmd.Output()
+	if err != nil {
+		return ""
+	}
+	return parseWindowsRegQueryValue(string(output), name)
+}
+
+func parseWindowsRegQueryValue(output, name string) string {
+	for _, line := range strings.Split(output, "\n") {
+		trimmed := strings.TrimSpace(line)
+		if !strings.HasPrefix(strings.ToLower(trimmed), strings.ToLower(name)) {
+			continue
+		}
+		parts := strings.SplitN(trimmed, "REG_SZ", 2)
+		if len(parts) != 2 {
+			continue
+		}
+		return strings.TrimSpace(parts[1])
+	}
+	return ""
+}
+
+func windowsExecutableFromCommand(command string) string {
+	trimmed := strings.TrimSpace(command)
+	if trimmed == "" {
+		return ""
+	}
+	if strings.HasPrefix(trimmed, `"`) {
+		end := strings.Index(trimmed[1:], `"`)
+		if end >= 0 {
+			return trimmed[1 : end+1]
+		}
+	}
+	fields := strings.Fields(trimmed)
+	if len(fields) == 0 {
+		return ""
+	}
+	return fields[0]
+}
+
+func startWindowsCodexToolsUninstaller(path string) error {
+	if runtime.GOOS != "windows" {
+		return errors.New("Codex++ 卸载程序只支持 Windows")
+	}
+	cmd := exec.Command(path)
+	cmd.Dir = filepath.Dir(path)
+	return cmd.Start()
+}
+
 func writeMacOSAppBundle(manager bool) error {
 	appPath := entrypointPath(manager)
 	contents := filepath.Join(appPath, "Contents")
diff --git a/launcher.go b/launcher.go
@@ -269,6 +269,16 @@ func buildCodexExecutable(appPath string) string {
 func startCodexApp(appPath string, debugPort uint16, extraArgs []string) (codexLaunchHandle, error) {
 	command := buildCodexLaunchCommand(appPath, debugPort, extraArgs)
 	if runtime.GOOS == "windows" {
+		if len(command) > 0 && strings.TrimSpace(command[0]) != "" && fileExists(command[0]) {
+			handle, err := startCodexProcess(command)
+			if err == nil {
+				return handle, nil
+			}
+			if buildWindowsPackagedActivation(appPath, debugPort, extraArgs) == nil {
+				return nil, err
+			}
+			appendDiagnosticLog("launcher.windows_direct_start_failed", map[string]any{"command": safeCommandForLog(command), "error": err.Error()})
+		}
 		if activation := buildWindowsPackagedActivation(appPath, debugPort, extraArgs); activation != nil {
 			processID, activationErr := activateWindowsPackagedAppWithEnvironment(activation.appUserModelID, activation.arguments, codexLaunchEnvironment())
 			if activationErr == nil {
@@ -288,13 +298,6 @@ func startCodexApp(appPath string, debugPort uint16, extraArgs []string) (codexL
 			}
 			return nil, fmt.Errorf("MSIX 激活 %s 失败：%v；explorer 兜底失败：%v；直接启动 %s 也失败：%w", activation.appUserModelID, activationErr, explorerErr, command[0], err)
 		}
-		if len(command) > 0 && strings.TrimSpace(command[0]) != "" && fileExists(command[0]) {
-			handle, err := startCodexProcess(command)
-			if err == nil {
-				return handle, nil
-			}
-			return nil, err
-		}
 	}
 	if len(command) == 0 || strings.TrimSpace(command[0]) == "" {
 		return nil, fmt.Errorf("未找到 Codex.exe：%s", appPath)
diff --git a/main_test.go b/main_test.go
@@ -42,6 +42,24 @@ func TestBuildWatcherInstallPlanMatchesOriginalWindowsShape(t *testing.T) {
 	}
 }
 
+func TestParseWindowsUninstallRegistryValue(t *testing.T) {
+	output := `HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Uninstall\CodexTools
+    DisplayName    REG_SZ    CodexTools
+    UninstallString    REG_SZ    "C:\Users\A\AppData\Local\CodexTools\Uninstall.exe"
+`
+	value := parseWindowsRegQueryValue(output, "UninstallString")
+	if value != `"C:\Users\A\AppData\Local\CodexTools\Uninstall.exe"` {
+		t.Fatalf("uninstall registry value mismatch: %q", value)
+	}
+}
+
+func TestWindowsExecutableFromCommandParsesQuotedPath(t *testing.T) {
+	command := `"C:\Users\A\AppData\Local\CodexTools\Uninstall.exe" /S`
+	if got := windowsExecutableFromCommand(command); got != `C:\Users\A\AppData\Local\CodexTools\Uninstall.exe` {
+		t.Fatalf("quoted command path mismatch: %q", got)
+	}
+}
+
 func TestNormalizeSettingsLanguage(t *testing.T) {
 	settings := normalizeSettings(backendSettings{Language: "ja"})
 
@@ -914,18 +932,18 @@ func TestBuildWindowsPackagedActivationArguments(t *testing.T) {
 	}
 }
 
-func TestCodexLaunchPayloadPrefersPackagedActivationWhenReadable(t *testing.T) {
+func TestCodexLaunchPayloadPrefersDirectExecutableWhenReadable(t *testing.T) {
 	if runtime.GOOS != "windows" {
-		t.Skip("Windows packaged activation preference only applies on Windows")
+		t.Skip("Windows executable preference only applies on Windows")
 	}
 	appDir := filepath.Join(t.TempDir(), "OpenAI.Codex_26.519.11010.0_x64__2p2nqsd0c76g0", "app")
 	exe := filepath.Join(appDir, "Codex.exe")
 	writeTestFile(t, exe, "binary")
 
 	payload := codexLaunchPayload(appDir)
 
-	if got := stringFromAny(payload["method"]); got != "packaged_activation" {
-		t.Fatalf("readable MSIX app dir should prefer packaged activation: %#v", payload)
+	if got := stringFromAny(payload["method"]); got != "executable" {
+		t.Fatalf("readable MSIX app dir should prefer direct executable launch: %#v", payload)
 	}
 	if got := stringFromAny(payload["executable"]); got != exe {
 		t.Fatalf("executable mismatch: %q", got)
diff --git a/manager.go b/manager.go
@@ -195,6 +195,8 @@ func (s *server) dispatch(ctx context.Context, command string, args map[string]a
 		return s.installEntrypoints()
 	case "uninstall_entrypoints":
 		return s.uninstallEntrypoints(args)
+	case "uninstall_codextools":
+		return s.uninstallCodexTools(args)
 	case "repair_codex_app":
 		return s.repairCodexApp()
 	case "repair_backend":
@@ -972,6 +974,14 @@ func codexLaunchPayload(appPath string) map[string]any {
 		return payload
 	}
 	if runtime.GOOS == "windows" {
+		if executable := buildCodexExecutable(appPath); strings.TrimSpace(executable) != "" && fileExists(executable) {
+			payload["ready"] = true
+			payload["method"] = "executable"
+			payload["methodLabel"] = "可执行文件启动"
+			payload["executable"] = executable
+			payload["message"] = "将直接启动 Codex.exe 并附加调试端口参数。"
+			return payload
+		}
 		if appUserModelID := packagedWindowsAppUserModelID(appPath); appUserModelID != "" {
 			payload["ready"] = true
 			payload["method"] = "packaged_activation"
@@ -981,14 +991,6 @@ func codexLaunchPayload(appPath string) map[string]any {
 			payload["message"] = "将通过 AppUserModelID 激活 Windows Store/MSIX 版。"
 			return payload
 		}
-		if executable := buildCodexExecutable(appPath); strings.TrimSpace(executable) != "" && fileExists(executable) {
-			payload["ready"] = true
-			payload["method"] = "executable"
-			payload["methodLabel"] = "可执行文件启动"
-			payload["executable"] = executable
-			payload["message"] = "将按 1.1.12 的方式直接启动 Codex.exe。"
-			return payload
-		}
 	}
 	executable := buildCodexExecutable(appPath)
 	if strings.TrimSpace(executable) == "" {
diff --git a/web/src/App.tsx b/web/src/App.tsx
@@ -771,6 +771,20 @@ export function App() {
     }
   };
 
+  const uninstallCodexTools = async () => {
+    if (!window.confirm("将启动 Windows 卸载程序，并先移除 Codex++ 入口和 watcher。继续？")) return;
+    const result = await run(() =>
+      call<CommandResult<Record<string, unknown>>>("uninstall_codextools", {
+        options: { removeOwnedData },
+      }),
+    );
+    if (result) {
+      showNotice("Windows 卸载", result.message, result.status);
+      await refreshOverview(true);
+      await refreshWatcher(true);
+    }
+  };
+
   const repairShortcuts = async () => {
     const result = await run(() => call<InstallResult>("repair_shortcuts"));
     if (result) {
@@ -1160,6 +1174,7 @@ export function App() {
       repairCodexApp,
       installEntrypoints,
       uninstallEntrypoints,
+      uninstallCodexTools,
       repairShortcuts,
       saveSettings,
       saveSettingsValue,
@@ -1402,6 +1417,7 @@ type Actions = {
   repairBackend: () => Promise<void>;
   installEntrypoints: () => Promise<void>;
   uninstallEntrypoints: () => Promise<void>;
+  uninstallCodexTools: () => Promise<void>;
   repairShortcuts: () => Promise<void>;
   repairCodexApp: () => Promise<void>;
   saveSettings: () => Promise<void>;
@@ -2690,6 +2706,12 @@ function MaintenanceScreen({
             <Button onClick={() => void actions.installEntrypoints()}>安装入口</Button>
             <Button variant="secondary" onClick={() => void actions.uninstallEntrypoints()}>卸载入口</Button>
             <Button variant="secondary" onClick={() => void actions.repairShortcuts()}>修复入口</Button>
+            {watcherPlatform === "windows" ? (
+              <Button variant="outline" onClick={() => void actions.uninstallCodexTools()}>
+                <Trash2 className="h-4 w-4" />
+                卸载 Codex++
+              </Button>
+            ) : null}
           </Toolbar>
         </CardContent>
       </Panel>
diff --git a/web/src/i18n/translations.ts b/web/src/i18n/translations.ts
@@ -200,6 +200,7 @@ const enUS: TranslationDictionary = {
   "安装入口": "Install Entrypoints",
   "卸载入口": "Uninstall Entrypoints",
   "修复入口": "Repair Entrypoints",
+  "卸载 Codex++": "Uninstall Codex++",
   "自动接管": "Auto Takeover",
   "安装 watcher": "Install Watcher",
   "移除 watcher": "Remove Watcher",
