@walkhi/code-relax 0.1.0-beta.8 → 0.1.0-beta.80

package/dist/src/service-control.mjs

@@ -22,14 +22,24 @@ export async function openControl({ instanceId, secret, shutdown, status = () =>
     response.setHeader('Content-Type', 'application/json');
     response.setHeader('Connection', 'close');
     if (action) {
-      Promise.resolve().then(() => actions[action]()).then(result => {
+      Promise.resolve().then(async () => {
+        let body = '';
+        request.setEncoding('utf8');
+        for await (const chunk of request) {
+          body += chunk;
+          if (Buffer.byteLength(body) > 4096) throw new Error('管理请求过大');
+        }
+        const details = body ? JSON.parse(body) : {};
+        if (!details || typeof details !== 'object' || Array.isArray(details)) throw new Error('无效管理请求');
+        return actions[action](details);
+      }).then(result => {
         response.end(JSON.stringify({ ...result, instanceId, pid: process.pid }));
       }).catch(error => { response.writeHead(409).end(JSON.stringify({ error: error.message })); });
       return;
     }
     if (request.method === 'POST') response.once('finish', () => {
       Promise.resolve(shutdown()).catch(error => {
-        console.error('Bridge 关闭失败：', error.message);
+        console.error('桌面服务关闭失败：', error.message);
         process.exitCode = 1;
       });
     });
@@ -44,7 +54,7 @@ export async function openControl({ instanceId, secret, shutdown, status = () =>
   }) };
 }
 
-export function controlRequest(session, method = 'GET', action = '') {
+export function controlRequest(session, method = 'GET', action = '', details) {
   return new Promise((resolve, reject) => {
     const request = http.request({ hostname: '127.0.0.1', port: session.controlPort,
       path: `/${session.instanceId}${action ? '/' + action : ''}`, method, agent: false,
@@ -56,17 +66,17 @@ export function controlRequest(session, method = 'GET', action = '') {
       response.on('end', () => {
         try {
           if (response.statusCode === 409) throw new Error(JSON.parse(body).error);
-          if (response.statusCode !== 200) throw new Error('Bridge 管理通道身份验证失败。');
+          if (response.statusCode !== 200) throw new Error('桌面服务管理通道身份验证失败。');
           const identity = JSON.parse(body);
           if (identity.instanceId !== session.instanceId || identity.pid !== session.pid) {
-            throw new Error('Bridge 实例身份不匹配。');
+            throw new Error('桌面服务实例身份不匹配。');
           }
           resolve(identity);
         } catch (error) { reject(error); }
       });
     });
-    request.on('timeout', () => request.destroy(new Error('Bridge 管理通道响应超时。')));
+    request.on('timeout', () => request.destroy(new Error('桌面服务管理通道响应超时。')));
     request.on('error', reject);
-    request.end();
+    request.end(details === undefined ? undefined : JSON.stringify(details));
   });
 }

package/dist/src/service-doctor.mjs

@@ -1,70 +1,150 @@
-import fs from 'node:fs';
-import path from 'node:path';
-import { readRecord } from './service-lifecycle.mjs';
-import { inspectSkill } from './skill-install.mjs';
-import { readManagedEnvironment } from './platform/windows/user-environment.mjs';
-import { managedAppServerUrl } from './managed-app-server.mjs';
-
-export async function doctor({ paths, host, service, skillTarget }) {
-  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}`);
-  });
-  let sharedUrl;
-  await check('shared-service', async () => {
-    sharedUrl = await host.sharedServiceUrl();
-    add('shared-service', 'ok', sharedUrl ? '完整控制连接可用。' : '当前使用基础控制。');
-  });
-  await check('desktop', async () => {
-    await host.desktopEnvironment(readRecord(path.join(paths.stateRoot, 'bridge-startup-context.json')), sharedUrl);
-    add('desktop', 'ok', 'Desktop 来源上下文和工具管道已定位；实际任务操作尚未验证。');
-  });
-  await check('network', async () => {
-    const address = await host.lanAddress();
-    if (!address) throw Error('未找到局域网 IPv4；请连接受信任的 Wi-Fi 或有线网络。');
-    add('network', 'ok', `局域网地址：${address}`);
-  });
-  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}，但当前运行 Bridge 未报告版本，可能仍是旧进程；请重新执行安装或重启工作站服务。`);
-    if (state.running) add('managed-app-server', state.managedAppServer?.state === 'ready' ? 'ok' : 'error',
-      state.managedAppServer?.state === 'ready' ? '受管 app-server 已就绪。'
-        : 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();
-    if (environment.forceCliUser === '1' || environment.forceCliMachine === '1') {
-      add('desktop-environment', 'error', 'CODEX_APP_SERVER_FORCE_CLI=1 会阻止 Desktop 使用受管 app-server。');
-    } else if (environment.userValue === managedAppServerUrl) {
-      add('desktop-environment', 'ok', `Desktop 后续启动地址：${managedAppServerUrl}`);
-    } else {
-      add('desktop-environment', 'warning', environment.userValue
-        ? `用户配置了其他 app-server 地址：${environment.userValue}`
-        : '尚未配置 Desktop 后续启动地址；请重新执行 setup。');
-    }
-  });
-  await check('skill', async () => {
-    const state = inspectSkill(skillTarget);
-    add('skill', state.managed ? 'ok' : 'warning', state.managed ? '本包管理的 Skill 已安装。'
-      : state.installed ? '存在同名自定义 Skill，本包不会覆盖。' : '可执行 relax skill-install 安装 Skill。');
-  });
-  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 os from 'node:os';
+import { readRecord } from './service-lifecycle.mjs';
+import { inspectSkill } from './skill-install.mjs';
+import { recoveryStatus } from './shared-recovery.mjs';
+
+export function packageDeploymentCheck(cliVersion, installedVersion) {
+  if (!cliVersion) return { id: 'package-version', status: 'warning', message: '无法读取当前 CLI 包版本，未确认本次部署版本。' };
+  if (cliVersion !== installedVersion) return { id: 'package-version', status: 'error',
+    message: `当前 CLI 包为 ${cliVersion}，固定服务为 ${installedVersion || '未确认'}；本次包尚未完整部署。安装脚本可能未执行或执行失败，不能仅凭 npm 警告判断。请查看 install.log；确认允许部署并中断相关任务后，执行 relax setup，再运行 relax doctor。无需放开全局 npm 脚本权限。` };
+  return { id: 'package-version', status: 'ok', message: `CLI 与固定服务版本一致：${cliVersion}。这不单独证明本次 postinstall 执行过；当前可用性以下方服务和内核检查为准。` };
+}
+
+export async function doctor({ paths, host, service, skillTarget, ensureAutostart, cliVersion, diagnostics = false }) {
+  const checks = [];
+  let installedVersion;
+  let kernelUpdate = null;
+  let desktopRecovery = null;
+  let serviceState = 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('尚未完整部署服务；安装脚本可能未执行或执行失败。请查看 install.log，确认部署后执行 relax setup，再运行 relax doctor；不能仅凭 npm 警告判断原因。');
+    if (!record.nodeExecutable || !fs.existsSync(record.nodeExecutable)) throw Error('记录的 Node 已失效，请用可用的 Node 重新安装 Code Relax。');
+    installedVersion = record.version;
+    add('installation', 'ok', `已安装版本：${record.version}；Node：${record.nodeExecutable}`);
+  });
+  checks.push(packageDeploymentCheck(cliVersion, installedVersion));
+  await check('bridge-runtime', async () => {
+    await host.bridgeEnvironment();
+    add('bridge-runtime', 'ok', '桌面服务启动环境正常。');
+  });
+  await check('network', async () => {
+    const address = await host.lanAddress();
+    if (!address) { add('network', 'warning', '未连接局域网；需要局域网连接时，请接入 Wi-Fi 或有线网络。'); return; }
+    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();
+    serviceState = state;
+    if (state.keepAwake) {
+      const power = state.keepAwake;
+      add('keep-awake', power.enabled && !power.active ? 'warning' : 'ok',
+        power.active ? '保持唤醒已生效，允许屏幕熄灭。' : !power.enabled ? '保持唤醒已由 CLI 关闭。'
+          : `保持唤醒未生效：${power.error || '未知原因'}；可执行 relax keep-awake on 重新申请。`);
+    }
+    add('service', state.running ? 'ok' : 'error', state.running
+      ? `本机服务正常：${state.mode}，端口 ${state.port}，运行版本：${state.version || '未知'}` : '服务未就绪；安装后执行 relax start。');
+    if (state.running && installedVersion && state.version !== installedVersion) add('service-version', 'error', state.version
+      ? `已安装版本 ${installedVersion}，但当前运行版本为 ${state.version}；请重新执行安装或重启工作站服务。`
+      : `已安装版本 ${installedVersion}，但无法确认运行服务版本；请保留诊断结果核查，不能据此认定旧进程或自动重启。`);
+    if (state.running) add('execution', state.execution?.ready === true && state.execution?.canWrite === true ? 'ok' : 'error',
+      state.execution?.ready === true && state.execution?.canWrite === true
+        ? 'Codex 完整控制通道已就绪；单个对话的写入权限需在打开该对话时确认。' : 'Codex 完整控制尚未确认就绪且可写；请查看内核和连接诊断，不能仅凭服务在线判定健康。');
+    if (state.running && state.desktop) {
+      const descriptions = {
+        managed: '桌面端已接入 Code Relax 内核。',
+        ordinary: '桌面端正在独立运行，未接入 Code Relax 内核；若同一对话报写入冲突，请核对桌面端占用。',
+        stopped: '桌面端未启动；手机可独立使用已就绪的内核。',
+        unsupported: '当前平台未提供桌面端接入。',
+      };
+      add('desktop', 'ok', state.desktop.installed === false && state.desktop.state !== 'unsupported'
+        ? '未安装桌面端；手机可独立使用已就绪的内核。'
+        : descriptions[state.desktop.state] || '桌面端接入状态暂未确认。');
+    }
+    const currentVersion = state.managedAppServer?.version || null;
+    if (state.discoveryError) add('kernel-discovery', 'warning',
+      `最新内核检查失败，当前运行状态不代表已使用最新版：${state.discoveryError}`);
+    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 内核尚未就绪。'} 请执行 relax setup 修复；若提示未安装或未登录 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',
+      '工作站更新尚未完全生效，请执行 relax setup。');
+  });
+  if (diagnostics) {
+    try { desktopRecovery = await recoveryStatus(paths.stateRoot); }
+    catch (error) { desktopRecovery = { status: 'unknown', error: error.message }; }
+  }
+  await check('skill', async () => {
+    const state = inspectSkill(skillTarget);
+    add('skill', state.managed ? 'ok' : 'warning', state.managed ? '本包管理的 Skill 已安装。'
+      : state.installed ? '存在同名自定义 Skill，本包不会覆盖。' : 'Skill 未安装；重新执行 relax setup。');
+  });
+  return { ready: !checks.some(item => item.status === 'error'), kernelUpdate, checks, ...(diagnostics ? { desktopRecovery, diagnostics: {
+    collectedAt: new Date().toISOString(), platform: process.platform, arch: process.arch, osRelease: os.release(),
+    nodeVersion: process.version, nodeExecutable: process.execPath, serviceRoot: paths.serviceRoot,
+    servicePid: serviceState?.pid || null, port: serviceState?.port || null, serviceVersion: serviceState?.version || null,
+    kernel: serviceState?.managedAppServer ? {
+      version: serviceState.managedAppServer.version || null,
+      executable: serviceState.managedAppServer.executable || null,
+      selectedVersion: serviceState.managedAppServer.selectedVersion || null,
+      preferredExecutable: serviceState.managedAppServer.preferredExecutable || null,
+      selectedSource: serviceState.managedAppServer.source || null,
+    } : null,
+  } } : {}) };
+}
+
+export function formatDoctorOutput(result, detail = false) {
+  const labels = { 'keep-awake': '保持唤醒', installation: '安装文件', 'bridge-runtime': '运行环境', network: '局域网',
+    autostart: '登录自启动', service: '工作站服务', 'managed-app-server': 'Codex 内核',
+    execution: '完整控制', desktop: 'Codex 桌面端', 'kernel-discovery': '内核发现', 'package-version': '安装包版本', 'service-version': '服务版本', 'managed-app-server-update': 'Codex 更新',
+    'managed-app-server-launcher': '工作站更新', skill: 'Codex Skill' };
+  const byId = id => result.checks.find(item => item.id === id);
+  const summary = (id, success) => {
+    const item = byId(id);
+    return `${labels[id]}：${!item ? '未检查（工作站服务尚未启动）' : item.status === 'ok' ? success : '异常，见下方处理方法'}`;
+  };
+  const issues = result.checks.filter(item => item.status !== 'ok');
+  const lines = [result.ready ? '工作站检查通过。' : '工作站检查发现问题。',
+    summary('installation', '完整'), summary('package-version', 'CLI 与固定服务一致'), summary('service', '正在运行'), summary('managed-app-server', '已就绪'), summary('execution', '通道已就绪（不代表每个对话均可写）')];
+  if (issues.length) lines.push('', '需要处理或留意：', ...issues.map(item => `- ${labels[item.id] || item.id}：${item.message}`));
+  if (detail) {
+    const info = result.diagnostics || {};
+    lines.unshift('Code Relax 诊断报告（供客服或技术人员排查）', `采集时间：${info.collectedAt || '未知'}`,
+      `系统：${info.platform || process.platform} ${info.arch || process.arch} ${info.osRelease || ''}`,
+      `Node：${info.nodeVersion || process.version}；${info.nodeExecutable || process.execPath}`,
+      `服务目录：${info.serviceRoot || '未知'}`, `服务进程：${info.servicePid || '未运行'}；端口：${info.port || '未知'}`, '');
+    lines.push('', '检查详情：', ...result.checks.filter(item => item.status === 'ok').map(item => `- ${labels[item.id] || item.id}：${item.message}`));
+    if (info.kernel) lines.push('',
+      `运行内核：${info.kernel.version || '未知'}；${info.kernel.executable || '路径未知'}`,
+      `候选内核：${info.kernel.selectedVersion || '未知'}；来源 ${info.kernel.selectedSource || '未知'}；${info.kernel.preferredExecutable || '路径未知'}`);
+    const recovery = result.desktopRecovery;
+    if (recovery && !['none', 'unsupported'].includes(recovery.status)) {
+      const status = { failed: '未完成', completed: '已完成', succeeded: '已完成', running: '进行中', unknown: '无法读取' }[recovery.status] || recovery.status;
+      lines.push('', `Desktop 接入排障记录（仅用于排查上次接入，不代表当前服务状态）：上次 Codex Desktop 接入${status}。`);
+      if (recovery.error) lines.push(`记录原因：${recovery.error}`);
+    }
+  }
+  lines.push('', result.ready ? '添加手机：运行 relax pair 生成配对二维码。' : '按上述方法处理后，再运行 relax doctor。');
+  return lines.join('\n');
+}

