fix(macos): parse runtime state with bundled Node.js (#27)

Remove the system Python and shell eval dependency from runtime-state restoration. Parse saved values as data with the validated bundled Node runtime and add command-injection regression coverage.

Author: Ziwen-Lii

macos/CHANGELOG.md

@@ -7,6 +7,7 @@
 - 修正内置主题引用了未随仓库发布的背景文件，恢复使用 bundled abstract demo 素材
 - 更新主题配置往返测试：安装只备份外观键，不再错误断言强制切换深色模式
 - 恢复原本没有 `[desktop]` 配置段的用户设置时，不再额外写入空段
+- 热切换读取运行状态时复用 Codex 内置 Node.js，不再依赖系统 `python3` 或执行 `eval`
 
 ---
 

macos/scripts/common-macos.sh

@@ -276,6 +276,22 @@ state_field() {
   ' "$STATE_PATH" "$key"
 }
 
+restore_runtime_context_from_state() {
+  [ -f "$STATE_PATH" ] || return 0
+  local value=""
+
+  value="$(state_field codexBundle 2>/dev/null || true)"
+  [ -z "$value" ] || CODEX_BUNDLE="$value"
+  value="$(state_field codexExe 2>/dev/null || true)"
+  [ -z "$value" ] || CODEX_EXE="$value"
+  value="$(state_field codexVersion 2>/dev/null || true)"
+  [ -z "$value" ] || CODEX_VERSION="$value"
+  value="$(state_field codexTeamId 2>/dev/null || true)"
+  [ -z "$value" ] || CODEX_TEAM_ID="$value"
+
+  export CODEX_BUNDLE CODEX_EXE CODEX_VERSION CODEX_TEAM_ID
+}
+
 write_state() {
   local port="$1"
   local injector_pid="$2"
@@ -441,16 +457,7 @@ ensure_node_runtime() {
       : "${CODEX_EXE:=/Applications/Codex.app/Contents/MacOS/ChatGPT}"
       : "${CODEX_VERSION:=}"
       : "${CODEX_TEAM_ID:=}"
-      # Soft-fill from state if present
-      if [ -f "$STATE_PATH" ]; then
-        eval "$(/usr/bin/python3 -c 'import json,sys
-try:
-  s=json.load(open(sys.argv[1]))
-  for k,env in [("codexBundle","CODEX_BUNDLE"),("codexExe","CODEX_EXE"),("codexVersion","CODEX_VERSION"),("codexTeamId","CODEX_TEAM_ID")]:
-    v=s.get(k) or ""
-    if v: print(f"export {env}={json.dumps(v)}")
-except Exception: pass' "$STATE_PATH" 2>/dev/null || true)"
-      fi
+      restore_runtime_context_from_state
       return 0
     fi
   done

macos/tests/run-tests.sh

@@ -22,11 +22,44 @@ if /usr/bin/grep -R -n -E '(writeFile|rename|copyFile|rm).*app\.asar' "$ROOT/scr
   printf 'A runtime script appears to mutate app.asar.\n' >&2
   exit 1
 fi
+if /usr/bin/grep -n -E '/usr/bin/python3|(^|[[:space:]])eval([[:space:]]|$)' \
+  "$ROOT/scripts/common-macos.sh" >/dev/null; then
+  printf 'The shared macOS runtime must parse state with the bundled Node.js, without python3 or eval.\n' >&2
+  exit 1
+fi
 
 "$NODE" "$ROOT/scripts/injector.mjs" --check-payload >/dev/null
 
 TMP="$(/usr/bin/mktemp -d /tmp/codex-dream-skin-tests.XXXXXX)"
 trap '/bin/rm -rf "$TMP"' EXIT
+
+RUNTIME_HOME="$TMP/runtime-home"
+RUNTIME_STATE_ROOT="$RUNTIME_HOME/Library/Application Support/CodexDreamSkinStudio"
+RUNTIME_STATE="$RUNTIME_STATE_ROOT/state.json"
+STATE_EVAL_MARKER="$TMP/state-eval-marker"
+EXPECTED_BUNDLE="/Applications/Codex \$(touch \"$STATE_EVAL_MARKER\").app"
+EXPECTED_EXE="$EXPECTED_BUNDLE/Contents/MacOS/ChatGPT; touch \"$STATE_EVAL_MARKER\""
+EXPECTED_VERSION='1.1.2 "nightly"'
+EXPECTED_TEAM_ID="TEAM'ID"
+/bin/mkdir -p "$RUNTIME_STATE_ROOT"
+"$NODE" -e '
+  const fs = require("node:fs");
+  const [file, codexBundle, codexExe, codexVersion, codexTeamId] = process.argv.slice(1);
+  fs.writeFileSync(file, `${JSON.stringify({ codexBundle, codexExe, codexVersion, codexTeamId })}\n`);
+' "$RUNTIME_STATE" "$EXPECTED_BUNDLE" "$EXPECTED_EXE" "$EXPECTED_VERSION" "$EXPECTED_TEAM_ID"
+/usr/bin/env -u NODE -u NODE_VERSION HOME="$RUNTIME_HOME" /bin/bash -c '
+  . "$1/scripts/common-macos.sh"
+  ensure_node_runtime
+  [ "$CODEX_BUNDLE" = "$2" ]
+  [ "$CODEX_EXE" = "$3" ]
+  [ "$CODEX_VERSION" = "$4" ]
+  [ "$CODEX_TEAM_ID" = "$5" ]
+' _ "$ROOT" "$EXPECTED_BUNDLE" "$EXPECTED_EXE" "$EXPECTED_VERSION" "$EXPECTED_TEAM_ID"
+[ ! -e "$STATE_EVAL_MARKER" ] || {
+  printf 'Runtime state values were evaluated as shell code.\n' >&2
+  exit 1
+}
+
 /bin/mkdir -p "$TMP/theme"
 /bin/cp "$ROOT/assets/portal-hero.png" "$TMP/theme/background.png"
 "$NODE" "$ROOT/scripts/write-theme.mjs" custom --output-dir "$TMP/theme" \
@@ -71,4 +104,4 @@ NO_DESKTOP_BACKUP="$TMP/theme-backup-without-desktop.json"
 /usr/bin/env -u HOME /bin/bash -c '. "$1/scripts/common-macos.sh"; [ -n "$HOME" ] && [ "$SKIN_VERSION" = "1.1.2" ]' _ "$ROOT"
 "$ROOT/scripts/doctor-macos.sh" >/dev/null
 
-printf 'PASS: syntax, payload, custom-theme, config round-trips, HOME recovery, signature, and doctor checks.\n'
+printf 'PASS: syntax, payload, runtime-state safety, custom-theme, config round-trips, HOME recovery, signature, and doctor checks.\n'