@ailuntz/minilink 0.9.5 → 0.9.6

package/README.md

@@ -37,7 +37,7 @@ npm 11 默认可能跳过全局包的安装脚本；上面的单次许可让 Min
 
 通过 `minilink link` 保存选择后，完全退出并重开 Desktop。
 
-macOS 上 `off` 会让后续启动直接使用 Desktop 自带的 Codex；`on` 会重新接入 MiniLink。已打开的 Desktop 需要完全退出并重开，才会切换启动方式。MiniLink 会在每次启动时重新查找 Desktop 自带的 Codex，兼容旧版 `Resources/codex` 和新版 `Resources/codex-cli/bin/codex` 布局。
+macOS 上 `off` 会让后续启动直接使用 Desktop 自带的 Codex；`on` 会重新接入 MiniLink。已打开的 Desktop 需要完全退出并重开，才会切换启动方式。MiniLink 使用 ChatGPT 当前内置的 `Resources/codex-cli/CodexCLI.app/Contents/MacOS/codex`。
 
 ## 配置
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ailuntz/minilink",
-  "version": "0.9.5",
+  "version": "0.9.6",
   "description": "Use your Codex profiles in the Desktop model menu.",
   "type": "module",
   "license": "MIT AND Apache-2.0",

package/src/config.mjs

@@ -63,22 +63,12 @@ export function discoverProfiles(home = codexHome()) {
   return routes;
 }
 
-export const bundledCodexPaths = [
-  'codex-cli/bin/codex',
-  'codex-cli/CodexCLI.app/Contents/MacOS/codex',
-  'codex'
-];
-
-export function bundledCodex(app) {
-  for (const relative of bundledCodexPaths) {
-    const candidate = join(app, 'Contents/Resources', relative);
-    try { accessSync(candidate, constants.X_OK); return candidate; } catch {}
-  }
-  return null;
-}
+export const bundledCodexRelativePath = 'Contents/Resources/codex-cli/CodexCLI.app/Contents/MacOS/codex';
+export const bundledCodex = app => join(app, bundledCodexRelativePath);
 
 export function findApp() {
-  return [process.env.CODEX_DESKTOP_APP, '/Applications/ChatGPT.app', '/Applications/Codex.app', join(homedir(), 'Applications/ChatGPT.app'), join(homedir(), 'Applications/Codex.app')].filter(Boolean).find(p => bundledCodex(p));
+  const app = process.env.CODEX_DESKTOP_APP || '/Applications/ChatGPT.app';
+  try { accessSync(bundledCodex(app), constants.X_OK); return app; } catch { return null; }
 }
 
 export function resolveRealCodex(selfPath) {

package/src/install.mjs

@@ -5,7 +5,7 @@ import { execFileSync } from 'node:child_process';
 import { fileURLToPath } from 'node:url';
 import { activeRuns } from './runtime.mjs';
 import { legacyInstallation } from './legacy.mjs';
-import { atomicJSON, configPath, codexHome, resolveRealCodex, readConfig, bundledCodexPaths } from './config.mjs';
+import { atomicJSON, configPath, codexHome, readConfig, bundledCodexRelativePath } from './config.mjs';
 
 const label = 'com.ailuntz.minilink';
 export const installRoot = () => join(homedir(), '.local/share/minilink');
@@ -42,7 +42,7 @@ function atomicFile(path, text, mode) {
 
 // Each installation has its own files: active Desktop processes keep their
 // original modules and picker assets while the next launch uses the new copy.
-export function install({ root = installRoot(), plist = defaultPlist(), source = sourceRoot, home = codexHome(), config = configPath(), node = process.execPath, npm = process.env.npm_execpath, prefix = process.env.npm_config_prefix, run = launchctl, legacy = root === installRoot() ? legacyInstallation() : null, realCodex = resolveRealCodex(join(source, 'bin/minilink.mjs')) } = {}) {
+export function install({ root = installRoot(), plist = defaultPlist(), source = sourceRoot, home = codexHome(), config = configPath(), node = process.execPath, npm = process.env.npm_execpath, prefix = process.env.npm_config_prefix, run = launchctl, legacy = root === installRoot() ? legacyInstallation() : null } = {}) {
   if (process.platform !== 'darwin') throw new Error('Desktop 接入目前仅支持 macOS。');
   const previous = installation(root), wrapper = join(root, 'minilink');
   if (existsSync(plist) && !previous) throw new Error('同名 LaunchAgent 已存在且不属于本次安装。');
@@ -76,10 +76,8 @@ export function install({ root = installRoot(), plist = defaultPlist(), source =
     if (JSON.parse(readFileSync(join(dependency, 'package.json'), 'utf8')).name !== 'smol-toml') throw new Error('smol-toml 依赖路径无效。');
     cpSync(dependency, join(runtime, 'node_modules/smol-toml'), { recursive: true });
     const state = { version: 2, source, runtime, wrapper, node, npm: npm || previous?.npm, prefix: prefix || previous?.prefix, codexHome: home, configPath: config, previousEnv: previous?.previousEnv || legacy?.state.previousEnv || null, installedAt: new Date().toISOString() };
-    // The small fallback also serves Desktop instances that inherited the old
-    // launch environment before npm uninstall removed the integration.
-    const fallbackApps = ['/Applications/ChatGPT.app', '/Applications/Codex.app', join(homedir(), 'Applications/ChatGPT.app'), join(homedir(), 'Applications/Codex.app')];
-    const fallback = `if [ ! -f ${shellQuote(stateFile)} ]; then\n  if [ -n "$MINILINK_REAL_CODEX" ] && [ -x "$MINILINK_REAL_CODEX" ]; then exec "$MINILINK_REAL_CODEX" "$@"; fi\n  for app in "$CODEX_DESKTOP_APP" ${fallbackApps.map(shellQuote).join(' ')}; do\n    [ -n "$app" ] || continue\n    for rel in ${bundledCodexPaths.map(shellQuote).join(' ')}; do\n      candidate="$app/Contents/Resources/$rel"\n      if [ -x "$candidate" ]; then exec "$candidate" "$@"; fi\n    done\n  done\n  exec ${shellQuote(realCodex)} "$@"\nfi`;
+    // A Desktop process can retain this launcher after npm removes the state.
+    const fallback = `if [ ! -f ${shellQuote(stateFile)} ]; then\n  exec "\${CODEX_DESKTOP_APP:-/Applications/ChatGPT.app}/${bundledCodexRelativePath}" "$@"\nfi`;
     atomicFile(wrapper, `#!/bin/sh\n${fallback}\nexport CODEX_HOME=${shellQuote(home)}\nexport MINILINK_CONFIG=${shellQuote(config)}\nexec ${shellQuote(node)} ${shellQuote(join(runtime, 'bin/minilink.mjs'))} "$@"\n`, 0o755);
     atomicFile(activate, `#!/bin/sh\nexec ${shellQuote(node)} ${shellQuote(join(runtime, 'src/lifecycle.mjs'))}\n`, 0o700);
     mkdirSync(dirname(plist), { recursive: true });