@walkhi/code-relax 0.1.0-beta.81 → 0.1.0-beta.82

package/dist/build-platform.json

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

package/dist/src/desktop-launcher.mjs

@@ -1,71 +1,73 @@
-import fs from 'node:fs';
-import path from 'node:path';
-import { setTimeout as delay } from 'node:timers/promises';
-import { readRecord, lifecycle } from './service-lifecycle.mjs';
-import * as serviceHost from './platform/service-host.mjs';
-import { managedPortAvailable as portAvailable } from './managed-app-server.mjs';
-import { readManagedEndpoint } from './managed-endpoint.mjs';
-export { portAvailable };
-function desktopEnvironment(stateRoot, environment) {
-  const childEnv = { ...environment };
-  for (const key of ['CODEX_APP_SERVER_WS_URL', 'CODEX_APP_SERVER_FORCE_CLI', 'CODEX_APP_TOOLS_PIPE_PATH']) delete childEnv[key];
-  const runtime = readRecord(path.join(stateRoot, 'codex-runtime.json'));
-  if (runtime?.codexHome) childEnv.CODEX_HOME = runtime.codexHome;
-  childEnv.CODEX_APP_SERVER_WS_URL = readManagedEndpoint(stateRoot);
-  return childEnv;
-}
-
-// Opening the optional UI does not start, restart or supervise the kernel.
-export async function startDesktop({ stateRoot, host, environment = process.env, restart = false }) {
-  let stage = 'inspect';
-  try {
-    const info = await host.inspect();
-    if (!info.desktop) throw new Error('未安装 Codex 桌面端。');
-    if (info.running && !restart) return { status: 'running', message: 'Codex 桌面端已启动。' };
-    if (info.running) { stage = 'close'; await host.closeDesktop(info.desktop); }
-    stage = 'activate';
-    await host.startDesktop(info.desktop, desktopEnvironment(stateRoot, environment));
-    return { status: 'accepted', message: restart ? '已提交 Codex 桌面端重启请求。' : '已提交 Codex 桌面端启动请求。' };
-  } catch (error) {
-    console.error(JSON.stringify({ time: new Date().toISOString(), event: 'desktop-operation-failed', restart, stage,
-      message: error.message, code: error.code, stderr: error.stderr }));
-    throw new Error(stage === 'close' ? '桌面端关闭失败，请查看工作站诊断日志。'
-      : stage === 'activate' ? '桌面端启动失败，请查看工作站诊断日志。' : '无法检查桌面端，请查看工作站诊断日志。', { cause: error });
-  }
-}
-
-export async function launchDesktop({ stateRoot, host, environment = process.env, wait = delay, timeout = 30000, recoveryId, progress = () => {}, service = lifecycle({ stateRoot, host: serviceHost }) }) {
-  fs.mkdirSync(stateRoot, { recursive: true });
-  const recovery = readRecord(path.join(stateRoot, 'shared-recovery.lock'));
-  if (recovery && recovery.operationId !== recoveryId) throw new Error('Codex 内核正在启动，请用 relax doctor 查看恢复状态。');
-  const lock = path.join(stateRoot, 'desktop-launch.lock');
-  let descriptor;
-  try { descriptor = fs.openSync(lock, 'wx'); }
-  catch (error) {
-    if (error.code === 'EEXIST') throw new Error('另一个 Desktop 启动操作正在进行；若上次异常退出，请确认没有启动器运行后移除 desktop-launch.lock。');
-    throw error;
-  }
-  try {
-    const info = await host.inspect();
-    if (!info.desktop) throw new Error('未安装 Codex Desktop，请使用 relax start 启动工作站。');
-    const connected = await host.sharedServiceUrl();
-    if (info.running) {
-      if (connected) return { reused: true };
-      throw new Error('请先保存任务并完全退出 Codex Desktop，再接入 Codex 内核；不会自动结束正在运行的任务。');
-    }
-    progress('starting-app-server');
-    const health = await service.status();
-    if (!health.running || !health.managedAppServer?.ready) throw new Error(health.managedAppServer?.error || '工作站 Codex 内核未就绪。');
-    const childEnv = desktopEnvironment(stateRoot, environment);
-    progress('starting-desktop');
-    await host.startDesktop(info.desktop, childEnv);
-    const deadline = Date.now() + timeout;
-    while (true) {
-      const ready = await host.desktopReady();
-      if (ready) break;
-      if (Date.now() >= deadline) throw new Error('Desktop 尚未接入 Codex 内核。请查看 Desktop 窗口后重试。');
-      await wait(500);
-    }
-    return { reused: false };
-  } finally { fs.closeSync(descriptor); fs.rmSync(lock, { force: true }); }
-}
+import fs from 'node:fs';
+import path from 'node:path';
+import { setTimeout as delay } from 'node:timers/promises';
+import { readRecord, lifecycle } from './service-lifecycle.mjs';
+import * as serviceHost from './platform/service-host.mjs';
+import { managedPortAvailable as portAvailable } from './managed-app-server.mjs';
+import { readManagedEndpoint } from './managed-endpoint.mjs';
+export { portAvailable };
+function desktopEnvironment(stateRoot, environment) {
+  const childEnv = { ...environment };
+  for (const key of ['CODEX_APP_SERVER_WS_URL', 'CODEX_APP_SERVER_FORCE_CLI', 'CODEX_APP_TOOLS_PIPE_PATH']) delete childEnv[key];
+  const runtime = readRecord(path.join(stateRoot, 'codex-runtime.json'));
+  if (runtime?.codexHome) childEnv.CODEX_HOME = runtime.codexHome;
+  childEnv.CODEX_APP_SERVER_WS_URL = readManagedEndpoint(stateRoot);
+  return childEnv;
+}
+
+// Opening the optional UI does not start, restart or supervise the kernel.
+export async function startDesktop({ stateRoot, host, environment = process.env, restart = false, progress = () => {} }) {
+  let stage = 'inspect';
+  progress(stage);
+  try {
+    const info = await host.inspect();
+    if (!info.desktop) throw new Error('未安装 Codex 桌面端。');
+    if (info.running && !restart) return { status: 'running', message: 'Codex 桌面端已启动。' };
+    if (info.running) { stage = 'close'; progress(stage); await host.closeDesktop(info.desktop); }
+    stage = 'activate'; progress(stage);
+    await host.startDesktop(info.desktop, desktopEnvironment(stateRoot, environment));
+    return { status: 'accepted', message: restart ? '已提交 Codex 桌面端重启请求。' : '已提交 Codex 桌面端启动请求。' };
+  } catch (error) {
+    console.error(JSON.stringify({ time: new Date().toISOString(), event: 'desktop-operation-failed', restart, stage,
+      message: error.message, code: error.code, stderr: error.stderr }));
+    throw new Error(stage === 'close' && ['MAC_DESKTOP_CLOSE_TIMEOUT', 'MAC_DESKTOP_CLOSE_CHANGED'].includes(error.code) ? error.message
+      : stage === 'close' ? '桌面端关闭失败，请查看工作站诊断日志。'
+      : stage === 'activate' ? '桌面端启动失败，请查看工作站诊断日志。' : '无法检查桌面端，请查看工作站诊断日志。', { cause: error });
+  }
+}
+
+export async function launchDesktop({ stateRoot, host, environment = process.env, wait = delay, timeout = 30000, recoveryId, progress = () => {}, service = lifecycle({ stateRoot, host: serviceHost }) }) {
+  fs.mkdirSync(stateRoot, { recursive: true });
+  const recovery = readRecord(path.join(stateRoot, 'shared-recovery.lock'));
+  if (recovery && recovery.operationId !== recoveryId) throw new Error('Codex 内核正在启动，请用 relax doctor 查看恢复状态。');
+  const lock = path.join(stateRoot, 'desktop-launch.lock');
+  let descriptor;
+  try { descriptor = fs.openSync(lock, 'wx'); }
+  catch (error) {
+    if (error.code === 'EEXIST') throw new Error('另一个 Desktop 启动操作正在进行；若上次异常退出，请确认没有启动器运行后移除 desktop-launch.lock。');
+    throw error;
+  }
+  try {
+    const info = await host.inspect();
+    if (!info.desktop) throw new Error('未安装 Codex Desktop，请使用 relax start 启动工作站。');
+    const connected = await host.sharedServiceUrl();
+    if (info.running) {
+      if (connected) return { reused: true };
+      throw new Error('请先保存任务并完全退出 Codex Desktop，再接入 Codex 内核；不会自动结束正在运行的任务。');
+    }
+    progress('starting-app-server');
+    const health = await service.status();
+    if (!health.running || !health.managedAppServer?.ready) throw new Error(health.managedAppServer?.error || '工作站 Codex 内核未就绪。');
+    const childEnv = desktopEnvironment(stateRoot, environment);
+    progress('starting-desktop');
+    await host.startDesktop(info.desktop, childEnv);
+    const deadline = Date.now() + timeout;
+    while (true) {
+      const ready = await host.desktopReady();
+      if (ready) break;
+      if (Date.now() >= deadline) throw new Error('Desktop 尚未接入 Codex 内核。请查看 Desktop 窗口后重试。');
+      await wait(500);
+    }
+    return { reused: false };
+  } finally { fs.closeSync(descriptor); fs.rmSync(lock, { force: true }); }
+}

