Merge main and resolve conflicts

Author: wasim-builds

.github/workflows/ci.yml

@@ -114,3 +114,25 @@ jobs:
       - name: Run Windows regression suite
         shell: cmd
         run: ${{ matrix.executable }} -NoLogo -NoProfile -ExecutionPolicy Bypass -File .\windows\tests\run-tests.ps1
+
+  macos-tests:
+    name: macOS repository regressions
+    runs-on: macos-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
+        with:
+          node-version: "22"
+
+      - name: Locate runner Node.js
+        id: node
+        shell: bash
+        run: echo "path=$(command -v node)" >> "$GITHUB_OUTPUT"
+
+      - name: Run macOS regressions without installed-app checks
+        shell: bash
+        env:
+          NODE: ${{ steps.node.outputs.path }}
+          CODEX_DREAM_SKIN_SKIP_SIGNED_RUNTIME_TESTS: "1"
+          CODEX_DREAM_SKIN_SKIP_DOCTOR: "1"
+        run: ./macos/tests/run-tests.sh

docs/platforms.md

@@ -75,15 +75,15 @@ Windows 启动、失败回滚与恢复重开均从已注册的 `OpenAI.Codex` 
 ### 平台差异
 
 - macOS 的选图脚本会把这些字段写入主题库，可通过 `--appearance`、`--focus-x`、`--focus-y`、`--safe-area`、`--task-mode` 设置。
-- Windows 安装会把运行所需的 `assets/` 与 `scripts/` 原子复制到 `%LOCALAPPDATA%\CodexDreamSkin\engine`，所有快捷方式均指向该受管副本，因此安装后可移动或删除源码目录。安装还会初始化 `active-theme`、`themes` 与 `images`，并把「桥本有菜」同时设为首次默认和可切换的已保存主题。系统托盘支持更换背景、保存当前主题、从「已保存主题」切换、暂停和恢复；图片与 `theme.json` 保存在主题仓库中，不写进 Codex 的 `config.toml`。安装会保留用户已有的 `appearanceTheme`；仅在识别到旧版精确托管的浅色三元组时按备份迁移。
+- Windows 安装会把运行所需的 `assets/` 与 `scripts/` 原子复制到 `%LOCALAPPDATA%\CodexDreamSkin\engine`，所有快捷方式均指向该受管副本，因此安装后可移动或删除源码目录。安装还会初始化 `active-theme`、`themes` 与 `images`，并把「桥本有菜」设为首次默认活动主题，同时把「桥本有菜」与「Gothic Void Crusade / 哥特虚空远征」播种为可切换的已保存主题。系统托盘支持更换背景、保存当前主题、从「已保存主题」切换、暂停和恢复；图片与 `theme.json` 保存在主题仓库中，不写进 Codex 的 `config.toml`。安装会保留用户已有的 `appearanceTheme`；仅在识别到旧版精确托管的浅色三元组时按备份迁移。
 - Windows 渲染器仍支持在注入前用 `window.__CODEX_DREAM_SKIN_CONFIG__` 提供内存级可选覆盖（形状同上，颜色覆盖使用 `palette.accent`），但普通用户应优先使用持久化主题仓库与托盘。
 
 ## 预设与图片类型
 
 - `macos/presets/preset-arina-hashimoto/` 是置顶的实测精选主题「桥本有菜 / Arina Hashimoto」。macOS 安装后用 `switch-theme-macos.sh --id preset-arina-hashimoto` 切换。
 - 该 preset pack 中只有 `background.jpg`（`2560 × 1440`、16:9、纯背景）和 `theme.json` 会被播种；它由用户提供的 `1672 × 941` 源 PNG 标准化导出，不代表增加了源图细节。Byte-identical 源图归档在 `docs/images/presets/arina-hashimoto-source.png`，不会随 preset 播种；`arina-hashimoto-light.jpg` 与 `arina-hashimoto-dark.jpg` 是 `2308 × 1572` Retina 浅/暗真实首页截图，未发送输入仅在截图时用临时本地样式遮蔽，只作效果预览，绝不能当背景导入。
 - `macos/presets/preset-gothic-void-crusade/` 是社区作者贡献的原创哥特科幻主题；macOS 没有活动主题时默认启用它。升级只清理固定的旧内置预设 ID，不删除 `custom-*` 或当前活动主题副本。
