@walkhi/code-relax 0.1.0-beta.43 → 0.1.0-beta.45

package/dist/bin/codex-remote.mjs

@@ -224,7 +224,8 @@ async function main() {
     return;
   }
   if (command === 'doctor' || command === 'diag') {
-    const result = await doctor({ paths, host, service, ensureAutostart, diagnostics: command === 'diag' });
+    const cliVersion = readRecord(path.join(packageRoot(path.dirname(fileURLToPath(import.meta.url))), 'package.json'))?.version;
+    const result = await doctor({ paths, host, service, ensureAutostart, cliVersion, diagnostics: command === 'diag' });
     console.log(json ? JSON.stringify(result) : formatDoctorOutput(result, command === 'diag'));
     if (!result.ready) process.exitCode = 1;
     return;

package/dist/build-platform.json

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

package/dist/src/platform/windows/start-hidden-console.ps1

@@ -1,6 +1,7 @@
 $ErrorActionPreference = 'Stop'
 [Console]::InputEncoding = New-Object System.Text.UTF8Encoding($false)
 [Console]::OutputEncoding = New-Object System.Text.UTF8Encoding($false)
+$brokerStarted = $false
 try {
     $spec = [Console]::In.ReadToEnd() | ConvertFrom-Json
     # WMI owns this launch, not the caller's kill-on-close Desktop job hierarchy.
@@ -13,10 +14,15 @@ try {
     $request = Join-Path $launchRoot ($instance + '.request.json')
     $diagnostic = Join-Path $launchRoot ($instance + '.broker.log')
     $spec | Add-Member -NotePropertyName instance -NotePropertyValue $instance
-    $spec | Add-Member -NotePropertyName diagnostic -NotePropertyValue $diagnostic
     $requestTemporary = $request + '.tmp'
     [IO.File]::WriteAllText($requestTemporary, ($spec | ConvertTo-Json -Compress -Depth 10), (New-Object Text.UTF8Encoding($false)))
     [IO.File]::Move($requestTemporary, $request)
+    # MSIX can redirect a newly written file even when its existing parent
+    # resolves outside the package. Resolve the file handle, not just the folder.
+    $request = [IsolatedProcess]::ResolvePath($request)
+    $launchRoot = [IO.Path]::GetDirectoryName($request)
+    $ready = Join-Path $launchRoot ($instance + '.json')
+    $diagnostic = Join-Path $launchRoot ($instance + '.broker.log')
     $startup = New-CimInstance -ClassName Win32_ProcessStartup -ClientOnly -Property @{
         ShowWindow=[uint16]0; CreateFlags=[uint32]0x1000010
     }
@@ -26,6 +32,7 @@ try {
         CommandLine=$command; CurrentDirectory=$env:USERPROFILE; ProcessStartupInformation=$startup
     }
     if ($broker.ReturnValue -ne 0) { throw ('Windows process broker failed: ' + $broker.ReturnValue) }
+    $brokerStarted = $true
     $deadline = [DateTime]::UtcNow.AddSeconds(30)
     while (-not (Test-Path -LiteralPath $ready)) {
         if ([DateTime]::UtcNow -gt $deadline) {
@@ -44,6 +51,8 @@ try {
     [Console]::Error.WriteLine($_.Exception.Message)
     exit 1
 } finally {
-    if ($request -and (Test-Path -LiteralPath $request)) { Remove-Item -LiteralPath $request -Force }
+    # Once launched, the worker owns consumption. A slow broker must not lose
+    # its request merely because this caller timed out; never launch a retry.
+    if (-not $brokerStarted -and $request -and (Test-Path -LiteralPath $request)) { Remove-Item -LiteralPath $request -Force }
     if ($requestTemporary -and (Test-Path -LiteralPath $requestTemporary)) { Remove-Item -LiteralPath $requestTemporary -Force }
 }

package/dist/src/self-relay/server.mjs

@@ -989,7 +989,7 @@ function controlPayload(value) {
     const message = JSON.parse(value);
     if (message.type === 'unsubscribe') return true;
     return ['request', 'subscribe'].includes(message.type) && typeof message.path === 'string' &&
-      (message.path === '/api/health' || message.path.startsWith('/api/shared-recovery'));
+      (message.path === '/api/health' || message.path === '/api/desktop/start' || message.path.startsWith('/api/shared-recovery'));
   } catch { return false; }
 }
 

package/dist/src/server.mjs

@@ -261,10 +261,10 @@ async function handleRequest(request, response) {
     if (request.method === 'GET' && url.pathname === '/api/shared-recovery') {
       sendJson(response, 200, await recoveryStatus(stateRoot)); return;
     }
-    if (request.method === 'POST' && url.pathname === '/api/shared-recovery') {
+    if (request.method === 'POST' && ['/api/shared-recovery', '/api/desktop/start'].includes(url.pathname)) {
       const body = await readJsonBody(request);
       if (body.confirmed !== true || typeof body.operationId !== 'string') throw new RequestError(400, '请确认重新打开当前 Codex 并接入 Codex 内核后再继续。');
-      sendJson(response, 202, await requestRecovery(stateRoot, body)); return;
+      sendJson(response, 202, await requestRecovery(stateRoot, { ...body, startOnly: url.pathname === '/api/desktop/start' })); return;
     }
     if (url.pathname === '/api/service/update' && request.method === 'GET') {
       sendJson(response, 200, await checkServiceUpdate(stateRoot)); return;

package/dist/src/service-doctor.mjs

@@ -5,7 +5,14 @@ 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, diagnostics = false }) {
+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;
@@ -17,11 +24,12 @@ export async function doctor({ paths, host, service, skillTarget, ensureAutostar
   };
   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 || !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', '桌面服务启动环境正常。');
@@ -46,9 +54,12 @@ export async function doctor({ paths, host, service, skillTarget, ensureAutostar
     }
     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', 'warning', state.version
+    if (state.running && installedVersion && state.version !== installedVersion) add('service-version', 'error', state.version
       ? `已安装版本 ${installedVersion}，但当前运行版本为 ${state.version}；请重新执行安装或重启工作站服务。`
-      : `已安装版本 ${installedVersion}，但当前运行的桌面服务未报告版本，可能仍是旧进程；请重新执行安装或重启桌面服务。`);
+      : `已安装版本 ${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 完整控制尚未确认就绪且可写；请查看内核和连接诊断，不能仅凭服务在线判定健康。');
     const currentVersion = state.managedAppServer?.version || null;
     const selectedVersion = state.managedAppServer?.selectedVersion || null;
     if (state.managedAppServer) kernelUpdate = { pending: state.managedAppServer.updatePending === true,
@@ -86,7 +97,7 @@ export async function doctor({ paths, host, service, skillTarget, ensureAutostar
 export function formatDoctorOutput(result, detail = false) {
   const labels = { 'keep-awake': '保持唤醒', installation: '安装文件', 'bridge-runtime': '运行环境', network: '局域网',
     autostart: '登录自启动', service: '工作站服务', 'managed-app-server': 'Codex 内核',
-    'service-version': '服务版本', 'managed-app-server-update': 'Codex 更新',
+    execution: '完整控制', '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) => {
@@ -95,7 +106,7 @@ export function formatDoctorOutput(result, detail = false) {
   };
   const issues = result.checks.filter(item => item.status !== 'ok');
   const lines = [result.ready ? '工作站检查通过。' : '工作站检查发现问题。',
-    summary('installation', '完整'), summary('service', '正在运行'), summary('managed-app-server', '已就绪')];
+    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 || {};

package/dist/src/service-update.mjs

@@ -9,13 +9,19 @@ 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 publicUpdateOperation(record, installedVersion) {
+  if (!record) return null;
+  return { operationId: record.operationId, targetVersion: record.targetVersion,
+    status: record.status, targetInstalled: Boolean(installedVersion && installedVersion === record.targetVersion),
+    error: record.status === 'failed' ? '上次更新未完整完成，请查看工作站更新日志。' : null,
+    installedVersion: record.installedVersion || null };
+}
 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 };
+    operation: publicUpdateOperation(record, installed?.version) };
 }
 export async function checkServiceUpdate(root) {
   const result = await fetch('https://registry.npmjs.org/@walkhi%2fcode-relax/latest', { signal: AbortSignal.timeout(12000) });
@@ -64,7 +70,7 @@ export async function requestServiceUpdate(root, body) {
         pid: owner.pid, created: owner.created, executable: owner.executable } });
     } catch (error) {
       writeRecord(statusPath(root), { ...readRecord(statusPath(root)), status: 'failed', error: error.message });
-      throw error;
+      throw new Error('工作站更新启动未完成，请查看工作站更新日志；结果确认前不要重复提交。');
     }
     return serviceUpdateStatus(root);
   } finally { scheduling = false; }

package/dist/src/shared-recovery.mjs

@@ -51,7 +51,7 @@ export async function planRecovery(stateRoot, host, available = portAvailable) {
   return { desktop: info.desktop, action };
 }
 
-export async function requestRecovery(stateRoot, { confirmed, operationId = randomUUID() } = {}, host = desktopHost) {
+export async function requestRecovery(stateRoot, { confirmed, operationId = randomUUID(), startOnly = false } = {}, host = desktopHost) {
   if (host.desktopIntegration === false) throw new Error('此平台尚不支持 Desktop 自动接入。');
   if (confirmed !== true) throw new Error(recoveryWarning + ' 请明确确认后再执行。');
   if (!/^[0-9a-f]{8}(?:-[0-9a-f]{4}){3}-[0-9a-f]{12}$/i.test(operationId)) throw new Error('无效的恢复操作编号。');
@@ -60,12 +60,13 @@ export async function requestRecovery(stateRoot, { confirmed, operationId = rand
   if (previous.operationId === operationId) return previous;
   if (active(previous)) throw new Error('已有恢复操作正在执行，请查看恢复状态。');
   const planned = await planRecovery(stateRoot, host);
+  if (startOnly && (await host.inspect()).running) throw new Error('Codex 桌面端已经启动，未执行重启。');
   let lock;
   try { lock = fs.openSync(lockPath(stateRoot), 'wx'); }
   catch (error) { if (error.code === 'EEXIST') throw new Error('已有恢复操作，请先查看恢复状态。'); throw error; }
   fs.writeFileSync(lock, JSON.stringify({ operationId })); fs.closeSync(lock);
   const record = { operationId, status: 'scheduled', stage: 'prepared', startedAt: new Date().toISOString(),
-    message: 'Codex 连接请求已接受，电脑管理连接保持运行。', steps: recoverySteps(), ...planned };
+    message: 'Codex 连接请求已接受，电脑管理连接保持运行。', startOnly, steps: recoverySteps().filter(step => !startOnly || step.id !== 'stopping-desktop'), ...planned };
   try {
     writeRecord(recordPath(stateRoot), record);
     const log = path.join(stateRoot, 'shared-recovery.log');
@@ -103,7 +104,9 @@ export async function runRecovery(stateRoot, operationId, dependencies = {}) {
     const planned = await planRecovery(stateRoot, host, available);
     record = { ...record, ...planned };
     if (fs.existsSync(path.join(stateRoot, 'desktop-launch.lock'))) throw new Error('Desktop 正在启动，未与启动操作并行恢复。');
-    stage('stopping-desktop'); await host.closeDesktop(record.desktop);
+    if (record.startOnly) {
+      if ((await host.inspect()).running) throw new Error('Codex 桌面端已经启动，未执行重启。');
+    } else { stage('stopping-desktop'); await host.closeDesktop(record.desktop); }
     await waitFor(async () => !(await host.inspect()).running, '当前 Codex Desktop 未退出，未继续接入 Codex 内核。');
     stage('starting-app-server'); await start({ stateRoot, host, recoveryId: operationId, progress: stage });
     stage('checking-execution');

package/package.json

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

package/tools/postinstall.mjs

@@ -53,7 +53,7 @@ export function formatSetupOutput(output) {
   try {
     const result = JSON.parse(output);
     const migration = result.managedAppServerMigration || {};
-    return `Code Relax ${result.version || '未知版本'} 服务安装完成。\n`
+    return `Code Relax ${result.version || '未知版本'} setup 已完成；接下来执行安装后健康检查。\n`
       + '工作站服务和 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')
@@ -152,10 +152,14 @@ if (invokedDirectly && process.env.npm_config_global === 'true') {
     prepareNativePackage(fileURLToPath(new URL('../', import.meta.url)));
     setupStarted = true;
     runStage(entry, 'setup', ['setup', '--json'], output => formatSetupOutput(output));
-    try { runStage(entry, 'doctor', ['doctor']); }
+    try {
+      runStage(entry, 'doctor', ['doctor']);
+      console.log('Code Relax 自动安装成功：setup 与安装后健康检查均已通过，无需重复执行 setup。');
+      console.log('npm 的脚本安全提示与安装结果分别判断；本次安装脚本已实际执行，未修改 npm 安全配置。');
+    }
     catch (error) {
       console.error('服务安装已完成，但安装后健康检查未通过；请查看上方诊断与安装日志。');
-      process.exitCode = 1;
+      process.exitCode = Number.isInteger(error?.status) && error.status > 0 ? error.status : 1;
     }
     console.log(`安装日志：${installLog}`);
     appendLog(process.exitCode ? '[postinstall] failed stage=doctor' : '[postinstall] success');