@walkhi/code-relax 0.1.0-beta.6 → 0.1.0-beta.7

package/README.md

@@ -80,4 +80,4 @@ npm uninstall -g @walkhi/code-relax
 
 ## 发布边界
 
-registry 当前公开包为 `@walkhi/code-relax@0.1.0-beta.6`，主 CLI 为 `relax`，并保留 `code-relax` 兼容入口。该版为受管 app-server 记录启动代次，升级发现旧启动链时自动重建进程，使 beta5 的隐藏控制台修复真正生效；`doctor` 会区分安装版本与运行代次。通信协议仍为 7。详细规则见 [npm 分发](../docs/npm-distribution.md)。
+registry 当前公开包为 `@walkhi/code-relax@0.1.0-beta.7`，主 CLI 为 `relax`，并保留 `code-relax` 兼容入口。该版沿用 beta6 的启动代次自动迁移，并在 npm 安装控制台明确报告 app-server 是否重启、迁移前后 PID、Bridge 恢复结果和安装日志路径；`doctor` 会区分安装版本与运行代次。通信协议仍为 7。详细规则见 [npm 分发](../docs/npm-distribution.md)。

package/dist/bin/codex-remote.mjs

@@ -206,7 +206,12 @@ async function main() {
       throw new Error(bridge.managedAppServer?.error || 'Bridge 已安装，但受管 app-server 未就绪；未写入 Desktop 环境变量。');
     }
     let managedAppServerMigrated = false;
-    if (bridge.managedAppServer.launcherRestartRequired) {
+    const managedAppServerMigration = {
+      required: bridge.managedAppServer.launcherRestartRequired === true,
+      restarted: false,
+      previousPid: bridge.managedAppServer.pid || null,
+    };
+    if (managedAppServerMigration.required) {
       await service.restartManagedAppServer();
       const migrationDeadline = Date.now() + 40_000;
       do {
@@ -220,6 +225,7 @@ async function main() {
         throw new Error('受管 app-server 未在 40 秒内完成启动链迁移。');
       }
       managedAppServerMigrated = true;
+      managedAppServerMigration.restarted = true;
     }
     const autostart = await residentStartup(installed, 'enable');
     const environment = await configureManagedEnvironment(physicalStateRoot);
@@ -228,6 +234,9 @@ async function main() {
     installed.environment = environment;
     installed.managedAppServer = bridge.managedAppServer;
     installed.managedAppServerMigrated = managedAppServerMigrated;
+    installed.managedAppServerMigration = { ...managedAppServerMigration,
+      currentPid: bridge.managedAppServer.pid || null,
+      launcherRevision: bridge.managedAppServer.launcherRevision ?? null };
     installed.desktop = bridge.desktop;
     installed.desktopRestartRecommended = bridge.desktop?.state === 'ordinary';
     const migrationText = managedAppServerMigrated ? '已自动重建旧启动链的 app-server；安装前尚未完成的任务可能已中断。\n' : '';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@walkhi/code-relax",
-  "version": "0.1.0-beta.6",
+  "version": "0.1.0-beta.7",
   "license": "UNLICENSED",
   "type": "module",
   "scripts": {

package/tools/postinstall.mjs

@@ -33,12 +33,12 @@ function systemSummary() {
     + `osArch=${os.arch()} processArch=${process.arch} node=${process.version} npmUserAgent=${npm}`;
 }
 
-function runStage(entry, stage, args) {
+function runStage(entry, stage, args, formatOutput = value => value) {
   appendLog(`[${stage}] start`);
   try {
     const output = execFileSync(process.execPath, [entry, ...args], { encoding: 'utf8', windowsHide: true,
       stdio: ['inherit', 'pipe', 'pipe'] });
-    if (output) { process.stdout.write(output); appendLog(`[${stage}] stdout\n${output.trimEnd()}`); }
+    if (output) { process.stdout.write(formatOutput(output)); appendLog(`[${stage}] stdout\n${output.trimEnd()}`); }
     appendLog(`[${stage}] success`);
   } catch (error) {
     if (error?.stdout) { process.stdout.write(error.stdout); appendLog(`[${stage}] stdout\n${String(error.stdout).trimEnd()}`); }
@@ -48,6 +48,30 @@ function runStage(entry, stage, args) {
   }
 }
 
+export function formatSetupOutput(output, previous = {}) {
+  try {
+    const result = JSON.parse(output);
+    const migration = result.managedAppServerMigration || {};
+    const pid = migration.currentPid || result.managedAppServer?.pid || '未知';
+    const appServer = migration.restarted
+      ? `已重启（旧启动链迁移，PID ${migration.previousPid || '未知'} → ${pid}）`
+      : previous.valid
+        ? `未重启（PID ${pid}，启动代次 ${migration.launcherRevision ?? '未知'} 已是最新）`
+        : `已启动（PID ${pid}，启动代次 ${migration.launcherRevision ?? '未知'}）`;
+    return `Code Relax ${result.version || '未知版本'} 安装成功。\n`
+      + `受管 app-server：${appServer}\n`
+      + `Bridge：${result.restarted ? '已恢复并健康' : '已启动并健康'}\n`
+      + `${result.desktopRestartRecommended ? 'Codex Desktop：建议完全退出后重新打开。\n' : ''}`;
+  } catch { return output; }
+}
+
+export function formatSkillOutput(output) {
+  try {
+    const result = JSON.parse(output);
+    return `Code Relax Skill：${result.message || (result.installed ? '已安装' : '已检查')}\n`;
+  } catch { return output; }
+}
+
 function installationSnapshot() {
   const recordPath = path.join(serviceRoot, 'installation.json');
   if (!fs.existsSync(serviceRoot)) return { exists: false, valid: false };
@@ -101,9 +125,10 @@ if (process.env.npm_config_global === 'true') {
   let stage = 'setup';
   appendLog(`[postinstall] start package=${process.env.npm_package_version || 'unknown'} ${systemSummary()}`);
   try {
-    runStage(entry, stage, ['setup', '--json']);
+    runStage(entry, stage, ['setup', '--json'], output => formatSetupOutput(output, previous));
     stage = 'skill-install';
-    runStage(entry, stage, ['skill-install', '--json']);
+    runStage(entry, stage, ['skill-install', '--json'], formatSkillOutput);
+    console.log(`安装日志：${installLog}`);
     appendLog('[postinstall] success');
   } catch (error) {
     const current = installationSnapshot();