minecodex 2.0.4 → 2.0.5

package/features/notes/src/frontend/entry.mjs

@@ -9,6 +9,7 @@ let button = null;
 let addButton = null;
 let composerRoot = null;
 let composerThread = null;
+let composerEditable = null;
 let panel = null;
 let items = [];
 let generation = 0;
@@ -169,7 +170,7 @@ function renderList() {
         async () => {
           const current = generation;
           try {
-            window.__codexPersonalRuntime.insertText(item.body);
+            window.__codexPersonalRuntime.insertText(item.body, composerEditable);
             // 插入同步成功后再记一次调用；失败和单纯浏览不计数。
             close();
             await api(`/api/prompts/${encodeURIComponent(item.id)}/use`, {
@@ -224,7 +225,7 @@ function isOpenComposerMenu(node) {
 function sync() {
   if (disposed || signal.aborted) return;
   syncNavigation();
-  const nativeComposer = config.codex.composer(null,{threadOnly:false});
+  const nativeComposer = config.codex.composer(null,{purpose:"insertion"});
   const add = nativeComposer?.add;
   const card = nativeComposer?.root;
   const thread = nativeComposer?.threadId ?? null;
@@ -232,13 +233,14 @@ function sync() {
     close();
     composerThread = thread;
   }
-  if (add !== addButton || card !== composerRoot) {
+  if (add !== addButton || card !== composerRoot || nativeComposer?.editable !== composerEditable) {
     close();
     button?.remove();
     button = null;
     addButton = add;
     composerRoot = card;
   }
+  composerEditable = nativeComposer?.editable ?? null;
   if (!add) return;
   if (
     panel &&
@@ -325,11 +327,12 @@ function syncNavigationSelection() {
 function restoreNavigationSelection() {
   navigationRail?.select(false);
 }
-function closePage(restoreFocus = false) {
+function closePage(restoreFocus = false, restoreNavigation = true) {
   dragState?.cancel();
   pageGeneration++;
   closePagePopup();
   closeEditor(false);
+  if (page) config.ui.releasePage(page, { restoreNavigation });
   page?.remove();
   page = null;
   restoreNavigationSelection();
@@ -362,7 +365,7 @@ function openPage() {
   pageFocus = document.activeElement;
   page = element("section");
   page.setAttribute(MARKER, "page");
-  config.ui.page(page);
+  config.ui.page(page, { sidebar:"none" });
   page.setAttribute("aria-label", text("Prompts", "提示词"));
   document.body.append(page);
   // 只隔离主内容的焦点，保留导航栏与原生窗口控件。
@@ -726,6 +729,18 @@ function orderControls(item, ordered, isCategory, row) {
     const parent = row.parentElement;
     const siblings = [...parent.children].filter(node => node.dataset.orderGroup === group);
     const originalNext = row.nextSibling;
+    const rect = row.getBoundingClientRect();
+    const radius = getComputedStyle(row).borderRadius;
+    const dragImage = row.cloneNode(true);
+    dragImage.removeAttribute("data-order-group");
+    dragImage.removeAttribute("data-order-id");
+    dragImage.setAttribute("aria-hidden", "true");
+    Object.assign(dragImage.style, { position:"fixed", left:"-10000px", top:"0", width:`${rect.width}px`,
+      height:`${rect.height}px`, margin:"0", boxSizing:"border-box", pointerEvents:"none",
+      background:"var(--mcx-color-surface)", borderRadius:radius, overflow:"hidden", clipPath:`inset(0 round ${radius})` });
+    // 显式裁切拖影，避免浏览器自动截图留下矩形外边界。
+    parent.append(dragImage);
+    event.dataTransfer.setDragImage(dragImage, event.clientX - rect.left, event.clientY - rect.top);
     const placeholder = element("div", "pm-drop-placeholder");
     placeholder.style.height = `${row.getBoundingClientRect().height}px`;
     placeholder.setAttribute("aria-hidden", "true");
@@ -752,6 +767,7 @@ function orderControls(item, ordered, isCategory, row) {
       if (finished) return;
       finished = true;
       lifetime.abort();
+      dragImage.remove();
       dragState = null;
       row.draggable = false;
       if (!started) return;
@@ -768,8 +784,9 @@ function orderControls(item, ordered, isCategory, row) {
     dragState = { cancel: () => finish(false) };
     event.dataTransfer.effectAllowed = "move";
     event.dataTransfer.setData("text/plain", item.id);
-    // 等浏览器截取拖影后再隐藏原行，避免拖影变成空白。
+    // 等浏览器截取拖影后再清理替身、隐藏原行。
     requestAnimationFrame(() => {
+      dragImage.remove();
       if (finished || !row.isConnected) return;
       row.before(placeholder);
       row.classList.add("pm-dragging");
@@ -1075,7 +1092,7 @@ function manageCategories() {
   const target = editorShell(text("Categories", "分类"));
   const footer = config.ui.footer(element("div", "pm-footer"));
   footer.append(
-    pageControl(text("New category", "新建分类"), () => editCategory(), true),
+    pageControl(text("New category", "新建分类"), () => editCategory()),
   );
   for (const category of categories) {
     const row = element("div", "pm-row");
@@ -1291,11 +1308,11 @@ document.addEventListener(
       event.target.closest("[data-app-navigation-rail] button") &&
       !navButton?.contains(event.target)
     )
-      closePage();
+      closePage(false, false);
   },
   { signal, capture: true },
 );
-window.addEventListener("popstate", () => closePage(), { signal });
+window.addEventListener("popstate", () => closePage(false, false), { signal });
 window.addEventListener("resize", positionPage, { signal });
 
 const observer = new MutationObserver(() => {

package/features/session-status/DESIGN.md

@@ -8,6 +8,8 @@
 
 ## Token 与布局
 
+状态栏实例跟随可见正式会话的原生 Composer root，不跟随 contenteditable 编辑节点。发送时编辑区暂时不可交互或重建，同一外壳、同一会话的状态栏继续显示并保留展开选择和统计；不以延时隐藏掩盖变化。真正切换会话时清除旧统计，进入 home、隐藏外壳或迁入浮动输入框时移除实例。宿主读取身份与 Renderer 使用同一个 `composerSurface` 契约。
+
 | 角色 | Codex token | 用途 |
 | --- | --- | --- |
 | 次要文字 | `--color-text-tertiary` | 状态行文字与分隔符 |
@@ -24,7 +26,7 @@
 
 界面文案跟随 Codex 的 `html[lang]`：中文语言使用简体中文，其他语言使用英文；运行中切换语言时同步更新状态行和已打开的明细浮窗。MineCodex Web 使用同样的中英文规则提供本功能开关。
 
-TPS 根据 Codex 会话事件计算有效样本的会话平均约值，以 `N tok/s` 呈现；分母扣除工具执行区间（含迟到事件，重叠区间仅扣一次），不将其视为实时解码速度；缺少有效计时样本时显示 `—`。累计 token 与缓存比例来自 Codex 用量记录。上下文使用原生 Codex 桌面版的口径：最近请求 `last.totalTokens / modelContextWindow`，直接订阅原生会话的 `latestTokenUsageInfo`（`thread/tokenUsage/updated` 更新），压缩后与原生同步刷新，不依赖日志轮询；原生数据不可用时显示占位；状态栏显示百分环和数字，弹层显示用量、窗口容量和压缩次数。二级浮窗的 token 数按十进制换算为 K/M，省略 `tok` 后缀；TPS 仍保留 `tok/s`。日志可见历史只列有数据的指令、消息、工具交互三个短标签，估算值以 `~` 开头。6px 进度条使用 Codex 图标选择器的紫、蓝、绿配色，标签圆点保持同色；当前页面未暴露对应变量时使用 Codex 亮／暗主题原值。剩余的原生占用以浅灰表示；若估算合计超过原生占用，按比例缩放彩色段，让进度条终点始终对应原生总占用。不显示无法取得的工具定义，也不放解释性长文案。
+TPS 根据 Codex 会话事件计算有效样本的会话平均约值，以 `N tok/s` 呈现；分母仅扣除完整落在同一响应计时范围内、且不与已观测模型输出重叠的工具区间（含迟到事件，重叠区间仅扣一次）；跨响应运行或与生成并行的后台工具不扣时，模型输出缺少结束时间时保守保留该样本的观测时长，不将其视为实时解码速度；缺少有效计时样本时显示 `—`。累计 token 与缓存比例来自 Codex 用量记录。上下文使用原生 Codex 桌面版的口径：最近请求 `last.totalTokens / modelContextWindow`，直接订阅原生会话的 `latestTokenUsageInfo`（`thread/tokenUsage/updated` 更新），压缩后与原生同步刷新，不依赖日志轮询；原生数据不可用时显示占位；状态栏显示百分环和数字，弹层显示用量、窗口容量和压缩次数。二级浮窗的 token 数按十进制换算为 K/M，省略 `tok` 后缀；TPS 仍保留 `tok/s`。日志可见历史只列有数据的指令、消息、工具交互三个短标签，估算值以 `~` 开头；工具结果同时接受字符串与内容数组，压缩后的 replacement_history 采用同一文本解析。6px 进度条使用 Codex 图标选择器的紫、蓝、绿配色，标签圆点保持同色；当前页面未暴露对应变量时使用 Codex 亮／暗主题原值。剩余的原生占用以浅灰表示；若估算合计超过原生占用，按比例缩放彩色段，让进度条终点始终对应原生总占用。不显示无法取得的工具定义，也不放解释性长文案。
 
 上下文弹层按视觉归属排列：进度条下紧接三个可见历史分段，不加分段副标题；分隔线之后列原生占用合计、窗口容量和压缩次数。合计取原生最近请求用量，不是三个估算分段的求和。
 
@@ -35,7 +37,7 @@ TPS 标签后放置 12px Lucide info 图标，继承标签颜色，间距 6px。
 ### 折叠入口
 - 首次安装默认展开；用户收起后在模型选择左侧显示 12px context 环，24px 热区；原生 context 环开启时隐藏原生重复入口，卸载时恢复。
 - Tooltip 沿用原生 context 内容：上下文窗口、使用/剩余比例、已用/容量（k tokens）；样式遵循通用 Tooltip。
-- 点击环展开输入框下方详情，右侧 chevron-up 收起；200ms grid 高度与160ms透明度过渡，尊重 reduced-motion。展开状态跨会话、主聊天和 side chat 共享并持久保存。展开时隐藏输入框内的 context 环；收起动效完成后容器 display:none，不保留父级 gap，收起内容不参与键盘焦点。每个输入框订阅自己的会话上下文和统计。
+- 点击环展开输入框下方详情，右侧 chevron-up 收起。原生布局一次切换到目标状态，测量切换前后的位置，仅用 transform 衔接输入框与模型控件；状态行入场配合4px位移与透明度过渡；中途反向按当前位移衔接。展开220ms、收起160ms，曲线 `cubic-bezier(0.23,1,0.32,1)`。反向操作从当前可见位置和透明度继续，取消旧动画；退出内容临时脱离布局，结束后恢复并 display:none，不保留父级 gap。reduced-motion 立即切换，收起内容不参与键盘焦点。展开状态跨会话、主聊天和 side chat 共享并持久保存，展开时隐藏输入框内的 context 环；每个输入框订阅自己的会话上下文和统计。
 - Cache 按原始 cachedInputTokens / inputTokens 计算：大于99%显示一位小数，其余取整数，状态栏和详情共用格式。
 
 输入框实例仅绑定可见的 thread composer。全屏标签页中的隐藏聊天、浮动 Quick Chat（含 right-panel composer overlay）、inert 区域不注入；原生移动输入框或切换可见性时销毁实例并取消订阅，返回聊天后重建。

package/features/session-status/src/adapters/codex/session-log.mjs

@@ -7,6 +7,7 @@ function estimatedTextTokens(value) {
 }
 
 function estimatedContentTokens(content) {
+  if (typeof content === "string") return estimatedTextTokens(content);
   if (!Array.isArray(content)) return 0;
   return content.reduce((total, item) => {
     if (item?.type === "input_image" || item?.type === "output_image") return total + IMAGE_TOKENS_ESTIMATE;
@@ -71,7 +72,7 @@ export function sessionFacts(record) {
     if (p.type === "task_complete" && Number.isFinite(p.time_to_first_token_ms)) emit("first-token-measured", { elapsed:p.time_to_first_token_ms });
     if (p.type === "item_completed") {
       if (p.item?.type === "ContextCompaction") emit("compaction-finished");
-      if (MODEL_OUTPUT_ITEMS.has(p.item?.type) && Number.isFinite(p.started_at_ms)) emit("output-observed", { start:p.started_at_ms });
+      if (MODEL_OUTPUT_ITEMS.has(p.item?.type) && Number.isFinite(p.started_at_ms)) emit("output-observed", { start:p.started_at_ms, end:p.completed_at_ms });
       if (TOOL_ITEMS.has(p.item?.type) && Number.isFinite(p.started_at_ms) && Number.isFinite(p.completed_at_ms)) emit("tool-measured", { start:p.started_at_ms, end:p.completed_at_ms });
     }
     if (p.type === "token_count") emit("usage-observed", { total:usage(p.info?.total_token_usage), last:usage(p.info?.last_token_usage), contextWindow:p.info?.model_context_window });

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

@@ -14,6 +14,7 @@ export function createSessionState() {
     last: null,
     contextWindow: null,
     firstOutputAt: null,
+    pendingOutputIntervals: [],
     pendingToolIntervals: [],
     speedMeasurements: [],
     ttftTotalMs: 0,
@@ -30,14 +31,17 @@ export function createSessionState() {
   };
 }
 
-function overlappingToolMs(intervals, start, end) {
-  const clipped = intervals
-    .map(([toolStart, toolEnd]) => [Math.max(start, toolStart), Math.min(end, toolEnd)])
+function boundedToolWaitMs(intervals, start, end, outputs) {
+  // 仅扣同一响应内、与已观测生成不重叠的工具区间；后台进程存活时间不是等待时间。
+  if (outputs.some(([, outputEnd]) => !Number.isFinite(outputEnd))) return 0;
+  const waits = intervals
+    .filter(([toolStart, toolEnd]) => toolStart >= start && toolEnd <= end
+      && !outputs.some(([outputStart, outputEnd]) => toolStart < outputEnd && toolEnd > outputStart))
     .filter(([left, right]) => right > left)
     .sort((left, right) => left[0] - right[0]);
   let elapsed = 0;
   let rightEdge = start;
-  for (const [left, right] of clipped) {
+  for (const [left, right] of waits) {
     elapsed += Math.max(0, right - Math.max(left, rightEdge));
     rightEdge = Math.max(rightEdge, right);
   }
@@ -45,7 +49,7 @@ function overlappingToolMs(intervals, start, end) {
 }
 
 export function applySessionStatusEvent(state, event) {
-  const reset = () => { state.firstOutputAt=null; state.pendingToolIntervals=[]; };
+  const reset = () => { state.firstOutputAt=null; state.pendingOutputIntervals=[]; state.pendingToolIntervals=[]; };
   switch (event.kind) {
     case "history-replaced":
       state.compactionRecords++; state.last=null; reset();
@@ -63,11 +67,14 @@ export function applySessionStatusEvent(state, event) {
     case "turn-ended": reset(); if (event.id) state.runningTurns.delete(event.id); else state.runningTurns.clear(); break;
     case "first-token-measured": state.ttftTotalMs+=event.elapsed; state.ttftSamples++; break;
     case "compaction-finished": state.compactionCompleted++; break;
-    case "output-observed": state.firstOutputAt=Math.min(state.firstOutputAt ?? event.start,event.start); break;
+    case "output-observed":
+      state.firstOutputAt=Math.min(state.firstOutputAt ?? event.start,event.start);
+      state.pendingOutputIntervals.push([event.start,event.end]);
+      break;
     case "tool-measured":
       state.toolMs+=Math.max(0,event.end-event.start);
       state.pendingToolIntervals.push([event.start,event.end]);
-      // 工具记录可能晚到，补扣与既有响应样本重叠的时间。
+      // 工具记录可能晚到；是否属于可扣除等待区间，由样本的生成边界判断。
       for (const sample of state.speedMeasurements) if (event.start < sample.end && event.end > sample.start) sample.tools.push([event.start,event.end]);
       break;
     case "usage-observed":
@@ -81,7 +88,8 @@ export function applySessionStatusEvent(state, event) {
         state.responses.add(event.id);
         const output=event.last?.output;
         if (Number.isFinite(output) && output > 0 && state.firstOutputAt != null && Number.isFinite(event.end) && event.end > state.firstOutputAt)
-          state.speedMeasurements.push({ start:state.firstOutputAt,end:event.end,output,tools:state.pendingToolIntervals.slice() });
+          state.speedMeasurements.push({ start:state.firstOutputAt,end:event.end,output,
+            outputs:state.pendingOutputIntervals.slice(),tools:state.pendingToolIntervals.slice() });
       }
       reset();
       if (event.total) { state.total=event.total; state.hasResponseUsage=true; }
@@ -96,7 +104,7 @@ export function sessionStatusSnapshot(state, threadId) {
   let decodeMs = 0;
   let speedSamples = 0;
   for (const sample of state.speedMeasurements) {
-    const elapsed = sample.end - sample.start - overlappingToolMs(sample.tools, sample.start, sample.end);
+    const elapsed = sample.end - sample.start - boundedToolWaitMs(sample.tools, sample.start, sample.end, sample.outputs);
     if (elapsed <= 0 || elapsed >= 600_000) continue;
     decodeTokens += sample.output;
     decodeMs += elapsed;

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

@@ -35,9 +35,7 @@ style.id = STYLE_ID;
 style.textContent = `
   [${MARKER}] { box-sizing:border-box; display:flex; flex-wrap:wrap; justify-content:center; align-items:center; gap:0 4px; margin:0 auto; padding-top:2px; max-width:100%; min-height:24px; min-width:0; font-family:var(--mcx-font-sans-default,inherit); font-size:var(--mcx-text-xs,12px); line-height:16px; font-variant-numeric:tabular-nums; color:var(--mcx-color-text-tertiary); }
   [${MARKER}][hidden] { display:none; }
-  [data-minecodex-session-reveal] { display:grid; grid-template-rows:0fr; opacity:0; transition:grid-template-rows 200ms ease,opacity 160ms ease; }
-  [data-minecodex-session-reveal][data-expanded] { grid-template-rows:1fr; opacity:1; }
-  @starting-style { [data-minecodex-session-reveal][data-expanded] { grid-template-rows:0fr; opacity:0; } }
+  [data-minecodex-session-reveal] { display:grid; grid-template-rows:1fr; }
   [data-minecodex-session-reveal][data-expanded]:not([hidden]) { margin-top:-4px; }
   [data-minecodex-session-reveal] > div { min-height:0; overflow:hidden; }
   [data-minecodex-session-reveal]:not([data-expanded]) { pointer-events:none; }
@@ -102,7 +100,7 @@ window.addEventListener("storage", (event) => {
 }, { signal });
 // Codex 会把离屏输入框搬到 Quick Chat 浮层；节点仍连接不代表当前页面是聊天。
 function isActiveComposer(composer) {
-  return Boolean(config.codex.composer(composer));
+  return Boolean(config.codex.composerSurface(composer));
 }
 function createInstance(composerElement) {
 let copy = selectedCopy();
@@ -156,15 +154,30 @@ document.body.append(tooltip);
 let expanded = globalExpanded;
 let collapseTimer = null;
 let collapsing = false;
+const motion = new Set();
+function clearMotion() {
+  for (const animation of motion) animation.cancel();
+  motion.clear();
+  for (const key of ["position", "left", "top", "width"]) reveal.style.removeProperty(key);
+}
 const nativeIndicators = new Set();
 function setExpanded(value) {
+  const card = reveal.previousElementSibling;
+  const model = card?.querySelector('[data-composer-navigation-target="reasoning"]');
+  const controls = model?.parentElement;
+  const before = card?.getBoundingClientRect();
+  const controlsBefore = controls?.getBoundingClientRect();
+  const revealBefore = reveal.getBoundingClientRect();
+  const opacity = reveal.hidden ? 0 : Number(getComputedStyle(reveal).opacity);
+  const animate = value !== expanded && !root.hidden && !matchMedia("(prefers-reduced-motion: reduce)").matches;
   clearTimeout(collapseTimer);
-  collapsing = expanded && !value && !matchMedia("(prefers-reduced-motion: reduce)").matches;
+  clearMotion();
+  collapsing = animate && !value;
   expanded = value;
-  if (collapsing) collapseTimer = setTimeout(() => {
-    collapsing = false;
-    syncVisibility(findComposer());
-  }, 200);
+  // 退出内容暂时脱离布局，原生输入框一次到达目标位置，再以位移衔接。
+  if (collapsing) Object.assign(reveal.style, {
+    position:"fixed", left:`${revealBefore.left}px`, top:`${revealBefore.top}px`, width:`${revealBefore.width}px`,
+  });
   reveal.toggleAttribute("data-expanded", expanded);
   clip.inert = !expanded;
   trigger.setAttribute("aria-expanded", String(expanded));
@@ -172,6 +185,25 @@ function setExpanded(value) {
   if (expanded) reveal.hidden = false;
   syncVisibility(findComposer());
   if (!expanded) closePanel();
+  if (!animate) return;
+  const duration = expanded ? 220 : 160;
+  const options = { duration, easing:"cubic-bezier(0.23,1,0.32,1)", fill:"both" };
+  const play = (node, frames) => { if (node) motion.add(node.animate(frames, options)); };
+  const after = card.getBoundingClientRect();
+  play(card, [{transform:`translateY(${before.top-after.top}px)`},{transform:"translateY(0)"}]);
+  if (controlsBefore) {
+    const after = controls.getBoundingClientRect();
+    play(controls, [{transform:`translateX(${controlsBefore.left-after.left}px)`},{transform:"translateX(0)"}]);
+  }
+  const offset = expanded && revealBefore.height ? revealBefore.top-reveal.getBoundingClientRect().top : -4;
+  play(reveal, [{opacity,transform:`translateY(${expanded ? offset : 0}px)`},
+    {opacity:expanded ? 1 : 0,transform:`translateY(${expanded ? 0 : -4}px)`}]);
+  if (!expanded) play(trigger, [{opacity:0},{opacity:1}]);
+  collapseTimer = setTimeout(() => {
+    collapsing = false;
+    clearMotion();
+    syncVisibility(findComposer());
+  }, duration);
 }
 trigger.addEventListener("click", () => setGlobalExpanded(!expanded), { signal });
 function hideTooltip() { tooltip.hidden = true; trigger.removeAttribute("aria-describedby"); }
@@ -401,7 +433,7 @@ function findComposer() {
   return isActiveComposer(composerElement) ? composerElement : null;
 }
 function currentThreadId(composer) {
-  return config.codex.currentThreadId(composer);
+  return composer ? config.codex.composerSurface(composer)?.threadId ?? null : null;
 }
 // 与原生 Context 指示器订阅同一会话状态；不以日志百分比覆盖它。
 const emptyNativeContext = () => ({ contextUsedTokens:null,contextWindow:null,contextPercent:null });
@@ -445,6 +477,9 @@ function ensurePosition() {
   const composer = findComposer();
   const threadId = currentThreadId(composer);
   if (threadId !== activeThreadId) {
+    clearTimeout(collapseTimer);
+    clearMotion();
+    collapsing = false;
     activeThreadId = threadId;
     nativeContext = emptyNativeContext();
     // 会话建立后先展示占位，不让日志落盘速度决定状态栏是否出现。
@@ -547,6 +582,7 @@ return { update: receiver.update, setExpanded, dispose() {
   nativeUsage.dispose();
   clearTimeout(refreshTimer);
   clearTimeout(collapseTimer);
+  clearMotion();
   observer.disconnect();
   localeObserver.disconnect();
   closePanel();
@@ -560,7 +596,7 @@ function syncInstances() {
   for (const [composer, instance] of instances) {
     if (!isActiveComposer(composer)) { instance.dispose(); instances.delete(composer); }
   }
-  for (const composer of document.querySelectorAll('[data-codex-composer="true"][contenteditable="true"]')) {
+  for (const composer of document.querySelectorAll('[data-codex-composer-root]')) {
     if (isActiveComposer(composer) && !instances.has(composer)) instances.set(composer, createInstance(composer));
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "minecodex",
-  "version": "2.0.4",
+  "version": "2.0.5",
   "description": "Lightweight, local-first plugins for the Codex desktop app.",
   "license": "MIT",
   "type": "module",

package/packages/codex-adapter/README.md

@@ -6,8 +6,9 @@
 
 | 接口 | 结果与约束 |
 | --- | --- |
-| `composer(element?, {threadOnly}?)` | 默认仅可见的 thread 输入框；Prompts 显式传 false 支持首页输入框。返回 editable/root/body/add/threadId；非thread不提供身份，隐藏祖先返回 null |
+| `composer(element?, {threadOnly, purpose}?)` | 默认仅可见的 Codex thread 输入框；Prompts 使用 `purpose:"insertion"` 支持 Chat、Work、Codex、Temporary Chat 与面板 chat bar。优先当前焦点所在输入框，并可显式绑定插入目标。返回 editable/root/body/add/threadId；非thread不提供身份，隐藏祖先返回 null |
 | `currentThreadId(element?)` | 从合格输入框取得 UUID；不从残留 sidebar 选中项猜当前线程 |
+| `composerSurface(element?)` | 返回可见正式会话外壳 root/threadId，独立于编辑区是否存在或暂时 inert；供会话状态呈现与宿主统计订阅使用。真正隐藏、移入浮层、切换 home 或卸载时返回 null；不能作为文字插入许可 |
 | `rail()` / `railSlot(ownGroup)` | 可见原生 rail 与模板/滚动区/固定组句柄；不包含插件菜单策略 |
 | `currentFiber(element)` / `props(element,predicate,limit?)` | 仅供 native Adapter 使用；优先匹配当前 committed props，支持最近祖先的 scope |
 | `report(name,available,reason?)` / `diagnostics()` | 最新能力状态的副本；不持有凭据、原始账户数据或用户内容 |

package/packages/codex-adapter/src/renderer/environment.mjs

@@ -18,12 +18,17 @@ export function createCodexEnvironment() {
     }
     return null;
   }
-  function composer(element = null, {threadOnly=true} = {}) {
-    const candidates = element ? [element] : document.querySelectorAll('[data-codex-composer="true"][contenteditable="true"]');
+  function composer(element = null, {threadOnly=true, purpose="thread"} = {}) {
+    const insertion = purpose === "insertion";
+    const rootSelector = insertion ? '[data-codex-composer-root], [data-chatgpt-composer]' : '[data-codex-composer-root]';
+    const candidates = element ? [element] : [...document.querySelectorAll(insertion
+      ? '[data-codex-composer="true"][contenteditable="true"], [data-chatgpt-composer] [data-composer-markdown][contenteditable="true"]'
+      : '[data-codex-composer="true"][contenteditable="true"]')];
+    if (!element && insertion) candidates.sort((a,b) => Number(Boolean(b.closest(rootSelector)?.contains(document.activeElement))) - Number(Boolean(a.closest(rootSelector)?.contains(document.activeElement))));
     for (const editable of candidates) {
-      const root = editable.closest('[data-codex-composer-root]');
-      if (!editable.isConnected || !root || (threadOnly && root.getAttribute('data-composer-placement') !== 'thread')
-        || editable.closest('[hidden], [inert], [aria-hidden="true"], [data-floating-chat-surface], [data-right-panel-composer-overlay-content]')
+      const root = editable.closest(rootSelector);
+      if (!editable.isConnected || !root || (!insertion && threadOnly && root.getAttribute('data-composer-placement') !== 'thread')
+        || editable.closest(insertion ? '[hidden], [inert], [aria-hidden="true"]' : '[hidden], [inert], [aria-hidden="true"], [data-floating-chat-surface], [data-right-panel-composer-overlay-content]')
         || !editable.checkVisibility({ visibilityProperty:true })) continue;
       const value = root.getAttribute('data-composer-placement') === 'thread' ? root.querySelector('[data-above-composer-portal]')?.getAttribute('data-above-composer-conversation-id') : null;
       const threadId = 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;
@@ -34,6 +39,19 @@ export function createCodexEnvironment() {
     report("composer", false, "active-thread-composer-unavailable");
     return null;
   }
+  // 状态属于会话外壳；发送时编辑区可能 inert 或重建，不代表离开会话。
+  function composerSurface(element = null) {
+    const roots = element ? [element.closest('[data-codex-composer-root]')] : document.querySelectorAll('[data-codex-composer-root]');
+    for (const root of roots) {
+      if (!root?.isConnected || root.getAttribute('data-composer-placement') !== 'thread'
+        || root.closest('[hidden], [aria-hidden="true"], [data-floating-chat-surface], [data-right-panel-composer-overlay-content]')
+        || !root.checkVisibility({visibilityProperty:true})) continue;
+      const value = root.querySelector('[data-above-composer-portal]')?.getAttribute('data-above-composer-conversation-id');
+      const threadId = 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;
+      return {root,threadId};
+    }
+    return null;
+  }
   function rail() {
     const node = [...document.querySelectorAll('[data-app-navigation-rail]')].find(node => node.getBoundingClientRect().width > 0) ?? null;
     report("navigation-rail", Boolean(node), node ? null : "rail-unavailable");
@@ -47,7 +65,7 @@ export function createCodexEnvironment() {
     const group = [...(scroll?.children ?? [])].find(child => child !== ownGroup && child.classList.contains('flex-col') && child.classList.contains('shrink-0'));
     return node && template && scroll ? { rail:node, template, scroll, group } : null;
   }
-  return { composer, rail, railSlot, currentThreadId:element => composer(element)?.threadId ?? null,
+  return { composer, composerSurface, rail, railSlot, currentThreadId:element => composer(element)?.threadId ?? null,
     // 仅供 UI／插件 native Adapter 使用，交互层不读取 React props。
     currentFiber, props, report, diagnostics:() => [...capabilities.values()].map(item => ({...item})) };
 }

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

@@ -812,10 +812,7 @@ export function createInjectionSource(features, {
     }
 
     function currentComposer() {
-      const marked = document.querySelector('[data-codex-composer="true"][contenteditable="true"]');
-      if (marked) return marked;
-      return Array.from(document.querySelectorAll('[contenteditable="true"][role="textbox"]'))
-        .find((element) => isVisibleToolbarControl(element)) ?? null;
+      return codex.composer(null, { purpose: "insertion" })?.editable ?? null;
     }
 
     function rememberComposerSelection() {
@@ -828,9 +825,9 @@ export function createInjectionSource(features, {
       savedComposerThread = threadIdentity();
     }
 
-    function insertComposerText(text) {
+    function insertComposerText(text, target = null) {
       if (typeof text !== "string" || !text) throw new Error("Text is required");
-      const composer = currentComposer();
+      const composer = target ? codex.composer(target, { purpose: "insertion" })?.editable : currentComposer();
       if (!composer) throw new Error("The active Composer was not found");
       const selection = document.getSelection();
       let fallback = true;

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

@@ -1,3 +1,4 @@
+import { LocalImageSource } from "../../../features/images/src/backend/local-image-source.mjs";
 import { cloudImagesAction } from "../../../features/images/src/backend/cloud-library.mjs";
 // CodexRuntime：Codex Renderer 生命周期与 host action 执行。
 // 注入源（createInjectionSource）与 CDP 客户端分别在 codex-injection.mjs / codex-cdp.mjs。
@@ -34,6 +35,7 @@ import {
 } from "./host-actions.mjs";
 import { SitesService } from "../../../features/sites/src/backend/sites-service.mjs";
 import { SessionStatusReader, threadIdFromLocation } from "../../../features/session-status/src/adapters/codex/session-reader.mjs";
+import { createCodexEnvironment } from "../../codex-adapter/src/renderer/environment.mjs";
 
 
 // 保持公共入口兼容：历史 import 从本文件继续可用。
@@ -48,11 +50,9 @@ export {
 } from "./codex-injection.mjs";
 
 export const SESSION_STATUS_THREAD_ID_EXPRESSION = `(() => {
-  return [...new Set([...document.querySelectorAll('[data-codex-composer="true"][contenteditable="true"]')].map(composer => {
-    const card = composer.closest('[data-codex-composer-root]');
-    if (card?.getAttribute('data-composer-placement') !== 'thread') return null;
-    return card.querySelector('[data-above-composer-portal]')?.getAttribute('data-above-composer-conversation-id');
-  }).filter(Boolean))];
+  const codex = (${createCodexEnvironment.toString()})();
+  return [...new Set([...document.querySelectorAll('[data-codex-composer-root]')]
+    .map(root => codex.composerSurface(root)?.threadId).filter(Boolean))];
 })()`;
 
 export class CodexRuntime {
@@ -79,6 +79,7 @@ export class CodexRuntime {
   }) {
     this.features = features;
     this.sitesService = sitesService ?? (features.some(feature => feature.id === "sites") ? new SitesService() : null);
+    this.localImageSource = features.some(feature => feature.id === "images") ? new LocalImageSource({dataDir:path.join(profileDir,"minecodex-image-gen")}) : null;
     this.profileDir = profileDir;
     this.appPath = appPath;
     this.cdpPort = cdpPort;
@@ -549,6 +550,15 @@ export class CodexRuntime {
       });
       return;
     }
+    if (feature.id === "images" && request.action === "local-image-source") {
+      try {
+        const result = await this.localImageSource.action(request.payload);
+        await this.resolveHostAction(client, request.requestId, {ok:true,result});
+      } catch (error) {
+        await this.resolveHostAction(client, request.requestId, {ok:false,error:{code:"LOCAL_IMAGE_SOURCE_FAILED",message:error.message}});
+      }
+      return;
+    }
     if (feature.id === "sites" && request.action === "sites") {
       try {
         const result = await this.sitesService.action(request.payload);
@@ -812,6 +822,7 @@ export class CodexRuntime {
     if (this.stopPromise) return this.stopPromise;
     this.stopPromise = (async () => {
       this.stopping = true;
+      await this.localImageSource?.close();
       this.targetRefreshQueued = false;
       this.monitorWake?.();
       await this.monitorPromise?.catch(() => {});

package/packages/runtime-host/src/feature-registry.mjs

@@ -17,6 +17,7 @@ const HOST_ACTIONS = new Set([
   "resolve-file-paths",
   "import-generated-image",
   "list-cloud-images",
+  "local-image-source",
   "import-cloud-image",
   "create-image-edit-thread",
 ]);

package/packages/ui/DESIGN.md

@@ -13,15 +13,18 @@
 - 原生适配层：解析实际token、主题、zoom和能力状态；共享锚点仅包含真实跨插件需求。原生事实遵循根规范，不在每个组件重新猜测。
 - 材质与层级基础：按Dialog、Dropdown、Popover、ComposerMenu、Page的原生分支提供有限选项，将遮罩与Portal规则同所选组件匹配。
 - Dialog：提供容器、标题、Close及操作区的结构；插件填表单、列表或确认内容。
-- Button：表达操作角色和状态，保留Cancel ghost、实际次级outline与主操作solid的语义区分；业务动作由插件传入。
-- Navbar：使用成对 default/selected 图标管理展示状态；原生图标与选中状态适配集中在 native 层，保留原生路由与 sidebar hover。
+- Button：通过 `action(node, "danger-solid")` 提供原生实色警戒分支，保留既有 `danger` soft 分支；通用 token 与适用规则见根 DESIGN.md。表达操作角色和状态，保留Cancel ghost、实际次级outline与主操作solid的语义区分；业务动作由插件传入。
+- Navbar：使用成对 default/selected 图标管理展示状态；原生图标与选中状态适配集中在 native 层，保留原生路由与 sidebar hover。退出注入页面时按当前 committed 原生状态恢复选中属性，不回放进入时的旧状态；原生目的地变化时及时移除替身图标，原节点复用或重渲染后仍保证只显示一个图标。
 - Tooltip：处理声明式标记、hover/focus、aria关联、关闭与卸载，不接管原生Tooltip。
+- Page 的 `sidebar:"none"` 分支通过 native/page Adapter 取得原生无上下文侧栏页面壳；`releasePage` 释放时区分返回原页面和用户主动导航，禁用时清理。
 - 页面、菜单与浮层：提供对应类型的外壳、挂载和通用交互，不读取提示词、会话或站点业务数据。
 
 ## 接入约束
 
 当前page-script通过 `config.ui` 使用公共能力；现有API包括 `heading`、`footer`、`action`、`overlay`、`surface`。`surface(node, kind, options)` 显式区分原生材质；`page`、`mount`、`trapFocus`、`composerMenu`、`tooltipSurface`、`navigationRail` 维护实际复用的层级、焦点与定位。`entry.resources` 通过 `config.resources` 提供插件自身 CSS 与图标，通用视觉仍由组件库维护。
 
+独立全页面且无专属二级导航的功能使用 `config.ui.page(node, { sidebar:"none" })`。移除页面前调用 `config.ui.releasePage(node)`；若用户正在主动选择原生导航，则传 `{ restoreNavigation:false }`，避免恢复动作覆盖用户选择。默认 `sidebar:"inherit"` 保留现有接入行为，不自动迁移其他功能。页面壳的产品规则与验收标准见根 DESIGN.md 的「全页面功能的页面壳选择」。
+
 Renderer安装函数经序列化注入，必须自包含。组件代码与Node/CDP隔离，宿主负责组装注入源码、生命周期和iframe主题桥；不为整理目录引入不必要的打包系统。
 
 通用生命周期契约由组件库维护。原生已经提供的焦点圈定、Escape和关闭机制优先复用；插件继续拥有业务状态、内容更新和具体回调。迁移时同步触发点焦点恢复、异步卸载及原生节点归属验证。

package/packages/ui/src/components/button.mjs

@@ -11,6 +11,8 @@ export function installButton(signal, ui) {
     [data-mcx-ui-surface=dialog] [data-mcx-ui-footer]>[data-mcx-ui-action=primary]:hover:not(:disabled):not([aria-disabled=true]) { background:var(--mcx-color-background-primary-solid-hover); }
     [data-mcx-ui-surface=dialog] [data-mcx-ui-footer]>[data-mcx-ui-action=danger] { box-shadow:none; background:var(--mcx-color-background-danger-soft-alpha); color:var(--mcx-color-text-danger); }
     [data-mcx-ui-surface=dialog] [data-mcx-ui-footer]>[data-mcx-ui-action=danger]:hover:not(:disabled):not([aria-disabled=true]) { background:var(--mcx-color-background-danger-soft-alpha-hover); }
+    [data-mcx-ui-action=danger-solid], [data-mcx-ui-surface=dialog] [data-mcx-ui-footer]>[data-mcx-ui-action=danger-solid] { box-shadow:none; border-color:transparent; background:var(--mcx-color-background-danger-solid); color:var(--mcx-color-text-danger-solid); }
+    [data-mcx-ui-action=danger-solid]:hover:not(:disabled):not([aria-disabled=true]), [data-mcx-ui-surface=dialog] [data-mcx-ui-footer]>[data-mcx-ui-action=danger-solid]:hover:not(:disabled):not([aria-disabled=true]) { background:color-mix(in oklab,var(--mcx-color-background-danger-solid) 90%,transparent); }
     [data-mcx-ui-surface=dialog] button:disabled { opacity:.4; cursor:default; }
     [data-mcx-ui-surface=dialog] [data-mcx-ui-close]:focus-visible, [data-mcx-ui-surface=dialog] [data-mcx-ui-footer]>button:focus-visible { outline:2px solid var(--mcx-color-ring); outline-offset:0; }
   `;

package/packages/ui/src/components/navigation-rail.mjs

@@ -5,16 +5,19 @@ export function installNavigationRail(signal, ui, native) {
   style.setAttribute("data-minecodex-ui-styles", "navigation-rail");
   style.textContent = `[data-mcx-native-rail-icon-hidden]{display:none!important}`;
   document.head.append(style);
-  function restore() {
-    for (const [node, state] of snapshots) {
-      state.icon?.removeAttribute("data-mcx-native-rail-icon-hidden");
-      state.replacement?.remove();
-      if (!node.isConnected) continue;
-      for (const [name, value] of state.attributes) {
-        if (value === null) node.removeAttribute(name);
-        else node.setAttribute(name, value);
-      }
+  function restoreNode(node, state) {
+    state.icon?.removeAttribute("data-mcx-native-rail-icon-hidden");
+    state.replacement?.remove();
+    if (!node.isConnected) return;
+    // 路由可能已变化，恢复当前 committed props，不回放旧选中态。
+    const attributes = native.attributes(node, [...state.attributes.keys()]) ?? state.attributes;
+    for (const [name, value] of attributes) {
+      if (value === null) node.removeAttribute(name);
+      else node.setAttribute(name, value);
     }
+  }
+  function restore() {
+    for (const [node, state] of snapshots) restoreNode(node, state);
     snapshots.clear();
   }
   function selection(button, selected) {
@@ -38,6 +41,10 @@ export function installNavigationRail(signal, ui, native) {
       if (!icon) continue;
       const item = native.item(node);
       const active = item ? item.isCurrentDestination : node.getAttribute("aria-current") === "page";
+      if (!active && snapshots.has(node)) {
+        restoreNode(node, snapshots.get(node));
+        snapshots.delete(node);
+      }
       if (!active && !snapshots.has(node)) native.remember(node, icon);
       if (!selected || (!active && !node.hasAttribute("data-selected"))) continue;
       let state = snapshots.get(node);
@@ -46,7 +53,7 @@ export function installNavigationRail(signal, ui, native) {
           .map(name => [name, node.getAttribute(name)])) };
         snapshots.set(node, state);
       }
-      if (active && state.icon !== icon) {
+      if (active && (state.icon !== icon || !state.replacement?.isConnected)) {
         state.icon?.removeAttribute("data-mcx-native-rail-icon-hidden");
         state.replacement?.remove();
         state.icon = icon;
@@ -57,6 +64,7 @@ export function installNavigationRail(signal, ui, native) {
           icon.setAttribute("data-mcx-native-rail-icon-hidden", "");
         }
       }
+      if (state.replacement?.isConnected) state.icon?.setAttribute("data-mcx-native-rail-icon-hidden", "");
       node.removeAttribute("data-selected");
       node.removeAttribute("aria-current");
       if (!node.hasAttribute("data-suppress-active-style")) node.setAttribute("data-suppress-active-style", "");