@walkhi/code-relax 0.1.0-beta.12 → 0.1.0-beta.13

package/dist/bin/codex-remote.mjs

@@ -15,8 +15,9 @@ import fs from 'node:fs';
 import { spawn } from 'node:child_process';
 import { setTimeout as delay } from 'node:timers/promises';
 import { requestRecovery, recoveryStatus, recoveryWarning } from '../src/shared-recovery.mjs';
-import { configureManagedEnvironment, clearManagedEnvironment } from '../src/platform/windows/user-environment.mjs';
+import { configureManagedEnvironment, clearManagedEnvironment, readManagedEnvironment } from '../src/platform/windows/user-environment.mjs';
 import { resolveCodexRuntime } from '../src/platform/windows/codex-runtime.mjs';
+import { managedAppServerUrl } from '../src/managed-app-server.mjs';
 import { controlRequest } from '../src/service-control.mjs';
 import { processAlive } from '../src/background-process.mjs';
 
@@ -74,8 +75,33 @@ async function main() {
   if (command.startsWith('autostart-')) {
     const installation = readRecord(path.join(serviceRoot, 'installation.json'));
     if (!installation?.nodeExecutable) throw new Error('请先执行 setup。');
-    const result = await residentStartup({ serviceRoot, nodeExecutable: installation.nodeExecutable }, command.slice('autostart-'.length));
-    console.log(json ? JSON.stringify(result) : `登录启动：${result.enabled ? '已启用' : '已关闭'}`); return;
+    const action = command.slice('autostart-'.length);
+    let environment;
+    if (action === 'disable') {
+      environment = await clearManagedEnvironment(stateRoot);
+      const current = await readManagedEnvironment();
+      if (current.userValue === managedAppServerUrl || (!current.userValue && current.machineValue === managedAppServerUrl)) {
+        throw new Error('Desktop 仍会连接 Code Relax 内核；请先处理非本包管理的 CODEX_APP_SERVER_WS_URL，未关闭登录启动。');
+      }
+    }
+    if (action === 'enable') {
+      const running = await service.status();
+      if (!running.running) await service.start();
+      const deadline = Date.now() + 35000;
+      while (true) {
+        const ready = await service.status();
+        if (ready.running && ready.managedAppServer?.ready) break;
+        if (Date.now() >= deadline) throw new Error('Codex 内核未就绪，未启用 Desktop 自动接入。');
+        await delay(250);
+      }
+    }
+    const result = await residentStartup({ serviceRoot, nodeExecutable: installation.nodeExecutable }, action);
+    if (action === 'enable' && (await desktopHost.inspect()).desktop) environment = await configureManagedEnvironment(stateRoot);
+    const output = { ...result, ...(environment ? { environment } : {}) };
+    const environmentText = environment?.preserved ? '；用户自定义的 Desktop 地址已保留，请自行核对' :
+      environment?.removed ? '；已清除 Code Relax 设置的 Desktop 地址' :
+        environment?.configured ? '；已配置 Desktop 接入地址' : '';
+    console.log(json ? JSON.stringify(output) : `登录启动：${result.enabled ? '已启用' : '已关闭'}${environmentText}`); return;
   }
   if (command === 'shared-recover' || command === 'shared-recovery-status') {
     if (command === 'shared-recover' && !flags.includes('--confirm')) throw new Error(recoveryWarning + ' 使用 --confirm 确认。');

package/package.json

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