@walkhi/code-relax 0.1.0-beta.1 → 0.1.0-beta.100

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

@@ -1,27 +1,83 @@
-param([string]$NodePath, [string]$Entry, [ValidateSet('enable','disable','status')][string]$Action='status')
+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 桌面服务'
+$legacyTaskName = 'Code Relax Bridge'
+$taskSource = '@walkhi/code-relax'
+$taskPath = '\' + $taskName
+$launcher = Join-Path $PSScriptRoot 'resident-start.js'
+$wscript = Join-Path $env:WINDIR 'System32\wscript.exe'
+$arguments = '//B //Nologo "' + $launcher + '" "' + $NodePath + '" "' + $Entry + '"'
+$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)
+$legacyRegistered = @($root.GetTasks(1) | Where-Object { $_.Name -eq $legacyTaskName } | 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.'
+}
+if ($legacyRegistered.Count -gt 0 -and $legacyRegistered[0].Definition.RegistrationInfo.Source -ne $taskSource) {
+    throw 'Legacy 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
+    if (-not (Test-Path -LiteralPath $NodePath) -or -not (Test-Path -LiteralPath $Entry) -or
+        -not (Test-Path -LiteralPath $launcher) -or -not (Test-Path -LiteralPath $wscript)) { throw 'Installed runtime is missing.' }
+    $definition = $scheduler.NewTask(0)
+    $definition.RegistrationInfo.Description = 'Start the Code Relax desktop service 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 = $wscript
+    $exec.Arguments = $arguments
+    $exec.WorkingDirectory = $env:USERPROFILE
+    [void]$root.RegisterTaskDefinition($taskName, $definition, 6, $null, $null, 3, $null) # TASK_CREATE_OR_UPDATE
+    if ($legacyRegistered.Count -gt 0) { $root.DeleteTask($legacyTaskName, 0) }
+} elseif ($Action -eq 'disable') {
+    if ($registered.Count -gt 0) { $root.DeleteTask($taskName, 0) }
+    if ($legacyRegistered.Count -gt 0) { $root.DeleteTask($legacyTaskName, 0) }
+}
+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
+$taskCurrent = $false
+if ($taskEnabled) {
+    $taskAction = $active[0].Definition.Actions.Item(1)
+    $taskCurrent = $taskAction.Path -ieq $wscript -and $taskAction.Arguments -ieq $arguments
 }
