@ailuntz/minilink 0.9.4 → 0.9.5

package/README.md

@@ -4,11 +4,13 @@
 
 ## 说明
 
-官方 [Profiles](https://learn.chatgpt.com/docs/config-file/config-advanced?site_locale=en#profiles) 已支持独立配置文件：`codex --profile deep-review` 会在 `~/.codex/config.toml` 上叠加 `~/.codex/deep-review.config.toml`。配置使用顶层字段，无需嵌套在 `[profiles.deep-review]` 中。
+> 官方 [Profiles](https://learn.chatgpt.com/docs/config-file/config-advanced?site_locale=en#profiles) 已支持独立配置文件：`codex --profile deep-review` 会在 `~/.codex/config.toml` 上叠加 `~/.codex/deep-review.config.toml`。配置使用顶层字段，无需嵌套在 `[profiles.deep-review]` 中。
 
-**截至 2026-09-24，仅添加 Profile 不会将额外供应商的模型加入 Desktop 菜单。MiniLink 读取这些配置，补充桌面端的模型选择能力。**
+> **截至 2026-09-24，仅添加 Profile 不会将额外供应商的模型加入 Desktop 菜单。MiniLink 读取这些配置，补充桌面端的模型选择能力。**
 
 
+> **用量提示：** 请避免耗尽原生 ChatGPT / Codex 账号的可用额度。额度耗尽后，Desktop 可能禁用输入框的发送按钮，即使切换至自定义模型也可能无法发送。MiniLink 不解除这一限制。
+
 ## 安装
 
 需 Node.js ≥22.16，并已安装 Desktop。
@@ -16,23 +18,27 @@
 macOS / Windows / Linux：
 
 ```sh
-npm install -g @ailuntz/minilink
+npm install -g @ailuntz/minilink --allow-scripts=@ailuntz/minilink
 minilink on
 ```
 
 完全退出并重开 Desktop。
 
+npm 11 默认可能跳过全局包的安装脚本；上面的单次许可让 MiniLink 完成 Desktop 接入，不会永久允许其他包的脚本。
+
 ## 命令
 
 | 命令 | 用途 |
 | --- | --- |
 | `minilink on` | 开启 |
 | `minilink link` | 选择模型与推理强度 |
-| `minilink off` | 关闭 |
+| `minilink off` | 关闭；macOS 同时撤销后续 Desktop 启动的 MiniLink 覆盖 |
 | `minilink doctor` | 检查配置与运行状态 |
 
 通过 `minilink link` 保存选择后，完全退出并重开 Desktop。
 
+macOS 上 `off` 会让后续启动直接使用 Desktop 自带的 Codex；`on` 会重新接入 MiniLink。已打开的 Desktop 需要完全退出并重开，才会切换启动方式。MiniLink 会在每次启动时重新查找 Desktop 自带的 Codex，兼容旧版 `Resources/codex` 和新版 `Resources/codex-cli/bin/codex` 布局。
+
 ## 配置
 
 读取 `~/.codex/*.config.toml`。通过 `model_catalog_json` 指定模型目录；未指定时继承原生目录。密钥使用提供商配置的环境变量，也可保存在 `~/.codex/.env`。

package/bin/minilink.mjs

@@ -6,7 +6,7 @@ import { startUpdate, updateStatus } from '../src/update.mjs';
 import { runProxy } from '../src/proxy.mjs';
 import { pickerEndpoints } from '../src/picker.mjs';
 import { selectModel, text, language } from '../src/terminal.mjs';
-import { installation, environmentStatus } from '../src/install.mjs';
+import { installation, environmentStatus, syncLaunchEnvironment } from '../src/install.mjs';
 
 const self = fileURLToPath(import.meta.url), args = process.argv.slice(2);
 const commands = ['on', 'link', 'off', 'doctor'];
@@ -21,6 +21,7 @@ async function main() {
   if (command === 'on' || command === 'off') {
     if (command === 'on') discoverProfiles();
     atomicJSON(configPath(), { version: 1, enabled: command === 'on' });
+    syncLaunchEnvironment({ enabled: command === 'on' });
     return output(text(command));
   }
   if (command === 'link') {

package/package.json

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

package/src/config.mjs

@@ -63,13 +63,27 @@ 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 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 => existsSync(join(p, 'Contents/Resources/codex')));
+  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));
 }
 
 export function resolveRealCodex(selfPath) {
   const app = findApp();
-  const candidate = setting('REAL_CODEX') || (app && join(app, 'Contents/Resources/codex'));
+  const candidate = setting('REAL_CODEX') || (app && bundledCodex(app));
   if (!candidate || !isAbsolute(candidate)) throw new Error('找不到内置 Codex；可用 MINILINK_REAL_CODEX 指定绝对路径。');
   let actual;
   try { actual = realpathSync(candidate); accessSync(actual, constants.X_OK); } catch { throw new Error('真正的 Codex 不存在或不可执行。'); }

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 } from './config.mjs';
+import { atomicJSON, configPath, codexHome, resolveRealCodex, readConfig, bundledCodexPaths } from './config.mjs';
 
 const label = 'com.ailuntz.minilink';
 export const installRoot = () => join(homedir(), '.local/share/minilink');
@@ -18,6 +18,22 @@ export function installation(root = installRoot()) {
   try { return JSON.parse(readFileSync(join(root, 'installation.json'), 'utf8')); } catch (e) { if (e.code === 'ENOENT') return null; throw new Error('安装状态损坏，请检查 installation.json。'); }
 }
 
