@ailuntz/minilink 0.9.8 → 0.9.10

package/README.md

@@ -26,6 +26,8 @@ minilink on
 
 `npm install` 只安装命令；`minilink on` 才接入 Desktop。更新包后再次运行 `minilink on`。
 
+MiniLink 始终调用 Desktop 自带的 Codex，不调用先前单独安装的 `codex` 命令。配置和会话仍使用官方的 `CODEX_HOME`（默认 `~/.codex`）；MiniLink 自己的启动文件放在 `~/.local/share/minilink`。
+
 ## 命令
 
 | 命令 | 用途 |

package/package.json

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

package/src/config.mjs

@@ -1,6 +1,6 @@
 import { readFileSync, readdirSync, mkdirSync, writeFileSync, renameSync, rmSync, existsSync, realpathSync, accessSync, constants, statSync, copyFileSync, mkdtempSync } from 'node:fs';
 import { homedir } from 'node:os';
-import { resolve, join, dirname, isAbsolute } from 'node:path';
+import { resolve, join, dirname } from 'node:path';
 import { randomUUID, createHash } from 'node:crypto';
 import { execFileSync } from 'node:child_process';
 import { parseEnv } from 'node:util';
@@ -104,8 +104,8 @@ export function findApp() {
 }
 
 export function resolveRealCodex(selfPath) {
-  const candidate = setting('REAL_CODEX') || officialCodex();
-  if (!candidate || !isAbsolute(candidate)) throw new Error('找不到内置 Codex；可用 MINILINK_REAL_CODEX 指定绝对路径。');
+  const candidate = officialCodex();
+  if (!candidate) throw new Error('找不到 ChatGPT 内置 Codex。');
   let actual;
   try { actual = realpathSync(candidate); accessSync(actual, constants.X_OK); } catch { throw new Error('真正的 Codex 不存在或不可执行。'); }
   if (actual === realpathSync(selfPath) || actual === realpathSync(process.execPath)) throw new Error('检测到路由递归调用。');

package/src/install.mjs

@@ -20,7 +20,7 @@ export function installation(root = installRoot()) {
 
 export function ensureInstalled({ state = installation(), source = sourceRoot, activate = installDesktop } = {}) {
   try {
-    if (state?.source === source && JSON.parse(readFileSync(join(state.runtime, 'package.json'), 'utf8')).version === VERSION) return state;
+    if (state?.source === source && state.packageVersion === VERSION && JSON.parse(readFileSync(join(state.runtime, 'package.json'), 'utf8')).version === VERSION) return state;
   } catch {}
   return activate();
 }
@@ -89,7 +89,7 @@ function installLinux({ root = installRoot(), source = sourceRoot, home = codexH
   const wrapper = join(root, 'minilink');
   mkdirSync(root, { recursive: true, mode: 0o700 });
   atomicFile(wrapper, `#!/bin/sh\nif [ ! -f ${shellQuote(join(source, 'package.json'))} ]; then exec ${shellQuote(native)} "$@"; fi\nexport CODEX_HOME=${shellQuote(home)}\nexport MINILINK_CONFIG=${shellQuote(config)}\nexec ${shellQuote(node)} ${shellQuote(join(source, 'bin/minilink.mjs'))} "$@"\n`, 0o755);
-  const state = { version: 3, platform: 'linux', source, runtime: source, wrapper, node, codexHome: home, configPath: config, installedAt: new Date().toISOString() };
+  const state = { version: 3, platform: 'linux', packageVersion: VERSION, source, runtime: source, wrapper, node, codexHome: home, configPath: config, installedAt: new Date().toISOString() };
   atomicJSON(join(root, 'installation.json'), state);
   return state;
 }
@@ -107,20 +107,20 @@ function syncWindows({ state = installation(), enabled } = {}) {
   if (enabled == null) enabled = readConfig(state.configPath).enabled;
   const current = windowsEnvironment();
   if (enabled) {
-    if (current && current !== state.wrapper) throw new Error('CODEX_CLI_PATH 已指向其他程序。');
-    if (!current) setWindowsEnvironment(state.wrapper);
+    if (current && current !== state.wrapper && current !== state.previousWrapper) throw new Error('CODEX_CLI_PATH 已指向其他程序。');
+    if (current !== state.wrapper) setWindowsEnvironment(state.wrapper);
   } else if (current === state.wrapper) setWindowsEnvironment(state.previousEnv || null);
 }
 
 function installWindows({ root = installRoot(), source = sourceRoot, home = codexHome(), config = configPath(), node = process.execPath } = {}) {
   const native = resolveRealCodex(join(source, 'bin/minilink.mjs'));
-  const previous = installation(root), wrapper = join(root, 'MiniLinkLauncher.exe');
+  const previous = installation(root), wrapper = join(root, `MiniLinkLauncher-${VERSION}.exe`);
   const current = windowsEnvironment();
-  if (current && current !== wrapper) throw new Error('CODEX_CLI_PATH 已指向其他程序。');
+  if (current && current !== wrapper && current !== previous?.wrapper) throw new Error('CODEX_CLI_PATH 已指向其他程序。');
   mkdirSync(root, { recursive: true, mode: 0o700 });
   if (!existsSync(wrapper)) powershell(`Add-Type -Path ${psQuote(join(source, 'src/platform/windows/MiniLinkLauncher.cs'))} -OutputAssembly ${psQuote(wrapper)} -OutputType ConsoleApplication`);
   atomicFile(join(root, 'launcher.paths'), [node, join(source, 'bin/minilink.mjs'), native, home, config].join('\n') + '\n', 0o600);
-  const state = { version: 3, platform: 'win32', source, runtime: source, wrapper, node, codexHome: home, configPath: config, previousEnv: previous?.previousEnv || null, installedAt: new Date().toISOString() };
+  const state = { version: 3, platform: 'win32', packageVersion: VERSION, source, runtime: source, wrapper, node, codexHome: home, configPath: config, previousEnv: previous?.previousEnv || null, previousWrapper: current === previous?.wrapper ? current : null, installedAt: new Date().toISOString() };
   atomicJSON(join(root, 'installation.json'), state);
   return state;
 }
@@ -161,7 +161,7 @@ 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: packageManager.npm || previous?.npm, prefix: packageManager.prefix || previous?.prefix, codexHome: home, configPath: config, previousEnv: previous?.previousEnv || legacy?.state.previousEnv || null, installedAt: new Date().toISOString() };
+    const state = { version: 2, packageVersion: VERSION, source, runtime, wrapper, node, npm: packageManager.npm || previous?.npm, prefix: packageManager.prefix || previous?.prefix, codexHome: home, configPath: config, previousEnv: previous?.previousEnv || legacy?.state.previousEnv || null, installedAt: new Date().toISOString() };
     // 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);

package/src/proxy.mjs

@@ -32,7 +32,7 @@ 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。');
+  if ((Number.parseInt(setting('ACTIVE'), 10) || 0) >= 8) throw new Error('检测到 minilink 递归调用。');
   const path = configPath();
   const enabled = readConfig(path).enabled;
   const hadConfig = existsSync(path);