fix: simplify hardRestart — remove helper script, spawn directly with EADDRINUSE retry

- Remove `.restart-helper.cjs` temp file approach (fragile, silent failure)
- Spawn new server process directly; relies on index.ts EADDRINUSE retry
- Bump EADDRINUSE retry from 5→10 attempts for safer restart window
- Validate nodeExe exists before spawn to prevent silent death
- Log child output to `.restart.log` for post-mortem debugging
- Fix 4 failing tests: align with git checkout step + SSE stream format

CHANGELOG.md

@@ -19,6 +19,10 @@
 - 模型/别名自动添加降级为 semi-auto：后端已通过 `isCodexCompatibleId()` 自动合并新模型，`apply-update.ts` 不再自动写入 `models.yaml`（避免 `mutateYaml` 破坏 YAML 格式）
 - Codex Desktop 版本更新至 v26.309.31024 (build 962)
 
+### Fixed
+
+- 自动更新重启可靠性：移除 `.restart-helper.cjs` 临时脚本方案，改为直接 spawn 新进程 + 复用 `index.ts` 内置 EADDRINUSE 重试（10 次 × 1s）；新增 nodeExe 存在性校验防止无声死亡，子进程输出写入 `.restart.log` 便于排查启动失败
+
 ### Fixed (pipeline)
 
 - Prompt 提取括号定位修复：`extractPrompts()` 的 `lastIndexOf("[")` 无限回溯导致匹配到无关 `[`，截取错误代码片段产出乱码；改为 50 字符窗口内搜索

src/index.ts

@@ -163,7 +163,7 @@ async function main() {
   let handle: ServerHandle;
 
   // Retry on EADDRINUSE — the previous process may still be releasing the port after a self-update restart
-  const MAX_RETRIES = 5;
+  const MAX_RETRIES = 10;
   const RETRY_DELAY_MS = 1000;
   for (let attempt = 1; ; attempt++) {
     try {

src/self-update.ts

@@ -6,11 +6,10 @@
  */
 
 import { execFile, execFileSync, spawn } from "child_process";
-import { existsSync, readFileSync, writeFileSync } from "fs";
+import { existsSync, openSync, readFileSync } from "fs";
 import { resolve } from "path";
 import { promisify } from "util";
 import { getRootDir, isEmbedded } from "./paths.js";
-import { getConfig } from "./config.js";
 
 // ── Restart ─────────────────────────────────────────────────────────
 let _closeHandler: (() => Promise<void>) | null = null;
@@ -21,53 +20,36 @@ export function setCloseHandler(handler: () => Promise<void>): void {
 }
 
 /**
- * Restart the server: try graceful close (up to 3s), then spawn a helper
- * that waits for the port to be free before starting the new server process.
+ * Restart the server: try graceful close (up to 3s), then spawn the new
+ * server process directly. The new process has built-in EADDRINUSE retry
+ * (in index.ts) so it handles port-release timing automatically.
  */
 function hardRestart(cwd: string): void {
   const nodeExe = process.argv[0];
   const serverArgs = process.argv.slice(1);
-  const port = getPort();
-
-  // Write a temporary CJS helper script that waits for the port to be free, then starts the server
-  const helperPath = resolve(cwd, ".restart-helper.cjs");
-  const helperContent = [
-    `const net = require("net");`,
-    `const { spawn, execSync } = require("child_process");`,
-    `const fs = require("fs");`,
-    `const nodeExe = ${JSON.stringify(nodeExe)};`,
-    `const args = ${JSON.stringify(serverArgs)};`,
-    `const cwd = ${JSON.stringify(cwd)};`,
-    `const port = ${port};`,
-    `let attempts = 0;`,
-    `function tryStart() {`,
-    `  attempts++;`,
-    `  const s = net.createServer();`,
-    `  s.once("error", () => {`,
-    `    if (attempts >= 20) { cleanup(); process.exit(1); }`,
-    `    setTimeout(tryStart, 500);`,
-    `  });`,
-    `  s.once("listening", () => {`,
-    `    s.close(() => {`,
-    `      spawn(nodeExe, args, { detached: true, stdio: "ignore", cwd }).unref();`,
-    `      cleanup();`,
-    `      process.exit(0);`,
-    `    });`,
-    `  });`,
-    `  s.listen(port);`,
-    `}`,
-    `function cleanup() { try { fs.unlinkSync(${JSON.stringify(helperPath)}); } catch {} }`,
-    `tryStart();`,
-  ].join("\n");
 
   const doRestart = () => {
-    console.log("[SelfUpdate] Writing restart helper and exiting...");
-    writeFileSync(helperPath, helperContent, "utf-8");
-    spawn(nodeExe, [helperPath], {
+    if (!existsSync(nodeExe)) {
+      console.error(`[SelfUpdate] Node executable not found: ${nodeExe}, aborting restart`);
+      return;
+    }
+
+    console.log("[SelfUpdate] Spawning new server process...");
+
+    // Redirect child output to a log file for post-mortem debugging
+    let outFd: number | null = null;
+    try {
+      outFd = openSync(resolve(cwd, ".restart.log"), "w");
+    } catch { /* fall back to ignore */ }
+
+    const child = spawn(nodeExe, serverArgs, {
       detached: true,
-      stdio: "ignore",
+      stdio: ["ignore", outFd ?? "ignore", outFd ?? "ignore"],
       cwd,
-    }).unref();
+    });
+    child.unref();
+
+    console.log(`[SelfUpdate] New process spawned (pid: ${child.pid ?? "unknown"}). Exiting...`);
     process.exit(0);
   };
 
@@ -92,16 +74,6 @@ function hardRestart(cwd: string): void {
   });
 }
 
-/** Read the configured port for the restart helper. */
-function getPort(): number {
-  try {
-    const config = getConfig();
-    return config.server.port ?? 8080;
-  } catch {
-    return 8080;
-  }
-}
-
 const execFileAsync = promisify(execFile);
 
 const GITHUB_REPO = "icebear0828/codex-proxy";