@walkhi/code-relax 0.1.0-beta.108 → 0.1.0-beta.109

package/dist/build-platform.json

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

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

@@ -67,7 +67,11 @@ function runtimeDirectories(files) {
 async function retainDesktopRuntime(executable, installed, stateRoot) {
   if (!/^[\w.-]+$/.test(installed.package)) throw new Error('Codex Desktop 安装包名称无效。');
   const source = path.dirname(executable);
-  const files = runtimeFiles(source);
+  // Desktop can run directly from its MSIX package without extracting bin/.
+  // Retain the same core siblings as Desktop, not the entire Electron resources.
+  const files = path.resolve(executable).toLowerCase() === path.resolve(installed.executable).toLowerCase()
+    ? ['codex.exe', 'codex-code-mode-host.exe', 'codex-windows-sandbox-setup.exe', 'codex-command-runner.exe'].sort()
+    : runtimeFiles(source);
   if (files.includes('runtime.json')) throw new Error('Codex 内核目录与保留清单文件名冲突。');
   const directories = runtimeDirectories(files);
   const root = path.join(stateRoot, 'desktop-runtimes');
@@ -93,7 +97,7 @@ async function retainDesktopRuntime(executable, installed, stateRoot) {
       created.push(to);
       try { fs.linkSync(from, to); }
       catch (error) {
-        if (error.code !== 'EXDEV') throw error;
+        if (!['EXDEV', 'EPERM'].includes(error.code)) throw error;
         fs.copyFileSync(from, to);
       }
     }
@@ -194,7 +198,11 @@ export async function resolveCodexRuntime(stateRoot, { refresh = false, environm
     try { installed = await installedDesktopRuntime(); }
     catch (error) { throw new Error(`无法确认最新 Codex Desktop 内核，未降级到其他 CLI：${error.message}`); }
   }
-  for (const candidate of discoverCodex(environment)) {
+  const discovered = discoverCodex(environment);
+  if (installed && runtimeFilesAvailable(installed.executable)) {
+    discovered.push({ executable: installed.executable, source: 'desktop' });
+  }
+  for (const candidate of discovered) {
     try {
       if (candidate.source === 'desktop' && !await matchesInstalledDesktop(candidate.executable, installed)) {
         continue; // Superseded Desktop extraction directories are not installed candidates.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@walkhi/code-relax",
-  "version": "0.1.0-beta.108",
+  "version": "0.1.0-beta.109",
   "private": false,
   "license": "UNLICENSED",
   "type": "module",

package/tools/postinstall.mjs

@@ -149,11 +149,18 @@ if (invokedDirectly && process.env.npm_config_global === 'true') {
   const previous = installationSnapshot();
   appendLog(`[postinstall] start package=${process.env.npm_package_version || 'unknown'} ${systemSummary()}`);
   let setupStarted = false;
+  let stage = 'platform';
   try {
     const { prepareNativePackage } = await import('../dist/src/platform/native-package.mjs');
     prepareNativePackage(fileURLToPath(new URL('../', import.meta.url)));
+    if (process.platform === 'win32') {
+      stage = 'desktop-helper';
+      console.log('正在检查并安装桌面操作辅助服务；需要授权时将在工作站弹出 Windows UAC。');
+      runStage(entry, stage, ['desktop-helper-install']);
+    }
+    stage = 'setup';
     setupStarted = true;
-    const setupOutput = runStage(entry, 'setup', ['setup', '--json'], formatSetupOutput);
+    runStage(entry, 'setup', ['setup', '--json'], formatSetupOutput);
     try {
       runStage(entry, 'doctor', ['doctor']);
     }
@@ -161,29 +168,16 @@ if (invokedDirectly && process.env.npm_config_global === 'true') {
       console.error('服务安装已完成，但安装后健康检查未通过；请查看上方诊断与安装日志。');
       process.exitCode = Number.isInteger(error?.status) && error.status > 0 ? error.status : 1;
     }
-    let desktopHelperReady = true;
-    if (!process.exitCode && process.platform === 'win32') {
-      try {
-        if (JSON.parse(setupOutput).desktopHelper?.running !== true) {
-          console.log('正在启用桌面操作辅助服务，请在这台电脑确认 Windows 权限提示。');
-          runStage(entry, 'desktop-helper-install', ['desktop-helper-install']);
-        }
-      } catch {
-        desktopHelperReady = false;
-        process.exitCode = 1;
-        console.error('Code Relax 安装失败：桌面操作辅助服务未就绪。请查看安装日志。');
-      }
-    }
-    if (!process.exitCode && desktopHelperReady) console.log('Code Relax 自动安装成功：工作站健康检查与所需组件均已就绪。');
+    if (!process.exitCode) console.log('Code Relax 自动安装成功：工作站健康检查与所需组件均已就绪。');
     console.log(`安装日志：${installLog}`);
-    appendLog(!desktopHelperReady ? '[postinstall] failed stage=desktop-helper' : process.exitCode ? '[postinstall] failed stage=doctor' : '[postinstall] success');
+    appendLog(process.exitCode ? '[postinstall] failed stage=doctor' : '[postinstall] success');
   } catch (error) {
     const current = installationSnapshot();
-    if (!setupStarted) console.error(`平台组件检查失败：${error.message}`);
+    if (!setupStarted) console.error(`${stage === 'desktop-helper' ? '桌面操作辅助服务安装失败' : '平台组件检查失败'}：${error.message}`);
     console.error(`\nCode Relax 安装未完全完成：\n${setupFailureGuidance(previous, current)}`);
     if (error?.code && error.code !== 'ERR_CHILD_PROCESS_STDIO_MAXBUFFER') console.error(`启动安装步骤失败：${error.message}`);
     console.error(`安装日志：${installLog}`);
-    appendLog('[postinstall] failed stage=setup');
+    appendLog(`[postinstall] failed stage=${stage}`);
     process.exitCode = Number.isInteger(error?.status) && error.status > 0 ? error.status : 1;
   } finally {
     try {