fix: support Codex 26.727 renderer markers

Recognize the new CSS-module shell and header markers while preserving the shell-plus-sidebar identity boundary. Keep home verification strict with guarded replacement signals after home-icon removal, and enforce the renderer discovery timeout across nested CDP operations.

Author: ZacharyPatrick

macos/assets/dream-skin.css

@@ -1,6 +1,6 @@
 // Canonical cross-platform renderer. Run tools/sync-runtime-assets.mjs after editing.
 ((cssText, artDataUrl, themeConfig) => {
-  const SELECTOR_CONTRACT = {"schema":"codex-dream-skin-selectors/1","selectors":[{"key":"shell-main","selector":"main.main-surface","tier":"L1","scope":"all","required":true},{"key":"left-panel","selector":"aside.app-shell-left-panel","tier":"L1","scope":"all","required":true},{"key":"header-tint","selector":"header.app-header-tint","tier":"L1","scope":"all","required":true},{"key":"home-icon","selector":"[data-testid=\"home-icon\"]","tier":"L1","scope":"home","required":true},{"key":"home-route","selector":"[role=\"main\"]:has([data-testid=\"home-icon\"])","tier":"L1","scope":"home","required":true},{"key":"home-route-css","selector":"[role=\"main\"]","tier":"L1","scope":"home","required":true},{"key":"home-banners","selector":".home-banners","tier":"L2","scope":"home","required":false},{"key":"composer-chrome","selector":".composer-surface-chrome","tier":"L2","scope":"home+thread","required":false},{"key":"composer-toolbar","selector":".composer-surface-chrome [class*=\"_footer_\"]","tier":"L2","scope":"home+thread","required":false},{"key":"home-utility","selector":"[class*=\"_homeUtilityBar_\"]","tier":"L2","scope":"home","required":false},{"key":"game-source","selector":"[data-feature=\"game-source\"]","tier":"L2","scope":"home","required":false},{"key":"home-suggestions","selector":".group\\/home-suggestions","tier":"L2","scope":"home","required":false},{"key":"project-selector","selector":".group\\/project-selector","tier":"L2","scope":"home config","required":false},{"key":"markdown","selector":"[class*=\"_markdown\"]","tier":"L2","scope":"thread","required":false},{"key":"thread-surface","selector":".thread-scroll-container","tier":"L2","scope":"thread","required":false},{"key":"message","selector":"[data-message-author-role]","tier":"L2","scope":"thread","required":false},{"key":"appearance-radio","selector":"input[name=\"appearance-theme\"]","tier":"L2","scope":"settings","required":false},{"key":"overlay-menu","selector":"[role=\"menu\"]","tier":"L2","scope":"overlay","required":false},{"key":"overlay-dialog","selector":"[role=\"dialog\"]","tier":"L2","scope":"overlay","required":false},{"key":"overlay-popper","selector":"[data-radix-popper-content-wrapper]","tier":"L2","scope":"overlay","required":false}],"stableTestids":["app-shell-header-context-menu-surface","home-icon","theme-preview"]};
+  const SELECTOR_CONTRACT = {"schema":"codex-dream-skin-selectors/1","selectors":[{"key":"shell-main","selector":":is(main.main-surface, main[class*=\"_MainContentSurface_\"])","tier":"L1","scope":"all","required":true},{"key":"left-panel","selector":"aside.app-shell-left-panel","tier":"L1","scope":"all","required":true},{"key":"header-tint","selector":":is(header.app-header-tint, header[class*=\"_Header_\"])","tier":"L1","scope":"all","required":true},{"key":"home-icon","selector":"[data-testid=\"home-icon\"]","tier":"L1","scope":"home","required":false},{"key":"home-route","selector":"[role=\"main\"]:has([data-testid=\"home-icon\"], [class*=\"_homeUtilityBar_\"], .group\\/home-suggestions)","tier":"L1","scope":"home","required":true},{"key":"home-route-css","selector":"[role=\"main\"]","tier":"L1","scope":"home","required":true},{"key":"home-banners","selector":".home-banners","tier":"L2","scope":"home","required":false},{"key":"composer-chrome","selector":".composer-surface-chrome","tier":"L2","scope":"home+thread","required":false},{"key":"composer-toolbar","selector":".composer-surface-chrome [class*=\"_footer_\"]","tier":"L2","scope":"home+thread","required":false},{"key":"home-utility","selector":"[class*=\"_homeUtilityBar_\"]","tier":"L2","scope":"home","required":false},{"key":"game-source","selector":"[data-feature=\"game-source\"]","tier":"L2","scope":"home","required":false},{"key":"home-suggestions","selector":".group\\/home-suggestions","tier":"L2","scope":"home","required":false},{"key":"project-selector","selector":".group\\/project-selector","tier":"L2","scope":"home config","required":false},{"key":"markdown","selector":"[class*=\"_markdown\"]","tier":"L2","scope":"thread","required":false},{"key":"thread-surface","selector":".thread-scroll-container","tier":"L2","scope":"thread","required":false},{"key":"message","selector":"[data-message-author-role]","tier":"L2","scope":"thread","required":false},{"key":"appearance-radio","selector":"input[name=\"appearance-theme\"]","tier":"L2","scope":"settings","required":false},{"key":"overlay-menu","selector":"[role=\"menu\"]","tier":"L2","scope":"overlay","required":false},{"key":"overlay-dialog","selector":"[role=\"dialog\"]","tier":"L2","scope":"overlay","required":false},{"key":"overlay-popper","selector":"[data-radix-popper-content-wrapper]","tier":"L2","scope":"overlay","required":false}],"stableTestids":["app-shell-header-context-menu-surface","home-icon","theme-preview"]};
   const STATE_KEY = "__CODEX_DREAM_SKIN_STATE__";
   const DISABLED_KEY = "__CODEX_DREAM_SKIN_DISABLED__";
   const STYLE_REGISTRY_KEY = "__CODEX_DREAM_SKIN_STYLE_SHEETS__";

macos/assets/renderer-inject.js

@@ -1,10 +1,10 @@
 {
   "schema": "codex-dream-skin-selectors/1",
-  "description": "双端统一选择器契约（初稿）。scope 与 required 均来自 2026-07-21 双端 DOM 快照实测，非猜测。doctor / CI 应逐条 querySelector 并按 tier 判级：L1 缺失=皮肤主行为受损，L2 缺失=精修静默降级。",
+  "description": "双端统一选择器契约。scope 与 required 来自脱敏 DOM 快照实测，非猜测。doctor / CI 应逐条 querySelector 并按 tier 判级：L1 缺失=皮肤主行为受损，L2 缺失=精修静默降级。",
   "verifiedAgainst": {
-    "date": "2026-07-21",
-    "chromium": "150.0.7871.124",
-    "codexVersionMac": "26.715.61943",
+    "date": "2026-07-31",
+    "chromium": "150.0.7871.182",
+    "codexVersionMac": "26.715.61943 and 26.727.40816",
     "codexVersionWindows": "版本号未记录；bundle hash 与 mac 不同（ModelPickerTrigger mac=1fm6a win=1w4ob），确认存在版本错位",
     "fixtures": [
       "runtime/dom-fixtures/codex-dom-fixture-darwin-watch.json (15 状态)",
@@ -26,11 +26,11 @@
     "config": "依赖用户配置才出现（如未配置项目则无项目选择器）"
   },
   "selectors": [
-    { "key": "shell-main", "selector": "main.main-surface", "tier": "L1", "scope": "all", "required": true, "notes": "全局主表面。mac 设置页缺失（win 存在），缺失时整页仅 L0" },
+    { "key": "shell-main", "selector": ":is(main.main-surface, main[class*=\"_MainContentSurface_\"])", "tier": "L1", "scope": "all", "required": true, "notes": "全局主表面。兼容旧稳定类与 26.727+ CSS Modules 前缀；必须与 left-panel 组合用于窗口身份校验。mac 设置页缺失（win 存在），缺失时整页仅 L0" },
     { "key": "left-panel", "selector": "aside.app-shell-left-panel", "tier": "L1", "scope": "all", "required": true, "notes": "左侧栏；收起/重建时会移除节点，勿在其消失时清皮" },
-    { "key": "header-tint", "selector": "header.app-header-tint", "tier": "L1", "scope": "all", "required": true, "notes": "顶栏；皮肤不得覆盖其 position/z-index（既有回归约束）" },
-    { "key": "home-icon", "selector": "[data-testid=\"home-icon\"]", "tier": "L1", "scope": "home", "required": true, "notes": "首页判定信号，双端一致" },
-    { "key": "home-route", "selector": "[role=\"main\"]:has([data-testid=\"home-icon\"])", "tier": "L1", "scope": "home", "required": true, "notes": "首页容器。实测 [role=main] 仅存在于首页——它不是通用路由锚点，thread 页没有" },
+    { "key": "header-tint", "selector": ":is(header.app-header-tint, header[class*=\"_Header_\"])", "tier": "L1", "scope": "all", "required": true, "notes": "顶栏；兼容旧稳定类与 26.727+ CSS Modules 前缀。皮肤不得覆盖其 position/z-index（既有回归约束）" },
+    { "key": "home-icon", "selector": "[data-testid=\"home-icon\"]", "tier": "L1", "scope": "home", "required": false, "notes": "旧版首页判定及 hero 定位信号；26.727 已移除，因此不再单独阻断 L1" },
+    { "key": "home-route", "selector": "[role=\"main\"]:has([data-testid=\"home-icon\"], [class*=\"_homeUtilityBar_\"], .group\\/home-suggestions)", "tier": "L1", "scope": "home", "required": true, "notes": "首页容器。兼容旧 home-icon 与 26.727 的 utility/suggestions 信号；实测 [role=main] 仅存在于首页，thread 页没有" },
     { "key": "home-route-css", "selector": "[role=\"main\"]", "tier": "L1", "scope": "home", "required": true, "notes": "home-route 的 CSS 可组合别名：不含 :has()。CSS 禁止 :has() 嵌套，home-route 原选择器一旦写进 :has()/:not(:has()) 整条规则会被解析器丢弃（v1.3.1 全窗口首页与任务页氛围背景因此失效）。依据与 home-route 相同的实测：[role=main] 仅存在于首页；该锚点缺失时 CSS 路由门控整体失效，故必须按 L1 必需项监控" },
     { "key": "home-banners", "selector": ".home-banners", "tier": "L2", "scope": "home", "required": false, "notes": "Codex 26.721+ 新增的原生首页 banner 插槽，位于 home-route 第一个子节点内、通常为空（0 子节点）靠原生 empty:hidden 折叠。真正的首页内容（标题/建议卡/输入框）在这个版本上已变成该插槽外层容器的兄弟节点，不再是它的后代（见 #244 实测：home-route > div:first-child 被撑到 100% 高度会把内容挤出视口）。用于判定新旧 home DOM 形态，皮肤据此把 first-child 链路的强制尺寸限定在旧形态或改走兄弟节点" },
     { "key": "composer-chrome", "selector": ".composer-surface-chrome", "tier": "L2", "scope": "home+thread", "required": false, "notes": "输入框壳。win 实测存在无 composer 的 detail 路由，不可当全局锚点" },

macos/assets/selectors.json

@@ -371,12 +371,14 @@ class CdpSession {
     this.closed = false;
   }
 
-  async open() {
+  async open(timeoutMs = 25000) {
+    const deadline = Date.now() + Math.max(1, timeoutMs);
+    const remaining = (maximum) => Math.max(1, Math.min(maximum, deadline - Date.now()));
     await new Promise((resolve, reject) => {
       const timeout = setTimeout(() => {
         try { this.ws.close(); } catch {}
         reject(new Error("CDP WebSocket open timed out"));
-      }, 5000);
+      }, remaining(5000));
       this.ws.addEventListener("open", () => { clearTimeout(timeout); resolve(); }, { once: true });
       this.ws.addEventListener("error", () => { clearTimeout(timeout); reject(new Error("CDP WebSocket open failed")); }, { once: true });
     });
@@ -390,8 +392,8 @@ class CdpSession {
       }
       this.pending.clear();
     });
-    await this.send("Runtime.enable");
-    await this.send("Page.enable");
+    await this.send("Runtime.enable", {}, remaining(10000));
+    await this.send("Page.enable", {}, remaining(10000));
     return this;
   }
 
@@ -478,9 +480,9 @@ class CdpSession {
   }
 }
 
-async function listAppTargets(port) {
+async function listAppTargets(port, timeoutMs = 2000) {
   const controller = new AbortController();
-  const timeout = setTimeout(() => controller.abort(), 2000);
+  const timeout = setTimeout(() => controller.abort(), Math.max(1, Math.min(2000, timeoutMs)));
   try {
     const response = await fetch(`http://127.0.0.1:${port}/json/list`, {
       redirect: "error",
@@ -495,7 +497,7 @@ async function listAppTargets(port) {
   }
 }
 
-async function probeSession(session) {
+async function probeSession(session, timeoutMs = 10000) {
   return session.evaluate(`(() => {
     const markers = {
       shell: Boolean(document.querySelector(${selectorLiteral("shell-main")})),
@@ -510,7 +512,7 @@ async function probeSession(session) {
       codex: location.protocol === 'app:' &&
         ((markers.shell && markers.sidebar) || settings || markers.main),
     };
-  })()`);
+  })()`, timeoutMs);
 }
 
 async function waitForCodexProbe(session, timeoutMs = 1800) {
@@ -524,22 +526,25 @@ async function waitForCodexProbe(session, timeoutMs = 1800) {
   return probe;
 }
 
-async function connectTarget(target, port) {
-  return new CdpSession(target, port).open();
+async function connectTarget(target, port, timeoutMs) {
+  return new CdpSession(target, port).open(timeoutMs);
 }
 
-async function connectCodexTargets(port, timeoutMs) {
+export async function connectCodexTargets(port, timeoutMs) {
   const deadline = Date.now() + timeoutMs;
+  const remaining = (maximum = Number.POSITIVE_INFINITY) =>
+    Math.max(1, Math.min(maximum, deadline - Date.now()));
   let lastError;
   while (Date.now() < deadline) {
     try {
-      const targets = await listAppTargets(port);
+      const targets = await listAppTargets(port, remaining(2000));
       const connected = [];
       for (const target of targets) {
+        if (Date.now() >= deadline) break;
         let session;
         try {
-          session = await connectTarget(target, port);
-          const probe = await probeSession(session);
+          session = await connectTarget(target, port, remaining());
+          const probe = await probeSession(session, remaining(10000));
           if (probe?.codex) connected.push({ target, session, probe });
           else session.close();
         } catch (error) {
@@ -552,7 +557,8 @@ async function connectCodexTargets(port, timeoutMs) {
     } catch (error) {
       lastError = error;
     }
-    await new Promise((resolve) => setTimeout(resolve, 350));
+    const delay = Math.min(350, Math.max(0, deadline - Date.now()));
+    if (delay > 0) await new Promise((resolve) => setTimeout(resolve, delay));
   }
   throw new Error(`No verified ChatGPT renderer on 127.0.0.1:${port}: ${lastError?.message ?? "timed out"}`);
 }

macos/scripts/injector.mjs

@@ -9,7 +9,7 @@ const here = path.dirname(fileURLToPath(import.meta.url));
 const injectorPath = path.resolve(here, "../scripts/injector.mjs");
 const source = await fs.readFile(injectorPath, "utf8");
 
-function createFixture() {
+function createFixture({ shellVariant = "legacy" } = {}) {
   const domReady = [];
   const timers = new Map();
   const intervals = new Map();
@@ -24,7 +24,10 @@ function createFixture() {
       get documentElement() { return root; },
       addEventListener(type, callback) { if (type === "DOMContentLoaded") domReady.push(callback); },
       querySelector(selector) {
-        if (selector === "main.main-surface") return markers.shell ? {} : null;
+        if (
+          (shellVariant === "legacy" && selector.includes("main.main-surface")) ||
+          (shellVariant === "css-module" && selector.includes('main[class*="_MainContentSurface_"]'))
+        ) return markers.shell ? {} : null;
         if (selector === "aside.app-shell-left-panel") return markers.sidebar ? {} : null;
         if (selector === "[role=\"main\"]") return markers.main ? {} : null;
         if (selector.includes("appearance-theme") || selector.includes("theme-preview")) {
@@ -68,6 +71,19 @@ guarded.markers.sidebar = true;
 guarded.tick();
 assert.deepEqual(guarded.context.window.installs, ["guarded"]);
 
+const currentCodex = createFixture({ shellVariant: "css-module" });
+currentCodex.markers.shell = true;
+currentCodex.markers.sidebar = true;
+vm.runInNewContext(
+  earlyPayloadFor('window.installs.push("current-codex")', "current-codex"),
+  currentCodex.context,
+);
+assert.deepEqual(
+  currentCodex.context.window.installs,
+  ["current-codex"],
+  "Codex 26.727 CSS-module shell markers must be recognized without weakening sidebar identity.",
+);
+
 const generations = createFixture();
 generations.makeNotReady();
 generations.markers.shell = true;

macos/tests/injector-bootstrap.test.mjs

@@ -0,0 +1,50 @@
+import assert from "node:assert/strict";
+import { connectCodexTargets } from "../scripts/injector.mjs";
+
+const originalFetch = globalThis.fetch;
+const originalWebSocket = globalThis.WebSocket;
+
+class NeverOpeningWebSocket {
+  constructor() {
+    this.listeners = new Map();
+  }
+
+  addEventListener(type, listener) {
+    const listeners = this.listeners.get(type) ?? [];
+    listeners.push(listener);
+    this.listeners.set(type, listeners);
+  }
+
+  close() {}
+}
+
+globalThis.fetch = async () => ({
+  ok: true,
+  async json() {
+    return [{
+      type: "page",
+      id: "current-main",
+      url: "app://-/index.html",
+      webSocketDebuggerUrl: "ws://127.0.0.1:9341/devtools/page/current-main",
+    }];
+  },
+});
+globalThis.WebSocket = NeverOpeningWebSocket;
+
+try {
+  const startedAt = Date.now();
+  await assert.rejects(
+    connectCodexTargets(9341, 80),
+    /No verified ChatGPT renderer/,
+  );
+  const elapsed = Date.now() - startedAt;
+  assert.ok(
+    elapsed < 500,
+    `The 80ms discovery budget must cap the full target connection attempt (elapsed ${elapsed}ms).`,
+  );
+} finally {
+  globalThis.fetch = originalFetch;
+  globalThis.WebSocket = originalWebSocket;
+}
+
+console.log("PASS: renderer discovery honors its global timeout budget.");

macos/tests/injector-connection-timeout.test.mjs

@@ -173,6 +173,7 @@ fi
 "$NODE" "$ROOT/scripts/injector.mjs" --check-payload >/dev/null
 "$NODE" "$ROOT/tests/image-metadata.test.mjs"
 "$NODE" "$ROOT/tests/injector-bootstrap.test.mjs"
+"$NODE" "$ROOT/tests/injector-connection-timeout.test.mjs"
 "$NODE" "$ROOT/tests/window-readiness.test.mjs"
 "$NODE" "$ROOT/tests/renderer-inject.test.mjs"
 "$NODE" "$ROOT/tests/safe-css-validator.test.mjs"

macos/tests/run-tests.sh

@@ -16,6 +16,14 @@ const files = [
   "windows/assets/dream-skin.css",
 ];
 
+const selectorContract = JSON.parse(readFileSync(join(root, "tools/selectors.json"), "utf8"));
+const selectorByKey = new Map(selectorContract.selectors.map(({ key, selector }) => [key, selector]));
+const escapeRegExp = (value) => value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+const generatedMarkdownSelector = [
+  `${escapeRegExp(selectorByKey.get("shell-main"))}:not\\(:has\\(${escapeRegExp(selectorByKey.get("home-route-css"))}\\)\\)`,
+  escapeRegExp(selectorByKey.get("markdown")),
+].join(" ");
+
 const findNestedHas = (css) => {
   const findings = [];
   for (let index = css.indexOf(":has("); index !== -1; index = css.indexOf(":has(", index + 1)) {
@@ -50,7 +58,7 @@ for (const file of files) {
     const css = readFileSync(join(root, file), "utf8");
     const selectorToken = file.startsWith("runtime/")
       ? "__DREAM_SELECTOR_SHELL_MAIN__:not\\(:has\\(__DREAM_SELECTOR_HOME_ROUTE_CSS__\\)\\) __DREAM_SELECTOR_MARKDOWN__"
-      : "main\\.main-surface:not\\(:has\\(\\[role=\"main\"\\]\\)\\) \\[class\\*=\"_markdown\"\\]";
+      : generatedMarkdownSelector;
     const fullMode = ':is\\([^)]*\\[data-dream-task-mode="full"\\][^)]*\\[data-dream-art-task-mode="full"\\][^)]*\\)\\[data-dream-art-wide="true"\\]';
     const markdownRule = new RegExp(`${fullMode}\\s*\\n?\\s*${selectorToken}\\s*\\{\\s*\\n?\\s*color:\\s*var\\(--ds-text\\)\\s*!important;`);
     const lightShadowRule = new RegExp(`\\[data-dream-shell="light"\\]${fullMode}\\s*\\n?\\s*${selectorToken}\\s*\\{\\s*\\n?\\s*text-shadow:`);

macos/tests/runtime-css-nested-has.test.mjs

@@ -22,6 +22,15 @@ const brokenHome = resultFor("home", ["shell-main", "left-panel", "header-tint",
 assert.equal(brokenHome.pass, false);
 assert.equal(brokenHome.exitCode, 1);
 
+const currentCodexHome = resultFor("home", [
+  "shell-main", "left-panel", "header-tint", "home-route", "home-route-css",
+]);
+assert.equal(
+  currentCodexHome.pass,
+  true,
+  "Codex 26.727 removed home-icon; the remaining guarded home route must still satisfy L1.",
+);
+
 const settings = resultFor("settings", ["appearance-radio"]);
 assert.equal(settings.pass, true);
 assert.equal(settings.tiers.L1.length, 0, "Settings must not inherit home/all L1 requirements");