@walkhi/code-relax 0.1.0-beta.2 → 0.1.0-beta.4

package/README.md

@@ -80,4 +80,4 @@ npm uninstall -g @walkhi/code-relax
 
 ## 发布边界
 
-当前包名为 `@walkhi/code-relax@0.1.0-beta.2`，主 CLI 为 `relax`，并保留 `code-relax` 兼容入口。当前已完成 npm scope 发布和本机 registry 在线安装；本版修复了另一台电脑首次安装时的 Windows broker 交接超时，仍需在原电脑复核。详细规则见 [npm 分发](../docs/npm-distribution.md)。
+registry 当前公开包为 `@walkhi/code-relax@0.1.0-beta.3`，主 CLI 为 `relax`，并保留 `code-relax` 兼容入口。该版将 WMI 后的第二层 PowerShell broker 改为 Node worker，并加入 `%LOCALAPPDATA%\CodexRemote\install.log` 持久安装日志；本机启动交接、npm 打包和公开 registry 已验证，仍需在原故障电脑复核。详细规则见 [npm 分发](../docs/npm-distribution.md)。

package/dist/src/platform/windows/background-process.mjs

@@ -25,6 +25,6 @@ export function startWindowsProcess(executable, args, environment, logs = []) {
       if (!Number.isSafeInteger(pid) || pid <= 0) return reject(new Error('后台启动未返回有效 PID'));
       resolve(pid);
     });
-    helper.stdin.end(JSON.stringify({ executable, args, logs, environment }));
+    helper.stdin.end(JSON.stringify({ brokerExecutable: process.execPath, executable, args, logs, environment }));
   });
 }

package/dist/src/platform/windows/launch-worker.mjs

@@ -0,0 +1,42 @@
+import fs from 'node:fs';
+import { spawn } from 'node:child_process';
+
+const [requestPath, readyPath, instance, diagnosticPath] = process.argv.slice(2);
+let result = { instance, brokerPid: process.pid };
+
+function diagnostic(message) {
+  if (!diagnosticPath) return;
+  fs.appendFileSync(diagnosticPath, `${new Date().toISOString()} ${message}\n`, 'utf8');
+}
+
+try {
+  const spec = JSON.parse(fs.readFileSync(requestPath, 'utf8').replace(/^\uFEFF/u, ''));
+  diagnostic('request loaded');
+  if (spec.instance !== instance) throw new Error('Windows process broker request identity mismatch.');
+  fs.rmSync(requestPath, { force: true });
+  const descriptors = (spec.logs || []).map(file => fs.openSync(file, 'a'));
+  try {
+    const child = spawn(spec.executable, spec.args || [], {
+      detached: true,
+      windowsHide: true,
+      env: spec.environment,
+      stdio: ['ignore', descriptors[0] ?? 'ignore', descriptors[1] ?? 'ignore'],
+    });
+    await new Promise((resolve, reject) => {
+      child.once('spawn', resolve);
+      child.once('error', reject);
+    });
+    child.unref();
+    result.pid = child.pid;
+    diagnostic(`target started (PID ${child.pid})`);
+  } finally {
+    descriptors.forEach(descriptor => fs.closeSync(descriptor));
+  }
+} catch (error) {
+  result.error = error?.stack || error?.message || String(error);
+  try { diagnostic(`failed: ${result.error}`); } catch {}
+}
+
+const temporary = `${readyPath}.tmp`;
+fs.writeFileSync(temporary, JSON.stringify(result), 'utf8');
+fs.renameSync(temporary, readyPath);

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

@@ -11,29 +11,34 @@ try {
     $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 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)
-    $environment = @(Get-ChildItem Env: | ForEach-Object { $_.Name + '=' + $_.Value })
     $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') + '" -RequestPath "' + $request + '" -ReadyPath "' + $ready + '" -Instance "' + $instance + '"'
+    $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(30)
     while (-not (Test-Path -LiteralPath $ready)) {
-        if ([DateTime]::UtcNow -gt $deadline) { throw ('Windows process broker handoff timed out (broker PID ' + $broker.ProcessId + ').') }
+        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)

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

@@ -18,12 +18,16 @@ import { relayAddress, validSecret } from './wire.mjs';
 import { saveLanAuthorizations } from './lan-authorizations.mjs';
 import { lanNetworks } from '../platform/windows/network-info.mjs';
 
