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

package/dist/build-platform.json

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

package/dist/src/desktop-operation.mjs

@@ -0,0 +1,41 @@
+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 }));
+    }
+  }
+}

package/dist/src/platform/native-package.mjs

@@ -37,14 +37,17 @@ export function prepareNativePackage(packageRoot, { platform = process.platform,
   const pkg = readJson(path.join(packageRoot, 'package.json'));
   if (build.layout !== 'npm-platform-packages' || build.version !== pkg.version)
     throw new Error('安装包构建与当前系统、架构或版本不匹配，请重新安装。');
+  const nativeVersion = pkg.optionalDependencies?.[target.packageName];
+  if (!/^\d+\.\d+\.\d+(?:-[0-9A-Za-z.-]+)?$/.test(nativeVersion || ''))
+    throw new Error('安装包未锁定当前平台原生组件的精确版本。');
   let manifest;
   try { manifest = createRequire(path.join(packageRoot, 'package.json')).resolve(`${target.packageName}/package.json`); }
   catch (error) {
     if (error.code !== 'MODULE_NOT_FOUND') throw error;
-    throw new Error(`缺少 ${target.packageName}@${pkg.version}；请勿省略 optional 依赖，使用 npm install -g @walkhi/code-relax@${pkg.version} --include=optional --allow-scripts=@walkhi/code-relax --foreground-scripts 重新安装。`);
+    throw new Error(`缺少 ${target.packageName}@${nativeVersion}；请勿省略 optional 依赖，使用 npm install -g @walkhi/code-relax@${pkg.version} --include=optional --allow-scripts=@walkhi/code-relax --foreground-scripts 重新安装。`);
   }
   const native = readJson(manifest);
-  if (native.name !== target.packageName || native.version !== pkg.version
+  if (native.name !== target.packageName || native.version !== nativeVersion
       || native.os?.length !== 1 || native.os[0] !== platform || native.cpu?.length !== 1 || native.cpu[0] !== arch)
     throw new Error('原生组件包的系统、架构或版本不匹配，未更新工作站。');
   const source = path.join(path.dirname(manifest), 'native', target.file);

package/dist/src/server.mjs

@@ -39,7 +39,7 @@ import { DotsMessageImages } from './dots-message-images.mjs';
 import { desktopDotsProfiles } from './platform/windows/dots-profile.mjs';
 import { readPlanPricing } from './plan-pricing.mjs';
 import { requestRecovery, recoveryStatus } from './shared-recovery.mjs';
-import { startDesktop } from './desktop-launcher.mjs';
+import { DesktopOperation } from './desktop-operation.mjs';
 import { requestServiceRestart } from './service-restart.mjs';
 import { checkServiceUpdate, requestServiceUpdate, serviceUpdateStatus } from './service-update.mjs';
 import { TurnModelHistory } from './turn-model-history.mjs';
@@ -128,6 +128,7 @@ const dotsChat = new DotsChatServer(dotsServer, undefined, { uploadsRoot });
 managedAppServer.on('state', state => { if (state.ready) dotsChat.startBackgroundActivity(); });
 const runtimeDiscovery = new RuntimeDiscovery({ stateRoot, host: desktopHost,
   url: () => managedAppServer.snapshot().url, diagnose: runtimeDiagnostic });
+const desktopOperation = new DesktopOperation({ stateRoot, host: desktopHost, sample: () => runtimeDiscovery.sample() });
 const relayManager = createRelayManager(stateRoot);
 let sharedCatalog = null, executionMode = 'ordinary';
 function selectSharedExecution(enabled) {
@@ -159,6 +160,7 @@ function workstationHealth() {
       mode: executionMode },
     managedAppServer: managedAppServer.snapshot(),
     ...runtimeDiscovery.state,
+    desktopOperation: desktopOperation.snapshot(),
     sharedAppServerConnected: sharedServer?.ready === true,
     sharedRecoveryAvailable: runtimeDiscovery.state.desktop?.installed === true,
     mode: options.lan ? 'lan' : 'loopback',
@@ -197,8 +199,10 @@ async function handleRequest(request, response) {
       return;
     }
 
-    if (process.platform !== 'win32' && url.pathname.startsWith('/api/desktop/'))
-      throw new RequestError(501, 'Mac 版不提供远程桌面控制。', { code: 'desktop_control_unsupported' });
+    const remoteDesktopControl = ['/api/desktop/video-probe', '/api/desktop/frame', '/api/desktop/move', '/api/desktop/click'].includes(url.pathname)
+      || url.pathname.startsWith('/api/desktop/frames/');
+    if (process.platform !== 'win32' && remoteDesktopControl)
+      throw new RequestError(501, '此平台不提供远程桌面控制。', { code: 'desktop_control_unsupported' });
 
     if (url.pathname === '/api/desktop/video-probe') {
       if (request.method === 'POST') {
@@ -291,11 +295,13 @@ async function handleRequest(request, response) {
     }
     if (request.method === 'POST' && ['/api/desktop/start', '/api/desktop/restart'].includes(url.pathname)) {
       const body = await readJsonBody(request);
-      if (body.confirmed !== true) throw new RequestError(400, '请确认启动桌面端。');
-      let result, observed;
-      try { result = await startDesktop({ stateRoot, host: desktopHost, restart: url.pathname === '/api/desktop/restart' }); }
-      finally { observed = await runtimeDiscovery.sample(); }
-      sendJson(response, 202, { ...result, desktop: observed.desktop, checkedAt: observed.checkedAt }); return;
+      if (body.confirmed !== true || !/^[0-9a-f]{8}(?:-[0-9a-f]{4}){3}-[0-9a-f]{12}$/i.test(body.operationId || ''))
+        throw new RequestError(400, '请确认启动桌面端并提供操作编号。');
+      try {
+        sendJson(response, 202, desktopOperation.request({ operationId: body.operationId,
+          restart: url.pathname === '/api/desktop/restart' }));
+      } catch (error) { throw new RequestError(error.statusCode || 502, error.message); }
+      return;
     }
     if (request.method === 'POST' && url.pathname === '/api/shared-recovery') {
       const body = await readJsonBody(request);
@@ -346,6 +352,7 @@ async function handleRequest(request, response) {
     }
 
     if (request.method === 'GET' && url.pathname === '/api/health') {
+      if (url.searchParams.get('refresh') === 'desktop') await runtimeDiscovery.sample();
       sendJson(response, 200, workstationHealth()); return;
     }
     if (request.method === 'GET' && url.pathname === '/api/health/events') {

package/package.json

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