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

package/README.md

@@ -7,7 +7,7 @@ Bridge 让 HarmonyOS 客户端控制 Windows 上的 Codex Desktop。当前要求
 公开 beta 已发布到 npm，安装或更新使用：
 
 ```powershell
-npm i -g @walkhi/code-relax@beta --allow-scripts=@walkhi/code-relax
+npm i -g @walkhi/code-relax@beta --allow-scripts=@walkhi/code-relax --foreground-scripts
 ```
 
 首次安装前先保存工作，并从 Codex 菜单或 Windows 托盘完全退出 Codex。更新无需先停止正在运行的 Bridge；安装器会短暂停止、替换并恢复服务。npm 全局安装会自动执行 `setup` 和 Skill 安装。`setup` 将完整服务部署到 `%LOCALAPPDATA%\Programs\CodexRemote\service`，记录安装所用 Node 的绝对路径，不复制 Node。配置、日志和二维码以 `installation.json.stateRoot` 为准，通常位于 `%LOCALAPPDATA%\CodexRemote`，MSIX 环境可能解析到包缓存目录；附件位于 `%ProgramData%\CodexRemote\attachments`。
@@ -64,7 +64,7 @@ relax dev-stop --json
 更新固定服务：
 
 ```powershell
-npm i -g @walkhi/code-relax@beta --allow-scripts=@walkhi/code-relax
+npm i -g @walkhi/code-relax@beta --allow-scripts=@walkhi/code-relax --foreground-scripts
 ```
 
 `setup` 先暂存并校验新版本，再短暂停止 Bridge/中继完成切换；原服务此前正在运行时会自动恢复，新版本启动失败则回滚并启动旧版本。无需提前执行 `stop`。Node 路径变化或原 Node 被删除后需重新 setup。升级可能因 Node 可执行文件路径变化而再次触发 Windows 防火墙授权。
@@ -80,4 +80,4 @@ npm uninstall -g @walkhi/code-relax
 
 ## 发布边界
 
-registry 当前公开包为 `@walkhi/code-relax@0.1.0-beta.7`，主 CLI 为 `relax`，并保留 `code-relax` 兼容入口。该版沿用 beta6 的启动代次自动迁移，并在 npm 安装控制台明确报告 app-server 是否重启、迁移前后 PID、Bridge 恢复结果和安装日志路径；`doctor` 会区分安装版本与运行代次。通信协议仍为 7。详细规则见 [npm 分发](../docs/npm-distribution.md)。
+registry 当前公开包为 `@walkhi/code-relax@0.1.0-beta.8`，主 CLI 为 `relax`，并保留 `code-relax` 兼容入口。该版让安装摘要通过 `--foreground-scripts` 直接显示，首次安装或启动链迁移时干净重启 Desktop，分别报告已安装与实际运行版本，并把旧 Startup PowerShell 快捷方式迁移为当前用户任务计划登录触发器。通信协议仍为 7。详细规则见 [npm 分发](../docs/npm-distribution.md)。

package/dist/bin/codex-remote.mjs

@@ -170,7 +170,9 @@ async function main() {
       const source = path.join(stateRoot, name), target = path.join(physicalStateRoot, name);
       if (fs.existsSync(source) && !fs.existsSync(target)) fs.copyFileSync(source, target, fs.constants.COPYFILE_EXCL);
     }
-    const previous = fs.existsSync(serviceRoot) ? await service.status() : { processRunning: false };
+    const hadInstalledService = fs.existsSync(path.join(serviceRoot, 'installation.json'));
+    const desktopBeforeSetup = await desktopHost.inspect();
+    const previous = hadInstalledService ? await service.status() : { processRunning: false };
     const previousRelay = await selfRelay('relay-status', stateRoot);
     const resumeAfterUpdate = previous.processRunning || previousRelay.running;
     const executable = fs.realpathSync(process.execPath);
@@ -211,7 +213,13 @@ async function main() {
       restarted: false,
       previousPid: bridge.managedAppServer.pid || null,
     };
