minecodex 1.2.1 → 2.0.0

package/features/usage-meter/src/usage-meter.mjs

@@ -0,0 +1,200 @@
+// 订阅原生额度缓存；不另行轮询，也不复制账号信息到插件服务。
+const MARKER = "data-minecodex-usage-meter";
+const TIP_ID = "minecodex-usage-tooltip";
+const STYLE_ID = "minecodex-usage-style";
+let record = null;
+let client = null;
+let unsubscribe = null;
+let queued = false;
+let hoverTimer = null;
+
+function remainingWindows(data) {
+  const windows = [data?.rate_limit?.primary_window, data?.rate_limit?.secondary_window];
+  const remaining = seconds => {
+    const window = windows.find(window => window?.limit_window_seconds === seconds);
+    return typeof window?.used_percent === "number" && Number.isFinite(window.used_percent)
+      ? Math.round(Math.max(0, Math.min(100, 100 - window.used_percent))) : null;
+  };
+  const weekly = remaining(604800), fiveHour = remaining(18000);
+  return weekly == null ? null : { weekly, fiveHour, primary: fiveHour ?? weekly };
+}
+
+function nativeContext(rail) {
+  const key = Object.keys(rail).find(key => key.startsWith("__reactFiber$"));
+  let fiber = key ? rail[key] : null;
+  const result = { auth: null, client: null, router: null };
+  for (let depth = 0; fiber && depth < 200; depth++, fiber = fiber.return) {
+    const props = fiber.memoizedProps;
+    if (!props) continue;
+    for (const value of [props.auth, props.value]) {
+      if (!result.auth && value && typeof value === "object" && "authMethod" in value && "userId" in value && "accountId" in value) result.auth = value;
+    }
+    for (const value of [props.queryClient, props.client, props.value]) {
+      if (!result.client && typeof value?.getQueryCache === "function" && typeof value?.getQueryData === "function") result.client = value;
+    }
+    const router = props.router ?? props.value?.router;
+    if (!result.router && typeof router?.navigate === "function") result.router = router;
+    if (result.auth && result.client && result.router) break;
+  }
+  return result;
+}
+
+function currentWindows(context) {
+  const { auth, client } = context;
+  if (auth?.isLoading || !auth?.userId || !auth?.accountId || !["chatgpt", "chatgptAuthTokens"].includes(auth.authMethod)) return null;
+  const data = client?.getQueryData(["rate-limit-status", auth.userId, auth.accountId]);
+  // 账号与缓存必须同时一致；旧账号的最后一次响应不能留在导航栏。
+  if (!data || data.user_id !== auth.userId || data.account_id !== auth.accountId) return null;
+  return remainingWindows(data);
+}
+
+const style = document.createElement("style");
+style.id = STYLE_ID;
+style.textContent = `
+[${MARKER}] { position:relative; display:flex; align-items:center; justify-content:center; flex:none; -webkit-app-region:no-drag; }
+[${MARKER}] .mcx-usage-ring { display:block; width:24px; height:24px; overflow:visible; }
+[${MARKER}] .mcx-usage-number { position:absolute; inset:0; display:flex; align-items:center; justify-content:center; color:inherit; font-family:var(--font-sans-default); font-size:calc(var(--text-xs) * 2 / 3); line-height:1; font-weight:500; letter-spacing:0; font-variant-numeric:tabular-nums; pointer-events:none; }
+[${MARKER}] [data-window="weekly"] { color:inherit; }
+[${MARKER}] [data-window="fiveHour"] { color:var(--color-text-secondary); }
+#${TIP_ID} { position:fixed; z-index:2147483000; width:max-content; max-width:calc(100vw - 16px); pointer-events:none; user-select:none; padding:5px 12px; border:1px solid var(--color-border-tooltip); border-radius:var(--radius-2xl); background:var(--color-background-tooltip); color:var(--color-text-tooltip); box-shadow:var(--shadow-tooltip); font-family:var(--font-sans-default); font-size:var(--text-sm); line-height:18px; font-weight:var(--tooltip-compact-font-weight); letter-spacing:var(--tracking-tooltip); }
+#${TIP_ID}[hidden] { display:none; }
+#${TIP_ID} dl { display:grid; grid-template-columns:auto auto; gap:2px 16px; margin:0; }
+#${TIP_ID} dt { text-align:left; }
+#${TIP_ID} dd { margin:0; text-align:right; font-variant-numeric:tabular-nums; }
+`;
+document.head.append(style);
+
+function svgNode(name, attributes) {
+  const node = document.createElementNS("http://www.w3.org/2000/svg", name);
+  for (const [key, value] of Object.entries(attributes)) node.setAttribute(key, String(value));
+  return node;
+}
+
+function draw(windows) {
+  const svg = svgNode("svg", { viewBox: "0 0 32 32", class: "mcx-usage-ring", "aria-hidden": "true" });
+  for (const [key, radius] of [["weekly", 43 / 3], ["fiveHour", 10.5]]) {
+    if (windows[key] == null) continue;
+    const group = svgNode("g", { "data-window": key, fill: "none", stroke: "currentColor", "stroke-width": 10 / 3 });
+    group.append(svgNode("circle", { cx: 16, cy: 16, r: radius, opacity: 0.18 }));
+    if (windows[key] > 0) group.append(svgNode("circle", {
+      cx: 16, cy: 16, r: radius, pathLength: 100,
+      "stroke-dasharray": `${windows[key]} 100`, "stroke-linecap": "round", transform: "rotate(-90 16 16)",
+    }));
+    svg.append(group);
+  }
+  const number = document.createElement("span");
+  number.className = "mcx-usage-number";
+  number.textContent = String(windows.primary);
+  number.setAttribute("data-dual", String(windows.fiveHour != null));
+  number.setAttribute("data-digits", String(number.textContent.length));
+  record.button.replaceChildren(svg, number);
+  const list = document.createElement("dl");
+  const rows = windows.fiveHour == null ? [] : [["5h Limit", windows.fiveHour]];
+  rows.push(["Weekly Limit", windows.weekly]);
+  for (const [label, percent] of rows) {
+    const term = document.createElement("dt"), value = document.createElement("dd");
+    term.textContent = label;
+    value.textContent = `${percent}%`;
+    list.append(term, value);
+  }
+  record.tooltip.replaceChildren(list);
+  record.button.setAttribute("aria-label", rows.map(([label, percent]) => `${label} ${percent}%`).join(", "));
+  record.button.setAttribute("aria-description", "Open Usage settings");
+  if (!record.tooltip.hidden) positionTooltip();
+}
+
+function positionTooltip() {
+  if (!record) return;
+  const rect = record.button.getBoundingClientRect();
+  const tooltip = record.tooltip;
+  // 按物理视口定位，兼容原生 app-shell 的 CSS zoom。
+  tooltip.style.left = `${Math.max(8, Math.min(rect.right + 2, window.innerWidth - tooltip.offsetWidth - 8))}px`;
+  tooltip.style.top = `${Math.max(8, Math.min(rect.top + (rect.height - tooltip.offsetHeight) / 2, window.innerHeight - tooltip.offsetHeight - 8))}px`;
+}
+
+function showTooltip() {
+  clearTimeout(hoverTimer);
+  if (!record) return;
+  record.tooltip.hidden = false;
+  record.button.setAttribute("aria-describedby", TIP_ID);
+  positionTooltip();
+}
+function hideTooltip() {
+  clearTimeout(hoverTimer);
+  if (!record) return;
+  record.tooltip.hidden = true;
+  record.button.removeAttribute("aria-describedby");
+}
+function removeControl() {
+  hideTooltip();
+  record?.button.remove();
+  record?.tooltip.remove();
+  record = null;
+}
+
+function mount(help, rail) {
+  // 只克隆按钮的外观属性，不携带原生 Help 的菜单行为或 id。
+  const button = help.cloneNode(false);
+  for (const attribute of [...button.attributes]) {
+    if (attribute.name.startsWith("aria-") || attribute.name === "id" || attribute.name === "data-state") button.removeAttribute(attribute.name);
+  }
+  button.setAttribute(MARKER, "");
+  const tooltip = document.createElement("div");
+  tooltip.id = TIP_ID;
+  tooltip.setAttribute("role", "tooltip");
+  tooltip.hidden = true;
+  const anchor = help.parentElement.classList.contains("contents") ? help.parentElement : help;
+  anchor.after(button);
+  document.body.append(tooltip);
+  record = { button, tooltip, rail, help, signature: null };
+  button.addEventListener("pointerenter", () => { hoverTimer = setTimeout(showTooltip, 350); });
+  button.addEventListener("pointerleave", hideTooltip);
+  button.addEventListener("focus", showTooltip);
+  button.addEventListener("blur", hideTooltip);
+  button.addEventListener("keydown", event => { if (event.key === "Escape") { event.stopPropagation(); hideTooltip(); } });
+  button.addEventListener("click", () => {
+    hideTooltip();
+    const { router } = nativeContext(rail);
+    router?.navigate("/settings/usage?tab=overview", { state: router.state?.location?.state });
+  });
+}
+
+function sync() {
+  queued = false;
+  if (signal.aborted) return;
+  const rail = [...document.querySelectorAll('nav[data-app-navigation-rail="true"]')].find(rail => rail.getBoundingClientRect().width > 0);
+  const help = rail?.querySelector('button[aria-label="Help menu"],button[aria-label="帮助菜单"]');
+  const context = rail ? nativeContext(rail) : {};
+  if (client !== context.client) {
+    unsubscribe?.();
+    client = context.client;
+    unsubscribe = client?.getQueryCache().subscribe(event => {
+      if (event.query?.queryKey?.[0] === "rate-limit-status") schedule();
+    });
+  }
+  const windows = currentWindows(context);
+  if (!help || !context.router || !windows) { removeControl(); return; }
+  if (record?.help !== help || !record?.button.isConnected) { removeControl(); mount(help, rail); }
+  const signature = JSON.stringify(windows);
+  if (record.signature !== signature) { record.signature = signature; draw(windows); }
+}
+function schedule() {
+  if (queued || signal.aborted) return;
+  queued = true;
+  queueMicrotask(sync);
+}
+const observer = new MutationObserver(schedule);
+observer.observe(document.documentElement, { childList: true, subtree: true, attributes: true, attributeFilter: ["aria-label"] });
+window.addEventListener("resize", positionTooltip);
+window.addEventListener("focus", schedule);
+const cleanup = () => {
+  observer.disconnect();
+  unsubscribe?.();
+  window.removeEventListener("resize", positionTooltip);
+  window.removeEventListener("focus", schedule);
+  removeControl();
+  style.remove();
+};
+signal.addEventListener("abort", cleanup, { once: true });
+sync();
+return cleanup;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "minecodex",
-  "version": "1.2.1",
+  "version": "2.0.0",
   "description": "Lightweight, local-first plugins for the Codex desktop app.",
   "license": "MIT",
   "type": "module",
