minecodex 0.1.14 → 0.1.16

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

@@ -1,5 +1,4 @@
 import { randomBytes } from "node:crypto";
-import { spawn } from "node:child_process";
 import { mkdir, stat } from "node:fs/promises";
 import path from "node:path";
 
@@ -321,6 +320,9 @@ export function createInjectionSource(features, {
       [data-codex-model-slider-trigger-label] {
         display: inline; overflow: visible; text-overflow: clip; white-space: nowrap;
       }
+      [data-codex-model-slider-trigger] [class*="_ModelPickerTriggerEffortLabel_"] {
+        display: inline-flex; align-items: center; align-self: center;
+      }
       html[data-codex-model-slider-selecting-effort] [role="menu"][data-state="open"]:not(:has([data-reasoning-slider])) {
         visibility: hidden !important; opacity: 0 !important; animation: none !important; pointer-events: none !important;
       }
@@ -374,7 +376,6 @@ export function createInjectionSource(features, {
     if (modelSelectorFeature) {
       document.documentElement.setAttribute("data-codex-model-slider-catalog-ready", "");
       document.documentElement.append(modelSelectorStyle);
-      void loadNativeFastIcon();
     }
 
     for (const feature of pageScriptFeatures) {
@@ -617,32 +618,6 @@ export function createInjectionSource(features, {
       return icon;
     }
 
-    async function loadNativeFastIcon() {
-      const sourceLink = document.querySelector('link[href*="/assets/app-initial-"][href$=".js"]');
-      if (!sourceLink?.href) return;
-      try {
-        const source = await fetch(sourceLink.href).then((response) => response.text());
-        const active = source.match(/d:`(M11\.9125 21\.4125[^`]+)`,fill:`currentColor`/);
-        const inactive = source.match(/d:`(M7\.38 16\.2207[^`]+)`,fill:`currentColor`/);
-        if (!active?.[1] || !inactive?.[1]) return;
-        modelSelectorNativeFastIcons = {
-          active: { viewBox: "0 0 24 24", markup: `<path d="${active[1]}" fill="currentColor" />` },
-          inactive: {
-            viewBox: "0 0 20 20",
-            markup: `<g transform="translate(2.43 1.609)"><path d="${inactive[1]}" fill="currentColor" /></g>`,
-          },
-        };
-        document.querySelectorAll("[data-codex-model-slider-fast]").forEach((button) => {
-          const icon = createNativeFastIcon(button.getAttribute("aria-pressed") === "true");
-          const content = button.querySelector("[data-codex-model-slider-fast-content]");
-          if (icon && content) content.replaceChildren(icon);
-        });
-        queueEnsure();
-      } catch {
-        // Leave the native control untouched when this private Codex asset moves.
-      }
-    }
-
     function nativeCssModuleClass(tokenName, root = document) {
       const pattern = new RegExp(`^_${tokenName}_[A-Za-z0-9_-]+$`);
       const live = Array.from(root.querySelectorAll(`[class*="_${tokenName}_"]`))
@@ -674,11 +649,33 @@ export function createInjectionSource(features, {
       return null;
     }
 
+    function captureNativeFastIcon() {
+      const capture = (state, pathPrefix) => {
+        if (modelSelectorNativeFastIcons?.[state]) return;
+        const path = Array.from(document.querySelectorAll("svg path")).find(
+          (candidate) => candidate.getAttribute("d")?.startsWith(pathPrefix),
+        );
+        const svg = path?.closest("svg");
+        if (!svg) return;
+        const template = svg.cloneNode(true);
+        template.removeAttribute("id");
+        template.removeAttribute("width");
+        template.removeAttribute("height");
+        if (!modelSelectorNativeFastIcons) modelSelectorNativeFastIcons = {};
+        modelSelectorNativeFastIcons[state] = template;
+      };
+      capture("active", "M11.9125 21.4125");
+      capture("inactive", "M7.38 16.2207");
+      return modelSelectorNativeFastIcons;
+    }
+
     function createNativeFastIcon(active) {
-      const definition = modelSelectorNativeFastIcons?.[active ? "active" : "inactive"];
-      const icon = createModelSelectorIcon(definition, { brand: true });
+      const template = captureNativeFastIcon()?.[active ? "active" : "inactive"];
+      if (!template) return null;
+      const icon = template.cloneNode(true);
+      icon.setAttribute("aria-hidden", "true");
       const iconClass = nativeCssModuleClass("FastModeIcon");
-      if (icon && iconClass) icon.classList.add(iconClass);
+      if (iconClass && !icon.classList.contains(iconClass)) icon.classList.add(iconClass);
       return icon;
     }
 
@@ -852,7 +849,20 @@ export function createInjectionSource(features, {
       const aliases = (selector.models ?? []).filter((model) => (
         comparableModelLabel(model.slug) === target || comparableModelLabel(model.displayName) === target
       ));
-      return aliases.length === 1 ? aliases[0] : null;
+      return resolveModelAlias(aliases, identity);
+    }
+
+    function resolveModelAlias(aliases, identity) {
+      if (aliases.length === 1) return aliases[0];
+      if (aliases.length < 2 || identity.provider) return null;
+      const native = aliases.find((model) => !model.slug.includes("/"));
+      const thirdParty = aliases.find((model) => model.slug.includes("/"));
+      if (!native || !thirdParty) return null;
+      if (!modelIdentity(native.slug).backend.toLowerCase().startsWith("gpt")) return null;
+      const nativeLabel = formatIdentifier(
+        modelIdentity(String(native.displayName ?? native.slug)).backend,
+      ).toLowerCase();
+      return formatIdentifier(identity.backend).toLowerCase() === nativeLabel ? native : thirdParty;
     }
 
     function loadModelFavorites(selector) {
@@ -1128,6 +1138,29 @@ export function createInjectionSource(features, {
       }, 260);
     }
 
+    function nativeGptSortRank(rawValue) {
+      const known = new Map([
+        ["gpt-5.6-sol", 1], ["gpt-5.6-terra", 2], ["gpt-5.6-luna", 3],
+        ["gpt-5.5", 4], ["gpt-5.4", 5], ["gpt-5.4-mini", 6], ["gpt-5.3-codex-spark", 7],
+      ]);
+      const raw = String(rawValue ?? "").trim();
+      const knownRank = known.get(raw);
+      if (knownRank != null) return { official: true, rank: knownRank };
+      const identity = modelIdentity(raw);
+      return identity.provider ? null : { official: true, rank: 100 };
+    }
+
+    function compareEnhancedModelItems(a, b, favorites) {
+      const favA = Number(favorites.has(a.dataset.codexModelSliderRaw));
+      const favB = Number(favorites.has(b.dataset.codexModelSliderRaw));
+      if (favA !== favB) return favB - favA;
+      const rankA = nativeGptSortRank(a.dataset.codexModelSliderRaw);
+      const rankB = nativeGptSortRank(b.dataset.codexModelSliderRaw);
+      if (Boolean(rankA) !== Boolean(rankB)) return rankA ? -1 : 1;
+      if (rankA && rankB) return rankA.rank - rankB.rank;
+      return 0;
+    }
+
     function renderEnhancedModelMenu(menu, selector) {
       const items = modelMenuItems(menu).filter((item) => item.dataset.codexModelSliderRaw);
       if (!items.length) return;
@@ -1135,7 +1168,7 @@ export function createInjectionSource(features, {
       items.forEach((item) => { item.style.display = ""; });
       const starred = items.filter((item) => favorites.has(item.dataset.codexModelSliderRaw));
       const ordinary = items.filter((item) => !favorites.has(item.dataset.codexModelSliderRaw));
-      const desired = [...starred, ...ordinary];
+      const desired = items.slice().sort((a, b) => compareEnhancedModelItems(a, b, favorites));
       const parent = items[0].parentElement;
       if (!parent || !desired.every((item) => item.parentElement === parent)) return;
       const current = Array.from(parent.children).filter((child) => child.hasAttribute?.("data-codex-model-slider-item"));
@@ -1148,7 +1181,10 @@ export function createInjectionSource(features, {
           divider.setAttribute("data-codex-model-slider-divider", "");
           divider.setAttribute("role", "separator");
         }
-        if (divider.nextElementSibling !== ordinary[0]) parent.insertBefore(divider, ordinary[0]);
+        const firstOrdinary = desired.find((item) => !favorites.has(item.dataset.codexModelSliderRaw));
+        if (firstOrdinary && divider.nextElementSibling !== firstOrdinary) {
+          parent.insertBefore(divider, firstOrdinary);
+        }
       } else {
         divider?.remove();
       }
@@ -1204,6 +1240,7 @@ export function createInjectionSource(features, {
     }
 
     function enhanceModelItem(item, menu, selector, index) {
+      if (item.querySelector("[data-codex-model-slider-row]")) return;
       const observedRaw = modelItemRawValue(item);
       if (!observedRaw) return;
       if (!modelSelectorOriginalItems.has(item)) modelSelectorOriginalItems.set(item, item.innerHTML);
@@ -1215,7 +1252,6 @@ export function createInjectionSource(features, {
       item.dataset.codexModelSliderItem = "";
       item.dataset.codexModelSliderOrder = String(index);
       item.dataset.codexModelSliderIdentitySource = catalogModel ? "catalog" : nativeDescriptor ? "native" : "visible";
-      if (item.querySelector("[data-codex-model-slider-row]")) return;
 
       const identity = modelIdentity(raw);
       const display = modelDisplayLabel(identity, selector);
@@ -1808,8 +1844,14 @@ export function createInjectionSource(features, {
       const model = modelDefinitionFor(identity, selector);
       const efforts = model?.supportedReasoningLevels ?? [];
       if (!model || efforts.length < 2) return false;
-      const selectedEffort = document.querySelector("[data-codex-intelligence-trigger]")
-        ?.getAttribute("data-selected-reasoning-effort") ?? model.defaultReasoningLevel ?? efforts[0].effort;
+      // 控制器推导的任务内实际 effort 优先，避免子任务/主任务切换后触发器属性滞后；
+      // 触发器属性仅在控制器无法解析时作为实时回退，静态目录默认值最后兜底。
+      const nativeModel = nativeCatalogModelFor(identity);
+      const selectedEffort = nativeModel?.defaultReasoningLevel
+        ?? document.querySelector("[data-codex-intelligence-trigger]")
+          ?.getAttribute("data-selected-reasoning-effort")
+        ?? model.defaultReasoningLevel
+        ?? efforts[0].effort;
       const selectedServiceTier = nativeComposerModelController()?.selectedServiceTier;
       const serviceTierKey = selectedServiceTier?.id ?? selectedServiceTier ?? "standard";
       const key = `${identity.raw}:${selectedEffort}:${serviceTierKey}:${efforts.map((level) => level.effort).join(",")}`;
@@ -1818,7 +1860,6 @@ export function createInjectionSource(features, {
         parentMenu.firstElementChild
           ?.querySelector("[data-model-picker-power-slider] [class*='_TickRail_'] > span"),
       );
-      const nativeModel = nativeCatalogModelFor(identity);
       const templateWaitCount = Number(parentMenu.getAttribute("data-codex-model-slider-template-wait") ?? 0);
       if (nativeModel?.slug.toLowerCase().startsWith("gpt-") && !nativeTemplateReady && templateWaitCount < 3) {
         parentMenu.setAttribute("data-codex-model-slider-template-wait", String(templateWaitCount + 1));
@@ -1914,6 +1955,7 @@ export function createInjectionSource(features, {
     function ensureModelSelector() {
       const selector = modelSelectorFeature?.modelSelector;
       if (!selector) return;
+      captureNativeFastIcon();
       pruneModelSubmenuPositionObservers();
       if (!modelSelectorStyle.isConnected) document.head?.append(modelSelectorStyle);
       enhanceComposerModelTrigger(selector);
@@ -2950,6 +2992,42 @@ export function createInjectionSource(features, {
       return null;
     }
 
+    function nativeJsxRuntime(appModule) {
+      const candidates = Object.values(appModule).filter((value) => {
+        if (typeof value !== "function" || value.length !== 0) return false;
+        let source;
+        try {
+          source = Function.prototype.toString.call(value);
+        } catch {
+          return false;
+        }
+        if (source.length > 1200) return false;
+        if (
+          source.includes("useState")
+          || source.includes("memo_cache_sentinel")
+          || source.includes("(0,")
+          || source.startsWith("class ")
+        ) return false;
+        return source.includes("jsxs") && source.includes("Fragment");
+      });
+      for (const candidate of candidates) {
+        let runtime;
+        try {
+          runtime = candidate();
+        } catch {
+          continue;
+        }
+        if (
+          runtime
+          && typeof runtime === "object"
+          && typeof runtime.jsx === "function"
+          && typeof runtime.jsxs === "function"
+          && "Fragment" in runtime
+        ) return runtime;
+      }
+      return null;
+    }
+
     async function loadNativeTabCapability() {
       if (nativeTabCapability) return nativeTabCapability;
       if (nativeTabCapabilityPromise) return nativeTabCapabilityPromise;
@@ -2958,28 +3036,24 @@ export function createInjectionSource(features, {
           const moduleUrl = await waitForNativeTabModuleUrl();
           if (!moduleUrl) throw new Error("Codex app-initial modulepreload was not found");
           const appModule = await import(moduleUrl);
-          if (typeof appModule.Gtt !== "function") {
-            throw new Error("Codex right-panel controller factory is unavailable");
-          }
-          if (typeof appModule.hkt !== "function" || typeof appModule.Skt !== "function") {
-            throw new Error("Codex React runtime factories are unavailable");
-          }
-          const controller = appModule.Gtt("right");
-          const jsx = appModule.hkt();
-          const React = appModule.Skt();
+          const controller = Object.values(appModule).find((value) => (
+            value
+            && typeof value === "object"
+            && typeof value.openTab === "function"
+            && typeof value.closeTab === "function"
+            && typeof value.activateTab === "function"
+            && value.panelId === "right"
+          ));
+          if (!controller) throw new Error("Codex right-panel controller is unavailable");
+          const jsx = nativeJsxRuntime(appModule);
           if (
-            typeof controller?.openTab !== "function"
-            || typeof controller?.activateTab !== "function"
-            || typeof controller?.closeTab !== "function"
-            || !controller?.tabById$
+            !controller?.tabById$
             || typeof jsx?.jsx !== "function"
-            || typeof React?.useLayoutEffect !== "function"
-            || typeof React?.useRef !== "function"
+            || typeof jsx?.jsxs !== "function"
           ) throw new Error("Codex native tab capability is incomplete");
           nativeTabCapability = {
             controller,
             jsx,
-            React,
             moduleAsset: moduleUrl.split("/").pop(),
           };
           nativeTabCapabilityError = null;
@@ -3016,38 +3090,10 @@ export function createInjectionSource(features, {
       const detailKey = `${feature.id}:${detail.id}`;
       let Component = nativeDetailComponents.get(detailKey);
       if (Component) return Component;
-      const { jsx, React } = capability;
+      const { jsx } = capability;
+      const frameName = surfaceFrameName(feature.id);
       Component = function CodexPersonalDetailTab() {
-        const elementRef = React.useRef(null);
-        const frameRef = React.useRef(null);
-        const recordKeyRef = React.useRef(null);
-        const frameNameRef = React.useRef(null);
-        frameNameRef.current ??= surfaceFrameName(feature.id);
-        React.useLayoutEffect(() => {
-          const element = elementRef.current;
-          const frame = frameRef.current;
-          if (!element || !frame) return undefined;
-          const instanceId = crypto.randomUUID?.()
-            ?? `${Date.now()}-${Math.random().toString(36).slice(2)}`;
-          const recordKey = surfaceKey(feature.id, "native-detail", `${detail.id}:${instanceId}`);
-          recordKeyRef.current = recordKey;
-          registerSurface(recordKey, feature, "detail", detail.surfaceUrl, element, frame, detail.id);
-          let keys = nativeDetailSurfaceKeys.get(detailKey);
-          if (!keys) {
-            keys = new Set();
-            nativeDetailSurfaceKeys.set(detailKey, keys);
-          }
-          keys.add(recordKey);
-          queueTheme();
-          return () => {
-            keys.delete(recordKey);
-            if (keys.size === 0) nativeDetailSurfaceKeys.delete(detailKey);
-            removeSurfaceRecord(recordKey);
-            recordKeyRef.current = null;
-          };
-        }, []);
         return jsx.jsx("div", {
-          ref: elementRef,
           "data-codex-personal-native-detail": detailKey,
           style: {
             height: "100%",
@@ -3056,8 +3102,7 @@ export function createInjectionSource(features, {
             background: "var(--color-token-main-surface-primary)",
           },
           children: jsx.jsx("iframe", {
-            ref: frameRef,
-            name: frameNameRef.current,
+            name: frameName,
             src: "about:blank",
             title: detail.label,
             allow: "clipboard-write",
@@ -3085,17 +3130,17 @@ export function createInjectionSource(features, {
       return reloaded;
     }
 
-    async function waitForNativeDetailTabMount(scope, controller, tabId, detailKey) {
+    async function waitForNativeDetailTabElement(detailKey) {
       const deadline = performance.now() + 2_000;
       do {
-        let registered = false;
-        try {
-          registered = scope.get(controller.tabById$, tabId) != null;
-        } catch {}
-        if (registered && nativeDetailSurfaceKeys.has(detailKey)) return true;
+        const element = document.querySelector(
+          `[data-codex-personal-native-detail="${detailKey}"]`,
+        );
+        const frame = element?.querySelector("iframe");
+        if (element && frame) return { element, frame };
         await new Promise((resolve) => setTimeout(resolve, 25));
       } while (performance.now() < deadline);
-      return false;
+      return null;
     }
 
     async function openNativeDetailTab(feature, detail) {
@@ -3134,7 +3179,14 @@ export function createInjectionSource(features, {
           icon: nativeDetailIcon(feature, detail, jsx),
           isClosable: true,
           props: {},
-          onClose: () => nativeOpenTabSessions.delete(session),
+          onClose: () => {
+            nativeOpenTabSessions.delete(session);
+            const closedKeys = nativeDetailSurfaceKeys.get(detailKey);
+            if (closedKeys) {
+              for (const key of closedKeys) removeSurfaceRecord(key);
+              nativeDetailSurfaceKeys.delete(detailKey);
+            }
+          },
         });
       } catch (error) {
         if (isNewSession) nativeOpenTabSessions.delete(session);
@@ -3142,15 +3194,29 @@ export function createInjectionSource(features, {
         return null;
       }
 
-      if (!await waitForNativeDetailTabMount(scope, controller, tabId, detailKey)) {
-        if (isNewSession) nativeOpenTabSessions.delete(session);
-        if (!focusedExisting) {
-          try {
-            controller.closeTab(scope, tabId);
-          } catch {}
+      if (!nativeDetailSurfaceKeys.has(detailKey)) {
+        const mounted = await waitForNativeDetailTabElement(detailKey);
+        if (!mounted) {
+          if (isNewSession) nativeOpenTabSessions.delete(session);
+          if (!focusedExisting) {
+            try {
+              controller.closeTab(scope, tabId);
+            } catch {}
+          }
+          nativeTabCapabilityError = new Error("Codex native right-panel Tab did not mount");
+          return null;
         }
-        nativeTabCapabilityError = new Error("Codex native right-panel Tab did not mount");
-        return null;
+        const instanceId = crypto.randomUUID?.()
+          ?? `${Date.now()}-${Math.random().toString(36).slice(2)}`;
+        const recordKey = surfaceKey(feature.id, "native-detail", `${detail.id}:${instanceId}`);
+        registerSurface(recordKey, feature, "detail", detail.surfaceUrl, mounted.element, mounted.frame, detail.id);
+        let keys = nativeDetailSurfaceKeys.get(detailKey);
+        if (!keys) {
+          keys = new Set();
+          nativeDetailSurfaceKeys.set(detailKey, keys);
+        }
+        keys.add(recordKey);
+        queueTheme();
       }
 
       nativeTabCapabilityError = null;
@@ -3168,6 +3234,9 @@ export function createInjectionSource(features, {
     }
 
     function closeNativeDetailTabs() {
+      for (const keys of Array.from(nativeDetailSurfaceKeys.values())) {
+        for (const key of keys) removeSurfaceRecord(key);
+      }
       for (const session of Array.from(nativeOpenTabSessions)) {
         try {
           session.controller.closeTab(session.scope, session.tabId);
@@ -3884,7 +3953,7 @@ export class CodexRuntime {
     cdpPort = 9231,
     logger = console,
     fetchImpl = globalThis.fetch,
-    spawnProcess = spawn,
+    launchApplication = null,
     connectClient = connect,
     sleep = (timeoutMs) => new Promise((resolve) => setTimeout(resolve, timeoutMs)),
     availabilityTimeoutMs = 20_000,
@@ -3903,7 +3972,7 @@ export class CodexRuntime {
     this.cdpPort = cdpPort;
     this.logger = logger;
     this.fetchImpl = fetchImpl;
-    this.spawnProcess = spawnProcess;
+    this.launchApplication = launchApplication;
     this.connectClient = connectClient;
     this.sleep = sleep;
     this.availabilityTimeoutMs = availabilityTimeoutMs;
@@ -4040,17 +4109,19 @@ export class CodexRuntime {
   }
 
   launchManagedCodex() {
-    const child = this.spawnProcess(
-      this.appPath,
-      [
+    if (typeof this.launchApplication !== "function") {
+      throw new Error("CodexRuntime requires an explicit application launcher for isolated tests.");
+    }
+    const child = this.launchApplication({
+      appPath: this.appPath,
+      args: [
         `--user-data-dir=${this.profileDir}`,
         "--remote-debugging-address=127.0.0.1",
         `--remote-debugging-port=${this.cdpPort}`,
         `--remote-allow-origins=http://127.0.0.1:${this.cdpPort}`,
         "--no-first-run",
       ],
-      { detached: true, stdio: "ignore" },
-    );
+    });
     this.managedCodexChild = child;
     this.appPid = child.pid ?? null;
     this.notifyManagedCodexPidChange(this.appPid);

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

@@ -17,7 +17,6 @@ const featuresRoot = process.env.CODEX_FEATURES_ROOT ?? path.dirname(runtimeRoot
 const legacyDataDir = process.env.CODEX_IMAGE_HOST_DATA_DIR ?? path.join(os.homedir(), ".codex-image-host");
 const profileDir = process.env.CODEX_RUNTIME_PROFILE_DIR ?? path.join(legacyDataDir, "codex-profile");
 const cdpPort = Number(process.env.CODEX_RUNTIME_CDP_PORT ?? 9231);
-const launchCodex = process.env.MINECODEX_LAUNCH_CODEX === "1";
 
 const discoveredFeatures = await discoverFeatures(featuresRoot);
 if (!discoveredFeatures.length) throw new Error(`No codex-feature.json files found under ${featuresRoot}`);
@@ -66,13 +65,12 @@ runtime = new CodexRuntime({
   featureInstanceId,
   profileDir,
   cdpPort,
-  appPath: process.env.MINECODEX_CODEX_EXECUTABLE || undefined,
   onManagedCodexPidChange: updateCodexPidFile,
   onStatusChange: requestReadyFileRefresh,
 });
 
 try {
-  await runtime.start({ launchCodex });
+  await runtime.start();
   runtimeReady = true;
   await writeReadyFile();
 } catch (error) {