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

package/dist/shared/server-requests.cjs

@@ -1,67 +1,95 @@
-(function (root, factory) {
-  if (typeof module === 'object' && module.exports) module.exports = factory();
-  else root.CodexServerRequests = factory();
-})(globalThis, function () {
-  const command = 'item/commandExecution/requestApproval';
-  const file = 'item/fileChange/requestApproval';
+(function (root, factory) {
+  if (typeof module === 'object' && module.exports) module.exports = factory();
+  else root.CodexServerRequests = factory();
+})(globalThis, function () {
+  const command = 'item/commandExecution/requestApproval';
+  const file = 'item/fileChange/requestApproval';
   const input = 'item/tool/requestUserInput';
+  const elicitation = 'mcpServer/elicitation/request';
   const equal = (a, b) => JSON.stringify(a) === JSON.stringify(b);
+  function browserAccess(request) {
+    const p = request.params || {}, meta = p._meta || {};
+    if (request.method !== elicitation || p.mode !== 'form' || meta.tool_name !== 'access_browser_origin'
+      || meta.codex_approval_kind !== 'mcp_tool_call' || meta.codex_request_type !== 'approval_request'
+      || meta.codex_sensitive_action !== true || p.requestedSchema?.type !== 'object'
+      || Object.keys(p.requestedSchema.properties || {}).length) return null;
+    try {
+      const origin = new URL(meta.origin);
+      if (!['http:', 'https:'].includes(origin.protocol) || origin.origin !== meta.origin) return null;
+      return { origin: meta.origin, persistent: meta.persist === 'always' };
+    } catch { return null; }
+  }
   function decisions(request) {
-    if (request.method === command) return request.params.availableDecisions ?? ['accept', 'acceptForSession', 'decline', 'cancel'];
+    if (request.method === command) return request.params.availableDecisions ?? ['accept', 'acceptForSession', 'decline', 'cancel'];
     if (request.method === file) return ['accept', 'acceptForSession', 'decline', 'cancel'];
+    const browser = browserAccess(request);
+    if (browser) return browser.persistent ? ['allowOnce', 'allowSite', 'allowAllSites', 'decline'] : ['allowOnce', 'decline'];
     return [];
-  }
-  function validate(request, result) {
-    if ([command, file].includes(request.method)) {
-      if (!result || Object.keys(result).length !== 1 || !decisions(request).some(value => equal(value, result.decision))) throw new Error('审批选项不属于当前请求');
-      return;
-    }
+  }
+  function validate(request, result) {
+    if ([command, file].includes(request.method)) {
+      if (!result || Object.keys(result).length !== 1 || !decisions(request).some(value => equal(value, result.decision))) throw new Error('审批选项不属于当前请求');
+      return;
+    }
     if (request.method === input) {
-      const questions = request.params.questions || [];
-      if (!result?.answers || Object.keys(result).length !== 1 || Object.keys(result.answers).length !== questions.length
-        || questions.some(q => !Array.isArray(result.answers[q.id]?.answers) || result.answers[q.id].answers.some(a => typeof a !== 'string'))) throw new Error('回答格式无效');
+      const questions = request.params.questions || [];
+      if (!result?.answers || Object.keys(result).length !== 1 || Object.keys(result.answers).length !== questions.length
+        || questions.some(q => !Array.isArray(result.answers[q.id]?.answers) || result.answers[q.id].answers.some(a => typeof a !== 'string'))) throw new Error('回答格式无效');
       return;
     }
-    throw new Error('此类请求需在工作站处理');
-  }
-  class Store {
-    constructor(epoch, changed = () => {}) { this.epoch = epoch; this.changed = changed; this.requests = new Map(); }
-    list(threadId) { return [...this.requests.values()].filter(r => r.params.threadId === threadId).map(r => ({ ...r })); }
-    receive(message) {
-      if (!['string', 'number'].includes(typeof message.id) || !message.params?.threadId || this.requests.has(message.id)) return;
-      const request = { id: message.id, method: message.method, params: message.params, epoch: this.epoch, status: 'pending' };
-      this.requests.set(message.id, request); this.changed(request.params.threadId);
-    }
-    notification(method, params) {
-      if (method === 'serverRequest/resolved') {
-        const request = this.requests.get(params.requestId);
-        if (request?.params.threadId === params.threadId) { this.requests.delete(params.requestId); this.changed(params.threadId); }
-      } else if (method === 'turn/completed' || method === 'thread/closed') {
-        for (const [id, r] of this.requests) if (r.params.threadId === params.threadId && (method === 'thread/closed' || r.params.turnId === params.turn?.id)) this.requests.delete(id);
-        this.changed(params.threadId);
-      }
-    }
-    forget(threadId) {
-      for (const [id, request] of this.requests) if (request.params.threadId === threadId) this.requests.delete(id);
-      this.changed(threadId);
-    }
-    reset(epoch) {
-      const threads = new Set([...this.requests.values()].map(r => r.params.threadId));
-      this.requests.clear(); this.epoch = epoch; for (const id of threads) this.changed(id);
-    }
-    async respond(threadId, { id, epoch, result }, send) {
-      const request = this.requests.get(id);
-      if (!request || epoch !== this.epoch || request.params.threadId !== threadId) throw new Error('审批已处理或连接已变化，请等待同步');
-      if (request.status !== 'pending') throw new Error('决定已提交，正在等待工作站确认，请勿重复提交');
-      validate(request, result);
-      request.status = 'submitted'; this.changed(threadId);
-      try { await send({ id: request.id, result }); }
-      catch (error) {
-        if (this.requests.get(id) === request) { request.status = 'unknown'; this.changed(threadId); }
-        throw new Error('审批发送结果未确认，请检查工作站；不会自动重发。' + error.message);
-      }
-      return { submitted: true };
+    const browser = browserAccess(request);
+    if (browser) {
+      const allowed = [
+        { action: 'accept', content: {}, _meta: null },
+        { action: 'decline', content: null, _meta: null },
+      ];
+      if (browser.persistent) allowed.push(
+        { action: 'accept', content: {}, _meta: { persist: 'always' } },
+        { action: 'accept', content: {}, _meta: { persist: 'always', browser_use_persistent_approval_scope: 'all-sites' } },
+      );
+      if (!allowed.some(choice => equal(choice, result))) throw new Error('网站访问决定不属于当前请求');
+      return;
     }
-  }
-  return { Store, decisions, validate, command, file, input };
-});
+    throw new Error('此类请求需在工作站处理');
+  }
+  class Store {
+    constructor(epoch, changed = () => {}) { this.epoch = epoch; this.changed = changed; this.requests = new Map(); }
+    list(threadId) { return [...this.requests.values()].filter(r => r.params.threadId === threadId).map(r => ({ ...r })); }
+    receive(message) {
+      if (!['string', 'number'].includes(typeof message.id) || !message.params?.threadId || this.requests.has(message.id)) return;
+      const request = { id: message.id, method: message.method, params: message.params, epoch: this.epoch, status: 'pending' };
+      this.requests.set(message.id, request); this.changed(request.params.threadId);
+    }
+    notification(method, params) {
+      if (method === 'serverRequest/resolved') {
+        const request = this.requests.get(params.requestId);
+        if (request?.params.threadId === params.threadId) { this.requests.delete(params.requestId); this.changed(params.threadId); }
+      } else if (method === 'turn/completed' || method === 'thread/closed') {
+        for (const [id, r] of this.requests) if (r.params.threadId === params.threadId && (method === 'thread/closed' || r.params.turnId === params.turn?.id)) this.requests.delete(id);
+        this.changed(params.threadId);
+      }
+    }
+    forget(threadId) {
+      for (const [id, request] of this.requests) if (request.params.threadId === threadId) this.requests.delete(id);
+      this.changed(threadId);
+    }
+    reset(epoch) {
+      const threads = new Set([...this.requests.values()].map(r => r.params.threadId));
+      this.requests.clear(); this.epoch = epoch; for (const id of threads) this.changed(id);
+    }
+    async respond(threadId, { id, epoch, result }, send) {
+      const request = this.requests.get(id);
+      if (!request || epoch !== this.epoch || request.params.threadId !== threadId) throw new Error('审批已处理或连接已变化，请等待同步');
+      if (request.status !== 'pending') throw new Error('决定已提交，正在等待工作站确认，请勿重复提交');
+      validate(request, result);
+      request.status = 'submitted'; this.changed(threadId);
+      try { await send({ id: request.id, result }); }
+      catch (error) {
+        if (this.requests.get(id) === request) { request.status = 'unknown'; this.changed(threadId); }
+        throw new Error('审批发送结果未确认，请检查工作站；不会自动重发。' + error.message);
+      }
+      return { submitted: true };
+    }
+  }
+  return { Store, decisions, validate, command, file, input, elicitation, browserAccess };
+});