@@ -23,9 +23,10 @@
     "features/model-slider/THIRD_PARTY_NOTICES.md",
     "features/model-slider/vendor",
     "features/notes/src",
-    "features/notes/web",
     "features/notes/assets",
     "features/notes/codex-feature.json",
+    "features/notes/DESIGN.md",
+    "features/notes/README.md",
     "features/images/src",
     "features/images/web",
     "features/images/codex-feature.json",
@@ -41,17 +42,28 @@
     "apps/dashboard/favicon.svg",
     "apps/dashboard/index.html",
     "apps/dashboard/styles.css",
-    "README.md"
+    "README.md",
+    "features/usage-meter/src",
+    "features/usage-meter/codex-feature.json",
+    "features/usage-meter/DESIGN.md",
+    "features/usage-meter/README.md",
+    "features/unread-inbox/src",
+    "features/unread-inbox/codex-feature.json",
+    "features/unread-inbox/DESIGN.md",
+    "features/sidebar-focus/src",
+    "features/sidebar-focus/codex-feature.json",
+    "features/sidebar-focus/DESIGN.md",
+    "features/sidebar-focus/vendor/lucide-LICENSE"
   ],
   "engines": {
     "node": ">=22.5.0"
   },
   "scripts": {
     "start": "node packages/cli/bin/mcx.mjs serve",
-    "test": "node --test packages/cli/test/*.test.mjs packages/runtime-host/test/*.test.mjs features/model-slider/test/*.test.mjs features/notes/test/*.test.mjs features/images/test/*.test.mjs features/hide-upsell-banner/test/*.test.mjs features/session-status/test/*.test.mjs apps/dashboard/test/*.test.mjs",
+    "test": "node --test packages/cli/test/*.test.mjs packages/runtime-host/test/*.test.mjs features/model-slider/test/*.test.mjs features/notes/test/*.test.mjs features/images/test/*.test.mjs features/hide-upsell-banner/test/*.test.mjs features/session-status/test/*.test.mjs features/usage-meter/test/*.test.mjs apps/dashboard/test/*.test.mjs features/unread-inbox/test/*.test.mjs features/sidebar-focus/test/*.test.mjs",
     "test:cli": "node --test packages/cli/test/*.test.mjs",
     "test:runtime": "node --test packages/runtime-host/test/*.test.mjs",
-    "check": "node --check packages/cli/bin/mcx.mjs && node --check packages/cli/src/*.mjs && node --check packages/runtime-host/src/*.mjs",
+    "check": "node scripts/check-syntax.mjs",
     "build:service": "scripts/build-service-app.zsh",
     "pack:check": "npm pack --dry-run",
     "pack:audit": "node scripts/audit-package.mjs",
@@ -75,5 +87,8 @@
   "os": [
     "darwin",
     "win32"
-  ]
+  ],
+  "dependencies": {
+    "acorn": "^8.18.0"
+  }
 }

