fix: restart Codex reliably on Windows

CHANGELOG.md

@@ -4,6 +4,12 @@ All notable changes to Codex-X will be documented here.
 
 ## [Unreleased]
 
+## [v0.3.15] - 2026-08-20
+
+### 修复 Bug
+
+- 修复 Windows 重启 Codex 时仅隐藏到托盘、后台未退出，以及再次重启报错的问题。
+
 ## [v0.3.14] - 2026-08-20
 
 ### 更新

apps/desktop/package.json

@@ -1,6 +1,6 @@
 {
   "name": "codex-x",
-  "version": "0.3.14",
+  "version": "0.3.15",
   "private": true,
   "description": "Codex Switch & Instruct desktop manager",
   "type": "module",

apps/desktop/src-tauri/Cargo.lock

@@ -490,7 +490,7 @@ dependencies = [
 
 [[package]]
 name = "codex-x"
-version = "0.3.14"
+version = "0.3.15"
 dependencies = [
  "chrono",
  "dirs 5.0.1",

apps/desktop/src-tauri/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "codex-x"
-version = "0.3.14"
+version = "0.3.15"
 description = "Codex Switch & Instruct desktop manager"
 authors = ["yynxxxxx"]
 license = "MIT"

apps/desktop/src-tauri/src/platform.rs

@@ -943,6 +943,9 @@ fn windows_restart_script() -> String {
         .join(", ");
     r#"
 $ErrorActionPreference = 'Stop'
+$utf8 = [System.Text.UTF8Encoding]::new($false)
+[Console]::OutputEncoding = $utf8
+$OutputEncoding = $utf8
 $identities = @(__IDENTITIES__)
 $packages = @(Get-AppxPackage |
   Where-Object { $identities -contains $_.Name } |
@@ -951,10 +954,15 @@ $packages = @(Get-AppxPackage |
 if ($packages.Count -eq 0) { throw 'Supported Codex/ChatGPT Appx package was not found.' }
 
 function Get-CodexDesktopProcesses([string]$root) {
+  $appRoot = $root + 'app\'
+  $resourcesRoot = $appRoot + 'resources\'
   @(Get-Process -ErrorAction SilentlyContinue | Where-Object {
     try {
       $processPath = [IO.Path]::GetFullPath($_.MainModule.FileName)
-      $processPath.StartsWith($root, [StringComparison]::OrdinalIgnoreCase)
+      $executableName = [IO.Path]::GetFileName($processPath)
+      ($executableName -ieq 'Codex.exe' -or $executableName -ieq 'ChatGPT.exe') -and
+        $processPath.StartsWith($appRoot, [StringComparison]::OrdinalIgnoreCase) -and
+        -not $processPath.StartsWith($resourcesRoot, [StringComparison]::OrdinalIgnoreCase)
     } catch {
       $false
     }
@@ -990,25 +998,19 @@ if ([string]::IsNullOrWhiteSpace($applicationId) -or [string]::IsNullOrWhiteSpac
 
 $wasRunning = $processes.Count -gt 0
 if ($wasRunning) {
-  $closeRequested = $false
   foreach ($process in $processes) {
-    try {
-      if (-not $process.HasExited -and $process.MainWindowHandle -ne [IntPtr]::Zero) {
-        if ($process.CloseMainWindow()) { $closeRequested = $true }
-      }
-    } catch {}
-  }
-  if (-not $closeRequested) {
-    throw 'Codex/ChatGPT is running but its main window could not be asked to close normally.'
+    Stop-Process -InputObject $process -Force -ErrorAction SilentlyContinue
   }
 
   $quitDeadline = [DateTime]::UtcNow.AddSeconds(8)
   do {
-    Start-Sleep -Milliseconds 100
     $remaining = @(Get-CodexDesktopProcesses $installRoot)
-  } while ($remaining.Count -gt 0 -and [DateTime]::UtcNow -lt $quitDeadline)
+    if ($remaining.Count -eq 0) { break }
+    Start-Sleep -Milliseconds 100
+  } while ([DateTime]::UtcNow -lt $quitDeadline)
+  $remaining = @(Get-CodexDesktopProcesses $installRoot)
   if ($remaining.Count -gt 0) {
-    throw 'Codex/ChatGPT did not exit normally before the timeout; relaunch was cancelled.'
+    throw 'Codex/ChatGPT background processes could not be stopped before the timeout; relaunch was cancelled.'
   }
 }
 
@@ -1407,13 +1409,20 @@ mod tests {
     }
 
     #[test]
-    fn windows_restart_script_only_targets_selected_package_directory() {
+    fn windows_restart_script_only_stops_processes_in_the_selected_package_directory() {
         let script = windows_restart_script();
-        assert!(script.contains("$processPath.StartsWith($root"));
-        assert!(script.contains("$process.CloseMainWindow()"));
+        assert!(script.contains("$processPath.StartsWith($appRoot"));
+        assert!(script.contains("$executableName -ieq 'Codex.exe'"));
+        assert!(script.contains("$executableName -ieq 'ChatGPT.exe'"));
+        assert!(script.contains("-not $processPath.StartsWith($resourcesRoot"));
+        assert!(script.contains("Stop-Process -InputObject $process -Force"));
+        assert!(script.contains("[Console]::OutputEncoding = $utf8"));
         assert!(script.contains("shell:AppsFolder\\"));
-        assert!(!script.contains("Stop-Process"));
+        assert!(!script.contains("CloseMainWindow"));
+        assert!(!script.contains("Get-Process -Name"));
+        assert!(!script.contains("Stop-Process -Name"));
         assert!(!script.contains("taskkill"));
+        assert!(!script.contains("ApplicationFrameHost"));
     }
 
     #[test]

apps/desktop/src-tauri/tauri.conf.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://schema.tauri.app/config/2",
   "productName": "Codex-X",
-  "version": "0.3.14",
+  "version": "0.3.15",
   "identifier": "com.yynxxxxx.codexx",
   "build": {
     "frontendDist": "../dist",

package.json

@@ -1,7 +1,7 @@
 {
   "name": "codex-x-workspace",
   "private": true,
-  "version": "0.3.14",
+  "version": "0.3.15",
   "scripts": {
     "dev": "pnpm --dir apps/desktop tauri dev",
     "build": "pnpm --dir apps/desktop tauri build",