-- Windows 自带与 macOS byte-identical 的 `windows/assets/dream-reference.jpg` 纯背景，并在首次初始化时播种「桥本有菜」；可直接从「已保存主题 → 桥本有菜」切换。README 实机截图仍只作预览，绝不能作为背景导入。
+- Windows 自带与 macOS byte-identical 的 `windows/assets/dream-reference.jpg` 纯背景，并在首次初始化时播种「桥本有菜」与「Gothic Void Crusade」；可直接从「已保存主题」切换。README 实机截图仍只作预览，绝不能作为背景导入。
 - Windows 导入和 macOS 快速加载入口会拒绝空文件或超过 16 MB 的输入；macOS 主定制入口可接收最高 50 MB 的源图，但转换后的主题文件必须不超过 16 MB。两端 payload 构建还会拒绝任一边超过 16384px 或总像素超过 50MP 的声明尺寸；Windows 在复制导入图前复用 Node 元数据解析器执行同一限制。Windows 注入器用图片与主题内容的 SHA-256 修订值识别热更新，并在构建首帧 payload 前同步读取图片比例。
 - 自定义生图优先使用 `2560 × 1440`（16:9）：左侧约 50%～58% 保持低信息、低对比，主体放在右侧约 58%～88%。输出必须是连续铺满画布的纯背景，禁止窗口、侧栏、卡片、输入框、文字、Logo 和水印。
 - 可直接复制的无人物、右侧成年人物与参考图编辑模板见 `docs/reference-background-prompt-guide.md`；公共默认提示词不指定真人或名人。

macos/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## Unreleased
+
+### 改进
+
+- 菜单栏在 `paused` 状态显示「继续显示皮肤」（调用现有应用入口），与 Windows 托盘暂停/继续文案和语义对齐；运行中仍为「重新应用皮肤」+「暂停皮肤」。
+
 ## 1.2.0 — 2026-07-17
 
 ### 新增

macos/menubar/codex_dream_skin.10s.sh

@@ -129,9 +129,14 @@ case "$OPERATION_LINE" in
   *)
     case "$SESSION_LINE" in
       active)
+        # Same pair as Windows tray when running: re-apply + pause (live remove).
         echo "重新应用皮肤 | bash=\"$APPLY\" terminal=false refresh=true"
         echo "暂停皮肤 | bash=\"$PAUSE\" terminal=false refresh=true"
         ;;
+      paused)
+        # Same resume affordance as Windows tray "继续显示皮肤": clear pause and apply.
+        echo "继续显示皮肤 | bash=\"$APPLY\" terminal=false refresh=true"
+        ;;
       stale|unknown)
         echo "修复并应用 | bash=\"$APPLY\" terminal=false refresh=true"
         ;;

macos/tests/run-tests.sh

@@ -201,34 +201,42 @@ fi
   [ "$seeded" -eq 2 ] || exit 1
 ' _ "$ROOT"
 
