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

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);
       }
     },