minecodex 2.0.4 → 2.0.6

package/features/images/src/frontend/local-image-source.mjs

@@ -0,0 +1,195 @@
+// 只编排来源与加载状态；图库、标签、菜单及详情由原生 Adapter 承载。
+export function installLocalImageSource(config, signal, sources, native) {
+  let mounted;
+  let revision = 0;
+  let pendingPrompt;
+  const text = (en, zh) => (document.documentElement.lang || navigator.language).startsWith("zh") ? zh : en;
+
+  function requestPrompt(image) {
+    pendingPrompt = image.id;
+    document.dispatchEvent(new CustomEvent("minecodex:image-prompt", {detail:{imageId:image.id}}));
+  }
+
+  function unmount() {
+    revision++;
+    if (!mounted) return;
+    const record = mounted;
+    mounted = null;
+    record.observer?.disconnect();
+    record.view?.dispose();
+    record.nav?.dispose();
+    record.entry.tabs.hidden = record.tabsHidden;
+    record.entry.content.hidden = record.contentHidden;
+    record.entry.search?.removeEventListener("input", record.onSearch, true);
+    record.entry.search?.removeEventListener("keydown", record.onSearchKey, true);
+    if (record.entry.search) record.entry.search.value = record.searchValue;
+    record.navigation.remove();
+    record.area.remove();
+  }
+
+  function error(record) {
+    record.message.textContent = text("Could not load local images.", "本地图片加载失败。");
+    record.retry.hidden = false;
+  }
+
+  async function fetchPage(record, reset = false) {
+    if (record.fetching && !reset) return;
+    const current = ++revision;
+    record.fetching = true;
+    record.retry.hidden = true;
+    if (reset) {
+      record.images = [];
+      record.offset = 0;
+      record.total = 0;
+      record.view.render({images:[], loading:true});
+    }
+    try {
+      const page = await config.requestHostAction("local-image-source", {
+        operation:"list", offset:record.offset, query:record.query,
+      });
+      if (signal.aborted || mounted !== record || revision !== current || !record.active) return;
+      record.images.push(...page.images);
+      record.offset += page.images.length;
+      record.total = page.total;
+      record.view.render({images:record.images, loading:false});
+      record.message.textContent = page.total ? "" : text("No local images found.", "没有找到本地图片。");
+      record.sentinel.hidden = record.offset >= record.total;
+    } catch {
+      if (mounted === record && revision === current) {
+        record.view.render({images:record.images, loading:false});
+        error(record);
+      }
+    } finally {
+      if (mounted === record && revision === current) record.fetching = false;
+    }
+  }
+
+  function activate(record, key) {
+    revision++;
+    record.view?.clearSelection();
+    record.active = key === "imagegen";
+    record.entry.content.hidden = record.active || record.contentHidden;
+    record.area.hidden = !record.active;
+    if (record.entry.search) record.entry.search.value = record.active ? record.query : record.searchValue;
+    record.nav.render(key);
+    if (record.active) void fetchPage(record, true);
+  }
+
+  async function scan() {
+    if (signal.aborted) return;
+    const entry = sources.read();
+    if (mounted && mounted.entry.tabs === entry?.tabs) {
+      if (!mounted.active) mounted.nav?.render(entry.selectedKey);
+      return;
+    }
+    unmount();
+    if (!entry) return;
+    const navigation = document.createElement("div");
+    navigation.dataset.minecodexImageNavigation = "true";
+    entry.tabs.parentElement.append(navigation);
+    const area = document.createElement("section");
+    area.className = entry.content.className;
+    area.id = "minecodex-image-gen-content";
+    area.hidden = true;
+    const container = document.createElement("div");
+    const message = document.createElement("p");
+    message.className = "text-sm text-secondary";
+    const retry = document.createElement("button");
+    retry.type = "button";
+    retry.className = "rounded-full bg-text/5 px-4 py-2 text-sm text-default";
+    retry.textContent = text("Try again", "重试");
+    retry.hidden = true;
+    const sentinel = document.createElement("div");
+    sentinel.style.height = "1px";
+    sentinel.hidden = true;
+    sentinel.setAttribute("aria-hidden", "true");
+    area.append(container, message, retry, sentinel);
+    entry.content.after(area);
+    const record = {
+      entry, navigation, area, message, retry, sentinel,
+      tabsHidden:entry.tabs.hidden, contentHidden:entry.content.hidden,
+      searchValue:entry.search?.value ?? "", images:[], offset:0, total:0,
+      query:"", fetching:false, active:false,
+    };
+    mounted = record;
+    try {
+      const results = await Promise.allSettled([
+        native.mountNavigation(navigation, entry.tabs, key => activate(record, key)),
+        native.mount(container, entry.tabs, {
+          onOpen:(image, open) => open(image), onPrompt:requestPrompt,
+          onHidden:ids=>{
+            const hidden=new Set(ids),removed=record.images.filter(image=>hidden.has(image.id)).length;
+            record.images=record.images.filter(image=>!hidden.has(image.id));
+            record.offset=Math.max(0,record.offset-removed);record.total=Math.max(0,record.total-removed);
+            record.sentinel.hidden=record.offset>=record.total;
+          },
+          onRetry:error => {
+            console.error("MineCodex native Images rendering",error);
+            if (mounted !== record) return;
+            unmount();
+            config.codex.report("images.local-source", false, "Native image rendering failed");
+          },
+        }),
+      ]);
+      // 任一原生能力失败时也释放已建立的另一棵 root。
+      if (results.some(result => result.status === "rejected")) {
+        for (const result of results) if (result.status === "fulfilled") result.value.dispose();
+        throw results.find(result => result.status === "rejected").reason;
+      }
+      const [nav, view] = results.map(result => result.value);
+      if (signal.aborted || mounted !== record) {
+        nav.dispose();
+        view.dispose();
+        return;
+      }
+      record.nav = nav;
+      record.view = view;
+      entry.tabs.hidden = true;
+      nav.render(entry.selectedKey);
+      retry.onclick = () => fetchPage(record, true);
+      record.observer = new IntersectionObserver(entries => {
+        if (entries.some(entry => entry.isIntersecting) && record.active && !record.fetching && record.offset < record.total) {
+          void fetchPage(record);
+        }
+      }, {rootMargin:"400px"});
+      record.observer.observe(sentinel);
+      record.onSearch = event => {
+        if (!record.active) return;
+        event.stopImmediatePropagation();
+        record.query = entry.search.value.slice(0, 256);
+        void fetchPage(record, true);
+      };
+      record.onSearchKey = event => {
+        if (record.active && event.key === "Enter") {
+          event.preventDefault();
+          event.stopImmediatePropagation();
+        }
+      };
+      entry.search?.addEventListener("input", record.onSearch, true);
+      entry.search?.addEventListener("keydown", record.onSearchKey, true);
+    } catch {
+      if (mounted === record) {
+        unmount();
+        config.codex.report("images.local-source", false, "Native image capability unavailable");
+      }
+    }
+  }
+
+  let scheduled = false;
+  const observer = new MutationObserver(() => {
+    if (scheduled) return;
+    scheduled = true;
+    queueMicrotask(() => {scheduled = false; void scan();});
+  });
+  observer.observe(document.body, {childList:true, subtree:true, attributes:true, attributeFilter:["aria-selected"]});
+  void scan();
+  let cleaned = false;
+  const cleanup = () => {if(cleaned)return;cleaned=true;observer.disconnect();unmount();pendingPrompt=null;};
+  signal.addEventListener("abort", cleanup, {once:true});
+  return {
+    cleanup,
+    readViewer:header => native.readViewer(header),
+    pendingPrompt:() => pendingPrompt,
+    consumePrompt:() => {pendingPrompt = null;},
+  };
+}