+    let desktopRestarted = false;
+    let desktopRestartReason = null;
     if (managedAppServerMigration.required) {
+      const desktopInfo = 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;
       do {
@@ -226,9 +234,23 @@ async function main() {
       }
       managedAppServerMigrated = true;
       managedAppServerMigration.restarted = true;
+      if (desktopAttached) {
+        await launchDesktop('shared', { stateRoot: physicalStateRoot, host: desktopHost });
+        desktopRestarted = true;
+        desktopRestartReason = 'app-server-migration';
+        bridge = await service.status();
+      }
     }
     const autostart = await residentStartup(installed, 'enable');
     const environment = await configureManagedEnvironment(physicalStateRoot);
+    if (!hadInstalledService && desktopBeforeSetup.running && !desktopRestarted) {
+      const currentDesktop = await desktopHost.inspect();
+      if (currentDesktop.running) await desktopHost.closeDesktop(currentDesktop.desktop);
+      await launchDesktop('shared', { stateRoot: physicalStateRoot, host: desktopHost });
+      desktopRestarted = true;
+      desktopRestartReason = 'first-install';
+      bridge = await service.status();
+    }
     installed.autostart = autostart;
     installed.restarted = resumeAfterUpdate;
     installed.environment = environment;
@@ -237,10 +259,14 @@ async function main() {
     installed.managedAppServerMigration = { ...managedAppServerMigration,
       currentPid: bridge.managedAppServer.pid || null,
       launcherRevision: bridge.managedAppServer.launcherRevision ?? null };
+    installed.desktopRestarted = desktopRestarted;
+    installed.desktopRestartReason = desktopRestartReason;
     installed.desktop = bridge.desktop;
-    installed.desktopRestartRecommended = bridge.desktop?.state === 'ordinary';
+    installed.desktopRestartRecommended = !desktopRestarted && bridge.desktop?.state === 'ordinary';
     const migrationText = managedAppServerMigrated ? '已自动重建旧启动链的 app-server；安装前尚未完成的任务可能已中断。\n' : '';
-    const restartText = installed.desktopRestartRecommended
+    const restartText = desktopRestarted
+      ? 'Codex Desktop 已干净重启并重新接入受管 app-server。'
+      : installed.desktopRestartRecommended
       ? 'Codex 当前仍在使用原连接。可以在手机端选择“立即重启（推荐）”，或稍后自行完全退出再启动。'
       : '下次正常启动 Codex 时会连接受管 app-server。';
     console.log(json ? JSON.stringify({ ...installed, nextSteps: desktopSetupSteps, displayText: `${migrationText}${desktopSetupSteps.join('\n')}\n${restartText}` }) : `服务已安装：${installed.serviceRoot}\n使用已安装的 Node：${installed.nodeExecutable}\n受管 app-server 已就绪；首次联网可能需要 Windows 防火墙授权。\n${migrationText}${desktopSetupSteps.join('\n')}\n${restartText}`);
@@ -259,9 +285,9 @@ async function main() {
   }
   if (!json && (desktop || command === 'start')) console.log('正在检查电脑连接并准备 Bridge…');
   const result = await service[desktop ? 'start' : command]();
-  if (command === 'status') {
-    console.log(json ? JSON.stringify(result) : result.running
-      ? `服务正常：${result.mode}，端口 ${result.port}，PID ${result.pid}` : '服务未就绪。');
+  if (command === 'status') {
+    console.log(json ? JSON.stringify(result) : result.running
+      ? `服务正常：${result.mode}，版本 ${result.version || '未知'}，端口 ${result.port}，PID ${result.pid}` : '服务未就绪。');
     return;
   }
   const { accessUrl, qrPath: _legacyQrPath, ...metadata } = result;

package/dist/src/managed-app-server.mjs

@@ -77,6 +77,9 @@ export class ManagedAppServer extends EventEmitter {
         if (!await this.available()) throw new Error('45839 被未识别进程占用，未启动或结束任何进程。');
         const childEnvironment = { ...this.environment };
         for (const key of ['CODEX_APP_SERVER_WS_URL', 'CODEX_APP_SERVER_FORCE_CLI', 'CODEX_APP_TOOLS_PIPE_PATH']) delete childEnvironment[key];
+        for (const key of Object.keys(childEnvironment)) {
+          if (/^npm_/iu.test(key) || key.toUpperCase() === 'INIT_CWD') delete childEnvironment[key];
+        }
         const pid = await this.host.start(info.cli, ['app-server', '--listen', managedAppServerUrl], childEnvironment,
           [path.join(this.stateRoot, 'managed-app-server.stdout.log'), path.join(this.stateRoot, 'managed-app-server.stderr.log')]);
         const started = await this.host.process(pid);

package/dist/src/platform/windows/resident-startup.ps1

@@ -1,27 +1,67 @@
 param([string]$NodePath, [string]$Entry, [ValidateSet('enable','disable','status')][string]$Action='status')
 $ErrorActionPreference = 'Stop'
 [Console]::OutputEncoding = New-Object System.Text.UTF8Encoding($false)
+
+$taskName = 'Code Relax Bridge'
+$taskSource = '@walkhi/code-relax'
+$taskPath = '\' + $taskName
+$arguments = '"' + $Entry + '" start --json'
+$currentUser = [System.Security.Principal.WindowsIdentity]::GetCurrent().Name
+
+$scheduler = New-Object -ComObject 'Schedule.Service'
+$scheduler.Connect()
+$root = $scheduler.GetFolder('\')
+$registered = @($root.GetTasks(1) | Where-Object { $_.Name -eq $taskName } | Select-Object -First 1)
+if ($registered.Count -gt 0 -and $registered[0].Definition.RegistrationInfo.Source -ne $taskSource) {
+    throw 'Scheduled task is not owned by this installation.'
+}
+
+# Remove only the legacy shortcut created by this package. A Startup LNK that
+# launches hidden PowerShell with ExecutionPolicy Bypass triggers AV heuristics.
 $shell = New-Object -ComObject WScript.Shell
-$target = Join-Path $shell.SpecialFolders.Item('Startup') 'Code Relax Bridge.lnk'
-$launcher = Join-Path $PSScriptRoot 'resident-start.ps1'
-$powershell = Join-Path $env:SystemRoot 'System32/WindowsPowerShell/v1.0/powershell.exe'
-$exists = Test-Path -LiteralPath $target
-if ($exists) {
-    $existing = $shell.CreateShortcut($target)
-    if ($existing.TargetPath -ne $powershell -or -not $existing.Arguments.Contains('"' + $launcher + '"')) {
-        throw 'Startup shortcut is not owned by this installation.'
+$legacyPath = Join-Path $shell.SpecialFolders.Item('Startup') 'Code Relax Bridge.lnk'
+$legacyLauncher = Join-Path $PSScriptRoot 'resident-start.ps1'
+$legacyExists = Test-Path -LiteralPath $legacyPath
+if ($Action -ne 'status' -and $legacyExists) {
+    $legacy = $shell.CreateShortcut($legacyPath)
+    if (-not $legacy.Arguments.Contains('"' + $legacyLauncher + '"')) {
+        throw 'Legacy startup shortcut is not owned by this installation.'
     }
 }
+
 if ($Action -eq 'enable') {
     if (-not (Test-Path -LiteralPath $NodePath) -or -not (Test-Path -LiteralPath $Entry)) { throw 'Installed runtime is missing.' }
-    $link = $shell.CreateShortcut($target)
-    $link.TargetPath = $powershell
-    $link.Arguments = '-NoProfile -NonInteractive -WindowStyle Hidden -ExecutionPolicy Bypass -File "' + $launcher + '" -NodePath "' + $NodePath + '" -Entry "' + $Entry + '"'
-    $link.WorkingDirectory = $env:USERPROFILE
-    $link.WindowStyle = 7
-    $link.Description = 'Code Relax resident computer connection'
-    $link.Save()
-} elseif ($Action -eq 'disable' -and $exists) {
-    Remove-Item -LiteralPath $target
+    $definition = $scheduler.NewTask(0)
+    $definition.RegistrationInfo.Description = 'Start the Code Relax Bridge when this user signs in.'
+    $definition.RegistrationInfo.Source = $taskSource
+    $definition.Principal.UserId = $currentUser
+    $definition.Principal.LogonType = 3 # TASK_LOGON_INTERACTIVE_TOKEN
+    $definition.Principal.RunLevel = 0 # TASK_RUNLEVEL_LUA
+    $definition.Settings.Enabled = $true
+    $definition.Settings.Hidden = $true
+    $definition.Settings.StartWhenAvailable = $true
+    $definition.Settings.DisallowStartIfOnBatteries = $false
+    $definition.Settings.StopIfGoingOnBatteries = $false
+    $definition.Settings.ExecutionTimeLimit = 'PT5M'
+    $definition.Settings.MultipleInstances = 2 # TASK_INSTANCES_IGNORE_NEW
+    $trigger = $definition.Triggers.Create(9) # TASK_TRIGGER_LOGON
+    $trigger.UserId = $currentUser
+    $trigger.Enabled = $true
+    $exec = $definition.Actions.Create(0) # TASK_ACTION_EXEC
+    $exec.Path = $NodePath
+    $exec.Arguments = $arguments
+    $exec.WorkingDirectory = $env:USERPROFILE
+    [void]$root.RegisterTaskDefinition($taskName, $definition, 6, $null, $null, 3, $null) # TASK_CREATE_OR_UPDATE
+} elseif ($Action -eq 'disable' -and $registered.Count -gt 0) {
+    $root.DeleteTask($taskName, 0)
 }
-@{ enabled=(Test-Path -LiteralPath $target); path=$target; scope='current-user-logon' } | ConvertTo-Json -Compress
+if ($Action -ne 'status' -and $legacyExists) { Remove-Item -LiteralPath $legacyPath }
+
+$active = @($root.GetTasks(1) | Where-Object { $_.Name -eq $taskName } | Select-Object -First 1)
+$taskEnabled = $active.Count -gt 0 -and $active[0].Enabled
+@{
+    enabled=($taskEnabled -or ($Action -eq 'status' -and $legacyExists))
+    path=$(if ($taskEnabled) { 'Task Scheduler:' + $taskPath } elseif ($legacyExists) { $legacyPath } else { 'Task Scheduler:' + $taskPath })
+    scope='current-user-logon'
+    mechanism=$(if ($taskEnabled) { 'task-scheduler' } elseif ($legacyExists) { 'legacy-startup-shortcut' } else { 'task-scheduler' })
+} | ConvertTo-Json -Compress

package/dist/src/platform/windows/stop-desktop.ps1

@@ -5,15 +5,18 @@ $package = Get-AppxPackage OpenAI.Codex | Select-Object -First 1
 if (-not $package -or $Executable -ne (Join-Path $package.InstallLocation 'app/ChatGPT.exe')) {
     throw 'Desktop executable identity changed; recovery stopped.'
 }
-# This action is only reached after explicit whole-workstation recovery confirmation.
-# Never kill an app-server process tree: the independent recovery worker must survive.
-$workers = @(Get-CimInstance Win32_Process -Filter "Name='ChatGPT.exe'" | Where-Object { $_.ExecutablePath -eq $Executable })
+# Never kill another user's Desktop or an app-server process tree. The independent
+# installer/recovery worker must survive and relaunch only in this interactive session.
+$currentSessionId = (Get-Process -Id $PID -ErrorAction Stop).SessionId
+$workers = @(Get-CimInstance Win32_Process -Filter "Name='ChatGPT.exe'" | Where-Object {
+    $_.ExecutablePath -eq $Executable -and $_.SessionId -eq $currentSessionId
+})
 foreach ($worker in $workers) {
     $actual = Get-CimInstance Win32_Process -Filter "ProcessId=$($worker.ProcessId)"
     if ($actual -and $actual.ExecutablePath -eq $worker.ExecutablePath -and $actual.CreationDate -eq $worker.CreationDate) {
         Stop-Process -Id $worker.ProcessId -Force -ErrorAction Stop
     }
 }
-if (Get-Process ChatGPT -ErrorAction SilentlyContinue | Where-Object { $_.Path -eq $Executable }) {
+if (Get-Process ChatGPT -ErrorAction SilentlyContinue | Where-Object { $_.Path -eq $Executable -and $_.SessionId -eq $currentSessionId }) {
     throw 'Desktop did not exit; recovery stopped.'
 }

package/dist/src/server.mjs

@@ -47,7 +47,7 @@ const ALLOWED_MODELS = new Set([
   'gpt-5.3-codex-spark',
 ]);
 const ALLOWED_THINKING = new Set(['low', 'medium', 'high', 'xhigh', 'max', 'ultra']);
-const ALLOWED_TOOLS = new Set([
+const ALLOWED_TOOLS = new Set([
   'create_thread',
   'get_usage_limits',
   'list_projects',
@@ -55,9 +55,21 @@ const ALLOWED_TOOLS = new Set([
   'read_thread',
   'send_message_to_thread',
   'wait_threads',
-]);
-
-const options = parseOptions(process.argv.slice(2));
+]);
+
+function readRuntimeVersion() {
+  let directory = path.dirname(fileURLToPath(import.meta.url));
+  while (true) {
+    const manifest = readRecord(path.join(directory, 'package.json'));
+    if (manifest?.name === '@walkhi/code-relax') return manifest.version || '未知';
+    const parent = path.dirname(directory);
+    if (parent === directory) return '未知';
+    directory = parent;
+  }
+}
+
+const options = parseOptions(process.argv.slice(2));
+const runtimeVersion = readRuntimeVersion();
 const pipePath = process.env.CODEX_APP_TOOLS_PIPE_PATH?.trim();
 let sourceThreadId = (process.env.CODEX_THREAD_ID || process.env.CODEX_SESSION_ID)?.trim();
 
@@ -201,8 +213,8 @@ async function handleRequest(request, response) {
       // must not trigger PowerShell, process-identity, or app-server checks.
       const recovery = readRecord(path.join(stateRoot, 'shared-recovery.json'));
       const recovering = ['scheduled', 'running'].includes(recovery?.status);
-      sendJson(response, 200, {
-        status: 'ok', resident: true,
+      sendJson(response, 200, {
+        status: 'ok', resident: true, version: runtimeVersion,
         execution: { ...executionHealth.state, ready: executionHealth.state.ready && (!sharedServer || sharedServer.ready),
           ...(recovering ? { state: 'recovering' } : {}), mode: executionMode },
         managedAppServer: managedAppServer.snapshot(),

package/dist/src/service-doctor.mjs

@@ -7,6 +7,7 @@ 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); }
@@ -15,7 +16,8 @@ export async function doctor({ paths, host, service, skillTarget }) {
     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。');
-    add('installation', 'ok', `服务 ${record.version}；Node：${record.nodeExecutable}`);
+    installedVersion = record.version;
+    add('installation', 'ok', `已安装版本：${record.version}；Node：${record.nodeExecutable}`);
   });
   let sharedUrl;
   await check('shared-service', async () => {
@@ -34,7 +36,10 @@ export async function doctor({ paths, host, service, skillTarget }) {
   await check('service', async () => {
     const state = await service.status();
     add('service', state.running ? 'ok' : 'warning', state.running
-      ? `本机服务正常：${state.mode}，端口 ${state.port}` : '服务未就绪；安装后执行 relax start。');
+      ? `本机服务正常：${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 尚未就绪。');

package/dist/src/service-lifecycle.mjs

@@ -56,7 +56,7 @@ export function lifecycle({ stateRoot, host }) {
     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, execution: result?.execution,
+      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 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@walkhi/code-relax",
-  "version": "0.1.0-beta.7",
+  "version": "0.1.0-beta.8",
   "license": "UNLICENSED",
   "type": "module",
   "scripts": {

package/tools/postinstall.mjs

@@ -61,6 +61,7 @@ export function formatSetupOutput(output, previous = {}) {
     return `Code Relax ${result.version || '未知版本'} 安装成功。\n`
       + `受管 app-server：${appServer}\n`
       + `Bridge：${result.restarted ? '已恢复并健康' : '已启动并健康'}\n`
+      + `${result.desktopRestarted ? `Codex Desktop：已干净重启并重新接入（${result.desktopRestartReason === 'first-install' ? '首次安装' : 'app-server 迁移'}）\n` : ''}`
       + `${result.desktopRestartRecommended ? 'Codex Desktop：建议完全退出后重新打开。\n' : ''}`;
   } catch { return output; }
 }
@@ -119,7 +120,9 @@ function skillFailureGuidance(previous, current) {
   return `${service}；Codex Skill 安装失败。\n请执行 relax skill-install，再执行 relax doctor；无需重新卸载服务。`;
 }
 
-if (process.env.npm_config_global === 'true') {
+const invokedDirectly = process.argv[1]
+  && path.resolve(process.argv[1]) === path.resolve(fileURLToPath(import.meta.url));
+if (invokedDirectly && process.env.npm_config_global === 'true') {
   const entry = fileURLToPath(new URL('../dist/bin/codex-remote.mjs', import.meta.url));
   const previous = installationSnapshot();
   let stage = 'setup';