@walkhi/code-relax 0.1.0-beta.35 → 0.1.0-beta.36

package/dist/bin/codex-remote.mjs

@@ -265,7 +265,8 @@ async function main() {
     if (previousInstallation?.nodeExecutable) await removeDesktopShortcut({ serviceRoot, nodeExecutable: previousInstallation.nodeExecutable });
     const desktopBeforeSetup = desktopHost.desktopIntegration === false ? { running: false, desktop: null } : await desktopHost.inspect();
     const runtime = await resolveCodexRuntime(physicalStateRoot, { refresh: true });
-    const desktopNeedsAttach = desktopBeforeSetup.running && !await host.sharedServiceUrl();
+    const preserveCodex = options.includes('--preserve-codex');
+    const desktopNeedsRestart = desktopBeforeSetup.running && !preserveCodex;
     const previous = hadInstalledService ? await service.status() : { processRunning: false };
     const legacyRelaySession = readRecord(path.join(stateRoot, 'self-relay-session.json'));
     const previousRelay = legacyRelaySession ? await controlRequest(legacyRelaySession) : await selfRelay('relay-status', stateRoot);
@@ -286,7 +287,7 @@ async function main() {
     let stoppedForUpdate = false;
     const installed = await installService(packageRoot(path.dirname(fileURLToPath(import.meta.url))), serviceRoot, executable, physicalStateRoot, {
       beforeActivate: async () => {
-        if (desktopNeedsAttach) await desktopHost.closeDesktop(desktopBeforeSetup.desktop);
+        if (desktopNeedsRestart) await desktopHost.closeDesktop(desktopBeforeSetup.desktop);
         stoppedForUpdate = resumeAfterUpdate;
         if (previousRelay.running && legacyRelaySession) {
           await controlRequest(legacyRelaySession, 'POST');
@@ -315,46 +316,45 @@ async function main() {
       ? await configureManagedEnvironment(physicalStateRoot) : { configured: false, reason: desktopHost.desktopIntegration === false ? 'desktop-integration-unsupported' : 'desktop-not-installed' };
     let managedAppServerMigrated = false;
     const managedAppServerMigration = {
-      required: bridge.managedAppServer.launcherRestartRequired === true,
+      required: bridge.managedAppServer.launcherRestartRequired === true || bridge.managedAppServer.updatePending === true,
+      reason: bridge.managedAppServer.updatePending ? 'runtime-update' : bridge.managedAppServer.launcherRestartRequired ? 'launcher-migration' : null,
       restarted: false,
       previousPid: bridge.managedAppServer.pid || null,
+      previousVersion: bridge.managedAppServer.version || null,
     };
     let desktopRestarted = false;
-    let desktopRestartReason = null;
-    if (managedAppServerMigration.required) {
-      const desktopInfo = desktopHost.desktopIntegration === false ? { running: false } : await desktopHost.inspect();
-      const desktopAttached = desktopInfo.running
-        && (bridge.desktop?.attachedToManagedServer === true || Boolean(await host.sharedServiceUrl()));
-      if (desktopAttached) await desktopHost.closeDesktop(desktopInfo.desktop);
-      await service.restartManagedAppServer();
-      const migrationDeadline = Date.now() + 40_000;
+    if (managedAppServerMigration.required && !preserveCodex) {
+      const requested = await service.restartManagedAppServer(true);
+      const operationId = requested.restart?.operationId;
+      if (!operationId) throw new Error('安装更新未取得 Codex 内核重启操作编号。');
+      const complete = () => bridge.running && bridge.managedAppServer?.state === 'ready'
+        && bridge.managedAppServer.restart?.operationId === operationId
+        && bridge.managedAppServer.restart.status === 'completed'
+        && !bridge.managedAppServer.launcherRestartRequired && !bridge.managedAppServer.updatePending;
+      const migrationDeadline = Date.now() + 60_000;
       do {
         await delay(250);
         bridge = await service.status();
-        if (bridge.managedAppServer?.restart?.status === 'failed') {
-          throw new Error(bridge.managedAppServer.restart.error || 'Codex 内核启动链迁移失败。');
+        if (bridge.managedAppServer?.restart?.operationId === operationId && bridge.managedAppServer.restart.status === 'failed') {
+          throw new Error(bridge.managedAppServer.restart.error || '安装期间 Codex 内核更新失败。');
         }
-      } 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('Codex 内核未在 40 秒内完成启动链迁移。');
-      }
+      } while (Date.now() < migrationDeadline && !complete());
+      if (!complete()) throw new Error('安装期间 Codex 内核未在 60 秒内完成更新；未确认新内核就绪。');
       managedAppServerMigrated = true;
       managedAppServerMigration.restarted = true;
-      if (desktopAttached) {
-        await launchDesktop({ stateRoot: physicalStateRoot, host: desktopHost });
-        desktopRestarted = true;
-        desktopRestartReason = 'app-server-migration';
-        bridge = await service.status();
-      }
     }
     const skill = installSkill(path.join(serviceRoot, 'dist/skills/code-relax/SKILL.md'));
-    if (desktopNeedsAttach && !desktopRestarted) {
+    if (desktopNeedsRestart) {
       const currentDesktop = await desktopHost.inspect();
       if (currentDesktop.running) await desktopHost.closeDesktop(currentDesktop.desktop);
       await launchDesktop({ stateRoot: physicalStateRoot, host: desktopHost });
+      if (!await desktopHost.desktopReady()) throw new Error('安装期间 Codex 窗口已启动，但未确认连接到工作站内核。');
       desktopRestarted = true;
-      desktopRestartReason = 'attach-managed-server';
-      bridge = await service.status();
+    }
+    bridge = await service.status();
+    if (!bridge.running || bridge.managedAppServer?.state !== 'ready' || !bridge.execution?.ready
+        || (!preserveCodex && (bridge.managedAppServer.updatePending || bridge.managedAppServer.launcherRestartRequired))) {
+      throw new Error('安装文件已更新，但 Codex 内核更新或完整控制尚未就绪，安装未完成。');
     }
     installed.autostart = autostart;
     installed.skill = skill;
@@ -366,8 +366,11 @@ async function main() {
     installed.managedAppServerMigration = { ...managedAppServerMigration,
       currentPid: bridge.managedAppServer.pid || null,
       launcherRevision: bridge.managedAppServer.launcherRevision ?? null };
+    installed.preserveCodex = preserveCodex;
     installed.desktopRestarted = desktopRestarted;
-    installed.desktopRestartReason = desktopRestartReason;
+    installed.desktopRestartReason = desktopRestarted ? 'setup-reconnect' : null;
+    installed.desktopConnected = desktopRestarted ? true : null;
+    installed.executionReady = bridge.execution.ready;
     if (options.includes('--desktop-helper')) installed.desktopHelper = await installDesktopHelper();
     const migrationText = managedAppServerMigrated ? 'Codex 内核已更新并重启；请检查安装前正在进行的任务。\n' : '';
     const displayText = `Code Relax ${installed.version} 安装成功。\n${migrationText}${desktopSetupSteps.join('\n')}`;

package/dist/build-platform.json

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

package/dist/src/server.mjs

@@ -39,6 +39,7 @@ import { desktopDotsProfiles } from './platform/windows/dots-profile.mjs';
 import { readPlanPricing } from './plan-pricing.mjs';
 import { requestRecovery, recoveryStatus } from './shared-recovery.mjs';
 import { requestServiceRestart } from './service-restart.mjs';
+import { checkServiceUpdate, requestServiceUpdate, serviceUpdateStatus } from './service-update.mjs';
 import { TurnModelHistory } from './turn-model-history.mjs';
 import { browseCode } from './code-browser.mjs';
 import { fileRange, fileRevision, FileRangeError } from './file-transfer-range.mjs';
@@ -265,6 +266,12 @@ async function handleRequest(request, response) {
       if (body.confirmed !== true || typeof body.operationId !== 'string') throw new RequestError(400, '请确认重新打开当前 Codex 并接入 Codex 内核后再继续。');
       sendJson(response, 202, await requestRecovery(stateRoot, body)); return;
     }
+    if (url.pathname === '/api/service/update' && request.method === 'GET') {
+      sendJson(response, 200, await checkServiceUpdate(stateRoot)); return;
+    }
+    if (url.pathname === '/api/service/update' && request.method === 'POST') {
+      sendJson(response, 202, await requestServiceUpdate(stateRoot, await readJsonBody(request))); return;
+    }
     if (request.method === 'POST' && url.pathname === '/api/service/restart') {
       const body = await readJsonBody(request);
       if (body.confirmed !== true) throw new RequestError(400, '请确认重启工作站服务后再继续。');
@@ -309,6 +316,7 @@ async function handleRequest(request, response) {
       sendJson(response, 200, {
         status: 'ok', resident: true, version: runtimeVersion,
         keepAwake: powerManager.snapshot(),
+        serviceUpdate: serviceUpdateStatus(stateRoot),
         execution: { ...executionHealth.state, ready: executionReady, canWrite: executionReady,
           mode: executionMode },
         managedAppServer: managedAppServer.snapshot(),

package/dist/src/service-install.mjs

@@ -35,7 +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,
+    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;

package/dist/src/service-update-worker.mjs

@@ -0,0 +1,42 @@
+import fs from 'node:fs';
+import path from 'node:path';
+import { spawn } from 'node:child_process';
+import { setTimeout as delay } from 'node:timers/promises';
+
+// Copied outside both npm and service directories before launch. Builtins only.
+const jobFile = process.argv[2];
+const job = JSON.parse(fs.readFileSync(jobFile, 'utf8'));
+process.chdir(path.dirname(jobFile));
+const read = () => JSON.parse(fs.readFileSync(job.statusFile, 'utf8'));
+function update(values) {
+  const current = read();
+  if (current.operationId !== job.operationId) throw new Error('更新操作已被替换');
+  const temporary = `${job.statusFile}.${process.pid}.tmp`;
+  fs.writeFileSync(temporary, JSON.stringify({ ...current, ...values }), { mode: 0o600 });
+  fs.renameSync(temporary, job.statusFile);
+}
+try {
+  const deadline = Date.now() + 30000;
+  while (read().owner?.pid !== process.pid) {
+    if (Date.now() >= deadline) throw new Error('独立更新进程交接超时');
+    await delay(100);
+  }
+  await delay(1500);
+  update({ status: 'running', startedAt: new Date().toISOString() });
+  const args = [job.npmCliPath, 'install', '--global', `@walkhi/code-relax@${job.targetVersion}`,
+    '--foreground-scripts', '--allow-scripts=@walkhi/code-relax,node-datachannel,sharp', '--registry=https://registry.npmjs.org'];
+  if (job.npmPrefix) args.push('--prefix', job.npmPrefix);
+  const child = spawn(job.nodeExecutable, args, { cwd: path.dirname(jobFile), windowsHide: true,
+    stdio: ['ignore', 'inherit', 'inherit'] });
+  const code = await new Promise((resolve, reject) => {
+    child.once('error', reject); child.once('exit', (code, signal) => resolve(code ?? `signal ${signal}`));
+  });
+  if (code !== 0) throw new Error(`npm 安装失败（${code}），请查看工作站更新日志。`);
+  const installed = JSON.parse(fs.readFileSync(path.join(job.serviceRoot, 'installation.json'), 'utf8'));
+  if (installed.version !== job.targetVersion) throw new Error('安装结束，但工作站版本与目标版本不一致。');
+  update({ status: 'completed', finishedAt: new Date().toISOString(), installedVersion: installed.version });
+} catch (error) {
+  console.error(error.stack || error.message);
+  update({ status: 'failed', finishedAt: new Date().toISOString(), error: error.message });
+  process.exitCode = 1;
+}

package/dist/src/service-update.mjs

@@ -0,0 +1,71 @@
+import fs from 'node:fs';
+import path from 'node:path';
+import { fileURLToPath } from 'node:url';
+import { startBackground } from './background-process.mjs';
+import { readRecord, writeRecord } from './service-lifecycle.mjs';
+import { runtimePaths } from './platform/runtime-paths.mjs';
+import { desktopHost } from './platform/desktop-host.mjs';
+
+const versionPattern = /^\d+\.\d+\.\d+(?:-[0-9A-Za-z.-]+)?$/;
+const statusPath = root => path.join(root, 'service-update.json');
+const installation = () => readRecord(path.join(runtimePaths().serviceRoot, 'installation.json'));
+export function serviceUpdateStatus(root) {
+  const record = readRecord(statusPath(root));
+  const installed = installation();
+  return { supported: Boolean(installed?.npmCliPath && fs.existsSync(installed.npmCliPath)),
+    currentVersion: installed?.version || null,
+    operation: record ? { operationId: record.operationId, targetVersion: record.targetVersion,
+      status: record.status, error: record.error || null, installedVersion: record.installedVersion || null } : null };
+}
+export async function checkServiceUpdate(root) {
+  const result = await fetch('https://registry.npmjs.org/@walkhi%2fcode-relax/latest', { signal: AbortSignal.timeout(12000) });
+  if (!result.ok) throw new Error(`查询工作站版本失败：HTTP ${result.status}`);
+  const latest = await result.json();
+  if (!versionPattern.test(latest.version || '')) throw new Error('npm 返回的版本号无效');
+  return { ...serviceUpdateStatus(root), latestVersion: latest.version };
+}
+let scheduling = false;
+export async function requestServiceUpdate(root, body) {
+  if (body.confirmed !== true || !/^[0-9a-f-]{36}$/i.test(body.operationId || '') || !versionPattern.test(body.targetVersion || '')) {
+    throw new Error('请确认工作站更新及目标版本后再继续。');
+  }
+  if (scheduling) throw new Error('工作站更新正在安排。');
+  scheduling = true;
+  try {
+    const previous = readRecord(statusPath(root));
+    if (previous?.operationId === body.operationId) return serviceUpdateStatus(root);
+    if (previous && ['scheduled', 'running'].includes(previous.status)) {
+      const actual = previous.owner?.pid ? await desktopHost.process(previous.owner.pid) : null;
+      if (actual && actual.created === previous.owner.created && actual.executable === previous.owner.executable) {
+        throw new Error('工作站已有更新正在执行。');
+      }
+      writeRecord(statusPath(root), { ...previous, status: 'failed', error: '更新进程已退出，未确认安装完成。' });
+    }
+    const latest = await checkServiceUpdate(root);
+    if (!latest.supported) throw new Error('当前安装缺少 npm 路径，请先安装支持手机更新的过渡版。');
+    if (latest.latestVersion !== body.targetVersion) throw new Error('最新版本已变化，请重新检查后确认。');
+    if (latest.currentVersion === body.targetVersion) throw new Error('工作站已是此版本。');
+    const installed = installation();
+    const directory = path.join(root, 'service-updates', body.operationId);
+    fs.mkdirSync(directory, { recursive: true, mode: 0o700 });
+    const worker = path.join(directory, 'worker.mjs');
+    fs.copyFileSync(fileURLToPath(new URL('./service-update-worker.mjs', import.meta.url)), worker);
+    const jobFile = path.join(directory, 'job.json');
+    writeRecord(jobFile, { ...body, statusFile: statusPath(root), npmCliPath: installed.npmCliPath,
+      npmPrefix: installed.npmPrefix, nodeExecutable: installed.nodeExecutable, serviceRoot: runtimePaths().serviceRoot });
+    writeRecord(statusPath(root), { operationId: body.operationId, targetVersion: body.targetVersion,
+      status: 'scheduled', requestedAt: new Date().toISOString() });
+    try {
+      const log = path.join(directory, 'update.log');
+      const pid = await startBackground(installed.nodeExecutable, [worker, jobFile], process.env, [log, log]);
+      const owner = await desktopHost.process(pid);
+      if (!owner) throw new Error('独立更新进程未启动。');
+      writeRecord(statusPath(root), { ...readRecord(statusPath(root)), owner: {
+        pid: owner.pid, created: owner.created, executable: owner.executable } });
+    } catch (error) {
+      writeRecord(statusPath(root), { ...readRecord(statusPath(root)), status: 'failed', error: error.message });
+      throw error;
+    }
+    return serviceUpdateStatus(root);
+  } finally { scheduling = false; }
+}

package/package.json

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

package/tools/postinstall.mjs

@@ -55,7 +55,8 @@ export function formatSetupOutput(output) {
     const migration = result.managedAppServerMigration || {};
     return `Code Relax ${result.version || '未知版本'} 服务安装完成。\n`
       + '工作站服务和 Codex 内核已就绪，已启用登录自启。\n'
-      + (migration.restarted ? 'Codex 内核已更新并重启；请检查安装前正在进行的任务。\n' : '')
+      + (result.preserveCodex ? '过渡版保留当前 Codex 和内核运行状态；待手机发起下一次完整更新。\n' : migration.restarted ? `Codex 内核已更新：${migration.previousVersion || '未知'} → ${result.managedAppServer?.version || '未知'}（PID ${migration.previousPid} → ${migration.currentPid}）。\n` : 'Codex 内核已是当前选定版本，无需切换。\n')
+      + (result.preserveCodex ? '' : result.desktopRestarted ? '电脑版 Codex 已重启，并确认连接到工作站内核。\n' : '安装前未运行电脑版 Codex，保持关闭。\n')
       + (result.desktopRestartRecommended ? 'Codex Desktop：请完全退出后重新打开。\n' : '');
   } catch { return output; }
 }
@@ -150,7 +151,7 @@ if (invokedDirectly && process.env.npm_config_global === 'true') {
     const { prepareNativePackage } = await import('../dist/src/platform/native-package.mjs');
     prepareNativePackage(fileURLToPath(new URL('../', import.meta.url)));
     setupStarted = true;
-    runStage(entry, 'setup', ['setup', '--json'], output => formatSetupOutput(output));
+    runStage(entry, 'setup', ['setup', '--json', '--preserve-codex'], output => formatSetupOutput(output));
     try { runStage(entry, 'doctor', ['doctor']); }
     catch (error) {
       console.error('服务安装已完成，但安装后健康检查未通过；请查看上方诊断与安装日志。');