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

package/dist/build-platform.json

@@ -1 +1 @@
-{"layout":"npm-platform-packages","version":"0.1.0-beta.44"}
+{"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-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.44",
+  "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.44",
-    "@walkhi/code-relax-native-darwin-arm64": "0.1.0-beta.44",
-    "@walkhi/code-relax-native-darwin-x64": "0.1.0-beta.44"
+    "@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"
   }
 }