@walkhi/code-relax 0.1.0-beta.26 → 0.1.0-beta.28

package/dist/src/service-doctor.mjs

@@ -1,61 +1,72 @@
-import fs from 'node:fs';
-import path from 'node:path';
-import { readRecord } from './service-lifecycle.mjs';
-import { inspectSkill } from './skill-install.mjs';
-import { recoveryStatus } from './shared-recovery.mjs';
-
-export async function doctor({ paths, host, service, skillTarget, ensureAutostart }) {
-  const checks = [];
-  let installedVersion;
-  const add = (id, status, message) => checks.push({ id, status, message });
-  const check = async (id, task) => {
-    try { await task(); } catch (error) { add(id, 'error', error.message); }
-  };
-  await check('installation', async () => {
-    const record = readRecord(path.join(paths.serviceRoot, 'installation.json'));
-    if (!record || !fs.existsSync(path.join(paths.serviceRoot, 'dist/bin/codex-remote.mjs'))) throw Error('尚未完整部署服务，请重新安装 Code Relax。');
-    if (!record.nodeExecutable || !fs.existsSync(record.nodeExecutable)) throw Error('记录的 Node 已失效，请用可用的 Node 重新安装 Code Relax。');
-    installedVersion = record.version;
-    add('installation', 'ok', `已安装版本：${record.version}；Node：${record.nodeExecutable}`);
-  });
-  await check('bridge-runtime', async () => {
-    await host.bridgeEnvironment();
-    add('bridge-runtime', 'ok', '桌面服务启动环境已就绪；实际任务操作尚未验证。');
-  });
-  await check('network', async () => {
-    const address = await host.lanAddress();
-    if (!address) throw Error('未找到局域网 IPv4；请连接受信任的 Wi-Fi 或有线网络。');
-    add('network', 'ok', `局域网地址：${address}`);
-  });
-  await check('autostart', async () => {
-    const state = await ensureAutostart();
-    add('autostart', 'ok', `当前用户登录自启：${state.repaired ? '已自动恢复' : '已启用'}。`);
-  });
-  await check('service', async () => {
-    const state = await service.status();
-    add('service', state.running ? 'ok' : 'warning', state.running
-      ? `本机服务正常：${state.mode}，端口 ${state.port}，运行版本：${state.version || '未知'}` : '服务未就绪；安装后执行 relax start。');
-    if (state.running && installedVersion && state.version !== installedVersion) add('service-version', 'warning', state.version
-      ? `已安装版本 ${installedVersion}，但当前运行版本为 ${state.version}；请重新执行安装或重启工作站服务。`
-      : `已安装版本 ${installedVersion}，但当前运行的桌面服务未报告版本，可能仍是旧进程；请重新执行安装或重启桌面服务。`);
-    if (state.running) add('managed-app-server', state.managedAppServer?.state === 'ready' ? 'ok' : 'error',
-      state.managedAppServer?.state === 'ready' ? 'Codex 内核已就绪。'
-        : state.managedAppServer?.error || 'Codex 内核尚未就绪。');
-    if (state.managedAppServer?.updatePending) add('managed-app-server-update', 'warning',
-      '已选择另一版本 CLI；当前 app-server 继续完成任务，下次内核启动时采用选定版本。');
-    if (state.managedAppServer?.launcherRestartRequired) add('managed-app-server-launcher', 'warning',
-      '安装文件已经更新，但当前 app-server 仍由旧启动链创建；隐藏控制台等运行时修复尚未生效，请执行 relax setup 或重启 Windows。');
-  });
-  await check('desktop-recovery', async () => {
-    const state = await recoveryStatus(paths.stateRoot);
-    add('desktop-recovery', state.status === 'failed' ? 'warning' : 'ok',
-      `最近 Desktop 接入：${state.message || state.status}${state.error ? `；${state.error}` : ''}`);
-  });
-  await check('skill', async () => {
-    const state = inspectSkill(skillTarget);
-    add('skill', state.managed ? 'ok' : 'warning', state.managed ? '本包管理的 Skill 已安装。'
-      : state.installed ? '存在同名自定义 Skill，本包不会覆盖。' : 'Skill 未安装；重新执行 relax setup。');
-  });
-  add('firewall', 'warning', '移动端连通性未验证。首次启动请允许记录的 Node 在受信任的专用网络通信；若曾拒绝，可在 Windows 安全中心的防火墙“允许应用通过防火墙”中检查该 Node。不要关闭整个防火墙。');
-  return { ready: !checks.some(item => item.status === 'error'), lanAccess: 'unverified', checks };
-}
+import fs from 'node:fs';
+import path from 'node:path';
+import { readRecord } from './service-lifecycle.mjs';
+import { inspectSkill } from './skill-install.mjs';
+import { recoveryStatus } from './shared-recovery.mjs';
+
+export async function doctor({ paths, host, service, skillTarget, ensureAutostart }) {
+  const checks = [];
+  let installedVersion;
+  let kernelUpdate = null;
+  const add = (id, status, message) => checks.push({ id, status, message });
+  const check = async (id, task) => {
+    try { await task(); } catch (error) { add(id, 'error', error.message); }
+  };
+  await check('installation', async () => {
+    const record = readRecord(path.join(paths.serviceRoot, 'installation.json'));
+    if (!record || !fs.existsSync(path.join(paths.serviceRoot, 'dist/bin/codex-remote.mjs'))) throw Error('尚未完整部署服务，请重新安装 Code Relax。');
+    if (!record.nodeExecutable || !fs.existsSync(record.nodeExecutable)) throw Error('记录的 Node 已失效，请用可用的 Node 重新安装 Code Relax。');
+    installedVersion = record.version;
+    add('installation', 'ok', `已安装版本：${record.version}；Node：${record.nodeExecutable}`);
+  });
+  await check('bridge-runtime', async () => {
+    await host.bridgeEnvironment();
+    add('bridge-runtime', 'ok', '桌面服务启动环境已就绪；实际任务操作尚未验证。');
+  });
+  await check('network', async () => {
+    const address = await host.lanAddress();
+    if (!address) throw Error('未找到局域网 IPv4；请连接受信任的 Wi-Fi 或有线网络。');
+    add('network', 'ok', `局域网地址：${address}`);
+  });
+  await check('autostart', async () => {
+    const state = await ensureAutostart();
+    add('autostart', 'ok', `当前用户登录自启：${state.repaired ? '已自动恢复' : '已启用'}。`);
+  });
+  await check('service', async () => {
+    const state = await service.status();
+    add('service', state.running ? 'ok' : 'warning', state.running
+      ? `本机服务正常：${state.mode}，端口 ${state.port}，运行版本：${state.version || '未知'}` : '服务未就绪；安装后执行 relax start。');
+    if (state.running && installedVersion && state.version !== installedVersion) add('service-version', 'warning', state.version
+      ? `已安装版本 ${installedVersion}，但当前运行版本为 ${state.version}；请重新执行安装或重启工作站服务。`
+      : `已安装版本 ${installedVersion}，但当前运行的桌面服务未报告版本，可能仍是旧进程；请重新执行安装或重启桌面服务。`);
+    const currentVersion = state.managedAppServer?.version || null;
+    const selectedVersion = state.managedAppServer?.selectedVersion || null;
+    if (state.managedAppServer) kernelUpdate = { pending: state.managedAppServer.updatePending === true,
+      currentVersion, selectedVersion,
+      command: state.managedAppServer.updatePending ? 'relax kernel-restart --confirm' : null };
+    if (state.running) add('managed-app-server', state.managedAppServer?.state === 'ready' ? 'ok' : 'error',
+      state.managedAppServer?.state === 'ready' ? `Codex 内核已就绪：版本 ${currentVersion || '未知'}。`
+        : state.managedAppServer?.error || 'Codex 内核尚未就绪。');
+    if (state.managedAppServer?.updatePending) {
+      const versionDetail = currentVersion && selectedVersion && currentVersion === selectedVersion
+        ? `内核版本号未变（${currentVersion}），重启后将使用更新后的安装文件`
+        : `当前内核 ${currentVersion || '未知'}，待应用 ${selectedVersion || '未知'}`;
+      add('managed-app-server-update', 'warning',
+        `Codex 更新待应用：${versionDetail}；执行 relax kernel-restart --confirm 应用更新。`);
+    }
+    if (state.managedAppServer?.launcherRestartRequired) add('managed-app-server-launcher', 'warning',
+      '安装文件已经更新，但当前 app-server 仍由旧启动链创建；隐藏控制台等运行时修复尚未生效，请执行 relax setup 或重启 Windows。');
+  });
+  await check('desktop-recovery', async () => {
+    const state = await recoveryStatus(paths.stateRoot);
+    add('desktop-recovery', state.status === 'failed' ? 'warning' : 'ok',
+      `最近 Desktop 接入：${state.message || state.status}${state.error ? `；${state.error}` : ''}`);
+  });
+  await check('skill', async () => {
+    const state = inspectSkill(skillTarget);
+    add('skill', state.managed ? 'ok' : 'warning', state.managed ? '本包管理的 Skill 已安装。'
+      : state.installed ? '存在同名自定义 Skill，本包不会覆盖。' : 'Skill 未安装；重新执行 relax setup。');
+  });
+  add('firewall', 'warning', '移动端连通性未验证。首次启动请允许记录的 Node 在受信任的专用网络通信；若曾拒绝，可在 Windows 安全中心的防火墙“允许应用通过防火墙”中检查该 Node。不要关闭整个防火墙。');
+  return { ready: !checks.some(item => item.status === 'error'), lanAccess: 'unverified', kernelUpdate, checks };
+}