-# Theme switches stage files and publish theme.json last, preserving a complete
-# active pack while the watcher is running.
-SWITCH_HOME="$TMP/switch-home"
-SWITCH_STATE="$SWITCH_HOME/Library/Application Support/CodexDreamSkinStudio"
-/bin/mkdir -p "$SWITCH_STATE/themes/preset-switch-fixture" "$SWITCH_STATE/theme"
-/bin/cp "$ROOT/assets/portal-hero.png" "$SWITCH_STATE/themes/preset-switch-fixture/background.png"
-/usr/bin/printf '%s\n' \
-  '{"schemaVersion":1,"id":"preset-switch-fixture","name":"切换测试","image":"background.png"}' \
-  > "$SWITCH_STATE/themes/preset-switch-fixture/theme.json"
-/usr/bin/printf '%s\n' '{"schemaVersion":1,"id":"old","name":"旧主题","image":"old.png"}' \
-  > "$SWITCH_STATE/theme/theme.json"
-: > "$SWITCH_STATE/theme/old.png"
-if /usr/bin/env HOME="$SWITCH_HOME" NODE="$NODE" \
-  "$ROOT/scripts/switch-theme-macos.sh" --id '../escape' --no-apply >/dev/null 2>&1; then
-  printf 'switch-theme unexpectedly accepted a path traversal theme id.\n' >&2
-  exit 1
+run_signed_runtime_switch_test() {
+  local switch_home="$TMP/switch-home"
+  local switch_state="$switch_home/Library/Application Support/CodexDreamSkinStudio"
+  /bin/mkdir -p "$switch_state/themes/preset-switch-fixture" "$switch_state/theme"
+  /bin/cp "$ROOT/assets/portal-hero.png" "$switch_state/themes/preset-switch-fixture/background.png"
+  /usr/bin/printf '%s\n' \
+    '{"schemaVersion":1,"id":"preset-switch-fixture","name":"切换测试","image":"background.png"}' \
+    > "$switch_state/themes/preset-switch-fixture/theme.json"
+  /usr/bin/printf '%s\n' '{"schemaVersion":1,"id":"old","name":"旧主题","image":"old.png"}' \
+    > "$switch_state/theme/theme.json"
+  : > "$switch_state/theme/old.png"
+  if /usr/bin/env HOME="$switch_home" NODE="$NODE" \
+    "$ROOT/scripts/switch-theme-macos.sh" --id '../escape' --no-apply >/dev/null 2>&1; then
+    printf 'switch-theme unexpectedly accepted a path traversal theme id.\n' >&2
+    exit 1
+  fi
+  /usr/bin/env HOME="$switch_home" NODE="$NODE" \
+    "$ROOT/scripts/switch-theme-macos.sh" --id preset-switch-fixture --no-apply >/dev/null
+  /usr/bin/cmp -s "$switch_state/theme/background.png" \
+    "$switch_state/themes/preset-switch-fixture/background.png"
+  [ ! -e "$switch_state/theme/old.png" ]
+  "$NODE" -e '
+    const fs = require("fs");
+    const theme = JSON.parse(fs.readFileSync(process.argv[1], "utf8"));
+    if (theme.id !== "preset-switch-fixture" || theme.name !== "切换测试") process.exit(1);
+  ' "$switch_state/theme/theme.json"
+  [ -z "$(/usr/bin/find "$switch_state" -maxdepth 1 -name '.theme-switch.*' -print -quit)" ]
+}
+
+if [ "${CODEX_DREAM_SKIN_SKIP_SIGNED_RUNTIME_TESTS:-0}" = "1" ]; then
+  printf 'SKIP: switch-theme integration requires an installed, signed Codex app.\n'
+  SWITCH_RUNTIME_RESULT="skipped"
+else
+  run_signed_runtime_switch_test
+  SWITCH_RUNTIME_RESULT="passed"
 fi
-/usr/bin/env HOME="$SWITCH_HOME" NODE="$NODE" \
-  "$ROOT/scripts/switch-theme-macos.sh" --id preset-switch-fixture --no-apply >/dev/null
-/usr/bin/cmp -s "$SWITCH_STATE/theme/background.png" \
-  "$SWITCH_STATE/themes/preset-switch-fixture/background.png"
-[ ! -e "$SWITCH_STATE/theme/old.png" ]
-"$NODE" -e '
-  const fs = require("fs");
-  const theme = JSON.parse(fs.readFileSync(process.argv[1], "utf8"));
-  if (theme.id !== "preset-switch-fixture" || theme.name !== "切换测试") process.exit(1);
-' "$SWITCH_STATE/theme/theme.json"
-[ -z "$(/usr/bin/find "$SWITCH_STATE" -maxdepth 1 -name '.theme-switch.*' -print -quit)" ]
 
 RUNTIME_HOME="$TMP/runtime-home"
 RUNTIME_STATE_ROOT="$RUNTIME_HOME/Library/Application Support/CodexDreamSkinStudio"
@@ -296,6 +304,7 @@ UNTRUSTED_TEAM_ID="TEAM'ID"
   if pid_is_codex_executable "$$" || pid_is_codex_descendant "$$"; then exit 1; fi
 ' _ "$ROOT"
 
+run_signed_runtime_state_tests() {
 # A reused live PID must never be killed or treated as a successfully stopped
 # injector when its command identity does not match the recorded watcher.
 STOP_HOME="$TMP/stop-home"
@@ -488,6 +497,15 @@ for state_payload in '{' '{}'; do
   ' _ "$ROOT" "$TEST_INJECTOR_JOB_LABEL"
   /usr/bin/cmp -s "$STOP_STATE_ROOT/state.json" "$STOP_STATE_ROOT/state.original"
 done
+}
+
+if [ "${CODEX_DREAM_SKIN_SKIP_SIGNED_RUNTIME_TESTS:-0}" = "1" ]; then
+  printf 'SKIP: runtime-state integration requires an installed, signed Codex app.\n'
+  RUNTIME_STATE_RESULT="skipped"
+else
+  run_signed_runtime_state_tests
+  RUNTIME_STATE_RESULT="passed"
+fi
 
 /bin/mkdir -p "$TMP/theme"
 /bin/cp "$ROOT/assets/portal-hero.png" "$TMP/theme/background.png"