package/dist/src/service-health.mjs

@@ -14,7 +14,7 @@ export function serviceHealth(session) {
       socket.terminate();
       if (error) reject(error); else resolve(value);
     };
-    const timer = setTimeout(() => finish(new Error('Bridge 健康检查超时。')), 6000);
+    const timer = setTimeout(() => finish(new Error('桌面服务健康检查超时。')), 6000);
     socket.on('open', () => socket.send(JSON.stringify({ type: 'auth', token })));
     socket.on('message', data => {
       try {
@@ -28,6 +28,6 @@ export function serviceHealth(session) {
     });
     socket.on('error', error => finish(error.code === 'ECONNREFUSED' ? null : error));
     socket.on('close', code => finish(new Error(code === 1008
-      ? 'Bridge 健康检查鉴权失败。' : 'Bridge 健康检查连接已断开。')));
+      ? '桌面服务健康检查鉴权失败。' : '桌面服务健康检查连接已断开。')));
   });
 }

package/dist/src/service-install.mjs

@@ -20,10 +20,11 @@ export function packageRoot(from) {
 export async function installService(source, target, executable, stateRoot, hooks = {}) {
   assertPlainPath(target);
   if (!fs.existsSync(path.join(source, 'dist/bin/codex-remote.mjs'))) throw new Error('缺少发布构建；源码目录请先执行 npm run build。');
+  const build = readRecord(path.join(source, 'dist/build-platform.json'));
+  if (build?.platform !== process.platform || build?.arch !== process.arch)
+    throw new Error('构建产物与本机系统或 CPU 不匹配，请在目标工作站安装依赖并重新构建。');
   if (!fs.existsSync(path.join(source, 'node_modules'))) throw new Error('缺少包依赖，请重新安装完整 npm 包。');
   const parent = path.dirname(target);
-  const legacyUploadsRoots = readRecord(path.join(target, 'installation.json'))?.legacyUploadsRoots || [];
-  if (fs.existsSync(path.join(source, 'src/server.mjs'))) legacyUploadsRoots.push(path.join(source, 'uploads'));
   fs.mkdirSync(parent, { recursive: true });
   const stage = path.join(parent, `service-stage-${randomUUID()}`);
   const backup = path.join(parent, `service-backup-${randomUUID()}`);
@@ -34,8 +35,13 @@ export async function installService(source, target, executable, stateRoot, hook
     }
     await exec(executable, [path.join(stage, 'dist/bin/codex-remote.mjs'), '--help'], { windowsHide: true });
     await exec(executable, ['-e', 'const r=require("node:module").createRequire(process.argv[1]); r("sharp"); r("qrcode"); r("ws"); r("node-datachannel");', path.join(stage, 'package.json')], { windowsHide: true });
-    writeRecord(path.join(stage, 'installation.json'), { installedAt: new Date().toISOString(), source, nodeExecutable: executable, stateRoot,
-      legacyUploadsRoots: [...new Set(legacyUploadsRoots)],
+    const previousInstallation = readRecord(path.join(target, 'installation.json'));
+    const npmCliPath = process.env.npm_execpath || previousInstallation?.npmCliPath;
+    const npmPrefix = process.env.npm_config_prefix || previousInstallation?.npmPrefix;
+    writeRecord(path.join(stage, 'installation.json'), {
+      npmCliPath: npmCliPath && path.isAbsolute(npmCliPath) && fs.existsSync(npmCliPath) ? fs.realpathSync(npmCliPath) : null,
+      npmPrefix: npmPrefix && path.isAbsolute(npmPrefix) ? npmPrefix : null,
+      installedAt: new Date().toISOString(), source, nodeExecutable: executable, stateRoot,
       version: readRecord(path.join(source, 'package.json')).version });
     const previous = fs.existsSync(target);
     let previousMoved = false, activated = false;
@@ -67,7 +73,7 @@ export async function installService(source, target, executable, stateRoot, hook
   }
 }
 
-export async function uninstallService({ serviceRoot, stateRoot, uploadsRoot, credentialsRoot }, service, beforeRemove = async () => {}) {
+export async function uninstallService({ serviceRoot, stateRoot, uploadsRoot, credentialsRoot }, service, beforeRemove = async () => {}) {
   const target = path.resolve(serviceRoot);
   assertPlainPath(target);
   if (path.basename(target) !== 'service' || path.basename(path.dirname(target)) !== 'CodexRemote') throw new Error('拒绝删除未识别的服务目录。');
@@ -76,11 +82,11 @@ export async function uninstallService({ serviceRoot, stateRoot, uploadsRoot, cr
     const relative = path.relative(target, path.resolve(data));
     if (!relative || (!relative.startsWith(`..${path.sep}`) && relative !== '..' && !path.isAbsolute(relative))) throw new Error('服务目录包含用户数据，拒绝删除。');
   }
-  if (!fs.existsSync(target)) {
-    await service.stop();
-    await beforeRemove();
-    return { removed: false, serviceRoot: target, preserved };
-  }
+  if (!fs.existsSync(target)) {
+    await service.stop();
+    await beforeRemove();
+    return { removed: false, serviceRoot: target, preserved };
+  }
   const pkg = readRecord(path.join(target, 'package.json'));
   const record = readRecord(path.join(target, 'installation.json'));
   if (pkg?.name !== '@walkhi/code-relax' || !record?.installedAt || !record?.nodeExecutable) throw new Error('缺少有效安装记录，未删除服务目录。');

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';
@@ -23,12 +23,11 @@ export function lifecycle({ stateRoot, host }) {
   fs.mkdirSync(stateRoot, { recursive: true });
   const sessionPath = path.join(stateRoot, 'bridge-session.json');
   const configPath = path.join(stateRoot, 'bridge-config.json');
-  const contextPath = path.join(stateRoot, 'bridge-startup-context.json');
   const scriptPath = fileURLToPath(new URL('./server.mjs', import.meta.url));
 
   async function alive(session) {
     if (!session?.controlPort || !session.instanceId || !session.controlSecret) {
-      if (await health(session)) throw new Error('当前为旧版 Bridge，请先使用旧版停止入口结束服务，再启动新版。');
+      if (await health(session)) throw new Error('当前为旧版桌面服务，请先使用旧版停止入口结束服务，再启动新版。');
       return false;
     }
     try { await controlRequest(session); return true; }
@@ -36,7 +35,7 @@ export function lifecycle({ stateRoot, host }) {
   }
   async function stop() {
     const session = readRecord(sessionPath);
-    if (!await alive(session)) return { stopped: true, message: 'Bridge 已停止。' };
+    if (!await alive(session)) return { stopped: true, message: '桌面服务已停止。' };
     await controlRequest(session, 'POST');
     const deadline = Date.now() + 10000;
     while (true) {
@@ -46,53 +45,53 @@ 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('Bridge 未在 10 秒内退出；未强杀进程。');
+      if (Date.now() > deadline) throw new Error('桌面服务未在 10 秒内退出；未强杀进程。');
       await delay(100);
     }
-    return { stopped: true, message: 'Bridge 已正常关闭。' };
+    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,
+    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 };
+      discoveryError: result?.discoveryError,
+      keepAwake: result?.keepAwake,
+      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('Bridge 尚未运行，无法迁移受管 app-server。');
-    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, version: connection.version, 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) {
-        const context = readRecord(contextPath) || {};
-        const sourceThreadId = process.env.CODEX_THREAD_ID || process.env.CODEX_SESSION_ID || context.sourceThreadId;
-        writeRecord(contextPath, { sourceThreadId });
-        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);
@@ -101,25 +100,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.desktopEnvironment(readRecord(contextPath), '');
+    const address = await host.lanAddress() || '127.0.0.1';
+    const { executable, environment } = await host.bridgeEnvironment();
     writeRecord(configPath, config);
-    writeRecord(contextPath, { sourceThreadId: environment.CODEX_THREAD_ID || environment.CODEX_SESSION_ID });
     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 启动失败，请查看 bridge.stderr.log。');
-        if (Date.now() > deadline) throw new Error('Bridge 未在 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('Bridge 启动实例不匹配。');
+      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() };
@@ -127,9 +125,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 };
+}

package/dist/src/service-power.mjs

@@ -0,0 +1,58 @@
+import path from 'node:path';
+import { readRecord, writeRecord } from './service-lifecycle.mjs';
+import { launchPowerInhibitor } from './platform/power-inhibitor.mjs';
+
+export const powerConfigPath = stateRoot => path.join(stateRoot, 'keep-awake.json');
+export const powerEnabled = stateRoot => readRecord(powerConfigPath(stateRoot))?.enabled !== false;
+
+export function createPowerManager(stateRoot, { launch = launchPowerInhibitor, report = console.error } = {}) {
+  let enabled = powerEnabled(stateRoot), active = false, error = '', child = null, closed, stopping = false;
+  let queue = Promise.resolve();
+  const snapshot = () => ({ enabled, active, error });
+  async function release() {
+    if (!child) return;
+    stopping = true;
+    child.stdin.end();
+    await closed;
+  }
+  async function acquire() {
+    if (child || !enabled) return;
+    error = '';
+    try {
+      const process = launch();
+      stopping = false;
+      child = process;
+      let stderr = '', output = '';
+      process.stderr.on('data', data => { stderr = (stderr + data).slice(-2048); });
+      process.stdin.on('error', cause => { if (cause.code !== 'EPIPE') report(`保持唤醒通道异常：${cause.message}`); });
+      closed = new Promise(resolve => process.once('close', code => {
+        if (active && !stopping) { error = stderr.trim() || `保持唤醒进程意外退出（${code}）`; report(error); }
+        child = null; active = false; resolve();
+      }));
+      await new Promise((resolve, reject) => {
+        const timer = setTimeout(() => { process.kill(); reject(new Error('保持唤醒申请超时')); }, 8000);
+        const finish = cause => { clearTimeout(timer); cause ? reject(cause) : resolve(); };
+        process.once('error', finish);
+        process.once('close', code => {
+          finish(new Error(stderr.trim() || `保持唤醒进程已退出（${code}）`));
+        });
+        process.stdout.on('data', data => {
+          output += data;
+          if (output.includes('ready\n') || output.includes('ready\r\n')) { active = true; finish(); }
+        });
+      });
+    } catch (cause) { error = cause.message; report(`保持唤醒未生效：${error}`); }
+  }
+  const serial = task => { const result = queue.then(task); queue = result.catch(() => {}); return result; };
+  return {
+    snapshot,
+    start: () => serial(async () => { await acquire(); return snapshot(); }),
+    setEnabled: value => serial(async () => {
+      writeRecord(powerConfigPath(stateRoot), { enabled: value });
+      enabled = value;
+      if (enabled) await acquire(); else { await release(); error = ''; }
+      return snapshot();
+    }),
+    close: () => serial(async () => { enabled = false; await release(); }),
+  };
+}