package/dist/src/desktop-operation.mjs

@@ -1,41 +1,46 @@
-import { setTimeout as delay } from 'node:timers/promises';
-import { startDesktop } from './desktop-launcher.mjs';
-
-// The request is acknowledged before native close/start can outlive the phone's
-// request deadline. Health carries the same receipt; a lost reply is not a retry.
-export class DesktopOperation {
-  constructor({ stateRoot, host, sample, launch = startDesktop, wait = delay, now = Date.now, timeout = 30000 }) {
-    Object.assign(this, { stateRoot, host, sample, launch, wait, now, timeout });
-    this.record = null;
-  }
-  snapshot() { return this.record ? { ...this.record } : null; }
-  request({ operationId, restart }) {
-    if (this.record?.operationId === operationId) return this.snapshot();
-    if (this.record?.status === 'running') {
-      throw Object.assign(new Error('桌面端操作仍在进行，请刷新状态核对结果。'), { statusCode: 409 });
-    }
-    this.record = { operationId, restart, status: 'running', startedAt: new Date(this.now()).toISOString() };
-    this.completion = this.run(this.record);
-    return this.snapshot();
-  }
-  async run(record) {
-    let failure;
-    try {
-      await this.launch({ stateRoot: this.stateRoot, host: this.host, restart: record.restart });
-      const deadline = this.now() + this.timeout;
-      while (!await this.host.desktopReady()) {
-        if (this.now() >= deadline) throw new Error('桌面端启动请求已执行，但未确认接入共享内核，请查看工作站诊断日志。');
-        await this.wait(500);
-      }
-    } catch (error) { failure = error; }
-    // Publish the final receipt with a fresh desktop sample, including failures.
-    try { await this.sample(); }
-    catch (error) { failure ||= error; }
-    Object.assign(record, { status: failure ? 'failed' : 'completed', finishedAt: new Date(this.now()).toISOString() });
-    if (failure) {
-      record.error = failure.message;
-      console.warn(JSON.stringify({ event: 'desktop-operation-result', operationId: record.operationId,
-        status: record.status, message: failure.message }));
-    }
-  }
-}
+import { setTimeout as delay } from 'node:timers/promises';
+import { startDesktop } from './desktop-launcher.mjs';
+
+// The request is acknowledged before native close/start can outlive the phone's
+// request deadline. Health carries the same receipt; a lost reply is not a retry.
+export class DesktopOperation {
+  constructor({ stateRoot, host, sample, launch = startDesktop, wait = delay, now = Date.now, timeout = 30000 }) {
+    Object.assign(this, { stateRoot, host, sample, launch, wait, now, timeout });
+    this.record = null;
+  }
+  snapshot() { return this.record ? { ...this.record } : null; }
+  request({ operationId, restart }) {
+    if (this.record?.operationId === operationId) return this.snapshot();
+    if (this.record?.status === 'running') {
+      throw Object.assign(new Error('桌面端操作仍在进行，请刷新状态核对结果。'), { statusCode: 409 });
+    }
+    this.record = { operationId, restart, status: 'running', startedAt: new Date(this.now()).toISOString() };
+    this.completion = this.run(this.record);
+    return this.snapshot();
+  }
+  async run(record) {
+    let failure;
+    const progress = stage => {
+      Object.assign(record, { stage, updatedAt: new Date(this.now()).toISOString() });
+      console.info(JSON.stringify({ event: 'desktop-operation-stage', operationId: record.operationId,
+        restart: record.restart, stage, time: record.updatedAt }));
+    };
+    try {
+      await this.launch({ stateRoot: this.stateRoot, host: this.host, restart: record.restart, progress });
+      progress('connecting');
+      const deadline = this.now() + this.timeout;
+      while (!await this.host.desktopReady()) {
+        if (this.now() >= deadline) throw new Error('桌面端启动请求已执行，但未确认接入共享内核，请查看工作站诊断日志。');
+        await this.wait(500);
+      }
+    } catch (error) { failure = error; }
+    // Publish the final receipt with a fresh desktop sample, including failures.
+    if (!failure) progress('verifying');
+    try { await this.sample(); }
+    catch (error) { failure ||= error; }
+    Object.assign(record, { status: failure ? 'failed' : 'completed', finishedAt: new Date(this.now()).toISOString() });
+    if (failure) record.error = failure.message;
+    console.info(JSON.stringify({ event: 'desktop-operation-result', operationId: record.operationId,
+      time: record.finishedAt, stage: record.stage, status: record.status, message: record.error }));
+  }
+}

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