@@ -821,6 +839,14 @@ CRLF_BACKUP="$TMP/config-crlf-backup.json"
 "$NODE" "$ROOT/scripts/theme-config.mjs" restore "$CRLF_CONFIG" "$CRLF_BACKUP" >/dev/null
 /usr/bin/cmp -s "$CRLF_CONFIG" "$TMP/original-crlf.toml"
 
-/usr/bin/env -u HOME /bin/bash -c '. "$1/scripts/common-macos.sh"; [ -n "$HOME" ] && [ "$SKIN_VERSION" = "$(/bin/cat "$ROOT/VERSION" 2>/dev/null | /usr/bin/tr -d '\''\n\r'\'')" ]' _ "$ROOT""$ROOT/scripts/doctor-macos.sh" >/dev/null
+/usr/bin/env -u HOME /bin/bash -c '. "$1/scripts/common-macos.sh"; [ -n "$HOME" ] && [ "$SKIN_VERSION" = "$(/bin/cat "$ROOT/VERSION" 2>/dev/null | /usr/bin/tr -d '\''\n\r'\'')" ]' _ "$ROOT"
+if [ "${CODEX_DREAM_SKIN_SKIP_DOCTOR:-0}" = "1" ]; then
+  printf 'SKIP: Doctor requires an installed, signed Codex app.\n'
+  DOCTOR_RESULT="skipped"
+else
+  "$ROOT/scripts/doctor-macos.sh" >/dev/null
+  DOCTOR_RESULT="passed"
+fi
 
-printf 'PASS: syntax, payload, bundled presets, preset seeding, runtime-state safety, custom-theme, config round-trips, HOME recovery, signature, and doctor checks.\n'
+printf 'PASS: syntax, payload, bundled presets, preset seeding, runtime-state safety, custom-theme, config round-trips, HOME recovery, signature, switch-theme signed runtime %s, runtime-state integration %s, and Doctor %s.\n' \
+  "$SWITCH_RUNTIME_RESULT" "$RUNTIME_STATE_RESULT" "$DOCTOR_RESULT"

windows/CHANGELOG.md

@@ -1,5 +1,14 @@
 # Windows Changelog
 
+## Unreleased
+
+### 修复
+
+- 收起或重建左侧栏时不再因找不到 `aside.app-shell-left-panel` 而整页卸掉皮肤；只要主内容壳层仍在就继续应用当前主题，避免闪回 Codex 原生配色。透明辅助窗口仍会清理残留样式。
+- 托盘「暂停皮肤」现在与 macOS 一致：写入暂停标记后立刻通过 CDP 执行 `injector --remove` 卸下当前窗口皮肤，不再只等 watcher 轮询；「继续显示皮肤」会清除暂停并重新应用。
+- Windows 注入器补齐与 macOS 相同的窗口内操作浮层（loading / 成功 / 失败）；暂停、继续与重新应用时在 Codex 主区显示「正在暂停皮肤…」「正在应用皮肤…」等进度，不再只有托盘气泡。
+- 安装/主题库初始化会把 macOS 同款「Gothic Void Crusade / 哥特虚空远征」播种到已保存主题（`presets/preset-gothic-void-crusade`），可与「桥本有菜」一并在托盘切换；默认活动主题仍为桥本有菜。
+
 ## 1.2.0 — 2026-07-17
 
 ### 新增

windows/assets/renderer-inject.js

@@ -326,9 +326,15 @@
     const root = document.documentElement;
     if (!root || !document.body) return;
 
-    const shellMain = document.querySelector("main.main-surface");
-    const shellSidebar = document.querySelector("aside.app-shell-left-panel");
-    if (!shellMain || !shellSidebar) {
+    // Main Codex shell is the content surface. The left rail is optional: Codex
+    // removes or rebuilds aside.app-shell-left-panel while collapsing/expanding
+    // it, and clearing the skin there flashes native colors over the active theme.
+    // True auxiliary windows (pets, blank targets) still have no main surface, so
+    // they continue to clear residual skin state.
+    const shellMain = document.querySelector("main.main-surface") ||
+      document.querySelector("main") ||
+      document.querySelector('[role="main"]');
+    if (!shellMain) {
       clearSkinDom();
       return;
     }
@@ -348,7 +354,9 @@
     }
 
     const home = document.querySelector('[role="main"]:has([data-testid="home-icon"])');