package/dist/skills/code-relax/SKILL.md

@@ -5,7 +5,7 @@ description: 启动、检查或停止 Code Relax 工作站服务，生成并展
 
 # Code Relax
 
-- `relax start --json` 启动 Bridge 和受管 Codex 内核，无需打开 Desktop；支持纯 CLI 安装。`shared-start` 仅用于额外打开 Desktop 并接入同一内核。已配置 Code Relax 中继时，启动命令同时恢复中继连接器和已有设备授权。
+- `relax start --json` 启动 Bridge 和受管 Codex 内核，无需打开 Desktop；支持纯 CLI 安装。Desktop 正常打开后接入已配置内核；需要重新接入时使用 App 的“重启 Codex Desktop”或经确认的 `relax shared-recover --confirm`。已配置 Code Relax 中继时，启动命令同时恢复中继连接器和已有设备授权。
 - npm 全局安装会自动执行服务部署和 Skill 安装；只有修复安装时才单独运行 `relax setup --json` 或 `relax skill-install --json`。
 - `setup` 默认启用当前用户登录启动工作站服务，不自动打开 Codex；用 `autostart-status / autostart-disable / autostart-enable` 管理。恢复完整控制会保留 Bridge 和中继，但仍须明确确认可能中断全部完整控制任务。
 - 用户要求启动 Code Relax 时，执行一次 `relax start --json`。用户要求二维码或当前启动结果包含二维码时，展示 CLI 返回的 `qrPath` 和 `displayText`；没有设备授权时可用 `relax pair --json` 生成新的配对二维码。

