@walkhi/code-relax 0.1.0-beta.32 → 0.1.0-beta.33

package/dist/build-platform.json

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@walkhi/code-relax",
-  "version": "0.1.0-beta.32",
+  "version": "0.1.0-beta.33",
   "private": false,
   "license": "UNLICENSED",
   "type": "module",
@@ -41,8 +41,8 @@
     "tag": "beta"
   },
   "optionalDependencies": {
-    "@walkhi/code-relax-native-win32-x64": "0.1.0-beta.32",
-    "@walkhi/code-relax-native-darwin-arm64": "0.1.0-beta.32",
-    "@walkhi/code-relax-native-darwin-x64": "0.1.0-beta.32"
+    "@walkhi/code-relax-native-win32-x64": "0.1.0-beta.33",
+    "@walkhi/code-relax-native-darwin-arm64": "0.1.0-beta.33",
+    "@walkhi/code-relax-native-darwin-x64": "0.1.0-beta.33"
   }
 }

package/tools/postinstall.mjs

@@ -53,14 +53,52 @@ export function formatSetupOutput(output) {
   try {
     const result = JSON.parse(output);
     const migration = result.managedAppServerMigration || {};
-    return `Code Relax ${result.version || '未知版本'} 安装成功。\n`
+    return `Code Relax ${result.version || '未知版本'} 服务安装完成。\n`
       + '工作站服务和 Codex 内核已就绪，已启用登录自启。\n'
       + (migration.restarted ? 'Codex 内核已更新并重启；请检查安装前正在进行的任务。\n' : '')
-      + (result.desktopRestartRecommended ? 'Codex Desktop：请完全退出后重新打开。\n' : '')
-      + '生成配对二维码：relax pair\n';
+      + (result.desktopRestartRecommended ? 'Codex Desktop：请完全退出后重新打开。\n' : '');
   } catch { return output; }
 }
 
+// npm owns command links. Inspect them without changing the user's shell configuration.
+export function commandDiagnostics(entry, { prefix, env = process.env, platform = process.platform } = {}) {
+  const windows = platform === 'win32';
+  const bin = windows ? prefix : path.join(prefix, 'bin');
+  const command = path.join(bin, windows ? 'relax.cmd' : 'relax');
+  const lines = [`命令入口：${command}`];
+  let linkReady = false;
+  try {
+    if (windows) {
+      const shim = fs.readFileSync(command, 'utf8');
+      linkReady = shim.replaceAll('\\', '/').includes('node_modules/@walkhi/code-relax/dist/bin/codex-remote.mjs') && fs.existsSync(entry);
+    } else {
+      linkReady = fs.realpathSync(command) === fs.realpathSync(entry);
+      fs.accessSync(command, fs.constants.X_OK);
+    }
+    lines.push(linkReady ? '命令链接：正常' : '命令链接：目标与本次安装不一致');
+  } catch (error) {
+    linkReady = false;
+    lines.push(`命令链接：不可用（${error.code || error.message}）`);
+  }
+  const normalize = value => {
+    let resolved;
+    try { resolved = fs.realpathSync(value); } catch { resolved = path.resolve(value); }
+    return windows ? resolved.toLowerCase() : resolved;
+  };
+  const pathValue = Object.entries(env).find(([key]) => key.toLowerCase() === 'path')?.[1] || '';
+  const onPath = pathValue.split(windows ? ';' : ':').filter(Boolean)
+    .some(value => normalize(value.replace(/^"|"$/g, '')) === normalize(bin));
+  lines.push(`安装进程 PATH：${onPath ? '包含' : '未包含'}全局命令目录`);
+  lines.push('注：npm 会调整安装进程 PATH；当前终端能否直接找到命令仍以终端为准。');
+  if (!linkReady) lines.push('CLI 入口异常；服务状态请以上方健康检查为准，请保留本次诊断输出。');
+  else if (!onPath) lines.push('全局命令目录未在 PATH 中，可先使用下方完整路径命令。');
+  const quote = value => "'" + value.replaceAll("'", windows ? "''" : "'\"'\"'") + "'";
+  const direct = `${windows ? '& ' : ''}${quote(process.execPath)} ${quote(entry)}`;
+  lines.push(`无需依赖 relax 命令的检查入口${windows ? '（PowerShell）' : ''}：`, `${direct} doctor`);
+  lines.push('生成配对二维码：', `${direct} pair`);
+  return lines.join('\n') + '\n';
+}
+
 function installationSnapshot() {
   const recordPath = path.join(serviceRoot, 'installation.json');
   if (!fs.existsSync(serviceRoot)) return { exists: false, valid: false };
@@ -113,8 +151,13 @@ if (invokedDirectly && process.env.npm_config_global === 'true') {
     prepareNativePackage(fileURLToPath(new URL('../', import.meta.url)));
     setupStarted = true;
     runStage(entry, 'setup', ['setup', '--json'], output => formatSetupOutput(output));
+    try { runStage(entry, 'doctor', ['doctor']); }
+    catch (error) {
+      console.error('服务安装已完成，但安装后健康检查未通过；请查看上方诊断与安装日志。');
+      process.exitCode = 1;
+    }
     console.log(`安装日志：${installLog}`);
-    appendLog('[postinstall] success');
+    appendLog(process.exitCode ? '[postinstall] failed stage=doctor' : '[postinstall] success');
   } catch (error) {
     const current = installationSnapshot();
     if (!setupStarted) console.error(`平台组件检查失败：${error.message}`);
@@ -123,5 +166,16 @@ if (invokedDirectly && process.env.npm_config_global === 'true') {
     console.error(`安装日志：${installLog}`);
     appendLog('[postinstall] failed stage=setup');
     process.exitCode = Number.isInteger(error?.status) && error.status > 0 ? error.status : 1;
+  } finally {
+    try {
+      const prefix = execFileSync(process.execPath, [process.env.npm_execpath, 'prefix', '--global'],
+        { encoding: 'utf8', windowsHide: true, stdio: ['ignore', 'pipe', 'pipe'] }).trim();
+      const output = commandDiagnostics(entry, { prefix });
+      process.stdout.write(output);
+      appendLog(`[command-diagnostics]\n${output}`);
+    } catch (error) {
+      console.error(`命令入口诊断失败：${error.message}`);
+      appendLog(`[command-diagnostics] failed: ${error.message}`);
+    }
   }
 }