-const exec = promisify(execFile);
-const script = fileURLToPath(import.meta.url);
-const recordPath = root => path.join(root, 'self-relay-session.json');
-
-async function loadConfig(stateRoot) {
-  const config = readRecord(path.join(stateRoot, 'self-relay-config.json')) || {};
+const exec = promisify(execFile);
+const script = fileURLToPath(import.meta.url);
+const recordPath = root => path.join(root, 'self-relay-session.json');
+const officialConfig = { url: 'wss://api.uulife.site/relay' };
+
+async function loadConfig(stateRoot) {
+  const configPath = path.join(stateRoot, 'self-relay-config.json');
+  const stored = readRecord(configPath) || {};
+  const config = { ...officialConfig, ...stored };
+  if (!stored.url) writeRecord(configPath, config);
   if (config.p2pIceServers !== undefined && !validProbeIceServers(config.p2pIceServers)) throw new Error('p2pIceServers 只接受最多 4 个 stun:主机:端口地址');
   if (config.p2pWindowsRouteHelper !== undefined && typeof config.p2pWindowsRouteHelper !== 'boolean') throw new Error('p2pWindowsRouteHelper 必须是布尔值');
   if (config.p2pWindowsRouteHelper && !/^[A-Za-z0-9_-]{32,128}$/.test(config.p2pWindowsRouteHelperToken || '')) throw new Error('p2pWindowsRouteHelperToken 无效');
@@ -37,8 +41,9 @@ async function loadConfig(stateRoot) {
       (pairing.protocol === 'http:' && pairing.hostname !== '127.0.0.1')) throw new Error('self-relay-config.json 的 pairingUrl 必须是 HTTPS /pair 地址。');
   return { ...config, url: resolved, pairingUrl: pairing.href };
 }
-async function registrationKey(config) {
-  const hostKeyFile = process.env.RELAY_HOST_KEY_FILE || config.hostKeyFile;
+async function registrationKey(config) {
+  if (config.url === officialConfig.url) return undefined;
+  const hostKeyFile = process.env.RELAY_HOST_KEY_FILE || config.hostKeyFile;
   let hostKey;
   if (hostKeyFile) hostKey = fs.readFileSync(hostKeyFile, 'utf8').trim();
   else {

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

@@ -198,11 +198,13 @@ export async function startSelfRelay({ port = 0, hostKey = secret(), pairingTtlM
               hostName = normalizeHostName(message.hostName);
             }
             catch { return fail(1008, 'Invalid LAN candidates'); }
-            room = durable ? rooms.get(message.deviceId) : undefined;
-            if (room && (room.status !== 'active' || !matches(message.deviceSecret, room.hostHash))) return fail();
-            if (!room) {
-              if (!matches(message.key, hostHash)) return fail();
-              if (rooms.size >= 256) return fail(4429, 'Device limit reached');
+            room = durable ? rooms.get(message.deviceId) : undefined;
+            if (room && (room.status !== 'active' || !matches(message.deviceSecret, room.hostHash))) return fail();
+            if (!room) {
+              // Durable computers prove future ownership with their generated device secret.
+              // The legacy deployment key remains accepted, but is no longer required for first registration.
+              if (!durable && !matches(message.key, hostHash)) return fail();
+              if (rooms.size >= 256) return fail(4429, 'Device limit reached');
               const now = new Date().toISOString();
               room = { id: durable ? message.deviceId : randomUUID(), durable,
                 revision: 0, status: 'active', clients: [], connections: new Map(), observers: new Map(), createdAt: now, updatedAt: now,

package/package.json

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

package/tools/postinstall.mjs

@@ -6,6 +6,47 @@ import { fileURLToPath } from 'node:url';
 
 const serviceRoot = path.join(process.env.LOCALAPPDATA || path.join(os.homedir(), 'AppData', 'Local'),
   'Programs', 'CodexRemote', 'service');
+const stateRoot = path.join(process.env.LOCALAPPDATA || path.join(os.homedir(), 'AppData', 'Local'), 'CodexRemote');
+const installLog = path.join(stateRoot, 'install.log');
+
+function sanitizeLog(value) {
+  let result = String(value).replace(/npm_[A-Za-z0-9]+/gu, '[redacted npm token]')
+    .replace(/([?&]token=)[^&\s"']+/giu, '$1[redacted]');
+  const paths = [['LOCALAPPDATA', process.env.LOCALAPPDATA], ['APPDATA', process.env.APPDATA],
+    ['USERPROFILE', process.env.USERPROFILE], ['TEMP', process.env.TEMP], ['TMP', process.env.TMP]]
+    .filter(([, item]) => item).sort((left, right) => right[1].length - left[1].length);
+  for (const [name, item] of paths) {
+    const pattern = item.replace(/[.*+?^${}()|[\]\\]/gu, '\\$&');
+    result = result.replace(new RegExp(pattern, 'giu'), `%${name}%`);
+  }
+  return result;
+}
+
+function appendLog(message) {
+  fs.mkdirSync(stateRoot, { recursive: true });
+  fs.appendFileSync(installLog, `${new Date().toISOString()} ${sanitizeLog(message)}\n`, 'utf8');
+}
+
+function systemSummary() {
+  const npm = String(process.env.npm_config_user_agent || 'unknown').replace(/[\r\n]/gu, ' ');
+  return `platform=${process.platform} osRelease=${os.release()} osVersion=${os.version()} `
+    + `osArch=${os.arch()} processArch=${process.arch} node=${process.version} npmUserAgent=${npm}`;
+}
+
+function runStage(entry, stage, args) {
+  appendLog(`[${stage}] start`);
+  try {
+    const output = execFileSync(process.execPath, [entry, ...args], { encoding: 'utf8', windowsHide: true,
+      stdio: ['inherit', 'pipe', 'pipe'] });
+    if (output) { process.stdout.write(output); appendLog(`[${stage}] stdout\n${output.trimEnd()}`); }
+    appendLog(`[${stage}] success`);
+  } catch (error) {
+    if (error?.stdout) { process.stdout.write(error.stdout); appendLog(`[${stage}] stdout\n${String(error.stdout).trimEnd()}`); }
+    if (error?.stderr) { process.stderr.write(error.stderr); appendLog(`[${stage}] stderr\n${String(error.stderr).trimEnd()}`); }
+    appendLog(`[${stage}] failed: ${error?.stack || error?.message || String(error)}`);
+    throw error;
+  }
+}
 
 function installationSnapshot() {
   const recordPath = path.join(serviceRoot, 'installation.json');
@@ -58,16 +99,20 @@ if (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';
+  appendLog(`[postinstall] start package=${process.env.npm_package_version || 'unknown'} ${systemSummary()}`);
   try {
-    execFileSync(process.execPath, [entry, 'setup', '--json'], { stdio: 'inherit', windowsHide: true });
+    runStage(entry, stage, ['setup', '--json']);
     stage = 'skill-install';
-    execFileSync(process.execPath, [entry, 'skill-install', '--json'], { stdio: 'inherit', windowsHide: true });
+    runStage(entry, stage, ['skill-install', '--json']);
+    appendLog('[postinstall] success');
   } catch (error) {
     const current = installationSnapshot();
     console.error(`\nCode Relax 安装未完全完成：\n${stage === 'setup'
       ? setupFailureGuidance(previous, current)
       : skillFailureGuidance(previous, current)}`);
     if (error?.code && error.code !== 'ERR_CHILD_PROCESS_STDIO_MAXBUFFER') console.error(`启动安装步骤失败：${error.message}`);
+    console.error(`安装日志：${installLog}`);
+    appendLog(`[postinstall] failed stage=${stage}`);
     process.exitCode = Number.isInteger(error?.status) && error.status > 0 ? error.status : 1;
   }
 }

package/dist/src/platform/windows/launch-worker.ps1

@@ -1,20 +0,0 @@
-param(
-    [Parameter(Mandatory=$true)][string]$RequestPath,
-    [Parameter(Mandatory=$true)][string]$ReadyPath,
-    [Parameter(Mandatory=$true)][string]$Instance
-)
-$ErrorActionPreference = 'Stop'
-$result = @{instance=$Instance; brokerPid=$PID}
-try {
-    $spec = Get-Content -LiteralPath $RequestPath -Raw -Encoding UTF8 | ConvertFrom-Json
-    if ($spec.instance -ne $Instance) { throw 'Windows process broker request identity mismatch.' }
-    Remove-Item -LiteralPath $RequestPath -Force
-    Add-Type -Path (Join-Path $PSScriptRoot 'IsolatedProcess.cs')
-    $stdout = if ($spec.logs.Count -gt 0) { [string]$spec.logs[0] } else { 'NUL' }
-    $stderr = if ($spec.logs.Count -gt 1) { [string]$spec.logs[1] } else { 'NUL' }
-    $environment = @($spec.environment.PSObject.Properties | ForEach-Object { $_.Name + '=' + [string]$_.Value })
-    $result.pid = [IsolatedProcess]::Start([string]$spec.executable, [string[]]$spec.args, $stdout, $stderr, [string[]]$environment)
-} catch { $result.error = $_.Exception.Message }
-$temporary = $ReadyPath + '.tmp'
-[IO.File]::WriteAllText($temporary, ($result | ConvertTo-Json -Compress), (New-Object Text.UTF8Encoding($false)))
-[IO.File]::Move($temporary, $ReadyPath)