@walkhi/code-relax 0.1.0-beta.69 → 0.1.0-beta.71

package/dist/build-platform.json

@@ -1 +1 @@
-{"layout":"npm-platform-packages","version":"0.1.0-beta.69"}
+{"layout":"npm-platform-packages","version":"0.1.0-beta.71"}

package/dist/src/platform/codex-protocol.mjs

@@ -11,7 +11,7 @@ const requiredMethods = ['thread/start', 'thread/resume', 'thread/list', 'thread
   'thread/settings/update', 'configRequirements/read', 'thread/queue/list', 'thread/queue/add',
   'thread/queue/delete', 'thread/queue/start', 'thread/read', 'thread/unsubscribe', 'config/read', 'account/rateLimits/read'];
 
-export function compareVersions(a, b) {
+export function compareVersions(a, b) {
   const parse = v => v.split(/[.-]/).map(part => /^\d+$/.test(part) ? Number(part) : part);
   const aa = parse(a), bb = parse(b);
   for (let i = 0; i < Math.max(aa.length, bb.length); i++) {
@@ -21,7 +21,12 @@ export function compareVersions(a, b) {
     return typeof aa[i] === 'number' && typeof bb[i] === 'number' ? aa[i] - bb[i] : String(aa[i]).localeCompare(String(bb[i]));
   }
   return 0;
-}
+}
+
+export function newestRuntime(candidates) {
+  return [...candidates].sort((a, b) => compareVersions(b.version, a.version)
+    || Number(b.source === 'desktop') - Number(a.source === 'desktop'))[0];
+}
 
 export async function verifyProtocol(executable, stateRoot) {
   const directory = fs.mkdtempSync(path.join(stateRoot, 'cli-schema-'));

package/dist/src/platform/codex-runtime.mjs

@@ -1,3 +1,4 @@
 import { platformModule } from './select.mjs';
 const adapter = await import(platformModule('codex-runtime'));
 export const { discoverCodex, resolveCodexRuntime, runtimeFilesAvailable, codeModeHostPath, runtimeFingerprint, pruneRetainedDesktopRuntimes } = adapter;
+export const runtimeInstallationFingerprint = adapter.runtimeInstallationFingerprint || (() => null);

package/dist/src/platform/macos/codex-runtime.mjs

@@ -4,7 +4,7 @@ import path from 'node:path';
 import { createRequire } from 'node:module';
 import { execFile, execFileSync } from 'node:child_process';
 import { promisify } from 'node:util';
-import { compareVersions, verifyProtocol } from '../codex-protocol.mjs';
+import { newestRuntime, verifyProtocol } from '../codex-protocol.mjs';
 import { readRecord, writeRecord } from '../../service-lifecycle.mjs';
 import { retainRuntime, runtimeFingerprint, packageRoot } from './retained-runtime.mjs';
 export { runtimeFingerprint, pruneRetainedDesktopRuntimes } from './retained-runtime.mjs';
@@ -97,25 +97,25 @@ export async function resolveCodexRuntime(stateRoot, { refresh = false, environm
   const explicit = environment.CODE_RELAX_CODEX_PATH || (saved?.source === 'explicit' ? saved.sourceExecutable : '');
   if (!refresh && saved?.executable && (!explicit || explicit === saved.sourceExecutable) && codexHome === saved.codexHome
       && runtimeFilesAvailable(saved.executable) && saved.fingerprint === runtimeFingerprint(saved.executable)) return saved;
-  const candidates = [], rejected = [];
+  const candidates = [];
   for (const candidate of discoverCodex({ ...environment, CODEX_HOME: codexHome, CODE_RELAX_CODEX_PATH: explicit })) {
     try {
-      if (!runtimeFilesAvailable(candidate.executable)) throw new Error('缺少配套原生 codex-code-mode-host');
       const { stdout } = await exec(candidate.executable, ['--version'], { timeout: 10000, env: { ...environment, CODEX_HOME: codexHome } });
       const version = /^codex-cli (\d+\.\d+\.\d+(?:-[\w.]+)?)/m.exec(stdout)?.[1];
       if (!version) throw new Error('无法识别 Codex 版本');
       candidates.push({ ...candidate, version });
-    } catch (error) { rejected.push(`${candidate.executable}: ${error.message}`); }
-  }
-  candidates.sort((a, b) => Number(b.source === 'desktop') - Number(a.source === 'desktop') || compareVersions(b.version, a.version));
-  for (const candidate of candidates) {
-    try {
+    } catch (error) { throw new Error(`无法确认 Codex 候选版本，未降级：${candidate.executable}: ${error.message}`); }
+  }
+  const candidate = newestRuntime(candidates);
+  if (candidate) {
+    try {
+      if (!runtimeFilesAvailable(candidate.executable)) throw new Error('缺少配套原生 codex-code-mode-host');
       const retained = await retainRuntime(candidate.executable, stateRoot, candidate.version);
       await verifyProtocol(retained.executable, stateRoot);
       const result = { ...candidate, ...retained, codexHome, fingerprint: runtimeFingerprint(retained.executable) };
       writeRecord(recordFile, result);
       return result;
-    } catch (error) { rejected.push(`${candidate.executable}: ${error.message}`); }
-  }
-  throw new Error(`未找到具备所需协议能力的 Mac Codex 内核，请安装官方 Codex 应用或完整 CLI 并登录账号。${rejected.length ? '\n' + rejected.join('\n') : ''}`);
-}
+    } catch (error) { throw new Error(`最新 Codex 内核 ${candidate.version} 校验失败，未降级：${candidate.executable}: ${error.message}`); }
+  }
+  throw new Error('未找到 Mac Codex 内核，请安装官方 Codex 应用或完整 CLI 并登录账号。');
+}