@@ -9,7 +9,8 @@ import { readRecord } from '../../service-lifecycle.mjs';
 export { residentStartup } from './resident-startup.mjs';
 
 import { managedEndpointUrl, readManagedEndpoint } from '../../managed-endpoint.mjs';
-export function createDesktopHost({ request = systemRequest, wait = delay, now = Date.now, timeout = 10000,
+export function createDesktopHost({ request = systemRequest, wait = delay, now = Date.now, timeout = 30000,
+  diagnose = record => console.info(JSON.stringify({ time: new Date().toISOString(), event: 'mac-desktop-close', ...record })),
   stateRoot = () => runtimePaths().stateRoot, fingerprint = file => {
     const stat = fs.statSync(path.join(file, 'Contents/Info.plist'));
     return `${stat.ino}:${stat.size}:${stat.mtimeMs}:${stat.ctimeMs}`;
@@ -48,10 +49,37 @@ export function createDesktopHost({ request = systemRequest, wait = delay, now =
       const info = await this.inspect();
       if (!info.running) return;
       if (info.desktop !== bundlePath || !info.process) throw new Error('Desktop 进程身份已变化，未请求退出。');
-      await request({ operation: 'desktop-close', bundlePath, expected: info.process });
+      const started = now();
+      const identity = value => value ? { pid: value.pid, created: value.created, executable: value.executable } : null;
+      const context = { target: identity(info.process), version: info.version, build: info.build, timeoutMs: timeout };
+      diagnose({ ...context, stage: 'request' });
+      let result;
+      try { result = await request({ operation: 'desktop-close', bundlePath, expected: info.process }); }
+      catch (error) {
+        diagnose({ ...context, stage: 'request-failed', elapsedMs: now() - started, error: error.message });
+        throw error;
+      }
+      diagnose({ ...context, stage: 'request-returned', elapsedMs: now() - started,
+        quitRequested: result.quitRequested === true, alreadyStopped: result.stopped === true });
       const deadline = now() + timeout;
-      while ((await this.inspect()).running) {
-        if (now() >= deadline) throw new Error('Desktop 尚未正常退出，请在 Mac 上处理未保存内容后重试；未强制结束进程。');
+      while (true) {
+        let current;
+        try { current = await this.inspect(); }
+        catch (error) {
+          diagnose({ ...context, stage: 'inspect-failed', elapsedMs: now() - started, error: error.message });
+          throw error;
+        }
+        const observation = { ...context, elapsedMs: now() - started, current: identity(current.process),
+          finishedLaunching: current.finishedLaunching, connectedToManagedServer: current.connectedToManagedServer };
+        if (!current.running) { diagnose({ ...observation, stage: 'exited' }); return; }
+        if (current.process?.pid !== info.process.pid || current.process?.created !== info.process.created) {
+          diagnose({ ...observation, stage: 'process-changed' });
+          throw Object.assign(new Error('Mac 桌面端进程已变化，请刷新状态核对；未再次请求退出。'), { code: 'MAC_DESKTOP_CLOSE_CHANGED' });
+        }
+        if (now() >= deadline) {
+          diagnose({ ...observation, stage: 'timeout', quitRequested: result.quitRequested === true });
+          throw Object.assign(new Error('Mac 桌面端退出请求已发送，但未在等待时间内退出。请在 Mac 查看桌面端退出状态和诊断日志；未强制结束进程。'), { code: 'MAC_DESKTOP_CLOSE_TIMEOUT' });
+        }
         await wait(200);
       }
     },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@walkhi/code-relax",
-  "version": "0.1.0-beta.81",
+  "version": "0.1.0-beta.82",
   "private": false,
   "license": "UNLICENSED",
   "type": "module",
@@ -42,7 +42,7 @@
   },
   "optionalDependencies": {
     "@walkhi/code-relax-native-win32-x64": "0.1.0-beta.80",
-    "@walkhi/code-relax-native-darwin-arm64": "0.1.0-beta.80",
-    "@walkhi/code-relax-native-darwin-x64": "0.1.0-beta.80"
+    "@walkhi/code-relax-native-darwin-arm64": "0.1.0-beta.82",
+    "@walkhi/code-relax-native-darwin-x64": "0.1.0-beta.82"
   }
 }