@walkhi/code-relax 0.1.0-beta.5 → 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.5`，主 CLI 为 `relax`，并保留 `code-relax` 兼容入口。该版让 WMI 所有的 Node broker 在目标进程期间保留隐藏控制台，避免 Codex 调用工具时反复弹出控制台窗口；同时沿用官方中继自助登记和持久安装日志，通信协议仍为 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

@@ -23,7 +23,7 @@ const help = `Code Relax（Windows）
   setup   部署并启动固定目录服务、受管 app-server 和登录自启动；安全配置 Desktop 后续接入
   start   启动或复用 Bridge，并恢复已配置的私有中继
   shared-start 启动或复用完整控制，再启动 Bridge 和已配置的私有中继
-  shared-recover --confirm 启用或重新启动完整控制，保留 Bridge 和中继，可能中断当前任务
+  shared-recover --confirm 重新打开 Desktop 并接入完整控制；不强制重启已有 app-server
   shared-recovery-status 查看最近一次恢复的实际阶段和结果
   autostart-enable / autostart-disable / autostart-status 管理当前用户登录时启动 Bridge
   desktop-start 恢复基础控制，再启动 Bridge（切换前须自行退出 Desktop）
@@ -154,8 +154,8 @@ async function main() {
     result.environment = environment;
     result.skill = skill.managed ? removeSkill() : { removed: false, message: '未移除自定义或未安装的 Skill。' };
     result.message = environment?.preserved
-      ? '固定目录服务已卸载；检测到用户自定义的 CODEX_APP_SERVER_WS_URL，已保留。配置、附件也已保留。npm 命令入口可再用 npm uninstall -g @walkhi/code-relax 移除。'
-      : '固定目录服务已卸载；Code Relax 设置的 app-server 环境变量已清理，其他配置和附件已保留。npm 命令入口可再用 npm uninstall -g @walkhi/code-relax 移除。';
+      ? '固定目录服务已卸载；检测到用户自定义的 CODEX_APP_SERVER_WS_URL，已保留。配置、附件和可能仍在执行任务的 app-server 也已保留；重启 Windows可结束该进程。npm 命令入口可再用 npm uninstall -g @walkhi/code-relax 移除。'
+      : '固定目录服务已卸载；Code Relax 设置的 app-server 环境变量已清理，其他配置、附件和可能仍在执行任务的 app-server 已保留；重启 Windows可结束该进程。npm 命令入口可再用 npm uninstall -g @walkhi/code-relax 移除。';
     console.log(json ? JSON.stringify(result) : `${result.message}\n${result.skill.message}`);
     return;
   }
@@ -205,18 +205,45 @@ async function main() {
     if (!bridge.running || bridge.managedAppServer?.state !== 'ready') {
       throw new Error(bridge.managedAppServer?.error || 'Bridge 已安装，但受管 app-server 未就绪；未写入 Desktop 环境变量。');
     }
+    let managedAppServerMigrated = false;
+    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 {
+        await delay(250);
+        bridge = await service.status();
+        if (bridge.managedAppServer?.restart?.status === 'failed') {
+          throw new Error(bridge.managedAppServer.restart.error || '受管 app-server 启动链迁移失败。');
+        }
+      } while (Date.now() < migrationDeadline && (!bridge.running || bridge.managedAppServer?.state !== 'ready' || bridge.managedAppServer.launcherRestartRequired));
+      if (!bridge.running || bridge.managedAppServer?.state !== 'ready' || bridge.managedAppServer.launcherRestartRequired) {
+        throw new Error('受管 app-server 未在 40 秒内完成启动链迁移。');
+      }
+      managedAppServerMigrated = true;
+      managedAppServerMigration.restarted = true;
+    }
     const autostart = await residentStartup(installed, 'enable');
     const environment = await configureManagedEnvironment(physicalStateRoot);
     installed.autostart = autostart;
     installed.restarted = resumeAfterUpdate;
     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' : '';
     const restartText = installed.desktopRestartRecommended
       ? 'Codex 当前仍在使用原连接。可以在手机端选择“立即重启（推荐）”，或稍后自行完全退出再启动。'
       : '下次正常启动 Codex 时会连接受管 app-server。';