package/dist/src/service-lifecycle.mjs

@@ -1,6 +1,6 @@
 import fs from 'node:fs';
 import path from 'node:path';
-import { startBackground, processAlive } from './background-process.mjs';
+import { startBackground, processAlive } from './background-process.mjs';
 import { randomBytes, randomUUID } from 'node:crypto';
 import { setTimeout as delay } from 'node:timers/promises';
 import { fileURLToPath } from 'node:url';
@@ -27,7 +27,7 @@ export function lifecycle({ stateRoot, host }) {
 
   async function alive(session) {
     if (!session?.controlPort || !session.instanceId || !session.controlSecret) {
-      if (await health(session)) throw new Error('当前为旧版桌面服务，请先使用旧版停止入口结束服务，再启动新版。');
+      if (await health(session)) throw new Error('当前为旧版桌面服务，请先使用旧版停止入口结束服务，再启动新版。');
       return false;
     }
     try { await controlRequest(session); return true; }
@@ -35,7 +35,7 @@ export function lifecycle({ stateRoot, host }) {
   }
   async function stop() {
     const session = readRecord(sessionPath);
-    if (!await alive(session)) return { stopped: true, message: '桌面服务已停止。' };
+    if (!await alive(session)) return { stopped: true, message: '桌面服务已停止。' };
     await controlRequest(session, 'POST');
     const deadline = Date.now() + 10000;
     while (true) {
@@ -45,50 +45,51 @@ export function lifecycle({ stateRoot, host }) {
         // Verify refusal on the next connection; never resend the shutdown request.
         if (error.code !== 'ECONNRESET') throw error;
       }
-      if (Date.now() > deadline) throw new Error('桌面服务未在 10 秒内退出；未强杀进程。');
+      if (Date.now() > deadline) throw new Error('桌面服务未在 10 秒内退出；未强杀进程。');
       await delay(100);
     }
-    return { stopped: true, message: '桌面服务已正常关闭。' };
+    return { stopped: true, message: '桌面服务已正常关闭。' };
   }
   async function status() {
     const session = readRecord(sessionPath);
     const running = await alive(session);
-    const result = running ? await health(session) : null;
-    return { running: running && result?.status === 'ok', processRunning: running, pid: session?.pid,
-      port: session?.port, mode: result?.transportMode, version: result?.version, execution: result?.execution,
-      managedAppServer: result?.managedAppServer, desktop: result?.desktop,
-      desktopRestartRecommended: result?.desktopRestartRecommended === true,
-      resident: result?.resident === true };
+    const result = running ? await health(session) : null;
+    return { running: running && result?.status === 'ok', processRunning: running, pid: session?.pid,
+      port: session?.port, mode: result?.transportMode, version: result?.version, execution: result?.execution,
+      managedAppServer: result?.managedAppServer, desktop: result?.desktop,
+      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) {
-      throw new Error('没有健康的局域网服务，请先执行 relax start。');
+      throw new Error('没有健康的局域网服务，请先执行 relax start。');
     }
     const address = await host.lanAddress();
     const url = new URL(session.accessUrl);
-    url.hostname = address || '127.0.0.1';
+    url.hostname = address || '127.0.0.1';
     session.accessUrl = url.href;
     writeRecord(sessionPath, session);
-    return { pid: session.pid, port: session.port, transportMode: connection.transportMode,
-      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('桌面服务尚未运行，无法迁移 Codex 内核。');
-    return controlRequest(session, 'POST', 'restart-managed-app-server');
-  }
-  async function start() {
-    let session = readRecord(sessionPath);
-    if (await alive(session)) {
+    return { pid: session.pid, port: session.port, transportMode: connection.transportMode,
+      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(confirmed = false) {
+    const session = readRecord(sessionPath);
+    if (!await alive(session)) throw new Error('桌面服务尚未运行，无法迁移 Codex 内核。');
+    const action = confirmed ? 'restart-managed-app-server-confirmed' : 'restart-managed-app-server';
+    return controlRequest(session, 'POST', action);
+  }
+  async function startBridge() {
+    let session = readRecord(sessionPath);
+    if (await alive(session)) {
       const result = await health(session);
-      if (session.scriptPath === scriptPath && session.lan && result?.status === 'ok' && result.resident) {
-        await controlRequest(session, 'POST', 'refresh-execution');
-        return pair();
-      }
+      if (session.scriptPath === scriptPath && session.lan && result?.status === 'ok' && result.resident) {
+        await controlRequest(session, 'POST', 'refresh-execution');
+        return pair();
+      }
       await stop();
     }
     let config = readRecord(configPath);
@@ -97,24 +98,24 @@ export function lifecycle({ stateRoot, host }) {
     if (!Number.isInteger(config.port) || config.port < 1 || config.port > 65535 || !/^[A-Za-z0-9_-]{20,}$/.test(config.token)) {
       throw new Error('bridge-config.json 中端口或 Token 无效；不会自动重置凭据。');
     }
-    const address = await host.lanAddress() || '127.0.0.1';
-    const { executable, environment } = await host.bridgeEnvironment();
-    writeRecord(configPath, config);
+    const address = await host.lanAddress() || '127.0.0.1';
+    const { executable, environment } = await host.bridgeEnvironment();
+    writeRecord(configPath, config);
     const instanceId = randomUUID();
     const controlSecret = randomBytes(32).toString('base64url');
     const readyPath = path.join(stateRoot, `bridge-ready-${instanceId}.json`);
-    const pid = await startBackground(executable, [scriptPath, '--lan', '--port', String(config.port), '--token', config.token],
-      { ...environment, CODEX_REMOTE_INSTANCE: instanceId, CODEX_REMOTE_CONTROL_SECRET: controlSecret,
-        CODEX_REMOTE_READY_PATH: readyPath }, [path.join(stateRoot, 'bridge.stdout.log'), path.join(stateRoot, 'bridge.stderr.log')]);
+    const pid = await startBackground(executable, [scriptPath, '--lan', '--port', String(config.port), '--token', config.token],
+      { ...environment, CODEX_REMOTE_INSTANCE: instanceId, CODEX_REMOTE_CONTROL_SECRET: controlSecret,
+        CODEX_REMOTE_READY_PATH: readyPath }, [path.join(stateRoot, 'bridge.stdout.log'), path.join(stateRoot, 'bridge.stderr.log')]);
     try {
       const deadline = Date.now() + 10000;
       let ready;
       while (!(ready = readRecord(readyPath))) {
-        if (!processAlive(pid)) throw new Error('桌面服务启动失败，请查看 bridge.stderr.log。');
-        if (Date.now() > deadline) throw new Error('桌面服务未在 10 秒内就绪。');
+        if (!processAlive(pid)) throw new Error('桌面服务启动失败，请查看 bridge.stderr.log。');
+        if (Date.now() > deadline) throw new Error('桌面服务未在 10 秒内就绪。');
         await delay(100);
       }
-      if (ready.instanceId !== instanceId || ready.pid !== pid) throw new Error('桌面服务启动实例不匹配。');
+      if (ready.instanceId !== instanceId || ready.pid !== pid) throw new Error('桌面服务启动实例不匹配。');
       session = { ...ready, controlSecret, executablePath: executable, scriptPath, port: config.port,
         lan: true, appServer: false, accessUrl: `http://${address}:${config.port}/?token=${config.token}`,
         startedAt: new Date().toISOString() };
@@ -122,9 +123,16 @@ export function lifecycle({ stateRoot, host }) {
       writeRecord(sessionPath, session);
       return await pair();
     } catch (error) {
-      if (processAlive(pid)) process.kill(pid);
+      if (processAlive(pid)) process.kill(pid);
       throw error;
     } finally { fs.rmSync(readyPath, { force: true }); }
   }
-  return { start, pair, status, stop, restartManagedAppServer };
-}
+  async function start() {
+    const result = await startBridge();
+    if (fs.existsSync(path.join(stateRoot, 'self-relay-config.json'))) {
+      await controlRequest(readRecord(sessionPath), 'POST', 'relay-start');
+    }
+    return result;
+  }
+  return { start, pair, status, stop, restartManagedAppServer };
+}