minecodex 2.0.43 → 2.0.44

package/features/composer-expand/src/native.mjs

@@ -1,8 +1,21 @@
 export async function loadComposerExpandControls(signal) {
-  const urls = [...document.querySelectorAll('link[rel="modulepreload"],script[src]')].map(node => node.href || node.src);
-  const initialUrl = urls.find(url => /\/app-initial-[^/]+\.js/.test(url));
-  const mainUrl = urls.find(url => /\/app-main-[^/]+\.js/.test(url));
-  if (!initialUrl || !mainUrl) throw new Error('composer-expand-modules-unavailable');
+  signal.throwIfAborted();
+  function modules() {
+    const urls = [...document.querySelectorAll('link[rel="modulepreload"],script[src]')].map(node => node.href || node.src);
+    const initialUrl = urls.find(url => /\/app-initial-[^/]+\.js/.test(url));
+    const mainUrl = urls.find(url => /\/app-main-[^/]+\.js/.test(url));
+    return initialUrl && mainUrl ? {initialUrl,mainUrl} : null;
+  }
+  // 冷启动时入口标签可能晚于 DOMContentLoaded 挂载。
+  const {initialUrl,mainUrl} = modules() ?? await new Promise((resolve,reject) => {
+    const observer = new MutationObserver(check);
+    function cleanup() { observer.disconnect();signal.removeEventListener('abort',abort); }
+    function abort() { cleanup();reject(signal.reason); }
+    function check() { const found=modules();if(found){cleanup();resolve(found);} }
+    observer.observe(document.documentElement,{subtree:true,childList:true,attributes:true,attributeFilter:['src','href','rel']});
+    signal.addEventListener('abort',abort,{once:true});
+    check();
+  });
   const read = async url => { const response=await fetch(url,{signal}); if(!response.ok) throw new Error('composer-expand-source-unavailable'); return response.text(); };
   const [initialSource,mainSource] = await Promise.all([read(initialUrl),read(mainUrl)]);
   const file = initialSource.match(/["'`]\.\/(app-primary-[\w-]+\.js)["'`]/)?.[1];
@@ -13,17 +26,40 @@ export async function loadComposerExpandControls(signal) {
     if (!local) throw new Error('composer-expand-binding-unavailable');
     const escaped = local.replace(/[.*+?^${}()|[\]\\]/g,'\\$&');
     const alias = source.slice(source.lastIndexOf('export{')).match(new RegExp(`(?:\\{|,)${escaped} as ([\\w$]+)(?:,|\\})`))?.[1];
-    if (alias) return (await import(url))[alias];
+    if (alias) {
+      const module=await import(url);
+      if (module[alias]===undefined) {
+        // 图标导出可能仍在原生 once 初始化器中，先初始化再读取实时导出。
+        const assignment=source.search(new RegExp(`(?:[,;{])${escaped}=`));
+        const initializer=assignment<0?null:source.slice(source.lastIndexOf('function ',assignment),assignment+1)
+          .match(/^function ([\w$]+)\(\)\{return\(\1=[\w$]+\(\(\(\)=>\{/);
+        if (!initializer) throw new Error('composer-expand-binding-unavailable');
+        const initialize=await binding(source,url,initializer[1]);
+        if (typeof initialize!=='function') throw new Error('composer-expand-binding-unavailable');
+        initialize();
+      }
+      if (module[alias]===undefined) throw new Error('composer-expand-binding-unavailable');
+      return module[alias];
+    }
     for (const match of source.matchAll(/import\{([^}]+)\}from["'`]([^"'`]+)["'`]/g)) {
       for (const entry of match[1].split(',')) {
         const parts=entry.trim().split(/\s+as\s+/);
-        if (parts.at(-1)===local) return (await import(new URL(match[2],url).href))[parts[0]];
+        if (parts.at(-1)===local) {
+          const dependencyUrl=new URL(match[2],url).href,module=await import(dependencyUrl);
+          if (module[parts[0]]!==undefined) return module[parts[0]];
+          const dependency=await read(dependencyUrl);
+          const exported=parts[0].replace(/[.*+?^${}()|[\]\\]/g,'\\$&');
+          const name=dependency.slice(dependency.lastIndexOf('export{')).match(new RegExp(`(?:\\{|,)([\\w$]+) as ${exported}(?:,|\\})`))?.[1];
+          return binding(dependency,dependencyUrl,name);
+        }
       }
     }
     throw new Error('composer-expand-binding-unavailable');
   }
   // 语义定位原生展开按钮，导入它实际使用的控件和成对图标。
-  const start=source.indexOf('function ',source.lastIndexOf('function ',source.indexOf('data-composer-expand-toggle')));
+  // 只匹配控件属性，避免先命中布局 className 中的同名 CSS 选择器。
+  const marker=source.search(/["'`]data-composer-expand-toggle["'`]:/);
+  const start=marker<0?-1:source.lastIndexOf('function ',marker);
   const control=source.slice(start,source.indexOf('var ',start));
   const button=control.match(/jsx\)\(([\w$]+),\{"aria-label"/ )?.[1];
   const icons=control.match(/children:[\w$]+\?\(0,[\w$]+\.jsx\)\(([\w$]+),\{\}\):\(0,[\w$]+\.jsx\)\(([\w$]+),\{\}\)/);

package/features/quick-chat/src/adapters/codex/shortcut.mjs

@@ -21,19 +21,29 @@ export function quickChatLifecycleExports(source) {
   const exportOf = name => name && exports.match(new RegExp(`(?:\\{|,)${escaped(name)} as ([\\w$]+)(?:,|\\})`))?.[1];
   const createExport = exportOf(create), openState = exportOf(state);
   if (!createExport || !openState) throw new Error('quick-chat-lifecycle-contract-unavailable');
-  return {open, create:createExport, openState};
+  // 冷启动时状态 atom 也可能尚未初始化，定位其所属的原生 once 初始化器。
+  const assignment = source.search(new RegExp(`(?:[,;{])${escaped(state)}=[\\w$]+\\([\\w$]+,!1\\)`));
+  const initializer = assignment < 0 ? null : source.slice(source.lastIndexOf('function ', assignment), assignment + 1)
+    .match(/^function ([\w$]+)\(\)\{return\(\1=[\w$]+\(\(\(\)=>\{/);
+  const initialize = exportOf(initializer?.[1]);
+  return {open, create:createExport, openState, ...(initialize ? {initialize} : {})};
+}
+
+// 命令目录是懒初始化导出；按命令定义识别，不能要求数组已经初始化。
+export function quickChatNativeCommand(source) {
+  const ids = new Set([...source.matchAll(/\{id:[`"']([\w$.-]+)[`"'],titleIntlId:[`"']codex\.command\.[^`"']+[`"']/g)].map(match => match[1]));
+  if (!ids.has('temporaryChat') || !ids.has('newTask')) throw new Error('quick-chat-command-catalog-unavailable');
+  return ids.has('quickChat');
 }
 
 export function installQuickChatShortcut(signal, codex, discover = null) {
   const windows = navigator.platform.startsWith('Win');
-  let bindings = null, disposed = false, pendingFocus = null;
-  const floatingAt = element => codex.props(element, p => typeof p.onMinimizedChange === 'function' && typeof p.onPresentationChange === 'function'
-    && (p.unifiedDocking === true || typeof p.dockThreadKey === 'string' && typeof p.renderMenu === 'function'));
-  function activateExisting() {
+  let bindings = null, disposed = false, pendingFocus = null, stopWaiting = null;
+  function activateExisting(minimize = false) {
     // 原生恢复按钮同时恢复 presentation、取消最小化并聚焦输入框。
     for (const button of document.querySelectorAll('button')) {
       if (!button.checkVisibility({visibilityProperty:true})) continue;
-      const floating = floatingAt(button);
+      const floating = codex.props(button, p => typeof p.isMinimized === 'boolean' && typeof p.onMinimizedChange === 'function' && typeof p.onPresentationChange === 'function');
       if (!floating?.isMinimized || floating.isHidden) continue;
       const restore = codex.props(button, p => p.uniform === true && p.size === 'composer' && typeof p.onClick === 'function'
         && typeof p.onPointerEnter === 'function' && typeof p.onPointerDown === 'function' && typeof p.onKeyDown === 'function');
@@ -43,11 +53,12 @@ export function installQuickChatShortcut(signal, codex, discover = null) {
     }
     for (const surface of document.querySelectorAll('[data-floating-chat-surface]')) {
       if (surface.closest('[hidden], [inert], [aria-hidden="true"]')) continue;
-      const floating = floatingAt(surface);
+      const floating = codex.props(surface, p => typeof p.isMinimized === 'boolean' && typeof p.onMinimizedChange === 'function' && typeof p.onPresentationChange === 'function');
       if (!floating || floating.isMinimized || floating.isHidden) continue;
       const editable = surface.querySelector('[data-chatgpt-composer] [contenteditable="true"]');
       if (!editable?.checkVisibility({visibilityProperty:true})) continue;
-      editable.focus({preventScroll:true});
+      if (minimize) { pendingFocus=null; floating.onMinimizedChange(true); }
+      else editable.focus({preventScroll:true});
       return true;
     }
     return false;
@@ -69,8 +80,9 @@ export function installQuickChatShortcut(signal, codex, discover = null) {
   function context() {
     for (const button of document.querySelectorAll('button[aria-haspopup="menu"]')) {
       if (!button.checkVisibility({visibilityProperty:true})) continue;
-      const mode = codex.props(button, p => typeof p.onModeSelect === 'function' && typeof p.mode === 'string', 80)?.mode;
-      if (mode !== 'codex') continue;
+      const picker = codex.props(button, p => typeof p.onModeSelect === 'function' && typeof p.mode === 'string', 80);
+      // 原生 ChatGPT 也使用 work 路由，具体产品由 workModeAccess 区分。
+      if (picker?.mode !== 'codex' && !(picker?.mode === 'work' && picker.workModeAccess === 'chatgpt')) continue;
       for (let fiber = codex.currentFiber(button), depth = 0; fiber && depth++ < 200; fiber = fiber.return) {
         const values = [];
         for (let hook = fiber.memoizedState, n = 0; hook && n++ < 150; hook = hook.next) values.push(hook.memoizedState?.current);
@@ -82,14 +94,35 @@ export function installQuickChatShortcut(signal, codex, discover = null) {
     return null;
   }
   async function load() {
-    const url = [...document.querySelectorAll('link[rel="modulepreload"],script[src]')].map(e => e.href || e.src).find(url => /\/app-initial-[^/]+\.js(?:$|\?)/.test(url));
-    if (!url) throw new Error('quick-chat-module-unavailable');
+    const findUrl = () => [...document.querySelectorAll('link[rel="modulepreload"],script[src]')].map(e => e.href || e.src).find(url => /\/app-initial-[^/]+\.js(?:$|\?)/.test(url));
+    // 宿主可早于原生模块入口注入；等待入口挂载，不能把正常启动顺序当作协议失效。
+    const url = findUrl() ?? await new Promise((resolve, reject) => {
+      codex.report('quick-chat-shortcut', false, 'quick-chat-module-pending');
+      const cleanup = () => { observer.disconnect(); signal.removeEventListener('abort', cancel); stopWaiting=null; };
+      const cancel = () => { cleanup(); reject(new Error('quick-chat-load-aborted')); };
+      const check = () => { const found=findUrl(); if (found) { cleanup(); resolve(found); } };
+      const observer = new MutationObserver(check);
+      stopWaiting=cancel;
+      observer.observe(document.documentElement, {childList:true,subtree:true,attributes:true,attributeFilter:['href','src']});
+      signal.addEventListener('abort', cancel, {once:true});
+      if (disposed || signal.aborted) cancel(); else check();
+    });
     const source = await (await fetch(url, {signal})).text();
     const module = await import(url);
-    const commands = Object.values(module).find(v => Array.isArray(v) && v.some(c => c?.id === 'temporaryChat') && v.some(c => c?.id === 'newTask'));
-    if (!commands) throw new Error('quick-chat-command-catalog-unavailable');
-    if (commands.some(c => c.id === 'quickChat')) return {native:true};
+    let native;
+    try { native=quickChatNativeCommand(source); }
+    catch (error) {
+      if (error.message !== 'quick-chat-command-catalog-unavailable') throw error;
+      // 新版命令目录移入共享模块；打开动作仍由入口模块导出。
+      const file=source.match(/["'`]\.\/(app-shared-[\w-]+\.js)["'`]/)?.[1];
+      if (!file) throw error;
+      const response=await fetch(new URL(file,url).href,{signal});
+      if (!response.ok) throw error;
+      native=quickChatNativeCommand(await response.text());
+    }
+    if (native) return {native:true};
     const roles = quickChatLifecycleExports(source);
+    if (!module[roles.openState] && typeof module[roles.initialize] === 'function') module[roles.initialize]();
     const open = module[roles.open], create = module[roles.create], openState = module[roles.openState];
     if (typeof open !== 'function' || typeof create !== 'function' || !openState) throw new Error('quick-chat-open-action-unavailable');
     return {native:false, open, create, isOpen:scope => scope.get(openState)};
@@ -98,15 +131,16 @@ export function installQuickChatShortcut(signal, codex, discover = null) {
     if (disposed || signal.aborted) return;
     bindings = value;
     codex.report('quick-chat-shortcut', true);
-  }).catch(() => { if (!disposed && !signal.aborted) codex.report('quick-chat-shortcut', false, 'native-shortcut-contract-unavailable'); });
-  function activate() {
+  }).catch(error => { if (!disposed && !signal.aborted) codex.report('quick-chat-shortcut', false,
+    /^quick-chat-[\w-]+$/.test(error?.message) ? error.message : 'native-shortcut-contract-unavailable'); });
+  function activate({minimize=false} = {}) {
     if (disposed || signal.aborted || !bindings || bindings.native) return false;
-    const scope = bindings && context();
+    const scope = context();
     if (scope && bindings.isOpen(scope) === false) {
       pendingFocus={scope,previous:new Set([...document.querySelectorAll('[data-floating-chat-surface]')].map(sessionId))};
       bindings.create(scope);
       focusNew();
-    } else if (!activateExisting()) {
+    } else if (!activateExisting(minimize)) {
       if (!scope) return false;
       bindings.open(scope);
     }
@@ -115,12 +149,12 @@ export function installQuickChatShortcut(signal, codex, discover = null) {
   function keydown(event) {
     const primaryModifier = windows ? event.ctrlKey && !event.metaKey : event.metaKey && !event.ctrlKey;
     if (event.defaultPrevented || event.repeat || event.isComposing
-      || !primaryModifier || !event.altKey || event.shiftKey || event.code !== 'KeyN' || !activate()) return;
+      || !primaryModifier || !event.altKey || event.shiftKey || event.code !== 'KeyN' || !activate({minimize:true})) return;
     event.preventDefault();
     event.stopPropagation();
   }
   document.addEventListener('keydown', keydown, {signal});
-  function dispose() { disposed = true; document.removeEventListener('keydown', keydown); bindings = null; pendingFocus=null; }
+  function dispose() { disposed = true; stopWaiting?.(); document.removeEventListener('keydown', keydown); bindings = null; pendingFocus=null; }
   signal.addEventListener('abort', dispose, {once:true});
   return {ready, dispose, sync:focusNew, activate, available:() => Boolean(bindings && !bindings.native && !disposed && !signal.aborted)};
 }

package/features/quick-chat/src/adapters/codex/sidebar.mjs

@@ -3,7 +3,7 @@ export async function loadQuickChatSidebarIcon(signal) {
   const initialUrl = urls.find(url => /\/app-initial-[^/]+\.js/.test(url));
   if (!initialUrl) throw new Error('quick-chat-icon-module-unavailable');
   const initial = await (await fetch(initialUrl,{signal})).text();
-  const file = initial.match(/["']\.\/(quick-chat-floating-surface-[\w-]+\.js)["']/)?.[1];
+  const file = initial.match(/["']\.\/((?:quick-chat-floating-surface|floating-chat-surface)-[\w-]+\.js)["']/)?.[1];
   if (!file) throw new Error('quick-chat-icon-module-unavailable');
   const url = new URL(file,initialUrl).href;
   const source = await (await fetch(url,{signal})).text();

package/features/quick-chat/src/injection-source.mjs

@@ -1,7 +1,7 @@
 import {quickChatHistoryVisible} from "./adapters/codex/history.mjs";
 import { readFile } from "node:fs/promises";
 import { createQuickChatAdapter } from "./adapters/codex/renderer.mjs";
-import { quickChatOpenExport, quickChatLifecycleExports, installQuickChatShortcut } from "./adapters/codex/shortcut.mjs";
+import { quickChatOpenExport, quickChatLifecycleExports, quickChatNativeCommand, installQuickChatShortcut } from "./adapters/codex/shortcut.mjs";
 import { createSubmissionTracker } from "./domain/submission.mjs";
 import { createQuickChatSidebarAdapter, loadQuickChatSidebarIcon } from "./adapters/codex/sidebar.mjs";
 import { installQuickChatSidebar } from "./frontend/sidebar.mjs";
@@ -9,7 +9,7 @@ import { createHistoryTracker } from "./domain/history.mjs";
 export async function createPageScriptSource() {
   const source = await readFile(new URL("./frontend/entry.mjs", import.meta.url), "utf8");
   const functions = [quickChatHistoryVisible, loadQuickChatSidebarIcon, createQuickChatSidebarAdapter, installQuickChatSidebar,
-    quickChatOpenExport, quickChatLifecycleExports, installQuickChatShortcut, createQuickChatAdapter,
+    quickChatOpenExport, quickChatLifecycleExports, quickChatNativeCommand, installQuickChatShortcut, createQuickChatAdapter,
     createSubmissionTracker, createHistoryTracker];
   return functions.map(fn => `const ${fn.name}=${fn.toString()};`).join('\n') + '\n' + source;
 }

package/package.json

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

package/packages/cli/src/platform.mjs

@@ -851,7 +851,14 @@ export class WindowsPlatformAdapter {
   async codex() {
     if (!this.codexInstallation) return this.assertCodexInstalled();
     if (this.codexInstallationInjected) return this.codexInstallation;
-    const currentFingerprint = await this.readCodexInstallationFingerprint(this.codexInstallation);
+    let currentFingerprint;
+    try {
+      currentFingerprint = await this.readCodexInstallationFingerprint(this.codexInstallation);
+    } catch (error) {
+      // MSIX 更新会删除旧版本目录，重新发现并校验当前官方包。
+      if (error.code !== "ENOENT") throw error;
+      return this.assertCodexInstalled();
+    }
     if (this.codexInstallationFingerprint == null) {
       this.codexInstallationFingerprint = currentFingerprint;
     } else if (currentFingerprint !== this.codexInstallationFingerprint) {