-    console.log(json ? JSON.stringify({ ...installed, nextSteps: desktopSetupSteps, displayText: `${desktopSetupSteps.join('\n')}\n${restartText}` }) : `服务已安装：${installed.serviceRoot}\n使用已安装的 Node：${installed.nodeExecutable}\n受管 app-server 已就绪；首次联网可能需要 Windows 防火墙授权。\n${desktopSetupSteps.join('\n')}\n${restartText}`);
+    console.log(json ? JSON.stringify({ ...installed, nextSteps: desktopSetupSteps, displayText: `${migrationText}${desktopSetupSteps.join('\n')}\n${restartText}` }) : `服务已安装：${installed.serviceRoot}\n使用已安装的 Node：${installed.nodeExecutable}\n受管 app-server 已就绪；首次联网可能需要 Windows 防火墙授权。\n${migrationText}${desktopSetupSteps.join('\n')}\n${restartText}`);
     return;
   }
   if (command === 'stop') {

package/dist/src/managed-app-server.mjs

@@ -8,6 +8,7 @@ import { SharedAppServer } from './shared-app-server.mjs';
 
 export const managedAppServerUrl = 'ws://127.0.0.1:45839';
 export const managedAppServerReadyUrl = 'http://127.0.0.1:45839/readyz';
+export const managedAppServerLauncherRevision = 2;
 const retryDelays = [1_000, 2_000, 5_000, 10_000, 20_000];
 
 export function managedPortAvailable() {
@@ -80,21 +81,26 @@ export class ManagedAppServer extends EventEmitter {
           [path.join(this.stateRoot, 'managed-app-server.stdout.log'), path.join(this.stateRoot, 'managed-app-server.stderr.log')]);
         const started = await this.host.process(pid);
         if (!sameManagedProcess(started, started)) throw new Error('Codex 内核启动后进程身份无法确认。');
-        record = actual = started;
+        actual = started;
+        record = { ...started, launcherRevision: managedAppServerLauncherRevision };
         writeRecord(this.recordPath, record);
       } else if (!readRecord(this.recordPath)) {
-        writeRecord(this.recordPath, actual);
+        record = { ...actual, launcherRevision: Number.isSafeInteger(record?.launcherRevision) ? record.launcherRevision : 0 };
+        writeRecord(this.recordPath, record);
       }
       await this.waitUntilReady(actual);
       await this.client.connect();
       if (!this.client.ready) throw new Error('Codex 内核协议初始化未完成。');
       const preferredExecutable = path.resolve(info.cli);
       const updatePending = path.resolve(actual.executable).toLowerCase() !== preferredExecutable.toLowerCase();
+      const launcherRevision = Number.isSafeInteger(record?.launcherRevision) ? record.launcherRevision : 0;
       this.retryAttempt = 0;
       this.retryAfter = 0;
       this.publish({ state: 'ready', ready: true, error: null, pid: actual.pid,
         created: actual.created, executable: actual.executable, preferredExecutable,
-        updatePending, url: managedAppServerUrl });
+        updatePending, launcherRevision,
+        launcherRestartRequired: launcherRevision !== managedAppServerLauncherRevision,
+        url: managedAppServerUrl });
       return true;
     } catch (error) {
       this.failed(error instanceof Error ? error.message : String(error));

package/dist/src/server.mjs

@@ -768,8 +768,14 @@ server.on('error', error => {
 server.listen(options.port, options.lan ? '0.0.0.0' : '127.0.0.1', async () => {
   try {
     if (process.env.CODEX_REMOTE_INSTANCE && process.env.CODEX_REMOTE_CONTROL_SECRET && process.env.CODEX_REMOTE_READY_PATH) {
-      control = await openControl({ instanceId: process.env.CODEX_REMOTE_INSTANCE,
-        secret: process.env.CODEX_REMOTE_CONTROL_SECRET, shutdown: shutDown, actions: { 'refresh-execution': refreshExecution } });
+      control = await openControl({ instanceId: process.env.CODEX_REMOTE_INSTANCE,
+        secret: process.env.CODEX_REMOTE_CONTROL_SECRET, shutdown: shutDown, actions: {
+          'refresh-execution': refreshExecution,
+          'restart-managed-app-server': () => {
+            const state = managedAppServer.snapshot();
+            return state.launcherRestartRequired ? managedAppServer.restart(crypto.randomUUID()) : state;
+          },
+        } });
       writeRecord(process.env.CODEX_REMOTE_READY_PATH, { instanceId: process.env.CODEX_REMOTE_INSTANCE,
         pid: process.pid, controlPort: control.port });
     }

package/dist/src/service-doctor.mjs

@@ -40,6 +40,8 @@ export async function doctor({ paths, host, service, skillTarget }) {
         : state.managedAppServer?.error || '受管 app-server 尚未就绪。');
     if (state.managedAppServer?.updatePending) add('managed-app-server-update', 'warning',
       'Codex Desktop 已提供新版 CLI；当前 app-server 会继续完成任务，并在下次进程自然重启或重新登录 Windows 后采用新版。');
+    if (state.managedAppServer?.launcherRestartRequired) add('managed-app-server-launcher', 'warning',
+      '安装文件已经更新，但当前 app-server 仍由旧启动链创建；隐藏控制台等运行时修复尚未生效，请执行 relax setup 或重启 Windows。');
   });
   await check('desktop-environment', async () => {
     const environment = await readManagedEnvironment();

package/dist/src/service-lifecycle.mjs

@@ -61,7 +61,7 @@ export function lifecycle({ stateRoot, host }) {
       desktopRestartRecommended: result?.desktopRestartRecommended === true,
       resident: result?.resident === true };
   }
-  async function pair() {
+  async function pair() {
     const session = readRecord(sessionPath);
     const connection = await alive(session) ? await health(session) : null;
     if (connection?.status !== 'ok' || !session.lan) {
@@ -76,7 +76,12 @@ export function lifecycle({ stateRoot, host }) {
       execution: connection.execution, managedAppServer: connection.managedAppServer, desktop: connection.desktop,
       desktopRestartRecommended: connection.desktopRestartRecommended === true, accessUrl: session.accessUrl,
       qrPath: path.join(stateRoot, 'connection-qr.png') };
-  }
+  }
+  async function restartManagedAppServer() {
+    const session = readRecord(sessionPath);
+    if (!await alive(session)) throw new Error('Bridge 尚未运行，无法迁移受管 app-server。');
+    return controlRequest(session, 'POST', 'restart-managed-app-server');
+  }
   async function start() {
     let session = readRecord(sessionPath);
     if (await alive(session)) {
@@ -126,5 +131,5 @@ export function lifecycle({ stateRoot, host }) {
       throw error;
     } finally { fs.rmSync(readyPath, { force: true }); }
   }
-  return { start, pair, status, stop };
-}
+  return { start, pair, status, stop, restartManagedAppServer };
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@walkhi/code-relax",
-  "version": "0.1.0-beta.5",
+  "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();