minecodex 1.2.0 → 1.2.2

package/features/session-status/src/session-status.mjs

@@ -32,6 +32,9 @@ style.id = STYLE_ID;
 style.textContent = `
   [${MARKER}] { box-sizing:border-box; display:flex; flex-wrap:wrap; justify-content:center; align-items:center; gap:0 12px; margin:-2px auto -6px; padding-top:2px; max-width:100%; min-height:24px; min-width:0; font-family:var(--font-sans-default,inherit); font-size:var(--text-xs,12px); line-height:16px; font-variant-numeric:tabular-nums; color:var(--color-text-tertiary); }
   [${MARKER}][hidden] { display:none; }
+  [${MARKER}]:not([hidden]) { animation:mcx-session-status-enter 160ms ease-out both; }
+  @keyframes mcx-session-status-enter { from { opacity:0; transform:translateY(4px); } to { opacity:1; transform:translateY(0); } }
+  @media (prefers-reduced-motion: reduce) { [${MARKER}]:not([hidden]) { animation:none; } }
   [${MARKER}] button { box-sizing:border-box; display:inline-flex; align-items:center; gap:5px; height:22px; color:inherit; font:inherit; border:0; border-radius:var(--radius-xl,12px); background:transparent; padding:3px 7px; cursor:pointer; white-space:nowrap; }
   [${MARKER}] svg, [data-minecodex-session-status-panel] h3 svg { width:14px; height:14px; flex:none; stroke-width:1.75; }
   [${MARKER}] [data-kind="context"] svg, [data-minecodex-session-status-panel] h3 .context-ring { width:12px; height:12px; stroke-width:2; }
@@ -105,6 +108,11 @@ let snapshot = null;
 let panel = null;
 let openKind = null;
 let rescanQueued = false;
+let activeThreadId = null;
+let refreshTimer = null;
+let refreshSequence = 0;
+let disposed = false;
+let lastRevision = 0;
 
 function number(value) { return value == null ? "—" : new Intl.NumberFormat().format(value); }
 function compact(value) {
@@ -261,8 +269,59 @@ function findComposer() {
   return document.querySelector('[data-codex-composer="true"][contenteditable="true"]')
     ?? document.querySelector('[contenteditable="true"][role="textbox"]');
 }
+function currentThreadId(composer) {
+  if (!composer) return null;
+  const card = composer?.closest('[data-codex-composer-root]');
+  const portal = card?.querySelector('[data-above-composer-portal]');
+  let value;
+  if (portal) value = portal.getAttribute('data-above-composer-conversation-id');
+  else if (card?.getAttribute('data-composer-placement') === 'home') return null;
+  else value = document.querySelector('[data-app-action-sidebar-thread-selected="true"]')?.getAttribute('data-app-action-sidebar-thread-id')
+    ?? window.location.pathname + window.location.search + window.location.hash;
+  return value?.match(/[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}/i)?.[0] ?? null;
+}
+function requestRefresh() {
+  if (!activeThreadId || signal.aborted) return;
+  if (typeof window[config.bindingName] === "function") {
+    window[config.bindingName](JSON.stringify({
+      token: config.bindingToken,
+      featureId: config.featureId,
+      requestId: `session-status:${++refreshSequence}`,
+      action: "refresh-session-status",
+    }));
+  }
+}
+function scheduleRefresh() {
+  clearTimeout(refreshTimer);
+  refreshTimer = null;
+  if (!activeThreadId || signal.aborted) return;
+  const waiting = snapshot?.turns == null || (snapshot.turns === 0 && snapshot.totalTokens == null);
+  const delay = waiting ? Math.max(500, snapshot?.retryAfterMs ?? 500) : snapshot?.isRunning ? 500 : 0;
+  if (!delay) return;
+  refreshTimer = setTimeout(() => {
+    refreshTimer = null;
+    requestRefresh();
+    scheduleRefresh();
+  }, delay);
+}
+function syncVisibility(composer) {
+  const threadId = currentThreadId(composer);
+  root.hidden = !threadId || snapshot?.threadId !== threadId;
+  if (root.hidden) closePanel();
+}
 function ensurePosition() {
+  if (disposed || signal.aborted) return;
   const composer = findComposer();
+  const threadId = currentThreadId(composer);
+  if (threadId !== activeThreadId) {
+    activeThreadId = threadId;
+    // 会话建立后先展示占位，不让日志落盘速度决定状态栏是否出现。
+    snapshot = threadId ? { threadId } : null;
+    closePanel();
+    render();
+    requestRefresh();
+    scheduleRefresh();
+  }
   if (!composer) { root.remove(); closePanel(); return; }
   const form = composer.closest("form");
   const card = composer.closest("[data-codex-composer-root]") ?? form ?? composer.parentElement?.parentElement;
@@ -271,10 +330,11 @@ function ensurePosition() {
     card.after(root);
     closePanel();
   }
+  syncVisibility(composer);
 }
 function render() {
-  root.hidden = !snapshot || (snapshot.turns === 0 && snapshot.totalTokens == null);
-  if (root.hidden) { closePanel(); return; }
+  syncVisibility(findComposer());
+  if (root.hidden) return;
   buttons[0].querySelector(".status-label").textContent = `${number(snapshot.turns)} ${copy.turns} ${number(snapshot.steps)} ${copy.steps} · ${snapshot.observedTps == null ? "—" : number(snapshot.observedTps)} tok/s`;
   buttons[1].querySelector(".status-label").textContent = `${compact(snapshot.totalTokens)} · ${copy.cache} ${snapshot.cacheHitPercent == null ? "—" : `${snapshot.cacheHitPercent}%`}`;
   buttons[2].querySelector(".status-label").textContent = snapshot.contextPercent == null ? "—" : `${snapshot.contextPercent}%`;
@@ -298,7 +358,10 @@ const observer = new MutationObserver(() => {
   rescanQueued = true;
   queueMicrotask(() => { rescanQueued = false; ensurePosition(); });
 });
-observer.observe(document.documentElement, { childList: true, subtree: true });
+observer.observe(document.documentElement, {
+  childList: true, subtree: true, attributes: true,
+  attributeFilter: ["data-above-composer-conversation-id", "data-composer-placement", "data-app-action-sidebar-thread-selected"],
+});
 const localeObserver = new MutationObserver(() => {
   const nextCopy = selectedCopy();
   if (nextCopy === copy) return;
@@ -309,14 +372,23 @@ localeObserver.observe(document.documentElement, { attributes: true, attributeFi
 ensurePosition();
 const previous = window.__minecodexSessionStatus;
 const receiver = {
-  update(value) {
-    snapshot = value;
+  update(value, revision) {
     ensurePosition();
+    // 切换会话期间的迟到快照不得覆盖新会话，也不清除其占位。
+    if (!activeThreadId || value?.threadId !== activeThreadId) return;
+    if (Number.isSafeInteger(revision)) {
+      if (revision <= lastRevision) return;
+      lastRevision = revision;
+    }
+    snapshot = value;
     render();
+    scheduleRefresh();
   },
 };
 window.__minecodexSessionStatus = receiver;
 return () => {
+  disposed = true;
+  clearTimeout(refreshTimer);
   observer.disconnect();
   localeObserver.disconnect();
   closePanel();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "minecodex",
-  "version": "1.2.0",
+  "version": "1.2.2",
   "description": "Lightweight, local-first plugins for the Codex desktop app.",
   "license": "MIT",
   "type": "module",
@@ -75,5 +75,8 @@
   "os": [
     "darwin",
     "win32"
-  ]
+  ],
+  "dependencies": {
+    "acorn": "^8.18.0"
+  }
 }

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",