-@{ enabled=(Test-Path -LiteralPath $target); path=$target; scope='current-user-logon' } | ConvertTo-Json -Compress
+@{
+    enabled=($taskCurrent -and $legacyRegistered.Count -eq 0)
+    taskPresent=$taskEnabled
+    path=$(if ($taskEnabled) { 'Task Scheduler:' + $taskPath } elseif ($legacyRegistered.Count -gt 0) { 'Task Scheduler:\' + $legacyTaskName } elseif ($legacyExists) { $legacyPath } else { 'Task Scheduler:' + $taskPath })
+    scope='current-user-logon'
+    mechanism=$(if ($taskCurrent -and $legacyRegistered.Count -eq 0) { 'task-scheduler' } elseif ($taskEnabled -or $legacyRegistered.Count -gt 0) { 'stale-task-scheduler' } elseif ($legacyExists) { 'legacy-startup-shortcut' } else { 'task-scheduler' })
+} | ConvertTo-Json -Compress

package/dist/src/platform/windows/rustdesk-video-probe.mjs

@@ -0,0 +1,168 @@
+import crypto from 'node:crypto';
+import fs from 'node:fs';
+import net from 'node:net';
+import os from 'node:os';
+import path from 'node:path';
+import { spawn } from 'node:child_process';
+import { brotliDecompressSync } from 'node:zlib';
+
+export const RUSTDESK_PROBE_HOST_SHA256 = '8555777215510d83d2d61c9dc984e4fcc838bd7e79f9d18a42585431f5e8bb47';
+const leaseMs = 60_000;
+const pause = ms => new Promise(resolve => setTimeout(resolve, ms));
+const failure = code => Object.assign(new Error('桌面视频测试尚未就绪'), { code, statusCode: 503 });
+
+// The official EXE is a launcher. Extract its verified Brotli payload into our
+// own runtime directory and launch the actual process, so leases own its PID.
+export function prepareRustDeskProbeHost(root) {
+  const bytes = fs.readFileSync(path.join(root, 'rustdesk-1.5.0-x86_64.exe'));
+  if (crypto.createHash('sha256').update(bytes).digest('hex') !== RUSTDESK_PROBE_HOST_SHA256) throw failure('desktop_video_host_hash');
+  const magic = Buffer.from('rustdesk'), decoder = new TextDecoder('utf-8', { fatal: true });
+  let search = 0, entries;
+  while (search < bytes.length) {
+    const at = bytes.indexOf(magic, search); if (at < 0) break; search = at + magic.length;
+    try {
+      let offset = at + magic.length; const files = [];
+      while (!bytes.subarray(offset, offset + magic.length).equals(magic)) {
+        const length = bytes.readUInt32BE(offset); offset += 4;
+        if (length < 1 || length > 512) throw new Error('payload');
+        const name = decoder.decode(bytes.subarray(offset, offset + length)).replaceAll('\\', '/'); offset += length;
+        if (/[\x00-\x1f]/.test(name) || path.posix.isAbsolute(name) || name.includes(':') || name.split('/').includes('..')) throw new Error('payload_path');
+        const size = bytes.readUInt32BE(offset); offset += 4;
+        if (size < 1 || offset + size + 32 > bytes.length) throw new Error('payload');
+        const data = bytes.subarray(offset, offset + size); offset += size;
+        const md5 = bytes.subarray(offset, offset + 32).toString(); offset += 32;
+        if (!/^[a-f0-9]{32}$/.test(md5)) throw new Error('payload');
+        files.push({ name: path.posix.normalize(name), data, md5 });
+        if (files.length > 5000) throw new Error('payload');
+      }
+      if (files.length !== 104 || !files.some(file => file.name === 'rustdesk.exe')) continue;
+      const suffix = Buffer.from('.\\rustdesk.exe');
+      if (!bytes.subarray(offset + 8, offset + 8 + suffix.length).equals(suffix)) continue;
+      entries = files; break;
+    } catch { /* Non-payload occurrences of the ASCII magic are expected in PE strings. */ }
+  }
+  if (!entries) throw failure('desktop_video_host_payload');
+  const runtime = path.resolve(root, 'runtime');
+  for (const file of entries) {
+    const target = path.resolve(runtime, file.name);
+    if (!target.startsWith(runtime + path.sep)) throw failure('desktop_video_host_path');
+    let existing;
+    try { existing = crypto.createHash('md5').update(fs.readFileSync(target)).digest('hex'); } catch {}
+    if (existing === file.md5) continue;
+    const data = brotliDecompressSync(file.data, { maxOutputLength: 128 * 1024 * 1024 });
+    if (crypto.createHash('md5').update(data).digest('hex') !== file.md5) throw failure('desktop_video_host_payload');
+    fs.mkdirSync(path.dirname(target), { recursive: true }); fs.writeFileSync(target, data);
+  }
+  return path.join(runtime, 'rustdesk.exe');
+}
+
+// A read-only, LAN-only prototype. The normal desktop helper and input path are independent.
+export class RustDeskVideoProbe {
+  constructor({ stateRoot, appData = process.env.APPDATA, platform = process.platform } = {}) {
+    this.platform = platform;
+    this.root = path.join(stateRoot, 'desktop-video-probe');
+    this.configRoot = path.join(appData || os.tmpdir(), 'RustDesk', 'config');
+    this.process = null; this.lease = null; this.timer = null; this.starting = false; this.stopped = Promise.resolve(); this.preparedExecutable = null;
+  }
+  configuration(port, password) {
+    const options = {
+      'direct-server': 'Y', 'direct-access-port': String(port),
+      'custom-rendezvous-server': '127.0.0.1:9', 'relay-server': '127.0.0.1:9', 'api-server': 'http://127.0.0.1:9',
+      'enable-hwcodec': 'N', 'access-mode': 'view', 'approve-mode': 'password', 'verification-method': 'use-permanent-password',
+      'enable-keyboard': 'N', 'enable-clipboard': 'N', 'enable-file-transfer': 'N', 'enable-audio': 'N',
+      'enable-tunnel': 'N', 'enable-terminal': 'N', 'enable-record-session': 'N',
+      'allow-auto-record-incoming': 'N', 'allow-auto-record-outgoing': 'N'
+    };
+    return {
+      main: `password = '${password}'\nsalt = '${crypto.randomBytes(16).toString('hex')}'\n`,
+      secondary: "rendezvous_server = '127.0.0.1:9'\n\n[options]\n" + Object.entries(options).map(([key, value]) => `${key} = '${value}'`).join('\n') + '\n'
+    };
+  }
+  async begin() {
+    if (this.platform !== 'win32') throw failure('desktop_video_platform');
+    if (this.starting || this.lease) throw failure('desktop_video_busy');
+    this.starting = true;
+    try {
+      await this.stopped;
+      const executable = path.join(this.root, 'rustdesk-1.5.0-x86_64.exe');
+      let binary;
+      try { binary = fs.readFileSync(executable); } catch { throw failure('desktop_video_host_missing'); }
+      if (crypto.createHash('sha256').update(binary).digest('hex') !== RUSTDESK_PROBE_HOST_SHA256) throw failure('desktop_video_host_hash');
+      const ownerFile = path.join(this.root, 'config-owner.json');
+      let owner;
+      try { owner = JSON.parse(fs.readFileSync(ownerFile, 'utf8')); } catch {}
+      const entries = fs.existsSync(this.configRoot) ? fs.readdirSync(this.configRoot) : [];
+      if (entries.length && (owner?.configRoot !== this.configRoot || !owner.hashes
+        || JSON.stringify(owner.hashes) !== JSON.stringify(this.configHashes()))) throw failure('desktop_video_existing_rustdesk');
+      const port = await new Promise((resolve, reject) => {
+        const server = net.createServer(); server.once('error', reject);
+        server.listen(0, '127.0.0.1', () => { const port = server.address().port; server.close(error => error ? reject(error) : resolve(port)); });
+      });
+      const actualExecutable = this.preparedExecutable ||= prepareRustDeskProbeHost(this.root);
+      const password = crypto.randomBytes(24).toString('hex'), leaseId = crypto.randomBytes(16).toString('hex');
+      const config = this.configuration(port, password);
+      fs.mkdirSync(this.root, { recursive: true, mode: 0o700 });
+      fs.mkdirSync(this.configRoot, { recursive: true, mode: 0o700 });
+      fs.writeFileSync(path.join(this.configRoot, 'RustDesk.toml'), config.main, { mode: 0o600 });
+      fs.writeFileSync(path.join(this.configRoot, 'RustDesk2.toml'), config.secondary, { mode: 0o600 });
+      this.saveOwner();
+      this.process = spawn(actualExecutable, ['--server'], { cwd: path.dirname(actualExecutable),
+        env: { ...process.env, RUSTDESK_APPNAME: 'rustdesk-1.5.0-x86_64.exe' }, windowsHide: true, stdio: 'ignore' });
+      const child = this.process; let launchError = false;
+      console.info(JSON.stringify({ event: 'desktop-video-host', stage: 'spawn', pid: child.pid }));
+      this.stopped = new Promise(resolve => {
+        let ended = false;
+        const finished = () => {
+          console.info(JSON.stringify({ event: 'desktop-video-host', stage: 'exit', pid: child.pid, code: child.exitCode }));
+          if (ended) return; ended = true;
+          try { this.saveOwner(); } catch { console.error(JSON.stringify({ event: 'desktop-video-owner', state: 'failed' })); }
+          if (this.process === child) { clearTimeout(this.timer); this.process = null; this.lease = null; }
+          resolve();
+        };
+        child.once('error', () => { launchError = true; finished(); });
+        child.once('exit', finished);
+      });
+      const deadline = Date.now() + 8_000;
+      let ready = false;
+      while (Date.now() < deadline && child.exitCode === null && !launchError) {
+        ready = await new Promise(resolve => {
+          const socket = net.connect({ host: '127.0.0.1', port });
+          let settled = false;
+          const finish = value => { if (settled) return; settled = true; socket.destroy(); resolve(value); };
+          socket.once('connect', () => finish(true)); socket.once('error', () => finish(false)); socket.setTimeout(300, () => finish(false));
+        });
+        if (ready) break;
+        await pause(150);
+      }
+      if (!ready) throw failure('desktop_video_host_start');
+      this.lease = { leaseId, password, port, codec: 'vp9', fps: 5, viewOnly: true };
+      console.info(JSON.stringify({ event: 'desktop-video-host', stage: 'ready', pid: child.pid }));
+      this.renew(leaseId);
+      return { ...this.lease, engine: 'rustdesk-probe', expiresInMs: leaseMs };
+    } catch (error) { this.stop(); throw error; }
+    finally { this.starting = false; }
+  }
+  configHashes() {
+    return ['RustDesk.toml', 'RustDesk2.toml'].map(name => {
+      try { return crypto.createHash('sha256').update(fs.readFileSync(path.join(this.configRoot, name))).digest('hex'); }
+      catch { return ''; }
+    });
+  }
+  saveOwner() {
+    fs.writeFileSync(path.join(this.root, 'config-owner.json'), JSON.stringify({ configRoot: this.configRoot, hashes: this.configHashes() }), { mode: 0o600 });
+  }
+  renew(leaseId) {
+    if (!this.lease || leaseId !== this.lease.leaseId) throw failure('desktop_video_lease');
+    clearTimeout(this.timer); this.timer = setTimeout(() => this.stop(), leaseMs); this.timer.unref();
+    return { active: true, expiresInMs: leaseMs };
+  }
+  release(leaseId) {
+    if (this.lease?.leaseId === leaseId) this.stop();
+    return { released: true };
+  }
+  stop() {
+    clearTimeout(this.timer); this.timer = null;
+    const child = this.process; this.process = null; this.lease = null;
+    if (child && child.exitCode === null) child.kill();
+  }
+}

package/dist/src/platform/windows/service-host.mjs

@@ -3,41 +3,33 @@ import { promisify } from 'node:util';
 import path from 'node:path';
 import { fileURLToPath } from 'node:url';
 import fs from 'node:fs';
-import { runtimePaths } from './runtime-paths.mjs';
-import { readRecord } from '../../service-lifecycle.mjs';
-import { lanNetworks } from './network-info.mjs';
+import { runtimePaths } from './runtime-paths.mjs';
+import { readRecord } from '../../service-lifecycle.mjs';
+import { readManagedEndpoint } from '../../managed-endpoint.mjs';
+import { lanNetworks } from './network-info.mjs';
 
 const exec = promisify(execFile);
 const bridgeRoot = fileURLToPath(new URL('../../../', import.meta.url));
-async function detect(script) {
+async function detect(script, args = []) {
   const executable = path.join(process.env.SystemRoot, 'System32/WindowsPowerShell/v1.0/powershell.exe');
   const { stdout } = await exec(executable, ['-NoProfile', '-NonInteractive', '-File',
-    path.join(bridgeRoot, script)], { windowsHide: true, encoding: 'utf8' });
+    path.join(bridgeRoot, script), ...args], { windowsHide: true, encoding: 'utf8' });
   return stdout.trim();
 }
 
 // Windows-only network metadata stays here, outside the lifecycle implementation.
-export const sharedServiceUrl = () => detect('get-shared-service-url.ps1');
-export const lanAddress = async () => (await lanNetworks())[0]?.address || '';
-export { lanNetworks };
-export function migrateState(stateRoot) {
-  fs.mkdirSync(stateRoot, { recursive: true });
-  for (const name of ['bridge-config.json', 'bridge-session.json']) {
-    const target = path.join(stateRoot, name);
-    const old = path.join(bridgeRoot, '../.codex/bridge', name);
-    if (!fs.existsSync(target) && fs.existsSync(old)) fs.copyFileSync(old, target, fs.constants.COPYFILE_EXCL);
-  }
-}
-export async function desktopEnvironment(context, sharedUrl) {
+export const sharedServiceUrl = () => {
+  const url = readManagedEndpoint(runtimePaths().stateRoot);
+  return url ? detect('get-shared-service-url.ps1', ['-AppServerUrl', url]) : '';
+};
+export const lanAddress = async () => (await lanNetworks())[0]?.address || '';
+export { lanNetworks };
+export async function bridgeEnvironment() {
   const environment = { ...process.env };
-  environment.CODEX_THREAD_ID ||= environment.CODEX_SESSION_ID || context?.sourceThreadId;
-  if (sharedUrl) environment.CODEX_REMOTE_SHARED_WS_URL = sharedUrl;
-  else delete environment.CODEX_REMOTE_SHARED_WS_URL;
   const installation = readRecord(path.join(runtimePaths(environment).serviceRoot, 'installation.json'));
   const executable = installation?.nodeExecutable;
-  if (!executable || !fs.existsSync(executable)) throw new Error('安装时选用的 Node 不存在，请重新安装 Code Relax。');
+  if (!executable || !fs.existsSync(executable)) throw new Error('安装时选用的 Node 不存在，请重新安装 Code Relax。');
   environment.CODEX_MCP_NODE_PATH = executable;
-  environment.CODEX_REMOTE_LEGACY_UPLOADS_ROOTS = JSON.stringify(installation.legacyUploadsRoots || []);
-  if (sharedUrl) delete environment.CODEX_APP_TOOLS_PIPE_PATH;
+  delete environment.CODEX_APP_TOOLS_PIPE_PATH;
   return { executable, environment };
 }

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.
@@ -10,30 +11,48 @@ try {
     Add-Type -Path (Join-Path $PSScriptRoot 'IsolatedProcess.cs')
     $launchRoot = [IsolatedProcess]::ResolvePath($launchRoot)
     $ready = Join-Path $launchRoot ($instance + '.json')
+    $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 ready -NotePropertyValue $ready
-    $environment = @(Get-ChildItem Env: | Where-Object { $_.Name -ne 'CODEX_REMOTE_PROCESS_SPEC' } | ForEach-Object { $_.Name + '=' + $_.Value })
-    $environment += 'CODEX_REMOTE_PROCESS_SPEC=' + ($spec | ConvertTo-Json -Compress -Depth 10)
+    $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; EnvironmentVariables=[string[]]$environment
+        ShowWindow=[uint16]0; CreateFlags=[uint32]0x1000010
     }
-    $powershell = Join-Path $env:SystemRoot 'System32\WindowsPowerShell\v1.0\powershell.exe'
-    $command = '"' + $powershell + '" -NoProfile -NonInteractive -WindowStyle Hidden -ExecutionPolicy Bypass -File "' + (Join-Path $PSScriptRoot 'launch-worker.ps1') + '"'
+    $worker = Join-Path $PSScriptRoot 'launch-worker.mjs'
+    $command = '"' + [string]$spec.brokerExecutable + '" "' + $worker + '" "' + $request + '" "' + $ready + '" "' + $instance + '" "' + $diagnostic + '"'
     $broker = Invoke-CimMethod -ClassName Win32_Process -MethodName Create -Arguments @{
         CommandLine=$command; CurrentDirectory=$env:USERPROFILE; ProcessStartupInformation=$startup
     }
     if ($broker.ReturnValue -ne 0) { throw ('Windows process broker failed: ' + $broker.ReturnValue) }
-    $deadline = [DateTime]::UtcNow.AddSeconds(20)
+    $brokerStarted = $true
+    $deadline = [DateTime]::UtcNow.AddSeconds(30)
     while (-not (Test-Path -LiteralPath $ready)) {
-        if ([DateTime]::UtcNow -gt $deadline) { throw 'Windows process broker handoff timed out.' }
+        if ([DateTime]::UtcNow -gt $deadline) {
+            $detail = if (Test-Path -LiteralPath $diagnostic) { (Get-Content -LiteralPath $diagnostic -Raw -Encoding UTF8).Trim() } else { 'broker did not create a diagnostic log' }
+            throw ('Windows process broker handoff timed out (broker PID ' + $broker.ProcessId + '): ' + $detail)
+        }
         Start-Sleep -Milliseconds 50
     }
     $result = Get-Content -LiteralPath $ready -Raw -Encoding UTF8 | ConvertFrom-Json
     Remove-Item -LiteralPath $ready
     if ($result.instance -ne $instance -or $result.brokerPid -ne $broker.ProcessId) { throw 'Windows process broker identity mismatch.' }
     if ($result.error) { throw [string]$result.error }
+    if (Test-Path -LiteralPath $diagnostic) { Remove-Item -LiteralPath $diagnostic -Force }
     [Console]::WriteLine([int]$result.pid)
 } catch {
     [Console]::Error.WriteLine($_.Exception.Message)
     exit 1
+} finally {
+    # 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/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/platform/windows/user-environment.mjs

@@ -1,50 +1,52 @@
-import path from 'node:path';
-import fs from 'node:fs';
-import { readRecord, writeRecord } from '../../service-lifecycle.mjs';
-import { runScript } from './desktop-host.mjs';
-import { managedAppServerUrl } from '../../managed-app-server.mjs';
-
-const ownershipFile = 'managed-environment.json';
-
-export async function readManagedEnvironment() {
-  return JSON.parse(await runScript('user-environment.ps1', ['-Action', 'Read']));
-}
-
-export async function configureManagedEnvironment(stateRoot) {
-  const current = await readManagedEnvironment();
-  const ownershipPath = path.join(stateRoot, ownershipFile);
-  const ownership = readRecord(ownershipPath);
-  if (current.forceCliUser === '1' || current.forceCliMachine === '1') {
-    throw new Error('CODEX_APP_SERVER_FORCE_CLI=1 会让 Codex 忽略受管 app-server；未修改该配置。');
-  }
-  if (current.userValue && current.userValue !== managedAppServerUrl) {
-    throw new Error(`用户已有 CODEX_APP_SERVER_WS_URL=${current.userValue}；未覆盖该配置。`);
-  }
-  if (current.userValue === managedAppServerUrl) {
-    const owned = ownership?.value === managedAppServerUrl;
-    return { configured: true, value: current.userValue, changed: false, owned };
-  }
-  const applied = JSON.parse(await runScript('user-environment.ps1', ['-Action', 'Set', '-Value', managedAppServerUrl]));
-  writeRecord(ownershipPath, { name: 'CODEX_APP_SERVER_WS_URL', value: managedAppServerUrl,
-    configuredAt: new Date().toISOString() });
-  return { configured: true, value: applied.userValue, changed: true, owned: true };
-}
-
-export async function clearManagedEnvironment(stateRoot) {
-  const ownershipPath = path.join(stateRoot, ownershipFile);
-  const ownership = readRecord(ownershipPath);
-  const current = await readManagedEnvironment();
-  if (!current.userValue) {
-    fs.rmSync(ownershipPath, { force: true });
-    return { removed: false, preserved: false, reason: 'already-empty' };
-  }
-  if (ownership?.value !== managedAppServerUrl || current.userValue !== managedAppServerUrl) {
-    fs.rmSync(ownershipPath, { force: true });
-    return { removed: false, preserved: true, value: current.userValue,
-      reason: ownership?.value === managedAppServerUrl ? 'user-modified' : 'not-owned' };
-  }
-  const result = JSON.parse(await runScript('user-environment.ps1', ['-Action', 'Clear']));
-  if (result.userValue) throw new Error('CODEX_APP_SERVER_WS_URL 清理后读回仍不为空。');
-  fs.rmSync(ownershipPath, { force: true });
-  return { removed: true, preserved: false, reason: 'removed' };
-}
+import path from 'node:path';
+import fs from 'node:fs';
+import { readRecord, writeRecord } from '../../service-lifecycle.mjs';
+import { runScript } from './desktop-host.mjs';
+import { managedEndpointUrl } from '../../managed-endpoint.mjs';
+
+const ownershipFile = 'managed-environment.json';
+
+export async function readManagedEnvironment() {
+  return JSON.parse(await runScript('user-environment.ps1', ['-Action', 'Read']));
+}
+
+export async function configureManagedEnvironment(stateRoot, url) {
+  const current = await readManagedEnvironment();
+  if (!managedEndpointUrl(url)) throw new Error('未确认 Codex 内核地址，未修改环境变量。');
+  const ownershipPath = path.join(stateRoot, ownershipFile);
+  const ownership = readRecord(ownershipPath);
+  if (current.forceCliUser === '1' || current.forceCliMachine === '1') {
+    throw new Error('CODEX_APP_SERVER_FORCE_CLI=1 会让 Codex 忽略当前内核地址；未修改该配置。');
+  }
+  if (current.userValue && current.userValue !== url && current.userValue !== ownership?.value) {
+    throw new Error(`用户已有 CODEX_APP_SERVER_WS_URL=${current.userValue}；未覆盖该配置。`);
+  }
+  if (current.userValue === url) {
+    const owned = ownership?.value === url;
+    return { configured: true, value: current.userValue, changed: false, owned };
+  }
+  const applied = JSON.parse(await runScript('user-environment.ps1', ['-Action', 'Set', '-Value', url]));
+  if (applied.userValue !== url) throw new Error('CODEX_APP_SERVER_WS_URL 写入后读回不一致。');
+  writeRecord(ownershipPath, { name: 'CODEX_APP_SERVER_WS_URL', value: url,
+    configuredAt: new Date().toISOString() });
+  return { configured: true, value: applied.userValue, changed: true, owned: true };
+}
+
+export async function clearManagedEnvironment(stateRoot) {
+  const ownershipPath = path.join(stateRoot, ownershipFile);
+  const ownership = readRecord(ownershipPath);
+  const current = await readManagedEnvironment();
+  if (!current.userValue) {
+    fs.rmSync(ownershipPath, { force: true });
+    return { removed: false, preserved: false, reason: 'already-empty' };
+  }
+  if (!managedEndpointUrl(ownership?.value) || current.userValue !== ownership.value) {
+    fs.rmSync(ownershipPath, { force: true });
+    return { removed: false, preserved: true, value: current.userValue,
+      reason: managedEndpointUrl(ownership?.value) ? 'user-modified' : 'not-owned' };
+  }
+  const result = JSON.parse(await runScript('user-environment.ps1', ['-Action', 'Clear']));
+  if (result.userValue) throw new Error('CODEX_APP_SERVER_WS_URL 清理后读回仍不为空。');
+  fs.rmSync(ownershipPath, { force: true });
+  return { removed: true, preserved: false, reason: 'removed' };
+}