minecodex 0.1.16 → 0.1.19

package/package.json

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

package/packages/cli/src/platform.mjs

@@ -613,6 +613,18 @@ export class MacPlatformAdapter {
     return true;
   }
 
+  async codexProcessStartedMsAgo(processInfo) {
+    if (!processInfo || !Number.isInteger(processInfo.pid) || processInfo.pid <= 1) return null;
+    const { stdout } = await this.execFile("/bin/ps", ["-axo", "pid=,lstart="]);
+    const line = String(stdout).split("\n").find((row) => {
+      const match = row.match(/\s*(\d+)\s+(.*)/);
+      return match?.[1] === String(processInfo.pid);
+    });
+    const startedAt = line ? Date.parse(line.replace(/^\s*\d+\s+/, "")) : Number.NaN;
+    if (!line || !Number.isFinite(startedAt)) return null;
+    return Math.max(0, Date.now() - startedAt);
+  }
+
   async terminateNativeCodex(pid, expectedCommand = null) {
     if (!Number.isInteger(pid) || pid <= 1) {
       throw new Error("MineCodex requires an exact ChatGPT PID to terminate.");

package/packages/cli/src/runtime-manager.mjs

@@ -120,7 +120,8 @@ export class RuntimeManager {
     waitForReady: readyWaiter = waitForReady,
     sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms)),
     stopTimeoutMs = 5_000,
-    manualLaunchPollMs = 1_000,
+    manualLaunchPollMs = 150,
+    manualTakeoverGraceMs = 60_000,
     cdpPort = Number(process.env.CODEX_RUNTIME_CDP_PORT ?? 9231),
     launchCoordinator = null,
   }) {
@@ -132,6 +133,7 @@ export class RuntimeManager {
     this.sleep = sleep;
     this.stopTimeoutMs = stopTimeoutMs;
     this.manualLaunchPollMs = manualLaunchPollMs;
+    this.manualTakeoverGraceMs = manualTakeoverGraceMs;
     this.cdpPort = cdpPort;
     this.child = null;
     this.appliedFeatures = [];
@@ -327,6 +329,19 @@ export class RuntimeManager {
     this.manualLaunchArmed = false;
   }
 
+  async isManualTakeoverAllowed(processInfo) {
+    if (typeof this.platform?.codexProcessStartedMsAgo !== "function") return true;
+    let startedMsAgo;
+    try {
+      startedMsAgo = await this.platform.codexProcessStartedMsAgo(processInfo);
+    } catch (error) {
+      this.logger.warn?.("MineCodex could not read the ChatGPT start time", error.message);
+      return true;
+    }
+    if (!Number.isInteger(startedMsAgo) || startedMsAgo < 0) return true;
+    return startedMsAgo < this.manualTakeoverGraceMs;
+  }
+
   async reconcileManualCodexLaunch() {
     if (this.manualLaunchMonitorStopped || this.manualLaunchSuppressionDepth > 0) return false;
     const snapshot = await this.nativeCodexSnapshot();
@@ -372,6 +387,14 @@ export class RuntimeManager {
           return false;
         }
         try {
+          if (!(await this.isManualTakeoverAllowed(currentProcess))) {
+            this.enhancementFailure = {
+              code: "OFFICIAL_CHATGPT_IN_USE",
+              message: "MineCodex left the official ChatGPT instance running because it was already in use.",
+              phase: "launch",
+            };
+            return null;
+          }
           const result = await this.launchCoordinator.ensureObservedLaunch(currentProcess, {
             stopRuntime: () => this.stopInternal(),
             startRuntime: () => this.startInternal(),

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

@@ -298,6 +298,8 @@ export function createInjectionSource(features, {
     let modelSelectorTriggerObserver = null;
     let modelSelectorObservedTrigger = null;
     let modelSelectorNativeFastIcons = null;
+    // Fast 图标来源标记：bundle 静态提取 vs DOM 克隆，DOM 克隆优先以保持像素一致。
+    let modelSelectorNativeFastIconSources = null;
     const modelSelectorStyle = document.createElement("style");
     modelSelectorStyle.setAttribute("data-codex-model-slider-style", "");
     modelSelectorStyle.textContent = `
@@ -376,6 +378,17 @@ export function createInjectionSource(features, {
     if (modelSelectorFeature) {
       document.documentElement.setAttribute("data-codex-model-slider-catalog-ready", "");
       document.documentElement.append(modelSelectorStyle);
+      // 启动阶段就解析 Fast 图标：先读持久化的原生克隆，再从 app bundle 静态提取兜底，
+      // 避免首次会话必须等用户点开弹窗后 DOM 里才出现图标。
+      const persistedIcons = loadPersistedNativeFastIcons();
+      if (persistedIcons) {
+        modelSelectorNativeFastIcons = persistedIcons;
+        modelSelectorNativeFastIconSources = {};
+        for (const state of Object.keys(persistedIcons)) {
+          modelSelectorNativeFastIconSources[state] = "persisted";
+        }
+      }
+      void loadNativeFastIconFromBundle();
     }
 
     for (const feature of pageScriptFeatures) {
@@ -649,9 +662,99 @@ export function createInjectionSource(features, {
       return null;
     }
 
+    const modelSelectorFastIconStorageKey = "codex-model-slider:fast-icons:v1";
+
+    function persistNativeFastIcons() {
+      if (!modelSelectorNativeFastIcons) return;
+      try {
+        const payload = {};
+        for (const [state, template] of Object.entries(modelSelectorNativeFastIcons)) {
+          payload[state] = template.outerHTML;
+        }
+        localStorage.setItem(modelSelectorFastIconStorageKey, JSON.stringify(payload));
+      } catch {
+        // localStorage 不可用时静默降级，仅本次会话内生效。
+      }
+    }
+
+    function loadPersistedNativeFastIcons() {
+      try {
+        const payload = JSON.parse(localStorage.getItem(modelSelectorFastIconStorageKey) ?? "null");
+        if (!payload || typeof payload !== "object") return null;
+        const icons = {};
+        for (const [state, markup] of Object.entries(payload)) {
+          if (typeof markup !== "string") continue;
+          const container = document.createElement("template");
+          container.innerHTML = markup;
+          const svg = container.content.querySelector("svg");
+          if (svg) icons[state] = svg;
+        }
+        return Object.keys(icons).length ? icons : null;
+      } catch {
+        return null;
+      }
+    }
+
+    function extractFastIconPath(source, prefix) {
+      const match = String(source).match(new RegExp(`d:\`(${prefix}[^\`]*)\``));
+      return match?.[1] ?? null;
+    }
+
+    async function loadNativeFastIconFromBundle() {
+      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());
+        if (!modelSelectorNativeFastIcons) {
+          modelSelectorNativeFastIcons = {};
+          modelSelectorNativeFastIconSources = {};
+        }
+        let gained = false;
+        const define = (state, prefix, definition) => {
+          if (modelSelectorNativeFastIcons[state]) return;
+          const path = extractFastIconPath(source, prefix);
+          if (!path) return;
+          const svg = createModelSelectorIcon({
+            viewBox: definition.viewBox,
+            markup: definition.transform
+              ? `<g transform="${definition.transform}"><path d="${path}" fill="currentColor" /></g>`
+              : `<path d="${path}" fill="currentColor" />`,
+          }, { brand: true });
+          if (!svg) return;
+          modelSelectorNativeFastIcons[state] = svg;
+          modelSelectorNativeFastIconSources[state] = "bundle";
+          gained = true;
+        };
+        define("active", "M11\\.9125 21\\.4125", { viewBox: "0 0 24 24" });
+        define("inactive", "M7\\.38 16\\.2207", { viewBox: "0 0 20 20", transform: "translate(2.43 1.609)" });
+        if (gained) {
+          persistNativeFastIcons();
+          applyNativeFastIconsToShells();
+          queueEnsure();
+        }
+      } catch {
+        // 私有资源移动时保持原生控件不变，等待 DOM 克隆兜底。
+      }
+    }
+
+    function hasVisibleFastControl() {
+      return Boolean(
+        document.querySelector("[data-codex-model-slider-fast]")
+        || document.querySelector('[class*="_FastModeToggle_"]')
+        || document.querySelector('[class*="_ModelPickerTriggerFastIndicator_"] svg'),
+      );
+    }
+
     function captureNativeFastIcon() {
+      // Fast 图标只在 Fast 控件渲染后才出现在 DOM（打开菜单或 GPT 模型）；
+      // 启动阶段已有 bundle/持久化兜底，因此无可见 Fast 控件时不做全页扫描。
+      if (!hasVisibleFastControl()) {
+        return modelSelectorNativeFastIcons;
+      }
       const capture = (state, pathPrefix) => {
-        if (modelSelectorNativeFastIcons?.[state]) return;
+        const current = modelSelectorNativeFastIcons?.[state];
+        const currentSource = modelSelectorNativeFastIconSources?.[state];
+        if (current && currentSource === "dom") return;
         const path = Array.from(document.querySelectorAll("svg path")).find(
           (candidate) => candidate.getAttribute("d")?.startsWith(pathPrefix),
         );
@@ -661,14 +764,33 @@ export function createInjectionSource(features, {
         template.removeAttribute("id");
         template.removeAttribute("width");
         template.removeAttribute("height");
-        if (!modelSelectorNativeFastIcons) modelSelectorNativeFastIcons = {};
+        if (!modelSelectorNativeFastIcons) {
+          modelSelectorNativeFastIcons = {};
+          modelSelectorNativeFastIconSources = {};
+        }
         modelSelectorNativeFastIcons[state] = template;
+        modelSelectorNativeFastIconSources[state] = "dom";
       };
       capture("active", "M11.9125 21.4125");
       capture("inactive", "M7.38 16.2207");
+      const ready = Boolean(
+        modelSelectorNativeFastIcons?.active && modelSelectorNativeFastIcons?.inactive,
+      );
+      if (ready) {
+        persistNativeFastIcons();
+        applyNativeFastIconsToShells();
+      }
       return modelSelectorNativeFastIcons;
     }
 
+    function applyNativeFastIconsToShells() {
+      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);
+      });
+    }
+
     function createNativeFastIcon(active) {
       const template = captureNativeFastIcon()?.[active ? "active" : "inactive"];
       if (!template) return null;
@@ -2992,42 +3114,6 @@ 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;
@@ -3045,15 +3131,9 @@ export function createInjectionSource(features, {
             && value.panelId === "right"
           ));
           if (!controller) throw new Error("Codex right-panel controller is unavailable");
-          const jsx = nativeJsxRuntime(appModule);
-          if (
-            !controller?.tabById$
-            || typeof jsx?.jsx !== "function"
-            || typeof jsx?.jsxs !== "function"
-          ) throw new Error("Codex native tab capability is incomplete");
+          if (!controller?.tabById$) throw new Error("Codex native tab capability is incomplete");
           nativeTabCapability = {
             controller,
-            jsx,
             moduleAsset: moduleUrl.split("/").pop(),
           };
           nativeTabCapabilityError = null;
@@ -3068,10 +3148,20 @@ export function createInjectionSource(features, {
       return capability;
     }
 
-    function nativeDetailIcon(feature, detail, jsx) {
+    function nativeReactElement(type, props) {
+      return {
+        $$typeof: Symbol.for("react.transitional.element"),
+        type,
+        key: null,
+        ref: null,
+        props: props ?? {},
+      };
+    }
+
+    function nativeDetailIcon(feature, detail) {
       const icon = detail.icon ?? feature.icon;
       if (!icon?.markup) return undefined;
-      return jsx.jsx("svg", {
+      return nativeReactElement("svg", {
         width: 16,
         height: 16,
         viewBox: icon.viewBox ?? "0 0 24 24",
@@ -3086,14 +3176,13 @@ export function createInjectionSource(features, {
       });
     }
 
-    function nativeDetailComponent(feature, detail, capability) {
+    function nativeDetailComponent(feature, detail) {
       const detailKey = `${feature.id}:${detail.id}`;
       let Component = nativeDetailComponents.get(detailKey);
       if (Component) return Component;
-      const { jsx } = capability;
       const frameName = surfaceFrameName(feature.id);
       Component = function CodexPersonalDetailTab() {
-        return jsx.jsx("div", {
+        return nativeReactElement("div", {
           "data-codex-personal-native-detail": detailKey,
           style: {
             height: "100%",
@@ -3101,7 +3190,7 @@ export function createInjectionSource(features, {
             overflow: "hidden",
             background: "var(--color-token-main-surface-primary)",
           },
-          children: jsx.jsx("iframe", {
+          children: nativeReactElement("iframe", {
             name: frameName,
             src: "about:blank",
             title: detail.label,
@@ -3152,7 +3241,7 @@ export function createInjectionSource(features, {
         return null;
       }
 
-      const { controller, jsx } = capability;
+      const { controller } = capability;
       const tabId = `${feature.id}-${detail.id}`;
       const detailKey = `${feature.id}:${detail.id}`;
       let session = Array.from(nativeOpenTabSessions).find((candidate) => (
@@ -3171,12 +3260,12 @@ export function createInjectionSource(features, {
       }
 
       try {
-        controller.openTab(scope, nativeDetailComponent(feature, detail, capability), {
+        controller.openTab(scope, nativeDetailComponent(feature, detail), {
           id: tabId,
           kind: tabId,
           title: detail.label,
           tooltip: detail.label,
-          icon: nativeDetailIcon(feature, detail, jsx),
+          icon: nativeDetailIcon(feature, detail),
           isClosable: true,
           props: {},
           onClose: () => {