+// A disabled integration must not remain in Desktop's launch path. The login
+// agent reapplies this state in the Aqua session when the command ran over SSH.
+export function syncLaunchEnvironment({ state = installation(), run = launchctl, enabled, previousWrapper } = {}) {
+  if (process.platform !== 'darwin' || !state?.wrapper) return;
+  if (enabled == null) {
+    try { enabled = readConfig(state.configPath).enabled; } catch { enabled = false; }
+  }
+  const current = run(['getenv', 'CODEX_CLI_PATH'], false) || null;
+  if (enabled) {
+    if (!current || current === previousWrapper) run(['setenv', 'CODEX_CLI_PATH', state.wrapper]);
+  } else if (current === state.wrapper || current === previousWrapper) {
+    if (state.previousEnv) run(['setenv', 'CODEX_CLI_PATH', state.previousEnv]);
+    else run(['unsetenv', 'CODEX_CLI_PATH']);
+  }
+}
+
 function atomicFile(path, text, mode) {
   const temporary = `${path}.${process.pid}.tmp`;
   try { writeFileSync(temporary, text, { mode }); renameSync(temporary, path); }
@@ -62,15 +78,19 @@ export function install({ root = installRoot(), plist = defaultPlist(), source =
     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.
-    atomicFile(wrapper, `#!/bin/sh\nif [ ! -f ${shellQuote(stateFile)} ]; then exec ${shellQuote(realCodex)} "$@"; fi\nexport CODEX_HOME=${shellQuote(home)}\nexport MINILINK_CONFIG=${shellQuote(config)}\nexec ${shellQuote(node)} ${shellQuote(join(runtime, 'bin/minilink.mjs'))} "$@"\n`, 0o755);
+    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`;
+    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 });
     atomicFile(plist, `<?xml version="1.0" encoding="UTF-8"?>\n<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">\n<plist version="1.0"><dict><key>Label</key><string>${label}</string><key>ProgramArguments</key><array><string>/bin/sh</string><string>${xml(activate)}</string></array><key>RunAtLoad</key><true/><key>StartInterval</key><integer>30</integer><key>LimitLoadToSessionType</key><string>Aqua</string></dict></plist>\n`, 0o600);
     atomicJSON(stateFile, state);
     run(['bootout', `gui/${process.getuid()}/${label}`], false);
     run(['bootstrap', `gui/${process.getuid()}`, plist]);
-    run(['setenv', 'CODEX_CLI_PATH', wrapper]);
-    if (run(['getenv', 'CODEX_CLI_PATH'], false) !== wrapper) throw new Error('启动环境验证失败。');
+    let enabled = false;
+    try { enabled = readConfig(config).enabled; } catch {}
+    syncLaunchEnvironment({ state, run, enabled, previousWrapper: legacy?.state.wrapper });
+    if (enabled && run(['getenv', 'CODEX_CLI_PATH'], false) !== wrapper) throw new Error('启动环境验证失败。');
     if (legacy) {
       run(['bootout', `gui/${process.getuid()}/${legacy.label}`], false); retired = true;
       atomicFile(legacy.state.wrapper, `#!/bin/sh\nexec ${shellQuote(wrapper)} "$@"\n`, 0o755);
@@ -117,8 +137,7 @@ export function reconcile({ root = installRoot(), plist = defaultPlist(), run =
   if (existsSync(join(state.source, 'package.json')) || busy(root)) {
     if (!busy(root)) pruneReleases(root, state, now);
     rmSync(marker, { force: true });
-    const env = run(['getenv', 'CODEX_CLI_PATH'], false);
-    if (!env) run(['setenv', 'CODEX_CLI_PATH', state.wrapper]);
+    syncLaunchEnvironment({ state, run });
     return;
   }
   let since;

package/src/proxy.mjs

@@ -34,12 +34,12 @@ export function isStdioServer(args) {
 export async function runProxy(args, selfPath) {
   if ((Number.parseInt(setting('ACTIVE'), 10) || 0) >= 8) throw new Error('检测到 minilink 递归调用；MINILINK_REAL_CODEX 必须指向真正的 codex。');
   const path = configPath();
-  readConfig(path);
+  const enabled = readConfig(path).enabled;
   const hadConfig = existsSync(path);
   const executable = resolveRealCodex(selfPath);
-  const routed = isStdioServer(args);
+  const routed = enabled && isStdioServer(args);
   const routes = routed ? discoverProfiles() : [];
-  const env = childEnvironment(routes);
+  const env = enabled ? childEnvironment(routes) : { ...process.env, MINILINK_ACTIVE: String((Number.parseInt(setting('ACTIVE'), 10) || 0) + 1) };
   env.CODEX_CLI_PATH = executable;
   const chats = routes.filter(r => r.chat).map(route => new Chat({ config: route, key: env[route.providerDefinition.env_key], env }));
   const picker = routed ? new Picker({ chats }) : null;

package/src/update.mjs

@@ -61,7 +61,7 @@ export async function upgrade(latest, state, { root = installRoot(), exec = exec
     // A manual uninstall during the download must not be undone by the worker.
     if (!existsSync(state.source) || installation(root)?.installedAt !== state.installedAt) return false;
     installing = true;
-    await npm(['install', '-g', '--prefix', state.prefix, candidate, '--offline', '--engine-strict', '--ignore-scripts=false']);
+    await npm(['install', '-g', '--prefix', state.prefix, candidate, '--offline', '--engine-strict', `--allow-scripts=${name}`]);
     const active = installation(root);
     if (!active?.runtime || JSON.parse(readFileSync(join(active.runtime, 'package.json'), 'utf8')).version !== latest) throw new Error('Desktop activation failed');
     return true;