package/features/images/src/library-prompt-page.mjs

@@ -1,13 +1,15 @@
-// 仅增强原生 Library 图片详情；不创建第二个图库或侧栏入口。
+// 原生 Library 图片详情的提示词增强；Image Gen 由同功能的独立安装器承载。
 const PANEL_ID = "minecodex-library-prompt";
 const zh = () => (document.documentElement.lang || navigator.language || "en").toLowerCase().startsWith("zh");
 const label = (en, cn) => zh() ? cn : en;
 let mounted = null;
+let localImageSource = null;
 const libraryApi=createLibraryApi();
 let scheduled = false;
 let candidate = null;
 
-const libraryImage=createLibraryViewerAdapter(config.codex).read;
+const libraryViewer=createLibraryViewerAdapter(config.codex,{readViewer:header=>localImageSource?.readViewer(header)});
+const libraryImage=libraryViewer.read;
 function element(tag, className, text) {
   const node = document.createElement(tag);
   node.className = className;
@@ -26,79 +28,128 @@ function copyGlyph(copied = false) {
 }
 
 function closePanel(record, restoreFocus = false) {
-  record.request?.abort();
-  record.request = null;
   record.panel.hidden = true;
-  record.button.setAttribute("aria-expanded", "false");
+
   if (restoreFocus && record.button.isConnected) record.button.focus();
 }
 
 function showPrompt(record) {
   record.panel.hidden = false;
-  record.button.setAttribute("aria-expanded", "true");
+
   record.close.focus();
 }
 
 async function resolvePrompt(file, request) {
-  if (!file.origination_thread_id || !file.origination_message_id) return null;
   request.signal.throwIfAborted();
-  const conversation = await libraryApi.conversation(file.origination_thread_id,AbortSignal.any([signal,request.signal,AbortSignal.timeout(25_000)]));
-  return promptFromConversation(file, conversation);
+  if(file.kind === "local") return config.requestHostAction("local-image-source",{operation:"prompt",id:file.id});
+  if(!file.origination_thread_id || !file.origination_message_id)return null;
+  const conversation=await libraryApi.conversation(file.origination_thread_id,AbortSignal.any([signal,request.signal,AbortSignal.timeout(25_000)]));
+  return promptFromConversation(file,conversation);
 }
 
 function unmount() {
   if (!mounted) return;
   closePanel(mounted);
   clearTimeout(mounted.copyTimer);
-  mounted.button.remove();
+  mounted.menuItem?.remove();
+  mounted.menuCleanup?.();
   mounted.panel.remove();
   mounted = null;
 }
 
+function syncMenu(record) {
+  const anchor = libraryViewer.promptMenu(record.file);
+  if (record.menuItem?.isConnected && record.menuItem.parentElement === anchor?.original.parentElement) return;
+  record.menuItem?.remove();
+  record.menuCleanup?.();
+  record.menuItem = null;
+  record.menuCleanup = null;
+  if (!anchor) return;
+  const {menu,original} = anchor;
+  const item = element("div", original.className);
+  item.setAttribute("role", "menuitem");
+  item.tabIndex = -1;
+  item.dataset.minecodexLibraryPrompt = "menuitem";
+  const row = original.firstElementChild.cloneNode(true);
+  row.querySelector(".truncate").textContent = label("View prompts", "查看提示词");
+  // 使用项目现有 Prompts 图形，保留原生菜单的紧凑／标准图标布局。
+  const glyph = document.querySelector('[aria-label="Prompts"] svg');
+  if (glyph) for (const svg of row.querySelectorAll("svg")) {
+    const icon = glyph.cloneNode(true);
+    icon.setAttribute("width", svg.getAttribute("width"));
+    icon.setAttribute("height", svg.getAttribute("height"));
+    svg.replaceWith(icon);
+  }
+  item.append(row);
+  original.before(item);
+  record.menuItem = item;
+  const open = event => {
+    event.preventDefault();
+    event.stopPropagation();
+    menu.addEventListener("focusScope.autoFocusOnUnmount", event => {
+      event.preventDefault();
+      if (mounted?.identity === record.identity) mounted.close.focus();
+    }, {once:true});
+    // 原生菜单在 document capture 处理 Escape；阻止它再冒泡关闭图片视口。
+    const stopEscape = event => event.stopPropagation();
+    menu.addEventListener("keydown", stopEscape, {once:true});
+    menu.dispatchEvent(new KeyboardEvent("keydown", {key:"Escape",bubbles:true,cancelable:true}));
+    menu.removeEventListener("keydown", stopEscape);
+    setTimeout(() => {
+      // 原生关闭菜单可能重建工具栏；把打开意图交给同一图片的新实例。
+      if (mounted?.identity === record.identity) showPrompt(mounted);
+    }, 0);
+  };
+  item.addEventListener("click", open);
+  item.addEventListener("pointermove", () => item.focus());
+  const keyboard = event => {
+    if (event.target === item && ["Enter", " "].includes(event.key)) return open(event);
+    if (!["ArrowUp", "ArrowDown"].includes(event.key)) return;
+    const items = [...menu.querySelectorAll('[role="menuitem"]')];
+    const index = items.indexOf(document.activeElement);
+    const next = items[(index + (event.key === "ArrowDown" ? 1 : -1) + items.length) % items.length];
+    // 仅补上未注册到原生 collection 的注入项，其他按键仍交给原生菜单。
+    if (index >= 0 && (document.activeElement === item || next === item)) {
+      event.preventDefault();event.stopImmediatePropagation();next.focus();
+    }
+  };
+  menu.addEventListener("keydown", keyboard, true);
+  record.menuCleanup = () => menu.removeEventListener("keydown", keyboard, true);
+}
+
 async function scan() {
   scheduled = false;
   if (signal.aborted) return;
   const header = [...document.querySelectorAll('[data-testid="viewer-header"]')].find(header => header.getBoundingClientRect().width > 0 && libraryImage(header));
   const file = header && libraryImage(header);
+  const toolbar = header && libraryViewer.toolbar(header);
   const identity = file && JSON.stringify(file);
   if (candidate?.header === header && candidate?.identity === identity
-    && (!mounted || (mounted.button.isConnected && mounted.panel.isConnected))) return;
+    && candidate?.zoom === toolbar?.zoom && candidate?.host === toolbar?.host
+    && (!mounted || (mounted.button.isConnected && mounted.panel.isConnected))) {
+    if (mounted) {syncMenu(mounted);openPendingLocalPrompt();}
+    return;
+  }
   candidate?.request.abort();
   unmount();
   candidate = null;
-  if (!file) return;
-  const next = { header, identity, request: new AbortController() };
+  // 等原生图片工具栏就绪再解析；否则早到的结果会把同图后续扫描短路。
+  if (!file || !toolbar || (file.kind !== "local" && (!file.origination_thread_id || !file.origination_message_id))) return;
+  const next = { header, identity, zoom:toolbar.zoom, host:toolbar.host, request: new AbortController() };
   candidate = next;
-  let prompt;
-  try { prompt = await resolvePrompt(file, next.request); }
-  catch { return; }
-  // 异步结果只能写回当前图片；没有提示词时不展示入口。
-  if (!prompt?.text || signal.aborted || candidate !== next || !header.isConnected) return;
-  // 缩放项在图片详情中是百分比菜单；沿用它的胶囊类，不固定构建 hash。
-  const zoom = [...header.querySelectorAll('button[aria-haspopup="menu"]')].find(button => /^\d+(?:\.\d+)?%$/.test(button.textContent.trim()));
-  const group = zoom?.parentElement?.parentElement;
-  const host = header.closest('[role="presentation"]');
-  if (!zoom || !group || !host) return;
-  const capsuleClass = zoom.className.split(/\s+/).filter(name => !/^_(?:dropdown|zoom)_/.test(name)).join(" ");
-  const button = element("button", capsuleClass, label("Prompt", "提示词"));
-  button.type = "button";
-  button.dataset.minecodexLibraryPrompt = "trigger";
-  button.setAttribute("aria-expanded", "false");
-  button.setAttribute("aria-controls", PANEL_ID);
-  button.style.width = "max-content";
-  button.style.minWidth = "0";
-  button.style.flex = "0 0 auto";
-  button.style.paddingInline = "calc(var(--mcx-spacing) * 3)";
-  group.prepend(button);
-  // 对齐原生 Library Version history 的面板、标题和内容区 token。
-  const panel = element("aside", "absolute inset-x-2 top-toolbar bottom-2 z-30 ms-auto mt-2 flex max-w-75 flex-col overflow-hidden rounded-2xl border border-default bg-surface shadow-lg select-none");
+  const {host,trigger:button} = toolbar;
+  // 对齐当前原生 File info 的实体材质、尺寸和内容区。
+  const panel = element("aside", "absolute end-2 bottom-2 z-40 flex min-h-0 flex-col overflow-hidden rounded-2xl bg-surface-elevated-secondary electron:elevation-prominent text-default select-none");
   panel.id = PANEL_ID;
   panel.setAttribute("aria-label", label("Image prompt", "图片提示词"));
   panel.hidden = true;
   panel.style.setProperty("-webkit-app-region", "no-drag");
-  panel.style.paddingBottom = "calc(var(--mcx-spacing) * 3)";
-  const heading = element("div", "flex items-center justify-between py-2 ps-4 pe-2");
-  const close = element("button", "flex size-8 shrink-0 items-center justify-center rounded-full text-default hover:bg-primary-ghost-hover focus-visible:outline-ring");
+  // File info 的 pt-13 与包装层 pt-px 合计；窄视口保留两侧 gutter。
+  panel.style.top = "calc(var(--mcx-spacing) * 13 + 1px)";
+  panel.style.width = "calc(var(--mcx-spacing) * 74)";
+  panel.style.maxWidth = "calc(100% - var(--mcx-spacing) * 4)";
+  const heading = element("div", "flex h-11 shrink-0 items-center justify-between gap-2 py-1 ps-4 pe-2");
+  const close = element("button", "no-drag cursor-interaction select-none disabled:cursor-default disabled:opacity-40 focus:outline-hidden focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-0 flex border gap-1 rounded-full text-default bg-text/5 not-disabled:not-aria-disabled:hover:bg-text/10 border-transparent button-toolbar py-0 text-sm leading-[18px] aspect-square shrink-0 items-center justify-center !px-0");
   close.type = "button";
   close.setAttribute("aria-label", label("Close prompt", "关闭提示词"));
   // 直接复用原生关闭图标，避免手绘近似图形。
@@ -109,34 +160,82 @@ async function scan() {
   const copy = element("button", close.className);
   copy.type = "button";
   function copyFeedback(copied = false, failed = false) {
-    const text = failed ? label("Try copying again", "重试复制") : copied ? label("Copied", "已复制") : label("Copy prompt", "复制提示词");
+    const text = failed ? label("Try copying again", "重试复制") : copied ? label("Copied", "已复制") : record?.prompt?.kind === "request" ? label("Copy original request", "复制原始请求") : label("Copy prompt", "复制提示词");
     copy.setAttribute("data-minecodex-tooltip", text);
     copy.setAttribute("aria-label", text);
     copy.replaceChildren(copyGlyph(copied));
   }
-  copyFeedback();
   actions.append(copy, close);
-  heading.append(element("span", "text-base font-semibold text-default", label("Prompt", "提示词")), actions);
-  const body = element("div", "min-h-0 flex-1 overflow-y-auto px-3");
-  body.style.paddingTop = "var(--mcx-spacing)";
-  body.append(
-    element("p", "px-1 text-sm leading-5 text-default whitespace-pre-wrap break-words select-text", prompt.text),
-  );
+  const title = element("span", "text-base font-semibold text-default select-none", label("Prompt", "提示词"));
+  const titleHeading = element("h2", "min-w-0 flex-1 truncate");
+  titleHeading.append(title);
+  heading.append(titleHeading, actions);
+  const body = element("div", "min-h-0 flex-1 overflow-y-auto px-3 py-4");
   panel.append(heading, body);
   host.append(panel);
-  const record = { header, file, identity, button, panel, body, close, request: null,
+  const record = { header, file, identity, button, panel, body, close, copy, prompt: null, state: "loading", request: next.request,
     refreshLocale() {
-      button.textContent = label("Prompt", "提示词");
+      if (record.menuItem) record.menuItem.querySelector(".truncate").textContent = label("View prompts", "查看提示词");
       panel.setAttribute("aria-label", label("Image prompt", "图片提示词"));
       close.setAttribute("aria-label", label("Close prompt", "关闭提示词"));
-      heading.firstElementChild.textContent = label("Prompt", "提示词");
+      title.textContent = label("Prompt", "提示词");
       copyFeedback();
+      renderBody();
     },
   };
+  function renderBody() {
+    body.replaceChildren();
+    body.setAttribute("aria-busy", String(record.state === "loading"));
+    copy.disabled = record.state !== "ready";
+    copyFeedback();
+    if (record.state === "loading") {
+      const skeleton = element("div", "flex flex-col gap-2 px-1");
+      skeleton.setAttribute("aria-hidden", "true");
+      for (const width of ["100%", "92%", "100%", "68%"]) {
+        const line = element("div", "h-3 rounded-full bg-text/5");
+        line.style.width = width;
+        skeleton.append(line);
+      }
+      body.append(element("span", "sr-only", label("Loading prompt", "正在加载提示词")), skeleton);
+    } else if (record.state === "ready") {
+      if (record.prompt.kind === "request") {
+        body.append(element("p", "px-1 pb-4 text-sm leading-5 text-secondary", label("The generation prompt is unavailable. The original request is shown below.", "未获取到生成提示词，以下提供用户原始请求。")));
+        body.append(element("h3", "px-1 pb-2 text-sm font-semibold text-default", label("Original request", "原始请求")));
+      }
+      body.append(element("p", "px-1 text-sm leading-5 text-default whitespace-pre-wrap break-words select-text", record.prompt.text));
+    } else {
+      const message = record.state === "empty" ? label("Native data does not provide the generation prompt for this image", "原生数据未提供这张图片的生成提示词") : label("Could not load the prompt", "提示词加载失败");
+      body.append(element("p", "px-1 text-sm leading-5 text-secondary", message));
+      if (record.state === "error") {
+        const retry = element("button", "mt-3 rounded-full border border-default px-3 py-1 text-sm text-default hover:bg-primary-ghost-hover", label("Try again", "重试"));
+        retry.type = "button";
+        retry.addEventListener("click", loadPrompt);
+        body.append(retry);
+      }
+    }
+  }
+  async function loadPrompt() {
+    record.state = "loading";
+    renderBody();
+    try {
+      const prompt = await resolvePrompt(file, next.request);
+      // 换图或卸载后不写回；关闭面板仍可继续预取。
+      if (signal.aborted || candidate !== next || mounted !== record || !header.isConnected) return;
+      record.prompt = prompt;
+      record.state = prompt?.text ? "ready" : "empty";
+    } catch {
+      if (signal.aborted || candidate !== next || mounted !== record || next.request.signal.aborted) return;
+      record.state = "error";
+    }
+    renderBody();
+  }
   mounted = record;
+  renderBody();
+  openPendingLocalPrompt();
   copy.addEventListener("click", async () => {
+    if (record.state !== "ready") return;
     try {
-      await navigator.clipboard.writeText(prompt.text);
+      await navigator.clipboard.writeText(record.prompt.text);
       if (mounted !== record) return;
       copyFeedback(true);
     } catch {
@@ -146,12 +245,22 @@ async function scan() {
     clearTimeout(record.copyTimer);
     record.copyTimer = setTimeout(() => copyFeedback(), 2000);
   });
-  button.addEventListener("click", () => panel.hidden ? showPrompt(record) : closePanel(record));
+  syncMenu(record);
   close.addEventListener("click", () => closePanel(record, true));
+  await loadPrompt();
 }
 
+function openPendingLocalPrompt(){
+  if(mounted?.file.kind!=="local" || localImageSource?.pendingPrompt()!==mounted.file.id)return;
+  localImageSource.consumePrompt();showPrompt(mounted);
+}
+function localPromptRequested(){openPendingLocalPrompt();void scan();}
+document.addEventListener("minecodex:image-prompt",localPromptRequested);
 const localeObserver = new MutationObserver(() => mounted?.refreshLocale());
 localeObserver.observe(document.documentElement, { attributes:true, attributeFilter:["lang"] });
+localImageSource = installLocalImageSource(config, signal, createImageSourcesAdapter(config.codex), createNativeImageSource(config.codex, {
+  requestHostAction:config.requestHostAction, libraryApi, createCloudImageActions, signal,
+}));
 const observer = new MutationObserver(() => {
   if (scheduled) return;
   scheduled = true;
@@ -165,7 +274,8 @@ function escape(event) {
   closePanel(mounted, true);
 }
 document.addEventListener("keydown", escape, true);
-const cleanup = () => { candidate?.request.abort(); candidate = null; observer.disconnect(); localeObserver.disconnect(); document.removeEventListener("keydown", escape, true); unmount(); };
+let cleaned = false;
+const cleanup = () => {if(cleaned)return;cleaned=true;document.removeEventListener("minecodex:image-prompt",localPromptRequested);candidate?.request.abort();candidate=null;observer.disconnect();localeObserver.disconnect();document.removeEventListener("keydown",escape,true);unmount();localImageSource.cleanup();};
 signal.addEventListener("abort", cleanup, { once: true });
 scan();
 return cleanup;

package/features/images/src/library-prompt-source.mjs

@@ -1,10 +1,16 @@
+import { createCloudImageActions } from "./frontend/cloud-image-actions.mjs";
+import { createImageSourcesAdapter } from "./adapters/codex/image-sources.mjs";
+import { createNativeImageSource } from "./adapters/codex/native-image-source.mjs";
+import {createNativeImageModules, discoverFilePreviewComposerBindings} from "./adapters/codex/native-image-modules.mjs";
+import { installLocalImageSource } from "./frontend/local-image-source.mjs";
 import { createLibraryApi } from "./adapters/codex/library-api.mjs";
 import { createLibraryViewerAdapter } from "./adapters/codex/library-viewer.mjs";
 import { readFile } from "node:fs/promises";
 import { promptResolverSource } from "./adapters/codex/prompt-resolver-source.mjs";
 
-// 两条 Renderer 路径共享纯规则，注入后不依赖 Node 模块闭包。
 export async function createPageScriptSource() {
-  const source = await readFile(new URL("./library-prompt-page.mjs", import.meta.url), "utf8");
-  return `const createLibraryApi=${createLibraryApi.toString()};\nconst createLibraryViewerAdapter=${createLibraryViewerAdapter.toString()};\nconst promptFromConversation = ${promptResolverSource()};\n${source}`;
+  const source=await readFile(new URL("./library-prompt-page.mjs",import.meta.url),"utf8");
+  const functions={createCloudImageActions,createImageSourcesAdapter,discoverFilePreviewComposerBindings,createNativeImageModules,createNativeImageSource,installLocalImageSource,createLibraryApi,createLibraryViewerAdapter};
+  const declarations=Object.entries(functions).map(([name,fn])=>`const ${name}=${fn.toString()};`).join("\n");
+  return `${declarations}\nconst promptFromConversation=${promptResolverSource()};\n${source}`;
 }

package/features/images/src/prompt-index.mjs

@@ -49,10 +49,17 @@ async function readPrompts(logPath, prompts) {
   const stored = new Map();
   const pendingSources = new Map();
   for await (const line of lines) {
-    if (line.includes('"image_generation_end"') || /"type"\s*:\s*"custom_tool_call"/.test(line) || /"name"\s*:\s*"wait"/.test(line) || [...pendingSources.keys()].some(id => line.includes(id))) {
+    if (line.includes('"image_generation_end"') || line.includes('"item_completed"') || /"type"\s*:\s*"custom_tool_call"/.test(line) || /"name"\s*:\s*"wait"/.test(line) || [...pendingSources.keys()].some(id => line.includes(id))) {
       let event;
       try { event = JSON.parse(line); } catch { continue; }
       const payload = event?.payload ?? event;
+      // 以完成事件为准；旧版内部状态可能仍是 generating，不能据此丢弃提示词。
+      const item = payload?.type === "item_completed" ? payload.item : null;
+      if (item?.type === "Extension" && item.kind === "image_gen.generation"
+        && typeof item.id === "string"
+        && typeof item.revisedPrompt === "string" && item.revisedPrompt.trim()) {
+        prompts.set(item.id, item.revisedPrompt);
+      }
       const legacy = legacyPromptFromPayload(payload);
       if (legacy && !prompts.has(legacy.imageGenerationItemId)) {
         prompts.set(legacy.imageGenerationItemId, legacy.prompt);
@@ -160,7 +167,12 @@ export class ThreadPromptIndex {
   async find(threadId, imageGenerationItemId) {
     const key = cacheKey(threadId, imageGenerationItemId);
     const cached = this.threadPrompts.get(threadId);
-    if (cached?.has(imageGenerationItemId)) return cached.get(imageGenerationItemId);
+    if (cached?.has(imageGenerationItemId)) {
+      // 工具请求先到、完成事件后到时，重新读取更准确的 revisedPrompt。
+      if (!await this.threadLogsChanged(threadId)) return cached.get(imageGenerationItemId);
+      this.threadPrompts.delete(threadId);
+      this.clearNegative(threadId);
+    }
 
     const negative = this.negativeCache.get(key);
     if (negative) {

package/features/model-slider/DESIGN.md

@@ -22,6 +22,8 @@ Composer 触发器区分两种状态：占位态（"Select model" / "Select effo
 - **Composer Trigger:** 占位态恢复原生 160px Content 宽度；真实模型态 HUG 完整名称，头部保留原生可点击 chevron。
 - **Slider Header:** 模型名最多两行，容器高度随内容自然撑开；effort 与 chevron 不收缩。无 Fast 时移除原生 12px 预留占位，让按钮与面板严格居中。
 - **Model List:** 保持 264px 原生宽度、Provider 副文本、收藏与最多六项可视高度；收藏与未收藏之间保留分隔线，弹窗内容四周保留约 6px 内边距；模型弹窗与原生 Slider 一致地水平居中于触发器。列表打开期间，Composer 占位文案从 `Select effort` 切为原生语义 `Select model`，关闭后恢复。
+- 模型列表使用共享 Dropdown 的 `opaque` 分支：不透明主题填充、无背景模糊，保留 Dropdown 圆角、边缘和阴影，避免后方聊天文字透入列表。此选择仅适用于模型列表。
+- Slider 与模型列表切换沿用 Codex 26.930.21537 的动效节奏：底边锚定，高度 320ms（`cubic-bezier(.19,1,.22,1)`）；列表内容 200ms 淡变与 10px 位移（`cubic-bezier(.23,1,.32,1)`），进入延迟 40ms。返回时收缩并淡出，Escape 先返回 Slider；减少动态效果时立即切换。切换与卸载会取消旧动画和清理定时器，不改原生 React 节点。
 - OCX 自动发现的 GPT 路由若与原生模型同名且没有独立推理档位，列表只显示原生项；当前已选中的路由仍显示，避免失去切换入口。有独立档位的 Provider 路由继续显示并标注 Provider。
 - Slider 预览档位时同步 effort 标签与 Fast 控件的 Ultra 状态；离开 Ultra 后立即恢复普通档位颜色。
 

package/features/model-slider/codex-feature.json

@@ -7,8 +7,8 @@
     "zh-CN": "模型滑条"
   },
   "description": {
-    "en": "A clearer, faster model picker with provider identity, favorites, and smoother interaction.",
-    "zh-CN": "让模型选择更清楚、更快，提供品牌识别、常用收藏和更顺畅的交互。"
+    "en": "Switch models and thinking levels. Keep favorites within reach.",
+    "zh-CN": "切换模型与思考强度，快速找到常用收藏。"
   },
   "entry": {
     "kind": "composer-model-selector"