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

package/dist/build-platform.json

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

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

@@ -15,6 +15,9 @@ if (-not $package -or $Executable -ne (Join-Path $package.InstallLocation 'app/C
 if ([Environment]::GetEnvironmentVariable('CODEX_APP_SERVER_WS_URL', 'User') -ne $AppServerUrl) {
     throw 'Desktop app-server environment differs from the workstation; run relax setup to repair it.'
 }
+if ([Environment]::GetEnvironmentVariable('CODEX_APP_SERVER_USE_LOCAL_DAEMON', 'User') -ne '1') {
+    throw 'Desktop browser session environment is not configured; run relax setup to repair it.'
+}
 if ([Environment]::GetEnvironmentVariable('CODEX_APP_SERVER_FORCE_CLI', 'User') -eq '1' -or
     [Environment]::GetEnvironmentVariable('CODEX_APP_SERVER_FORCE_CLI', 'Machine') -eq '1') {
     throw 'CODEX_APP_SERVER_FORCE_CLI=1 prevents Desktop from connecting to the workstation.'

package/dist/src/platform/windows/desktop-browser-environment.mjs

@@ -0,0 +1,38 @@
+import path from 'node:path';
+import fs from 'node:fs';
+import { readRecord, writeRecord } from '../../service-lifecycle.mjs';
+import { runScript } from './desktop-host.mjs';
+
+// Desktop 26.1027.6604.0 gates cua_repl's session environment on this flag.
+// MSIX activation does not inherit the caller's environment block.
+const name = 'CODEX_APP_SERVER_USE_LOCAL_DAEMON';
+const ownershipFile = 'managed-desktop-browser-environment.json';
+async function environment(action, value) {
+  const args = ['-Action', action, '-Name', name];
+  if (value != null) args.push('-Value', value);
+  return JSON.parse(await runScript('user-environment.ps1', args));
+}
+
+export async function configureDesktopBrowserEnvironment(stateRoot) {
+  const current = await environment('Read');
+  if (current.userValue === '1') return; // Do not claim an existing user setting.
+  const ownershipPath = path.join(stateRoot, ownershipFile);
+  // Save before writing so a failed write/broadcast can still be undone.
+  writeRecord(ownershipPath, { name, value: '1', previousValue: current.userValue ?? null });
+  const applied = await environment('Set', '1');
+  if (applied.userValue !== '1') throw new Error('Desktop browser environment verification failed.');
+}
+
+export async function restoreDesktopBrowserEnvironment(stateRoot) {
+  const ownershipPath = path.join(stateRoot, ownershipFile);
+  const ownership = readRecord(ownershipPath);
+  if (ownership?.name !== name || ownership.value !== '1') return;
+  const current = await environment('Read');
+  if (current.userValue === ownership.value) {
+    const previous = ownership.previousValue;
+    const restored = await environment(previous ? 'Set' : 'Clear', previous);
+    if ((restored.userValue || null) !== (previous || null)) throw new Error('Desktop browser environment restore failed.');
+  }
+  // A value changed by the user is preserved when management ends.
+  fs.rmSync(ownershipPath, { force: true });
+}

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

@@ -6,6 +6,7 @@ import path from 'node:path';
 import { managedEndpointUrl, readManagedEndpoint } from '../../managed-endpoint.mjs';
 import { runtimePaths } from './runtime-paths.mjs';
 import { sharedServiceUrl } from './service-host.mjs';
+import { configureDesktopBrowserEnvironment } from './desktop-browser-environment.mjs';
 const exec = promisify(execFile);
 const directory = path.dirname(fileURLToPath(import.meta.url));
 export const powershell = path.join(process.env.SystemRoot || 'C:\\Windows', 'System32/WindowsPowerShell/v1.0/powershell.exe');
@@ -19,9 +20,10 @@ export const desktopHost = {
   sharedServiceUrl,
   ownsListener: async (expected, url) => JSON.parse(await runScript('desktop-info.ps1', ['-ProcessId', String(expected.pid), '-Expected', JSON.stringify(expected), '-AppServerUrl', url, '-CheckListener'])),
   start: startWindowsProcess,
-  startDesktop: (executable, environment) => {
+  startDesktop: async (executable, environment) => {
     const url = managedEndpointUrl(environment.CODEX_APP_SERVER_WS_URL);
     if (!url || url !== readManagedEndpoint(runtimePaths().stateRoot)) throw new Error('Desktop 内核地址与工作站不一致。');
+    await configureDesktopBrowserEnvironment(runtimePaths().stateRoot);
     return runScript('activate-desktop.ps1', [
       '-Executable', executable, '-AppServerUrl', url,
     ]);

package/dist/src/platform/windows/user-environment.mjs

@@ -3,6 +3,7 @@ import fs from 'node:fs';
 import { readRecord, writeRecord } from '../../service-lifecycle.mjs';
 import { runScript } from './desktop-host.mjs';
 import { managedEndpointUrl } from '../../managed-endpoint.mjs';
+import { configureDesktopBrowserEnvironment, restoreDesktopBrowserEnvironment } from './desktop-browser-environment.mjs';
 
 const ownershipFile = 'managed-environment.json';
 
@@ -22,6 +23,7 @@ export async function configureManagedEnvironment(stateRoot, url) {
     throw new Error(`用户已有 CODEX_APP_SERVER_WS_URL=${current.userValue}；未覆盖该配置。`);
   }
   if (current.userValue === url) {
+    await configureDesktopBrowserEnvironment(stateRoot);
     const owned = ownership?.value === url;
     return { configured: true, value: current.userValue, changed: false, owned };
   }
@@ -29,10 +31,12 @@ export async function configureManagedEnvironment(stateRoot, 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() });
+  await configureDesktopBrowserEnvironment(stateRoot);
   return { configured: true, value: applied.userValue, changed: true, owned: true };
 }
 
 export async function clearManagedEnvironment(stateRoot) {
+  await restoreDesktopBrowserEnvironment(stateRoot);
   const ownershipPath = path.join(stateRoot, ownershipFile);
   const ownership = readRecord(ownershipPath);
   const current = await readManagedEnvironment();

package/dist/src/platform/windows/user-environment.ps1

@@ -1,10 +1,11 @@
-param(
+param(
     [ValidateSet('Read', 'Set', 'Clear')][string]$Action = 'Read',
-    [string]$Value = ''
+    [string]$Value = '',
+    [ValidateSet('CODEX_APP_SERVER_WS_URL', 'CODEX_APP_SERVER_USE_LOCAL_DAEMON')]
+    [string]$Name = 'CODEX_APP_SERVER_WS_URL'
 )
 $ErrorActionPreference = 'Stop'
 [Console]::OutputEncoding = New-Object System.Text.UTF8Encoding($false)
-$name = 'CODEX_APP_SERVER_WS_URL'
 
 function Broadcast-EnvironmentChange {
     if (-not ('CodeRelax.EnvironmentBroadcast' -as [type])) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@walkhi/code-relax",
-  "version": "0.1.0-beta.100",
+  "version": "0.1.0-beta.101",
   "private": false,
   "license": "UNLICENSED",
   "type": "module",