minecodex 2.0.10 → 2.0.12

package/features/model-slider/src/adapters/codex/controller.mjs

@@ -1,14 +1,16 @@
 export function createModelControllerAdapter(codex,comparableModelLabel) {
 function controllerView(props) {const view=Object.fromEntries(["models","model","reasoningEffort","powerSelections","selectedPowerSelection","fallbackPowerSelection","serviceTierOptions","selectedServiceTier","onSelectModel","onSelectReasoningEffort","onSelectPower","onCommitPower","onSelectServiceTier"].map(key=>[key,props[key]]));codex.report('model-controller',true);return view;}
-function nativeComposerTrigger() {
-    const triggers = Array.from(document.querySelectorAll("[data-codex-intelligence-trigger]"))
+function nativeComposerTriggers() {
+    return Array.from(document.querySelectorAll("[data-codex-intelligence-trigger]"))
       .filter((trigger) => trigger.checkVisibility({ checkVisibilityCSS: true, checkOpacity: true }));
+  }
+function nativeComposerTrigger() {
+    const triggers = nativeComposerTriggers();
     return triggers.find((trigger) => trigger.getAttribute("data-state") === "open")
       ?? triggers[0] ?? null;
   }
-function nativeComposerModelController() {
+function nativeComposerModelController(trigger = nativeComposerTrigger()) {
     codex.report("model-controller",false,"task-controller-unavailable");
-    const trigger = nativeComposerTrigger();
     let fiber = codex.currentFiber(trigger);
     let powerController = null;
     for (let depth = 0; fiber && depth < 40; depth += 1, fiber = fiber.return) {
@@ -102,5 +104,5 @@ function selfCheck() {
   return {state:available ? "available" : "unavailable",reason:available ? null : "model-controller-unavailable",
     scopes:[{name:"model-trigger",element:trigger}],checks:[{name:"model-trigger",available:true},{name:"model-controller",available}]};
 }
-return {selfCheck,fastIcons,trigger:nativeComposerTrigger,read:nativeComposerModelController,descriptor:nativeModelDescriptorForItem,setOpen:setReactControlledMenuOpen,selectItem:invokeNativeMenuItemSelect};
+return {selfCheck,fastIcons,trigger:nativeComposerTrigger,triggers:nativeComposerTriggers,read:nativeComposerModelController,descriptor:nativeModelDescriptorForItem,setOpen:setReactControlledMenuOpen,selectItem:invokeNativeMenuItemSelect};
 }

package/features/model-slider/src/frontend/install.mjs

@@ -13,8 +13,7 @@ export function installModelSlider(signal, { feature, ui, createIcon, requestRef
   let modelSelectorEffortTransactionTimer = null;
   let modelSelectorPendingOutsideDismiss = false;
   let modelSelectorSuppressOutsidePointerSequence = false;
-  let modelSelectorTriggerObserver = null;
-  let modelSelectorObservedTrigger = null;
+  const modelSelectorTriggerObservers = new Map();
   let modelSelectorControllerMenu = null;
   let modelSelectorNativeFastIcons = null;
   // 持久化脏标记：仅在图标实际变化时写一次 localStorage。
@@ -44,7 +43,7 @@ export function installModelSlider(signal, { feature, ui, createIcon, requestRef
     }
     html[data-codex-model-slider-catalog-ready]
     [data-codex-model-slider-trigger]
-    [class*="_ModelPickerTriggerModelText_"]:not([data-codex-model-slider-trigger-label]) {
+    [class*="_ModelPickerTriggerModelText_"]:not([data-codex-model-slider-trigger-label]):has(+ [data-codex-model-slider-trigger-label]) {
       display: none !important;
     }
     [data-codex-model-slider-trigger-label] {
@@ -1990,14 +1989,11 @@ export function installModelSlider(signal, { feature, ui, createIcon, requestRef
     return /^(select\s+(model|effort)|选择\s*(模型|思考强度))$/i.test(String(value ?? "").trim());
   }
 
-  function enhanceComposerModelTrigger(selector) {
-    const trigger = nativeComposerTrigger();
-    if (!trigger) return;
-    if (modelSelectorObservedTrigger !== trigger) {
-      modelSelectorTriggerObserver?.disconnect();
-      modelSelectorObservedTrigger = trigger;
-      modelSelectorTriggerObserver = new MutationObserver(queueEnsure);
-      modelSelectorTriggerObserver.observe(trigger, { childList: true, subtree: true, characterData: true });
+  function enhanceComposerModelTrigger(trigger, selector) {
+    if (!modelSelectorTriggerObservers.has(trigger)) {
+      const observer = new MutationObserver(queueEnsure);
+      observer.observe(trigger, { childList: true, subtree: true, characterData: true });
+      modelSelectorTriggerObservers.set(trigger, observer);
     }
     const nativeLabels = Array.from(trigger.querySelectorAll(
       '[class*="_ModelPickerTriggerModelText_"]:not([data-codex-model-slider-trigger-label])',
@@ -2060,7 +2056,14 @@ export function installModelSlider(signal, { feature, ui, createIcon, requestRef
     pruneGenericModelPickerContainers();
     document.documentElement.setAttribute("data-codex-model-slider-catalog-ready", "");
     if (!modelSelectorStyle.isConnected) document.head?.append(modelSelectorStyle);
-    enhanceComposerModelTrigger(selector);
+    // 主会话与 side chat 同时维护标签；菜单动作仍跟随原生打开的按钮。
+    const triggers = nativeModel.triggers().filter(trigger => nativeModel.read(trigger));
+    for (const [trigger, observer] of modelSelectorTriggerObservers) {
+      if (triggers.includes(trigger)) continue;
+      observer.disconnect();
+      modelSelectorTriggerObservers.delete(trigger);
+    }
+    for (const trigger of triggers) enhanceComposerModelTrigger(trigger, selector);
     const parentMenu = nativeModelPickerMenu();
     if (modelSelectorControllerMenu && modelSelectorControllerMenu.parentMenu !== parentMenu) {
       closeControllerModelMenu({ immediate: true });
@@ -2092,7 +2095,8 @@ export function installModelSlider(signal, { feature, ui, createIcon, requestRef
     closeControllerModelMenu({ immediate: true });
     clearTimeout(modelSelectorReturnTimer);
     clearTimeout(modelSelectorEffortTransactionTimer);
-    modelSelectorTriggerObserver?.disconnect();
+    for (const observer of modelSelectorTriggerObservers.values()) observer.disconnect();
+    modelSelectorTriggerObservers.clear();
     for (const record of modelSelectorPositionObservers.values()) {
       record.observer.disconnect();
       record.resizeObserver.disconnect();
@@ -2100,8 +2104,6 @@ export function installModelSlider(signal, { feature, ui, createIcon, requestRef
     modelSelectorPositionObservers.clear();
     for (const frame of modelSelectorMenuSizeFrames.values()) cancelAnimationFrame(frame);
     modelSelectorMenuSizeFrames.clear();
-    modelSelectorTriggerObserver = null;
-    modelSelectorObservedTrigger = null;
     modelSelectorReturnTimer = null;
     modelSelectorEffortTransactionTimer = null;
     modelSelectorPendingOutsideDismiss = false;

package/features/sidebar-focus/src/sidebar-focus.mjs

@@ -34,7 +34,10 @@ function reconcile() {
     }, { signal });
     // 作为原生按钮组的独立子项，继承组内 gap，不放进铃铛的 Tooltip 包装层。
     let anchor = bell;
-    while (anchor.parentElement && getComputedStyle(anchor.parentElement).display !== "flex") {
+    while (anchor.parentElement && anchor.parentElement !== sidebar) {
+      const layout = getComputedStyle(anchor.parentElement);
+      // 跳过零间距的通知包装层，接入真正带原生 gap 的按钮组。
+      if (["flex", "inline-flex"].includes(layout.display) && Number.parseFloat(layout.columnGap) > 0) break;
       anchor = anchor.parentElement;
     }
     anchor.after(button);

package/package.json

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

package/packages/ui/src/components/composer-menu.mjs

@@ -8,8 +8,9 @@ export function installComposerMenu(signal, ui) {
       ui.layer(node, "floating");
       const rect = body.getBoundingClientRect();
       const root = anchor.closest("[data-codex-composer-root], [data-chatgpt-composer]");
-      // 首页 Add 向下展开；已有会话保留向上的输入框菜单。
-      const below = root?.getAttribute("data-composer-placement") === "home";
+      const nativeSide = anchor.closest("[data-dropdown-overlay-side]")?.getAttribute("data-dropdown-overlay-side");
+      // 新会话跟随原生 Add 方向，不能仅凭 home 将 Codex 模式改为向下。
+      const below = root?.getAttribute("data-composer-placement") === "home" && nativeSide === "bottom";
       const zoom = Number.parseFloat(getComputedStyle(node).zoom) || 1;
       node.style.left = `${rect.left / zoom}px`;
       node.style.top = `${(below ? rect.bottom + gap : rect.top - gap) / zoom}px`;