-    for (const candidate of document.querySelectorAll('[role="main"]')) {
+    const mainCandidates = [...document.querySelectorAll('[role="main"]')];
+    if (!mainCandidates.length) mainCandidates.push(shellMain);
+    for (const candidate of mainCandidates) {
       candidate.classList.toggle("dream-home", candidate === home);
       candidate.classList.toggle("dream-task", candidate !== home);
     }

windows/presets/preset-gothic-void-crusade/background.jpg

@@ -0,0 +1,34 @@
+{
+  "schemaVersion": 1,
+  "id": "preset-gothic-void-crusade",
+  "name": "Gothic Void Crusade",
+  "brandSubtitle": "CODEX DREAM SKIN",
+  "tagline": "A solemn cathedral-world horizon for focused work.",
+  "projectPrefix": "Select project · ",
+  "projectLabel": "◉  Select project",
+  "statusText": "VOID CRUSADE ONLINE",
+  "quote": "MAKE SOMETHING WONDERFUL",
+  "image": "background.jpg",
+  "appearance": "auto",
+  "art": {
+    "focusX": 0.76,
+    "focusY": 0.45,
+    "safeArea": "left",
+    "taskMode": "ambient"
+  },
+  "colors": {
+    "background": "#0d0d0e",
+    "panel": "#171513",
+    "panelAlt": "#211d18",
+    "accent": "#c8a55a",
+    "accentAlt": "#e3c27a",
+    "secondary": "#74352e",
+    "highlight": "#8a2f27",
+    "text": "#f3ead7",
+    "muted": "#b5a386",
+    "line": "rgba(200, 165, 90, .28)"
+  },
+  "promoTitle": "Codex Dream Skin",
+  "promoSub": "Gothic Void Crusade",
+  "promoUrl": "https://github.com/Fei-Away/Codex-Dream-Skin"
+}

windows/presets/preset-gothic-void-crusade/theme.json

@@ -130,6 +130,8 @@ function Install-DreamSkinRuntimeEngine {
     'assets\dream-skin.css',
     'assets\renderer-inject.js',
     'assets\theme.json',
+    'presets\preset-gothic-void-crusade\background.jpg',
+    'presets\preset-gothic-void-crusade\theme.json',
     'scripts\common-windows.ps1',
     'scripts\config-utf8.ps1',
     'scripts\image-metadata.mjs',
@@ -146,7 +148,8 @@ function Install-DreamSkinRuntimeEngine {
       throw "Dream Skin runtime source is incomplete: $relative"
     }
   }
-  foreach ($directoryName in @('assets', 'scripts')) {
+  $runtimeDirectories = @('assets', 'scripts', 'presets')
+  foreach ($directoryName in $runtimeDirectories) {
     $sourceDirectory = Join-Path $sourceRoot $directoryName
     if ((Test-DreamSkinPathEqual -Left $fullStateRoot -Right $sourceDirectory) -or
       (Test-DreamSkinPathWithin -Path $fullStateRoot -Root $sourceDirectory)) {
@@ -162,7 +165,7 @@ function Install-DreamSkinRuntimeEngine {
   Ensure-DreamSkinManagedDirectory -Path $stagingRoot -Root $fullStateRoot
 
   try {
-    foreach ($directoryName in @('assets', 'scripts')) {
+    foreach ($directoryName in $runtimeDirectories) {
       Copy-Item -LiteralPath (Join-Path $sourceRoot $directoryName) -Destination $stagingRoot `
         -Recurse -Force -ErrorAction Stop
     }
@@ -174,13 +177,17 @@ function Install-DreamSkinRuntimeEngine {
     }
 
     $sourcePrefix = $sourceRoot.TrimEnd('\') + '\'
+    $sourceTrees = @(
+      foreach ($directoryName in $runtimeDirectories) { Join-Path $sourceRoot $directoryName }
+    )
+    $stagedTrees = @(
+      foreach ($directoryName in $runtimeDirectories) { Join-Path $stagingRoot $directoryName }
+    )
     $sourceFiles = @(
-      Get-ChildItem -LiteralPath (Join-Path $sourceRoot 'assets'), (Join-Path $sourceRoot 'scripts') `
-        -Recurse -File -Force -ErrorAction Stop
+      Get-ChildItem -LiteralPath $sourceTrees -Recurse -File -Force -ErrorAction Stop
     )
     $stagedFiles = @(
-      Get-ChildItem -LiteralPath (Join-Path $stagingRoot 'assets'), (Join-Path $stagingRoot 'scripts') `
-        -Recurse -File -Force -ErrorAction Stop
+      Get-ChildItem -LiteralPath $stagedTrees -Recurse -File -Force -ErrorAction Stop
     )
     if ($sourceFiles.Count -ne $stagedFiles.Count) {
       throw 'Staged Dream Skin runtime file count does not match its source.'