fix(macos): align menu reapply and ChatGPT launch semantics (#342)

* fix(macos): avoid restart prompt before hot reapply

* fix(macos): open ChatGPT through skin launcher

* docs(macos): record menu launch semantics fix

* fix(macos): restore consistent ChatGPT launch behavior

* fix(macos): restore ChatGPT open fallback consistency

---------

Co-authored-by: EchoJamie <yize.ma@definesys.com>

Author: EchoJamie

TASK_PROGRESS.md

@@ -1,5 +1,46 @@
 # Task Progress
 
+## macOS menu reapply/open ChatGPT restart fix (2026-08-05)
+
+- [scope] Branch `codex/fix-macos-reapply-open-chatgpt` was created from latest
+  `upstream/main` (`0a727a5`). Fix the macOS menu behavior where the first
+  "重新应用皮肤" click can restart ChatGPT even though the prompt says no restart,
+  and review its interaction with the separate "打开 ChatGPT" action.
+- [diagnosed] The menu title is derived from lightweight `session=active`
+  status, while `apply-from-menubar-macos.sh` always calls
+  `start-dream-skin-macos.sh --restart-existing`. If ChatGPT is running without
+  a verified CDP endpoint, `start-dream-skin-macos.sh` stops and relaunches it.
+- [implemented] `apply-from-menubar-macos.sh` keeps the original
+  `CHEAP_RUNNING` / `SESSION` prompt flow and now attempts `hot_reapply_theme`
+  after the existing confirmation but before falling back to
+  `start-dream-skin-macos.sh --restart-existing`. A successful hot reapply
+  exits without restarting ChatGPT.
+- [corrected] The native menu keeps the original "打开 ChatGPT" operation title
+  and always shows that action. Its implementation preserves the original
+  "未找到 ChatGPT" and "无法打开 ChatGPT" error surfaces, but replaces the
+  successful native `NSWorkspace.openApplication` launch with the Dream Skin
+  start path only when the installed engine is complete. If the engine is
+  missing or incomplete, the action falls back to native `NSWorkspace` opening
+  and does not install the engine implicitly.
+- [covered] Added static regressions to lock menu apply hot-reload ordering,
+  the preserved session-driven prompt model, the unchanged "打开 ChatGPT" title,
+  the Dream Skin-backed open action, and the native fallback when the engine is
+  not installed. The macOS test Gatekeeper scan now ignores the same
+  `.build-*` SwiftPM artifacts already listed in `macos/menubar-app/.gitignore`.
+- [verified 2026-08-06] `bash -n
+  macos/scripts/apply-from-menubar-macos.sh macos/tests/run-tests.sh`,
+  `git diff --check`, `swift build --package-path macos/menubar-app --product
+  CodexDreamSkinMenuBar`, and `CODEX_DREAM_SKIN_SKIP_DOCTOR=1 bash
+  macos/tests/run-tests.sh` all pass. The wrapper skipped Doctor as requested
+  by the environment flag.
+- [gap] Live restore / re-apply / open ChatGPT smoke has not been rerun after
+  narrowing the implementation back to the minimal AppDelegate + hot-reapply
+  path.
+- [gap] Direct `swift test --package-path macos/menubar-app` fails on this host
+  because the installed Swift toolchain cannot import `XCTest`; the repository
+  macOS test wrapper detects the missing full matching Xcode platform and skips
+  native XCTest accordingly.
+
 ## Client release v1.5.11 — preparing (2026-08-01)
 
 - [base/merged] Settings renderer PR #334 passed exact-head CI run

macos/menubar-app/Sources/CodexDreamSkinMenuBar/AppDelegate.swift

@@ -946,13 +946,32 @@ final class AppDelegate: NSObject, NSApplicationDelegate, NSMenuDelegate {
       showError(title: "未找到 ChatGPT", message: "请先安装并至少启动一次官方 ChatGPT / Codex 桌面应用。")
       return
     }
-    let configuration = NSWorkspace.OpenConfiguration()
-    NSWorkspace.shared.openApplication(at: appURL, configuration: configuration) { _, error in
-      if let error {
-        DispatchQueue.main.async {
-          self.showError(title: "无法打开 ChatGPT", message: error.localizedDescription)
+    guard !operationInFlight else { return }
+    guard !engineNeedsInstall(),
+          let script = installedScript(named: "start-dream-skin-macos.sh") else {
+      let configuration = NSWorkspace.OpenConfiguration()
+      NSWorkspace.shared.openApplication(at: appURL, configuration: configuration) { _, error in
+        if let error {
+          DispatchQueue.main.async {
+            self.showError(title: "无法打开 ChatGPT", message: error.localizedDescription)
+          }
         }
       }
+      return
+    }
+    operationInFlight = true
+    rebuildMenu()
+    ScriptRunner.run(script: script) { [weak self] result in
+      guard let self else { return }
+      self.operationInFlight = false
+      self.refreshStatus()
+      self.rebuildMenu()
+      if !result.succeeded {
+        self.showError(
+          title: "无法打开 ChatGPT",
+          message: self.conciseOutput(result.output, fallback: "请检查 ChatGPT 是否已安装，并重试。")
+        )
+      }
     }
   }
 

macos/scripts/apply-from-menubar-macos.sh

@@ -111,6 +111,13 @@ fi
 
 progress "检查 ChatGPT…"
 ensure_state_root
+progress "尝试热重载皮肤…"
+
+if hot_reapply_theme "$PORT" 8000; then
+  progress "完成：皮肤已应用"
+  exit 0
+fi
+
 progress "启动/连接调试口…"
 
 "$SCRIPT_DIR/start-dream-skin-macos.sh" --restart-existing >>"$LOG_OUT" 2>&1

macos/tests/run-tests.sh

@@ -91,6 +91,7 @@ UPDATE_JSON="$({
   if (value.releaseUrl !== "https://github.com/Fei-Away/Codex-Dream-Skin/releases/latest") process.exit(1);
 ' "$UPDATE_JSON"
 if /usr/bin/grep -R -n -E --exclude-dir='.build' \
+  --exclude-dir='.build-*' \
   'xattr|spctl[[:space:]]+--master-disable' \
   "$ROOT/menubar-app" "$ROOT/scripts/build-menubar-app.sh" "$ROOT/scripts/build-dmg.sh" >/dev/null; then
   printf 'Native distribution must not bypass Gatekeeper or remove quarantine attributes.\n' >&2
@@ -753,6 +754,41 @@ if /usr/bin/grep -F -q 'index($0, "--port " port)' "$ROOT/scripts/common-macos.s
   printf 'injector discovery still accepts a near-prefix port.\n' >&2
   exit 1
 fi
+APPLY_SCRIPT="$ROOT/scripts/apply-from-menubar-macos.sh"
+/usr/bin/grep -F -q 'if hot_reapply_theme "$PORT" 8000; then' "$APPLY_SCRIPT"
+/usr/bin/grep -F -q 'SESSION="off"' "$APPLY_SCRIPT"
+/usr/bin/grep -F -q 'if ! confirm "$PROMPT" "$OK_LABEL"; then' "$APPLY_SCRIPT"
+/usr/bin/grep -F -q '"$SCRIPT_DIR/start-dream-skin-macos.sh" --restart-existing' "$APPLY_SCRIPT"
+if /usr/bin/grep -F -q 'CODEX_RUNNING=' "$APPLY_SCRIPT" ||
+   /usr/bin/grep -F -q 'MENU_ACTION=' "$APPLY_SCRIPT" ||
+   /usr/bin/grep -F -q 'OPEN_PROMPT=' "$APPLY_SCRIPT"; then
+  printf 'menu apply must preserve the original session-driven prompt model.\n' >&2
+  exit 1
+fi
+HOT_LINE="$(/usr/bin/grep -n 'hot_reapply_theme "$PORT" 8000' "$APPLY_SCRIPT" | /usr/bin/head -1 | /usr/bin/cut -d: -f1)"
+CONFIRM_LINE="$(/usr/bin/grep -n 'if ! confirm "$PROMPT" "$OK_LABEL"; then' "$APPLY_SCRIPT" | /usr/bin/head -1 | /usr/bin/cut -d: -f1)"
+START_LINE="$(/usr/bin/grep -n 'start-dream-skin-macos.sh" --restart-existing' "$APPLY_SCRIPT" | /usr/bin/head -1 | /usr/bin/cut -d: -f1)"
+if [ -z "$HOT_LINE" ] || [ -z "$CONFIRM_LINE" ] || [ -z "$START_LINE" ] ||
+   [ "$CONFIRM_LINE" -ge "$HOT_LINE" ] ||
+   [ "$HOT_LINE" -ge "$START_LINE" ]; then
+  printf 'menu apply must keep its confirmation and hot-reapply before falling back to start.\n' >&2
+  exit 1
+fi
+MENU_SOURCE="$ROOT/menubar-app/Sources/CodexDreamSkinMenuBar/AppDelegate.swift"
+OPEN_CODEX_BODY="$(/usr/bin/sed -n '/@objc private func openCodex()/,/@objc private func openDreamSkinWebsite()/p' "$MENU_SOURCE")"
+/usr/bin/grep -F -q 'addActionItem("打开 ChatGPT", action: #selector(openCodex), enabled: !busy)' "$MENU_SOURCE"
+/usr/bin/grep -F -q 'showError(title: "未找到 ChatGPT", message: "请先安装并至少启动一次官方 ChatGPT / Codex 桌面应用。")' "$MENU_SOURCE"
+/usr/bin/grep -F -q 'guard !engineNeedsInstall(),' "$MENU_SOURCE"
+/usr/bin/grep -F -q 'let script = installedScript(named: "start-dream-skin-macos.sh") else {' "$MENU_SOURCE"
+/usr/bin/grep -F -q 'NSWorkspace.shared.openApplication(at: appURL, configuration: configuration)' "$MENU_SOURCE"
+/usr/bin/grep -F -q 'ScriptRunner.run(script: script)' "$MENU_SOURCE"
+/usr/bin/grep -F -q 'title: "无法打开 ChatGPT",' "$MENU_SOURCE"
+if /usr/bin/grep -F -q 'applyTitle = "打开并应用皮肤"' "$MENU_SOURCE" ||
+   /usr/bin/grep -F -q 'runInstalledScript(named: "apply-from-menubar-macos.sh", operation: "打开 ChatGPT")' "$MENU_SOURCE" ||
+   /usr/bin/printf '%s\n' "$OPEN_CODEX_BODY" | /usr/bin/grep -F -q 'installBundledEngineIfNeeded(force:'; then
+  printf 'Open ChatGPT must keep its menu title and must not use menu apply or install the engine implicitly.\n' >&2
+  exit 1
+fi
 
 # Corrupt or structurally incomplete state must be preserved and fail closed;
 # otherwise pause/restore could overwrite evidence while a watcher survives.