package/packages/cli/src/config.mjs

@@ -2,7 +2,7 @@ import { randomBytes } from "node:crypto";
 import { mkdir, readFile, rename, writeFile } from "node:fs/promises";
 import path from "node:path";
 
-export const FEATURE_IDS = Object.freeze(["model-slider", "notes", "images", "hide-upsell-banner", "session-status"]);
+export const FEATURE_IDS = Object.freeze(["model-slider", "notes", "images", "hide-upsell-banner", "session-status", "usage-meter", "unread-inbox", "sidebar-focus"]);
 export const DEFAULT_CONFIG = Object.freeze({
   schemaVersion: 1,
   features: Object.freeze({
@@ -11,6 +11,9 @@ export const DEFAULT_CONFIG = Object.freeze({
     images: true,
     "hide-upsell-banner": true,
     "session-status": true,
+    "usage-meter": true,
+    "unread-inbox": true,
+    "sidebar-focus": true,
   }),
 });
 

package/packages/cli/src/control-server.mjs

@@ -196,8 +196,8 @@ async function iconResponse(id, paths, response) {
   if (id === "model-slider") {
     iconPath = path.join(paths.featuresRoot, id, "assets", "ui", "sparkles.svg");
   } else if (id === "notes") {
-    iconPath = path.join(paths.featuresRoot, id, "assets", "icons", "sticky-note.svg");
-  } else if (["images", "hide-upsell-banner", "session-status"].includes(id)) {
+    iconPath = path.join(paths.featuresRoot, id, "assets", "icons", "book-open.svg");
+  } else if (["images", "hide-upsell-banner", "session-status", "usage-meter"].includes(id)) {
     const manifest = JSON.parse(await readFile(path.join(paths.featuresRoot, id, "codex-feature.json"), "utf8"));
     const viewBox = manifest.icon?.viewBox ?? "0 0 24 24";
     const svg = `<svg xmlns="http://www.w3.org/2000/svg" viewBox="${viewBox}" fill="none" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round">${manifest.icon.markup}</svg>`;

package/packages/runtime-host/src/cloud-images.mjs

@@ -0,0 +1,123 @@
+import { evaluationValue } from "./codex-cdp.mjs";
+
+// 在原生 Renderer 内使用现有登录态；凭据和临时下载地址不跨出 Renderer。
+export async function cloudImagesInRenderer(operation, payload) {
+  const key = Symbol.for("minecodex.cloud-images.v1");
+  const state = window[key] ??= { files: new Map(), conversations: new Map() };
+  if (!state.capability) {
+    state.capability = (async () => {
+      const initialUrl = [...document.querySelectorAll('link[rel="modulepreload"],script[src]')]
+        .map(element => element.href || element.src).find(url => /\/app-initial-[^/]+\.js/.test(url));
+      if (!initialUrl) throw new Error("Cloud Library is unavailable in this Codex version");
+      const initialSource = await (await fetch(initialUrl)).text();
+      const asset = name => {
+        const file = initialSource.match(new RegExp(`${name}-[\\w-]+\\.js`))?.[0];
+        if (!file) throw new Error(`Cloud Library capability ${name} is unavailable`);
+        return new URL(file, initialUrl).href;
+      };
+      const metadataUrl = asset("library-file-metadata");
+      const metadataSource = await (await fetch(metadataUrl)).text();
+      const apiLocal = metadataSource.match(/([\w$]+)\.safePost\(`\/files\/library`/)?.[1];
+      const importBlock = [...metadataSource.matchAll(/import\{([^}]+)\}from["']([^"']*app-initial[^"']+)["']/g)][0];
+      const apiExport = importBlock?.[1].split(",").map(s => s.trim().split(/\s+as\s+/)).find(parts => parts.at(-1) === apiLocal)?.[0];
+      if (!apiExport) throw new Error("Cloud Library API contract changed");
+      const metadataInit = metadataSource.match(/function ([\w$]+)\(\)\{return\(\1=/)?.[1];
+      const metadataExports = metadataSource.match(/export\{([^}]+)\}/)?.[1].split(",").map(s => s.trim().split(/\s+as\s+/)) ?? [];
+      const initExport = metadataExports.find(parts => parts[0] === metadataInit)?.at(-1);
+      const metadata = await import(metadataUrl);
+      if (typeof metadata[initExport] !== "function") throw new Error("Cloud Library initialization contract changed");
+      metadata[initExport]();
+      const module = await import(initialUrl);
+      const api = module[apiExport];
+      if (!api?.safeGet || !api?.safePost) throw new Error("Cloud Library API is not ready");
+      const downloadUrl = asset("library-file-download");
+      const downloadSource = await (await fetch(downloadUrl)).text();
+      const exports = downloadSource.match(/export\{([^}]+)\}/)?.[1].split(",").map(s => s.trim().split(/\s+as\s+/)) ?? [];
+      const responseLocal = downloadSource.match(/async function ([\w$]+)\([^)]*\)\{return [\w$]+\(await [\w$]+\([^;]+showInline:!0/)?.[1];
+      const initLocal = downloadSource.match(/function ([\w$]+)\(\)\{return\(\1=/)?.[1];
+      const exported = local => exports.find(parts => parts[0] === local)?.at(-1);
+      const download = await import(downloadUrl);
+      const initialize = download[exported(initLocal)], response = download[exported(responseLocal)];
+      if (typeof initialize !== "function" || typeof response !== "function") throw new Error("Cloud image download contract changed");
+      initialize();
+      return { api, response };
+    })().catch(error => { state.capability = null; throw error; });
+  }
+  const { api, response } = await state.capability;
+  if (operation === "list") {
+    if (!payload.cursor) { state.files.clear(); state.conversations.clear(); }
+    const result = await api.safePost("/files/library", {
+      requestBody: { limit: 50, cursor: payload.cursor ?? null, include_hidden_files: false, include_saved_entities: true },
+      signal: AbortSignal.timeout(25_000),
+    });
+    const files = result.items.filter(file => ["image/png", "image/jpeg", "image/webp"].includes(file.mime_type)
+      && file.origination_thread_id && file.origination_message_id && !file.trashed_at);
+    for (const file of files) state.files.set(file.id, file);
+    return { items: files.map(file => ({ libraryId: file.id, version: `${file.current_version_number}:${file.updated_at}`, name: file.file_name })), cursor: result.cursor ?? null };
+  }
+  const file = state.files.get(payload.libraryId);
+  if (!file) throw new Error("Cloud image must come from the current Library listing");
+  const threadId = file.origination_thread_id;
+  if (!state.conversations.has(threadId)) {
+    const request = api.safeGet("/conversation/{conversation_id}", {
+      parameters: { path: { conversation_id: threadId } }, signal: AbortSignal.timeout(25_000),
+    }).catch(error => { state.conversations.delete(threadId); throw error; });
+    state.conversations.set(threadId, request);
+  }
+  const conversation = await state.conversations.get(threadId);
+  const node = conversation.mapping?.[file.origination_message_id];
+  const parts = node?.message?.content?.parts ?? [];
+  const part = parts.find(part => typeof part === "object" && part.content_type === "image_asset_pointer"
+    && (part.asset_pointer === `sediment://${file.file_id}` || part.asset_pointer === file.file_id));
+  // 明确验证生成结果，避免把用户上传的参考图混入生成图库。
+  if (!part || !["assistant", "tool"].includes(node.message.author?.role)
+    || !(part.metadata?.generation?.gen_id || part.metadata?.dalle?.gen_id)) return { skipped: true };
+  let prompt = part.metadata?.dalle?.prompt || null;
+  let promptKind = prompt ? "generation" : null;
+  if (!prompt) {
+    let ancestor = conversation.mapping[node.parent];
+    const visited = new Set();
+    while (ancestor && !visited.has(ancestor.id)) {
+      visited.add(ancestor.id);
+      if (ancestor.message?.author?.role === "user") {
+        prompt = ancestor.message.content?.parts?.filter(p => typeof p === "string").join("\n") || null;
+        promptKind = prompt ? "request" : null;
+        break;
+      }
+      ancestor = conversation.mapping[ancestor.parent];
+    }
+  }
+  const max = 32 * 1024 * 1024;
+  if (file.file_size_bytes > max) throw new Error("Cloud image exceeds 32 MB");
+  const imageBlob = await response(file, AbortSignal.timeout(60_000));
+  if (!(imageBlob instanceof Blob) || imageBlob.size > max) throw new Error("Cloud image download returned an invalid image");
+  const reader = imageBlob.stream().getReader(), chunks = [];
+  let length = 0;
+  try {
+    while (true) {
+      const {done, value} = await reader.read(); if (done) break;
+      length += value.length;
+      if (length > max) throw new Error("Cloud image exceeds 32 MB");
+      chunks.push(value);
+    }
+  } finally { await reader.cancel().catch(() => {}); }
+  let binary = "";
+  for (const chunk of chunks) for (let i = 0; i < chunk.length; i += 0x8000) binary += String.fromCharCode(...chunk.subarray(i, i + 0x8000));
+  return {
+    bytesBase64: btoa(binary), mimeType: imageBlob.type.split(";")[0] || file.mime_type,
+    itemId: file.file_id, conversationId: threadId, conversationTitle: conversation.title,
+    sourceKind: "chat", prompt, promptKind,
+    cloudLibraryId: file.id, cloudVersion: `${file.current_version_number}:${file.updated_at}`,
+    createdAt: new Date((node.message.create_time || conversation.create_time) * 1000).toISOString(),
+  };
+}
+
+export async function cloudImagesAction(client, operation, payload = {}) {
+  if (!["list", "import"].includes(operation)) throw new Error("Unknown cloud image operation");
+  if (payload.cursor != null && (typeof payload.cursor !== "string" || payload.cursor.length > 4096)) throw new Error("Invalid Library cursor");
+  if (operation === "import" && (typeof payload.libraryId !== "string" || !/^libfile_[\w-]+$/.test(payload.libraryId))) throw new Error("Invalid Library file ID");
+  return evaluationValue(await client.send("Runtime.evaluate", {
+    expression: `(${cloudImagesInRenderer.toString()})(${JSON.stringify(operation)},${JSON.stringify(payload)})`,
+    awaitPromise: true, returnByValue: true,
+  }, { timeoutMs: 110_000 }));
+}

package/packages/runtime-host/src/codex-cdp.mjs

@@ -1,6 +1,6 @@
 // CDP (Chrome DevTools Protocol) 客户端：WebSocket 连接、表达式求值与进程等待。
 // 与注入内容无关；CodexRuntime 通过这里的 connectClient 与 Codex Renderer 通信。
-export async function connect(url) {
+export async function connect(url, { timeoutMs = 10_000 } = {}) {
   const socket = new WebSocket(url);
   const pending = new Map();
   const eventWaiters = new Map();
@@ -8,8 +8,24 @@ export async function connect(url) {
   let nextId = 1;
 
   await new Promise((resolve, reject) => {
-    socket.addEventListener("open", resolve, { once: true });
-    socket.addEventListener("error", reject, { once: true });
+    const finish = (error) => {
+      clearTimeout(timer);
+      socket.removeEventListener("open", onOpen);
+      socket.removeEventListener("error", onError);
+      socket.removeEventListener("close", onClose);
+      if (error) reject(error);
+      else resolve();
+    };
+    const onOpen = () => finish();
+    const onError = () => finish(new Error("CDP WebSocket connection failed"));
+    const onClose = () => finish(new Error("CDP WebSocket closed before opening"));
+    const timer = setTimeout(() => {
+      finish(new Error("CDP WebSocket connection timed out"));
+      socket.close();
+    }, timeoutMs);
+    socket.addEventListener("open", onOpen, { once: true });
+    socket.addEventListener("error", onError, { once: true });
+    socket.addEventListener("close", onClose, { once: true });
   });
   socket.addEventListener("message", (event) => {
     const message = JSON.parse(String(event.data));
@@ -39,11 +55,27 @@ export async function connect(url) {
 
   return {
     socket,
-    send(method, params = {}) {
+    send(method, params = {}, { timeoutMs = 30_000 } = {}) {
+      // 关闭后的 send 不会再收到 close 事件，必须立即结束请求。
+      if (socket.readyState !== WebSocket.OPEN) {
+        return Promise.reject(new Error("CDP WebSocket is not open"));
+      }
       const id = nextId++;
       return new Promise((resolve, reject) => {
-        pending.set(id, { resolve, reject });
-        socket.send(JSON.stringify({ id, method, params }));
+        const finish = (callback, value) => {
+          clearTimeout(timer);
+          pending.delete(id);
+          callback(value);
+        };
+        const timer = setTimeout(() => {
+          finish(reject, new Error(`CDP request timed out: ${method}`));
+        }, timeoutMs);
+        pending.set(id, {
+          resolve: (value) => finish(resolve, value),
+          reject: (error) => finish(reject, error),
+        });
+        try { socket.send(JSON.stringify({ id, method, params })); }
+        catch (error) { finish(reject, error); }
       });
     },
     on(method, listener) {
@@ -60,7 +92,10 @@ export async function connect(url) {
             clearTimeout(timeout);
             resolve(value);
           },
-          reject,
+          reject(error) {
+            clearTimeout(timeout);
+            reject(error);
+          },
         };
         const timeout = setTimeout(() => {
           const remaining = (eventWaiters.get(method) ?? []).filter((item) => item !== waiter);
@@ -150,4 +185,3 @@ export function waitForProcessChildExit(child, timeoutMs) {
     timer = setTimeout(() => finish(false), timeoutMs);
   });
 }
-

package/packages/runtime-host/src/codex-design-contract.mjs

@@ -3,6 +3,16 @@
 // 后经 CDP 注入），因此 install 内通过 config.themeTokens 拿到本模块的名单；
 // 名单只在这里维护，install 不再持有自己的字面量副本。
 
+// 同一语义的历史名称；app-color 前缀迁移由适配器统一处理。
+export const CODEX_THEME_TOKEN_ALIASES = Object.freeze({
+  "--color-text-foreground": ["--color-token-foreground"],
+  "--color-text-foreground-secondary": ["--color-token-text-secondary"],
+  "--color-text-foreground-tertiary": ["--color-token-text-tertiary"],
+  "--color-token-input-foreground": ["--color-text-foreground", "--color-token-foreground"],
+  "--color-text-accent": ["--color-token-text-link-foreground"],
+  "--color-border-focus": ["--color-token-focus-border"],
+});
+
 export const CODEX_THEME_TOKENS = Object.freeze([
   "--codex-base-accent",
   "--codex-base-ink",