package/dist/src/platform/windows/codex-runtime.mjs

@@ -1,5 +1,5 @@
 import fs from 'node:fs';
-import { compareVersions, verifyProtocol } from '../codex-protocol.mjs';
+import { newestRuntime, verifyProtocol } from '../codex-protocol.mjs';
 import os from 'node:os';
 import path from 'node:path';
 import { createRequire } from 'node:module';
@@ -24,11 +24,16 @@ async function fileHash(file) {
   return hash.digest('hex');
 }
 
-async function installedDesktopRuntime() {
+async function installedDesktopRuntime() {
   const { stdout } = await exec(powershell, ['-NoProfile', '-NonInteractive', '-ExecutionPolicy', 'Bypass',
     '-File', desktopRuntimeScript], { windowsHide: true, encoding: 'utf8', timeout: 30000 });
   return JSON.parse(stdout.trim());
-}
+}
+
+export async function runtimeInstallationFingerprint() {
+  const installed = await installedDesktopRuntime();
+  return installed ? [installed.package, fingerprint(installed.executable)] : null;
+}
 
 async function matchesInstalledDesktop(executable, installed) {
   if (!installed || !runtimeFilesAvailable(executable) || !runtimeFilesAvailable(installed.executable)) return false;
@@ -183,25 +188,30 @@ export async function resolveCodexRuntime(stateRoot, { refresh = false, environm
     CODE_RELAX_CODEX_PATH: environment.CODE_RELAX_CODEX_PATH || (saved?.source === 'explicit' ? saved.executable : '') };
   if (!refresh && saved?.executable && runtimeFilesAvailable(saved.executable)
     && saved.fingerprint === fingerprint(saved.executable)) return saved;
-  const candidates = [], rejected = [];
-  let installed = null;
-  try { installed = await installedDesktopRuntime(); }
-  catch (error) { rejected.push(`无法读取当前 Codex Desktop 安装包：${error.message}`); }
-  for (const candidate of discoverCodex(environment)) {
-    try {
-      if (!runtimeFilesAvailable(candidate.executable)) throw new Error('缺少同目录的 codex-code-mode-host.exe');
-      if (candidate.source === 'desktop' && !await matchesInstalledDesktop(candidate.executable, installed)) {
-        throw new Error('不是当前 Codex Desktop 安装包配套的 CLI');
+  const candidates = [];
+  let installed = null;
+  if (!environment.CODE_RELAX_CODEX_PATH) {
+    try { installed = await installedDesktopRuntime(); }
+    catch (error) { throw new Error(`无法确认最新 Codex Desktop 内核，未降级到其他 CLI：${error.message}`); }
+  }
+  for (const candidate of discoverCodex(environment)) {
+    try {
+      if (candidate.source === 'desktop' && !await matchesInstalledDesktop(candidate.executable, installed)) {
+        continue; // Superseded Desktop extraction directories are not installed candidates.
       }
       const { stdout } = await exec(candidate.executable, ['--version'], { windowsHide: true, timeout: 10000 });
       const version = /^codex-cli (\d+\.\d+\.\d+(?:-[\w.]+)?)/m.exec(stdout)?.[1];
       if (!version) throw new Error('无法识别版本');
       candidates.push({ ...candidate, version });
-    } catch (error) { rejected.push(`${candidate.executable}: ${error.message}`); }
-  }
-  candidates.sort((a, b) => Number(b.source === 'desktop') - Number(a.source === 'desktop') || compareVersions(b.version, a.version));
-  for (const candidate of candidates) {
-    try {
+    } catch (error) { throw new Error(`无法确认 Codex 候选版本，未降级：${candidate.executable}: ${error.message}`); }
+  }
+  if (installed && !candidates.some(candidate => candidate.source === 'desktop')) {
+    throw new Error(`当前 Codex Desktop 内核尚未准备完整，未降级到旧 CLI：${installed.package}。请打开更新后的桌面端完成内核提取。`);
+  }
+  const candidate = newestRuntime(candidates);
+  if (candidate) {
+    try {
+      if (!runtimeFilesAvailable(candidate.executable)) throw new Error('缺少同目录的 codex-code-mode-host.exe');
       const executable = candidate.source === 'desktop'
         ? await retainDesktopRuntime(candidate.executable, installed, stateRoot) : candidate.executable;
       await verifyProtocol(executable, stateRoot);
@@ -209,7 +219,7 @@ export async function resolveCodexRuntime(stateRoot, { refresh = false, environm
         codexHome: path.resolve(environment.CODEX_HOME || path.join(os.homedir(), '.codex')) };
       writeRecord(recordFile, result);
       return result;
-    } catch (error) { rejected.push(`${candidate.executable}: ${error.message}`); }
-  }
-  throw new Error(`未找到兼容的 Codex CLI，请安装或更新 Codex CLI 后执行 relax setup。${rejected.length ? '\n' + rejected.join('\n') : ''}`);
-}
+    } catch (error) { throw new Error(`最新 Codex 内核 ${candidate.version} 校验失败，未降级：${candidate.executable}: ${error.message}`); }
+  }
+  throw new Error('未找到 Codex CLI，请安装或更新 Codex CLI 后执行 relax setup。');
+}

package/dist/src/runtime-discovery.mjs

@@ -1,4 +1,4 @@
-import { discoverCodex, resolveCodexRuntime, runtimeFingerprint } from './platform/codex-runtime.mjs';
+import { discoverCodex, resolveCodexRuntime, runtimeFingerprint, runtimeInstallationFingerprint } from './platform/codex-runtime.mjs';
 
 // Advisory discovery is independent of execution health. Failure here must never
 // disable an already running app-server or cause an automatic process restart.
@@ -13,10 +13,10 @@ export class RuntimeDiscovery {
     const errors = [];
     try {
       const candidates = discoverCodex();
-      const signature = JSON.stringify(candidates.map(candidate => {
+      const signature = JSON.stringify([await runtimeInstallationFingerprint(), candidates.map(candidate => {
         try { return [candidate.executable, runtimeFingerprint(candidate.executable)]; }
         catch (error) { return [candidate.executable, error.message]; }
-      }));
+      })]);
       if (signature !== this.signature) {
         await resolveCodexRuntime(this.stateRoot, { refresh: true });
         this.signature = signature;