diff --git a/TASK_PROGRESS.md b/TASK_PROGRESS.md index 4e6a7024..ad1f35e2 100644 --- a/TASK_PROGRESS.md +++ b/TASK_PROGRESS.md @@ -1,5 +1,37 @@ # Task Progress +## Client release v1.5.11 — preparing (2026-08-01) + +- [base/merged] Settings renderer PR #334 passed exact-head CI run + `30648201928` at `6d8d2c561cae1e6084bd1fd288264be7c0823907`: Static, + macOS with Universal DMG, Windows PowerShell 7, and Windows PowerShell 5.1 + with Setup.exe compilation all succeeded. It was squash-merged to `main` as + `6e71534cd9cd55f87d1f6c9ff1cf305c7ef43893`. +- [scope] Independent worktree `/private/tmp/dreamskin-release-v1511.KVcKVg` + is on `codex/release-v1.5.11` from that exact `origin/main`. The release + changes only the six required platform version sources, four version-bound + assertions, both platform changelogs, and this durable record. +- [implemented locally] All six release version sources and four bound test + assertions now report `1.5.11`. Both changelogs describe the shared + Codex 26.727 Settings marker fix and its strict `app:` origin boundary. +- [verified locally] The six-source consistency check passes. Portable Node + regressions pass 82/82 (macOS 63 and Windows 19); both platform payload + checks report v1.5.11; runtime asset sync and `git diff --check` pass. The + complete applicable macOS suite passes with only its documented full-Xcode, + installed signed-runtime, and Doctor branches skipped. +- [committed locally] Reviewed release commit + `7d87e6e5ab14256ce6a44a2b7c327bfa6afef878` contains exactly the 12-file + v1.5.11 scope above. +- [pushed/PR open] Release commit + `7d87e6e5ab14256ce6a44a2b7c327bfa6afef878` and progress commit + `733b0a3ae95779714a736de86bcf1daf40cc1501` are pushed on + `codex/release-v1.5.11`; PR #335 targets `main` at + `https://github.com/Fei-Away/Codex-Dream-Skin/pull/335`. +- [pending] Commit and push this PR checkpoint, require four exact-head CI + jobs, then merge. + Only the Release workflow from the resulting `main` commit may tag and build + the public DMG, Setup.exe, and `SHA256SUMS.txt`. + ## PR #334 Windows CRLF CI follow-up — locally verified (2026-08-01) - [scope] Client worktree `/private/tmp/dreamskin-settings-fix.4tH4ld` is on diff --git a/macos/CHANGELOG.md b/macos/CHANGELOG.md index fbf9ef0a..7f58064e 100644 --- a/macos/CHANGELOG.md +++ b/macos/CHANGELOG.md @@ -4,6 +4,7 @@ ### 修复 +- 修复 Codex Desktop 26.727 设置页改用新版导航标记后,被注入器误判为非 ChatGPT 页面并报 `No page matched the expected ChatGPT shell markers` 的问题。双端共享契约现识别 `data-settings-panel-slug="general-settings"`,同时保留旧版外观设置锚点和严格的 `app:` 来源校验;首页与任务页的 L1 校验边界不变。 - 修复 Codex Desktop 26.727 更新后主区域、顶栏和顶部渐隐仍保持原生白底,或注入被错误报告为成功的问题(#320、#322、#326、#330)。共享选择器现同时识别旧结构与新版 app-shell 标记,首页和普通任务页必须达到完整 L1 可见性后才会提交成功。 - 同 ID 社区主题再次导入时原地升级,不再生成重复的 `id-2` / `id-3` 目录;仅在身份与完整语义指纹都匹配时清理旧后缀副本,缺失或非法 ID 使用双端一致的稳定映射(#318)。 - 主题目录替换增加持久化 journal 与 commit marker。进程被强制终止或系统重启后,菜单栏 App 会在启动时恢复未提交的旧主题;只有已持久提交且指纹匹配的新主题会被保留,损坏或冲突证据 fail-closed。 @@ -14,6 +15,7 @@ ### 内部 +- 同步 v1.5.11 版本号,发布 Codex 26.727 设置页识别修复。 - 同步 v1.5.10 版本号,发布社区主题升级、Codex 26.727 渲染兼容和中断恢复修复。 - 同步 v1.5.9 版本号以发布 Windows 一键换肤补丁;macOS 运行时代码相对 v1.5.8 无行为变化。 - 同步 v1.5.8 版本号以发布 Windows 安装器补丁;macOS 运行时代码相对 v1.5.7 无行为变化。 diff --git a/macos/VERSION b/macos/VERSION index f0ed3796..df808199 100644 --- a/macos/VERSION +++ b/macos/VERSION @@ -1 +1 @@ -1.5.10 +1.5.11 diff --git a/macos/package.json b/macos/package.json index 0c22dec0..b9e6d67b 100644 --- a/macos/package.json +++ b/macos/package.json @@ -1,6 +1,6 @@ { "name": "codex-dream-skin-studio", - "version": "1.5.10", + "version": "1.5.11", "private": true, "type": "module", "scripts": { diff --git a/macos/scripts/common-macos.sh b/macos/scripts/common-macos.sh index eb649299..14c5254e 100755 --- a/macos/scripts/common-macos.sh +++ b/macos/scripts/common-macos.sh @@ -29,7 +29,7 @@ CODEX_APP_JOB_LABEL="com.openai.codex-dream-skin-studio.app" INJECTOR_JOB_LABEL="com.openai.codex-dream-skin-studio.injector" EXPECTED_CODEX_TEAM_ID="2DC432GLL2" EXPECTED_CODEX_REQUIREMENT="anchor apple generic and certificate leaf[subject.OU] = \"$EXPECTED_CODEX_TEAM_ID\"" -SKIN_VERSION="1.5.10" +SKIN_VERSION="1.5.11" DREAM_SKIN_VALIDATED_RUNTIME_PID="" DREAM_SKIN_VALIDATED_RUNTIME_BUNDLE="" DREAM_SKIN_VALIDATED_RUNTIME_EXE="" diff --git a/macos/scripts/injector.mjs b/macos/scripts/injector.mjs index c0a8c618..9294c378 100644 --- a/macos/scripts/injector.mjs +++ b/macos/scripts/injector.mjs @@ -43,7 +43,7 @@ const stableTestidLiteral = (testid) => { } return JSON.stringify(`[data-testid="${testid}"]`); }; -const SKIN_VERSION = "1.5.10"; +const SKIN_VERSION = "1.5.11"; const LOOPBACK_HOSTS = new Set(["127.0.0.1", "localhost", "[::1]"]); const CDP_ID_PATTERN = /^[A-Za-z0-9._-]{1,200}$/; const MAX_ART_BYTES = 10 * 1024 * 1024; diff --git a/macos/tests/run-tests.sh b/macos/tests/run-tests.sh index 54c7c100..94aad6c6 100755 --- a/macos/tests/run-tests.sh +++ b/macos/tests/run-tests.sh @@ -86,7 +86,7 @@ UPDATE_JSON="$({ })" "$NODE" -e ' const value = JSON.parse(process.argv[1]); - if (value.currentVersion !== "v1.5.10" || value.latestVersion !== "v9.8.7") process.exit(1); + if (value.currentVersion !== "v1.5.11" || value.latestVersion !== "v9.8.7") process.exit(1); if (!value.updateAvailable) process.exit(1); if (value.releaseUrl !== "https://github.com/Fei-Away/Codex-Dream-Skin/releases/latest") process.exit(1); ' "$UPDATE_JSON" @@ -1071,7 +1071,7 @@ 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" = "1.5.10" ]' _ "$ROOT" +/usr/bin/env -u HOME /bin/bash -c '. "$1/scripts/common-macos.sh"; [ -n "$HOME" ] && [ "$SKIN_VERSION" = "1.5.11" ]' _ "$ROOT" if [ "${CODEX_DREAM_SKIN_SKIP_DOCTOR:-0}" = "1" ]; then printf 'SKIP: Doctor requires an installed, signed Codex app.\n' DOCTOR_RESULT="skipped" diff --git a/windows/CHANGELOG.md b/windows/CHANGELOG.md index aaaa3f2c..f01db361 100644 --- a/windows/CHANGELOG.md +++ b/windows/CHANGELOG.md @@ -4,6 +4,7 @@ ### 修复 +- 修复 Codex Desktop 26.727 设置页改用新版导航标记后,被注入器误判为非 ChatGPT 页面并报 `No page matched the expected ChatGPT shell markers` 的问题。双端共享契约现识别 `data-settings-panel-slug="general-settings"`,同时保留旧版外观设置锚点和严格的 `app:` 来源校验;首页与任务页的 L1 校验边界不变。 - 修复 Codex Desktop 26.727 更新后主区域、顶栏和顶部渐隐仍保持原生白底,或注入被错误报告为成功的问题(#320、#322、#326、#330)。共享选择器现同时识别旧结构与新版 app-shell 标记,首页和普通任务页必须达到完整 L1 可见性后才会提交成功。 - 同 ID 社区主题再次导入时原地升级,不再生成重复的 `id-2` / `id-3` 目录;仅在身份与完整语义指纹都匹配时清理旧后缀副本,缺失或非法 ID 使用双端一致的稳定映射(#318)。 - 主题目录替换增加持久化 journal 与 commit marker。PowerShell 进程被强制终止或系统重启后,托盘启动和下一次导入会恢复未提交的旧主题;只有已持久提交且指纹匹配的新主题会被保留,损坏或冲突证据 fail-closed。 @@ -14,6 +15,10 @@ - 修复社区主题一键换肤和 ZIP 导入拒绝 `backdrop-filter: blur(var(--ds-theme-surface-blur))` 的问题(#307、#312)。Safe CSS 仍只允许 `none`、0-20px blur 或注册的主题 blur 变量,不放宽到任意 filter 函数。 - 修复 Codex Desktop 26.721.x 首页在 `home-icon` 延迟渲染时被误判为注入校验失败的问题(#307)。Windows 校验现在与 macOS 一样复用已由首页内容信号解析出的 `[role="main"]` 容器;严格的 `home-icon` 路径仍优先,旧版行为不变。 +### 内部 + +- 同步 v1.5.11 版本号,发布 Codex 26.727 设置页识别修复。 + ## 1.5.6 — 2026-07-26 ### 安全 diff --git a/windows/VERSION b/windows/VERSION index f0ed3796..df808199 100644 --- a/windows/VERSION +++ b/windows/VERSION @@ -1 +1 @@ -1.5.10 +1.5.11 diff --git a/windows/scripts/injector.mjs b/windows/scripts/injector.mjs index 5b8b3865..00a4c7a9 100644 --- a/windows/scripts/injector.mjs +++ b/windows/scripts/injector.mjs @@ -39,7 +39,7 @@ const stableTestidLiteral = (testid) => { } return JSON.stringify(`[data-testid="${testid}"]`); }; -const SKIN_VERSION = "1.5.10"; +const SKIN_VERSION = "1.5.11"; const MAX_ART_BYTES = 10 * 1024 * 1024; const MAX_SAFE_CSS_BYTES = 256 * 1024; const STRONG_THEME_AUDIT_MS = 30000; diff --git a/windows/tests/injector-window-readiness.test.mjs b/windows/tests/injector-window-readiness.test.mjs index b8ffb2af..0323228e 100644 --- a/windows/tests/injector-window-readiness.test.mjs +++ b/windows/tests/injector-window-readiness.test.mjs @@ -125,7 +125,7 @@ function makeDomFixture({ }; const window = { __CODEX_DREAM_SKIN_STATE__: { - version: "1.5.10", + version: "1.5.11", themeId: "fixture-theme", revision: "fixture-revision", styleMode: "style", diff --git a/windows/tests/start-verified-skin-preserved.tests.ps1 b/windows/tests/start-verified-skin-preserved.tests.ps1 index dea23bd9..e4bac445 100644 --- a/windows/tests/start-verified-skin-preserved.tests.ps1 +++ b/windows/tests/start-verified-skin-preserved.tests.ps1 @@ -173,7 +173,7 @@ function Invoke-DreamSkinStartupFixture { # The exact renderer output from #267: theme installed and painted, every # readiness signal true except the native-window probe. $renderedPayload = @' -{"installed":true,"version":"1.5.10","stylePresent":true,"homePresent":true, +{"installed":true,"version":"1.5.11","stylePresent":true,"homePresent":true, "nativeWindow":{"pass":false,"bound":false,"reason":"target-window-unavailable"}, "documentVisibility":"visible","documentHidden":false, "viewport":{"width":1289,"height":829},