package/dist/src/desktop-launcher.mjs

@@ -1,11 +1,10 @@
 import fs from 'node:fs';
 import path from 'node:path';
 import { setTimeout as delay } from 'node:timers/promises';
-import { readRecord, writeRecord } from './service-lifecycle.mjs';
+import { readRecord } from './service-lifecycle.mjs';
 import { ManagedAppServer, managedAppServerUrl as sharedUrl, managedPortAvailable as portAvailable } from './managed-app-server.mjs';
 export { portAvailable };
-export async function launchDesktop(mode, { stateRoot, host, environment = process.env, available = portAvailable, wait = delay, timeout = 30000, recoveryId, progress = () => {} }) {
-  if (mode !== 'shared') throw new Error('只支持接入 Code Relax 管理的 Codex 内核。');
+export async function launchDesktop({ stateRoot, host, environment = process.env, available = portAvailable, wait = delay, timeout = 30000, recoveryId, progress = () => {} }) {
   fs.mkdirSync(stateRoot, { recursive: true });
   const recovery = readRecord(path.join(stateRoot, 'shared-recovery.lock'));
   if (recovery && recovery.operationId !== recoveryId) throw new Error('Codex 内核正在启动，请先查看 shared-recovery-status。');
@@ -22,11 +21,8 @@ export async function launchDesktop(mode, { stateRoot, host, environment = proce
     if (!info.desktop) throw new Error('未安装 Codex Desktop，请使用 relax start 启动工作站。');
     const connected = await host.sharedServiceUrl();
     if (info.running) {
-      if ((mode === 'shared') === Boolean(connected)) {
-        writeRecord(path.join(stateRoot, 'execution-mode.json'), { mode });
-        return { reused: true, mode };
-      }
-      throw new Error('请先保存任务并完全退出 Codex Desktop，再切换模式；不会自动结束正在运行的任务。');
+      if (connected) return { reused: true };
+      throw new Error('请先保存任务并完全退出 Codex Desktop，再接入 Codex 内核；不会自动结束正在运行的任务。');
     }
     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];
@@ -42,10 +38,9 @@ export async function launchDesktop(mode, { stateRoot, host, environment = proce
     while (true) {
       const ready = await host.sharedServiceUrl();
       if (ready) break;
-      if (Date.now() >= deadline) throw new Error('Desktop 尚未按所选模式就绪，未启动 Bridge。请查看 Desktop 窗口后重试。');
+      if (Date.now() >= deadline) throw new Error('Desktop 尚未接入 Codex 内核。请查看 Desktop 窗口后重试。');
       await wait(500);
     }
-    writeRecord(path.join(stateRoot, 'execution-mode.json'), { mode });
-    return { reused: false, mode };
+    return { reused: false };
   } finally { managed?.close(); fs.closeSync(descriptor); fs.rmSync(lock, { force: true }); }
 }

package/dist/src/file-upload-session.mjs

@@ -0,0 +1,124 @@
+import crypto from 'node:crypto';
+import fs from 'node:fs/promises';
+import path from 'node:path';
+
+export const MAX_FILE_BYTES = 20 * 1024 * 1024;
+export const MAX_FILE_COUNT = 4;
+export const MAX_TOTAL_BYTES = 40 * 1024 * 1024;
+export const FILE_CHUNK_BYTES = 256 * 1024;
+
+function validName(value) {
+  return typeof value === 'string' && value.length > 0 && value.length <= 180 &&
+    value !== '.' && value !== '..' && !/[\\/:*?"<>|\x00-\x1f]/.test(value) && !/[. ]$/.test(value) &&
+    !/^(?:CON|PRN|AUX|NUL|COM[1-9]|LPT[1-9])(?:\.|$)/i.test(value);
+}
+
+async function uniqueDestination(directory, name, partial) {
+  const dot = name.lastIndexOf('.');
+  const stem = dot > 0 ? name.slice(0, dot) : name;
+  const extension = dot > 0 ? name.slice(dot) : '';
+  for (let index = 0; ; index++) {
+    const suffix = index ? ` (${index})` : '';
+    const candidate = index ? `${stem.slice(0, 180 - extension.length - suffix.length)}${suffix}${extension}` : name;
+    if (!candidate || candidate.length > 180) throw new Error('同名文件过多，文件名无法继续编号');
+    const destination = path.join(directory, candidate);
+    try {
+      await fs.link(partial, destination);
+      await fs.unlink(partial);
+      return { name: candidate, path: destination };
+    } catch (error) {
+      if (error.code !== 'EEXIST') throw error;
+    }
+  }
+}
+
+export function createFileUploadSession(root) {
+  let upload;
+  const completed = new Map();
+  let completedBytes = 0;
+  const directory = path.join(root, 'incoming');
+  const clearActive = async () => {
+    const current = upload;
+    upload = undefined;
+    if (!current) return;
+    await current.handle.close().catch(() => {});
+    await fs.unlink(current.partial).catch(() => {});
+  };
+  const clear = async () => {
+    await clearActive();
+    for (const file of completed.values()) await fs.unlink(file.path).catch(() => {});
+    completed.clear(); completedBytes = 0;
+  };
+  return {
+    async receive(message) {
+      if (!message || typeof message !== 'object') throw new Error('无效的文件上传请求');
+      if (message.type === 'cancel') { await clear(); return { type: 'cancelled' }; }
+      if (message.type === 'commit') {
+        if (upload) throw new Error('文件尚未上传完成');
+        completed.clear(); completedBytes = 0;
+        return { type: 'committed' };
+      }
+      if (message.type === 'remove') {
+        if (upload) throw new Error('请等待当前文件上传完成');
+        const file = completed.get(message.id);
+        if (!file) throw new Error('文件上传会话已失效');
+        await fs.unlink(file.path);
+        completed.delete(message.id); completedBytes -= file.size;
+        return { type: 'removed', id: message.id };
+      }
+      if (message.type === 'start') {
+        if (upload) throw new Error('已有文件正在上传');
+        if (!validName(message.name)) throw new Error('文件名无效');
+        if (!Number.isSafeInteger(message.size) || message.size < 1 || message.size > MAX_FILE_BYTES) {
+          throw new Error('单个文件不得超过 20 MiB');
+        }
+        if (completed.size >= MAX_FILE_COUNT || completedBytes + message.size > MAX_TOTAL_BYTES) {
+          throw new Error('每条消息最多 4 个文件，合计不超过 40 MiB');
+        }
+        if (!/^[a-f0-9]{64}$/i.test(message.sha256 || '')) throw new Error('文件校验值无效');
+        const id = crypto.randomUUID();
+        await fs.mkdir(directory, { recursive: true });
+        const partial = path.join(directory, `.upload-${id}`);
+        const handle = await fs.open(partial, 'wx');
+        upload = { id, partial, handle, name: message.name, size: message.size,
+          expected: message.sha256.toLowerCase(), hash: crypto.createHash('sha256'), offset: 0 };
+        return { type: 'started', id, offset: 0, chunkBytes: FILE_CHUNK_BYTES };
+      }
+      const current = upload;
+      if (!current || message.id !== current.id) throw new Error('文件上传会话已失效');
+      if (message.type === 'chunk') {
+        if (!Number.isSafeInteger(message.offset) || message.offset !== current.offset) {
+          return { type: 'offset', id: current.id, offset: current.offset };
+        }
+        if (typeof message.data !== 'string' || message.data.length > Math.ceil(FILE_CHUNK_BYTES / 3) * 4 + 4 ||
+            !/^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?$/.test(message.data)) {
+          throw new Error('文件分片格式无效');
+        }
+        const bytes = Buffer.from(message.data, 'base64');
+        if (!bytes.length || bytes.length > FILE_CHUNK_BYTES || current.offset + bytes.length > current.size) {
+          throw new Error('文件分片大小无效');
+        }
+        await current.handle.writeFile(bytes);
+        current.hash.update(bytes);
+        current.offset += bytes.length;
+        return { type: 'offset', id: current.id, offset: current.offset };
+      }
+      if (message.type === 'finish') {
+        if (current.offset !== current.size || current.hash.digest('hex') !== current.expected) {
+          await clear(); throw new Error('文件大小或 SHA-256 校验失败');
+        }
+        await current.handle.sync();
+        await current.handle.close();
+        upload = undefined;
+        let saved;
+        try { saved = await uniqueDestination(directory, current.name, current.partial); }
+        catch (error) { await fs.unlink(current.partial).catch(() => {}); throw error; }
+        const result = { type: 'completed', id: current.id, ...saved, size: current.size };
+        completed.set(current.id, result); completedBytes += current.size;
+        return result;
+      }
+      throw new Error('不支持的文件上传操作');
+    },
+    close: clear,
+  };
+}

package/dist/src/lan-socket-server.mjs

@@ -1,16 +1,20 @@
 import { EventEmitter } from 'node:events';
 import crypto from 'node:crypto';
-import { WebSocketServer, WebSocket } from 'ws';
+import { WebSocketServer, WebSocket } from 'ws';
+import { createFileUploadSession, FILE_CHUNK_BYTES, MAX_FILE_BYTES, MAX_FILE_COUNT, MAX_TOTAL_BYTES } from './file-upload-session.mjs';
 
 // One authenticated connection carries requests and explicitly owned subscriptions.
 // The dispatcher is shared business routing, not an HTTP loopback proxy.
-export function attachLanSocket(server, { token, dispatch, authorizeDevice = () => false }) {
+export function attachLanSocket(server, { token, dispatch, authorizeDevice = () => false, uploadsRoot }) {
   // Allow four individually valid images to reach the aggregate-size validator,
   // so an oversized composition returns an error instead of dropping the connection.
   const wss = new WebSocketServer({ noServer: true, maxPayload: 48 * 1024 * 1024, perMessageDeflate: false });
-  server.on('upgrade', (request, socket, head) => {
+  const uploadWss = new WebSocketServer({ noServer: true, maxPayload: 512 * 1024, perMessageDeflate: false });
+  const activeUploads = new Set();
+  server.on('upgrade', (request, socket, head) => {
     const origin = request.headers.origin;
-    let allowed = request.url === '/api/socket';
+    const upload = request.url === '/api/file-transfer' && Boolean(uploadsRoot);
+    let allowed = request.url === '/api/socket' || upload;
     // Packaged ArkWeb pages have an opaque ("null") origin; device authentication remains required.
     if (origin && origin !== 'null') {
       try {
@@ -23,8 +27,44 @@ export function attachLanSocket(server, { token, dispatch, authorizeDevice = ()
       catch { allowed = false; }
     }
     if (!allowed) { socket.end('HTTP/1.1 403 Forbidden\r\nConnection: close\r\n\r\n'); return; }
-    wss.handleUpgrade(request, socket, head, ws => wss.emit('connection', ws));
-  });
+    const target = upload ? uploadWss : wss;
+    target.handleUpgrade(request, socket, head, ws => target.emit('connection', ws));
+  });
+  uploadWss.on('connection', ws => {
+    let authenticated = false, identity = '', upload;
+    let pending = Promise.resolve();
+    const authTimer = setTimeout(() => ws.close(1008, 'Authentication required'), 5000);
+    const reply = value => { if (ws.readyState === WebSocket.OPEN) ws.send(JSON.stringify(value)); };
+    ws.on('error', () => {});
+    ws.on('close', () => {
+      clearTimeout(authTimer);
+      void pending.finally(async () => {
+        await upload?.close();
+        if (identity) activeUploads.delete(identity);
+      });
+    });
+    ws.on('message', (bytes, binary) => {
+      pending = pending.then(async () => {
+        if (binary || bytes.length > 512 * 1024) throw new Error('无效的上传分片');
+        const message = JSON.parse(bytes.toString());
+        if (!authenticated) {
+          if (message?.type === 'device-auth' && typeof message.clientId === 'string' &&
+              authorizeDevice(message.clientId, message.credential) === true) identity = `device:${message.clientId}`;
+          else if (token && message?.type === 'auth' && typeof message.token === 'string') {
+            const supplied = Buffer.from(message.token), expected = Buffer.from(token || '');
+            if (supplied.length === expected.length && crypto.timingSafeEqual(supplied, expected)) identity = 'local-token';
+          }
+          if (!identity || activeUploads.has(identity) || activeUploads.size >= 2) throw new Error('上传身份无效或工作站已有上传任务');
+          activeUploads.add(identity); authenticated = true; clearTimeout(authTimer);
+          upload = createFileUploadSession(uploadsRoot);
+          reply({ type: 'ready', maxFileBytes: MAX_FILE_BYTES, maxFileCount: MAX_FILE_COUNT,
+            maxTotalBytes: MAX_TOTAL_BYTES, chunkBytes: FILE_CHUNK_BYTES });
+          return;
+        }
+        reply(await upload.receive(message));
+      }).catch(error => { reply({ type: 'error', error: error.message }); ws.close(1008, 'Upload rejected'); });
+    });
+  });
   wss.on('connection', ws => {
     let authenticated = false, alive = true;
     const active = new Map();
@@ -105,5 +145,8 @@ export function attachLanSocket(server, { token, dispatch, authorizeDevice = ()
       catch (error) { reply.json(500, { error: error.message }); }
     });
   });
-  return { close() { for (const ws of wss.clients) ws.terminate(); wss.close(); } };
-}
+  return { close() {
+    for (const ws of wss.clients) ws.terminate(); wss.close();
+    for (const ws of uploadWss.clients) ws.terminate(); uploadWss.close();
+  } };
+}

package/dist/src/managed-app-server.mjs

@@ -5,7 +5,7 @@ import { EventEmitter } from 'node:events';
 import { setTimeout as delay } from 'node:timers/promises';
 import { readRecord, writeRecord } from './service-lifecycle.mjs';
 import { SharedAppServer } from './shared-app-server.mjs';
-import { resolveCodexRuntime } from './platform/windows/codex-runtime.mjs';
+import { pruneRetainedDesktopRuntimes, resolveCodexRuntime, runtimeFilesAvailable } from './platform/windows/codex-runtime.mjs';
 
 export const managedAppServerUrl = 'ws://127.0.0.1:45839';
 export const managedAppServerReadyUrl = 'http://127.0.0.1:45839/readyz';
@@ -32,7 +32,6 @@ export class ManagedAppServer extends EventEmitter {
     this.timeout = timeout;
     this.now = now;
     this.recordPath = path.join(stateRoot, 'managed-app-server.json');
-    this.legacyRecordPath = path.join(stateRoot, 'shared-desktop.json');
     this.client = client;
     this.state = { state: 'absent', ready: false, error: null };
     this.restartStatus = null;
@@ -45,7 +44,11 @@ export class ManagedAppServer extends EventEmitter {
     });
   }
 
-  snapshot() { return { ...this.state, ...(this.restartStatus ? { restart: { ...this.restartStatus } } : {}) }; }
+  snapshot() {
+    return { ...this.state,
+      version: this.state.ready && this.client.ready ? this.client.serverVersion || null : null,
+      ...(this.restartStatus ? { restart: { ...this.restartStatus } } : {}) };
+  }
 
   async start() {
     this.stopped = false;
@@ -68,13 +71,17 @@ export class ManagedAppServer extends EventEmitter {
     try {
       fs.mkdirSync(this.stateRoot, { recursive: true });
       let record = null, actual = null;
-      for (const candidate of [readRecord(this.recordPath), readRecord(this.legacyRecordPath)].filter(Boolean)) {
-        const process = candidate.pid ? await this.host.process(candidate.pid) : null;
-        if (sameManagedProcess(candidate, process)) { record = candidate; actual = process; break; }
+      const candidate = readRecord(this.recordPath);
+      const process = candidate?.pid ? await this.host.process(candidate.pid) : null;
+      if (sameManagedProcess(candidate, process)) { record = candidate; actual = process; }
+      const startedHere = !actual;
+      const savedRuntime = actual ? readRecord(path.join(this.stateRoot, 'codex-runtime.json')) : null;
+      const runtime = actual && savedRuntime?.executable && runtimeFilesAvailable(savedRuntime.executable)
+        ? savedRuntime
+        : await resolveCodexRuntime(this.stateRoot, { refresh: !actual, environment: this.environment });
+      if (actual && !runtimeFilesAvailable(actual.executable)) {
+        throw new Error(`运行中的 Codex 内核目录已被移除或缺少 codex-code-mode-host.exe：${actual.executable}；已找到可用内核 ${runtime.executable}，请确认重启内核。`);
       }
-      const runtime = actual
-        ? readRecord(path.join(this.stateRoot, 'codex-runtime.json')) || { executable: actual.executable }
-        : await resolveCodexRuntime(this.stateRoot, { environment: this.environment });
       if (!actual) {
         if (!await this.available()) throw new Error('45839 被未识别进程占用，未启动或结束任何进程。');
         const childEnvironment = { ...this.environment };
@@ -97,6 +104,10 @@ export class ManagedAppServer extends EventEmitter {
       await this.waitUntilReady(actual);
       await this.client.connect();
       if (!this.client.ready) throw new Error('Codex 内核协议初始化未完成。');
+      if (startedHere) {
+        try { pruneRetainedDesktopRuntimes(this.stateRoot, actual.executable); }
+        catch (error) { console.error('旧版 Codex 内核文件清理失败：', error); }
+      }
       const preferredExecutable = path.resolve(runtime.executable);
       const updatePending = path.resolve(actual.executable).toLowerCase() !== preferredExecutable.toLowerCase();
       const launcherRevision = Number.isSafeInteger(record?.launcherRevision) ? record.launcherRevision : 0;
@@ -145,7 +156,7 @@ export class ManagedAppServer extends EventEmitter {
     const previous = this.state;
     this.publish({ ...previous, state: 'restarting', ready: false, error: null });
     try {
-      const record = readRecord(this.recordPath) || readRecord(this.legacyRecordPath);
+      const record = readRecord(this.recordPath);
       const actual = record?.pid ? await this.host.process(record.pid) : null;
       if (actual && !sameManagedProcess(record, actual)) {
         throw new Error('Codex 内核进程身份已经变化，未结束任何进程。');

package/dist/src/onboarding.mjs

@@ -8,10 +8,10 @@ export const connectionModesText = [
 export function phonePairingSteps(transportMode, paired = false) {
   const mode = transportMode === 'lan-shared' ? '局域网 · Codex 内核已就绪' : '局域网（Codex 内核未就绪）';
   return paired ? [
-    `已有移动设备授权。手机可继续使用私有中继；${mode} 会显示验证成功的当前网络和历史记录。`,
+    `已有移动设备授权。移动端可继续使用私有中继；${mode} 会显示验证成功的当前网络和历史记录。`,
     '添加另一台设备时执行 relax pair；每台设备只需扫码配对一次。',
   ] : [
-    '手机先安装 Code Relax。当前为鸿蒙 HarmonyOS 7 私测版，调试 HAP 需通过 DevEco/调试设备安装，尚无商店下载入口。',
+    '请先在移动端安装 Code Relax。当前为鸿蒙 HarmonyOS 7 私测版，调试 HAP 需通过 DevEco/调试设备安装，尚无商店下载入口。',
     '使用 App 扫描配对二维码；每台移动设备只需配对一次。',
     `配对后可直接使用私有中继；${mode} 会接收并验证当前网络候选，也可手动输入 IP。`,
   ];
@@ -25,5 +25,5 @@ export const desktopSetupSteps = [
 ];
 
 export function pairingDisplayText(nextSteps, notice) {
-  return ['Bridge 已就绪，请在手机上完成连接。', connectionModesText, ...nextSteps.map((step, index) => `${index + 1}. ${step}`), notice].join('\n\n');
+  return ['Bridge 已就绪，请在移动端完成连接。', connectionModesText, ...nextSteps.map((step, index) => `${index + 1}. ${step}`), notice].join('\n\n');
 }