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

package/dist/src/server.mjs

@@ -4,23 +4,24 @@ import http from 'node:http';
 import path from 'node:path';
 import os from 'node:os';
 import { fileURLToPath } from 'node:url';
-import vm from 'node:vm';
-import sharp from 'sharp';
-import { attachLanSocket } from './lan-socket-server.mjs';
-import fileMentions from '../shared/file-mentions.cjs';
-import { validateInlineImage } from './message-images.mjs';
-import { ThreadWriterConflictError } from './shared-app-server.mjs';
-import { ManagedAppServer, managedAppServerUrl } from './managed-app-server.mjs';
-import { RuntimeDiscovery } from './runtime-discovery.mjs';
+import vm from 'node:vm';
+import sharp from 'sharp';
+import { attachLanSocket } from './lan-socket-server.mjs';
+import fileMentions from '../shared/file-mentions.cjs';
+import { validateInlineImage } from './message-images.mjs';
+import { ThreadWriterConflictError } from './shared-app-server.mjs';
+import { ManagedAppServer, managedAppServerUrl } from './managed-app-server.mjs';
+import { RuntimeDiscovery } from './runtime-discovery.mjs';
 import { streamSharedThread } from './shared-thread-stream.mjs';
 import appServerEvents from '../shared/app-server-events.cjs';
 import { runtimePaths } from './platform/windows/runtime-paths.mjs';
 import { openControl } from './service-control.mjs';
 import { writeRecord, readRecord } from './service-lifecycle.mjs';
 import { ExecutionHealth } from './execution-health.mjs';
-import { authorizeLanDevice } from './self-relay/lan-authorizations.mjs';
+import { authorizeLanDevice } from './self-relay/lan-authorizations.mjs';
+import { createRelayManager } from './self-relay/lifecycle.mjs';
 import { generateAndSetThreadTitle } from './thread-title-generation.mjs';
-import { desktopHost } from './platform/windows/desktop-host.mjs';
+import { desktopHost } from './platform/windows/desktop-host.mjs';
 import { SharedCatalog } from './shared-catalog.mjs';
 import { requestRecovery, recoveryStatus } from './shared-recovery.mjs';
 import { requestServiceRestart } from './service-restart.mjs';
@@ -29,43 +30,43 @@ const MAX_ATTACHMENT_BYTES = 16 * 1024 * 1024;
 const MAX_CACHED_ATTACHMENTS = 32;
 const MAX_CACHED_FILES = 64;
 const MAX_CONTEXT_TAIL_BYTES = 4 * 1024 * 1024;
-const MAX_LIVE_ACTIVITY_TAIL_BYTES = 1024 * 1024;
-const SHARED_HISTORY_PAGE_BYTES = 500 * 1024;
-const SHARED_HISTORY_PAGE_TURNS = 8;
+const MAX_LIVE_ACTIVITY_TAIL_BYTES = 1024 * 1024;
+const SHARED_HISTORY_PAGE_BYTES = 500 * 1024;
+const SHARED_HISTORY_PAGE_TURNS = 8;
 const MAX_SETTINGS_SCAN_BYTES = 64 * 1024 * 1024;
-const ALLOWED_MODELS = new Set([
-  'gpt-6-astra',
-  'gpt-6-sol',
+const ALLOWED_MODELS = new Set([
+  'gpt-6-astra',
+  'gpt-6-sol',
   'gpt-5.6-sol',
   'gpt-5.6-terra',
   'gpt-5.6-luna',
   'gpt-5.5',
   'gpt-5.3-codex-spark',
 ]);
-const ALLOWED_THINKING = new Set(['low', 'medium', 'high', 'xhigh', 'max', 'ultra']);
-
-class RequestError extends Error {
-  constructor(statusCode, message, details) {
-    super(message);
-    this.statusCode = statusCode;
-    this.details = details;
-    this.code = details?.code;
-  }
-}
-
-function readRuntimeVersion() {
-  let directory = path.dirname(fileURLToPath(import.meta.url));
-  while (true) {
-    const manifest = readRecord(path.join(directory, 'package.json'));
-    if (manifest?.name === '@walkhi/code-relax') return manifest.version || '未知';
-    const parent = path.dirname(directory);
-    if (parent === directory) return '未知';
-    directory = parent;
-  }
-}
-
-const options = parseOptions(process.argv.slice(2));
-const runtimeVersion = readRuntimeVersion();
+const ALLOWED_THINKING = new Set(['low', 'medium', 'high', 'xhigh', 'max', 'ultra']);
+
+class RequestError extends Error {
+  constructor(statusCode, message, details) {
+    super(message);
+    this.statusCode = statusCode;
+    this.details = details;
+    this.code = details?.code;
+  }
+}
+
+function readRuntimeVersion() {
+  let directory = path.dirname(fileURLToPath(import.meta.url));
+  while (true) {
+    const manifest = readRecord(path.join(directory, 'package.json'));
+    if (manifest?.name === '@walkhi/code-relax') return manifest.version || '未知';
+    const parent = path.dirname(directory);
+    if (parent === directory) return '未知';
+    directory = parent;
+  }
+}
+
+const options = parseOptions(process.argv.slice(2));
+const runtimeVersion = readRuntimeVersion();
 
 const webRoot = path.resolve(path.dirname(fileURLToPath(import.meta.url)), '..', 'web');
 const projectRoot = os.homedir();
@@ -74,58 +75,59 @@ const markdownItScript = fs.readFileSync(path.join(webRoot, 'vendor', 'markdown-
 const markdownSandbox = { atob };
 vm.runInNewContext(markdownItScript.toString(), markdownSandbox);
 const imageMarkdown = markdownSandbox.markdownit({ html: false });
-const attachmentCache = new Map();
-const fileCache = new Map();
-const fileCapabilitySecret = crypto.randomBytes(32);
-const imageCapabilityKey = crypto.createHash('sha256')
-  .update('code-relax-image-capability\0').update(options.token || fileCapabilitySecret).digest();
+const attachmentCache = new Map();
+const fileCache = new Map();
+const fileCapabilitySecret = crypto.randomBytes(32);
+const imageCapabilityKey = crypto.createHash('sha256')
+  .update('code-relax-image-capability\0').update(options.token || fileCapabilitySecret).digest();
 const sessionPathCache = new Map();
 const sessionSettingsCache = new Map();
 const liveActivityCache = new Map();
-let sharedServer = null;
-const managedAppServer = new ManagedAppServer({ stateRoot, host: desktopHost });
+let sharedServer = null;
+const managedAppServer = new ManagedAppServer({ stateRoot, host: desktopHost });
 const runtimeDiscovery = new RuntimeDiscovery({ stateRoot, host: desktopHost, url: managedAppServerUrl });
-let sharedCatalog = null, executionMode = 'ordinary';
-function selectSharedExecution(enabled) {
-  const next = enabled ? managedAppServer.client : null;
-  if (sharedServer === next) return;
-  sharedServer = next;
-  sharedCatalog = sharedServer ? new SharedCatalog(sharedServer) : null;
-}
-const executionHealth = new ExecutionHealth(async () => {
-  await managedAppServer.ensure();
-  const managed = managedAppServer.snapshot();
-  // The managed app-server owns execution. Desktop is another client of the
-  // same service, so closing Desktop must not disable phone writes.
-  selectSharedExecution(managed.ready);
-  executionMode = sharedServer ? 'shared' : 'ordinary';
-  const managedRestarting = managed.state === 'restarting';
-  const ready = !managedRestarting && sharedServer?.ready === true;
-  const state = managedRestarting ? 'restarting'
-    : ready ? 'full' : 'unavailable';
-  return { state, ready, canWrite: ready, mode: executionMode };
-});
-async function refreshExecution() {
-  await executionHealth.refresh();
-  return { mode: executionMode };
-}
-async function requireExecutionWritable(threadId) {
-  const execution = await executionHealth.refresh();
-  if (!execution.canWrite) {
-    throw new RequestError(503, 'Codex 内核未就绪。请重启工作站服务；若仍失败，运行 relax doctor。',
-      { code: 'full_control_required', execution });
-  }
-  if (threadId && sharedServer) sharedServer.requireWritable(threadId);
-  return execution;
-}
-managedAppServer.client.on('subscription-error', error => console.error('Codex 内核任务取消订阅失败：', error.message));
+const relayManager = createRelayManager(stateRoot);
+let sharedCatalog = null, executionMode = 'ordinary';
+function selectSharedExecution(enabled) {
+  const next = enabled ? managedAppServer.client : null;
+  if (sharedServer === next) return;
+  sharedServer = next;
+  sharedCatalog = sharedServer ? new SharedCatalog(sharedServer) : null;
+}
+const executionHealth = new ExecutionHealth(async () => {
+  await managedAppServer.ensure();
+  const managed = managedAppServer.snapshot();
+  // The managed app-server owns execution. Desktop is another client of the
+  // same service, so closing Desktop must not disable phone writes.
+  selectSharedExecution(managed.ready);
+  executionMode = sharedServer ? 'shared' : 'ordinary';
+  const managedRestarting = managed.state === 'restarting';
+  const ready = !managedRestarting && sharedServer?.ready === true;
+  const state = managedRestarting ? 'restarting'
+    : ready ? 'full' : 'unavailable';
+  return { state, ready, canWrite: ready, mode: executionMode };
+});
+async function refreshExecution() {
+  await executionHealth.refresh();
+  return { mode: executionMode };
+}
+async function requireExecutionWritable(threadId) {
+  const execution = await executionHealth.refresh();
+  if (!execution.canWrite) {
+    throw new RequestError(503, 'Codex 内核未就绪。请重启工作站服务；若仍失败，运行 relax doctor。',
+      { code: 'full_control_required', execution });
+  }
+  if (threadId && sharedServer) sharedServer.requireWritable(threadId);
+  return execution;
+}
+managedAppServer.client.on('subscription-error', error => console.error('Codex 内核任务取消订阅失败：', error.message));
 
 async function handleRequest(request, response) {
   try {
     const url = new URL(request.url || '/', `http://${request.headers.host || 'localhost'}`);
 
     if (!request.socketRequest) {
-      sendJson(response, 404, { error: '此端口不提供网页。' });
+      sendJson(response, 404, { error: '此端口不提供网页。' });
       return;
     }
 
@@ -150,87 +152,87 @@ async function handleRequest(request, response) {
     }
     if (request.method === 'POST' && url.pathname === '/api/shared-recovery') {
       const body = await readJsonBody(request);
-      if (body.confirmed !== true || typeof body.operationId !== 'string') throw new RequestError(400, '请确认重新打开当前 Codex 并接入 Codex 内核后再继续。');
+      if (body.confirmed !== true || typeof body.operationId !== 'string') throw new RequestError(400, '请确认重新打开当前 Codex 并接入 Codex 内核后再继续。');
       sendJson(response, 202, await requestRecovery(stateRoot, body)); return;
     }
-    if (request.method === 'POST' && url.pathname === '/api/service/restart') {
-      const body = await readJsonBody(request);
-      if (body.confirmed !== true) throw new RequestError(400, '请确认重启工作站服务后再继续。');
-      sendJson(response, 202, await requestServiceRestart(stateRoot)); return;
-    }
-    if (request.method === 'POST' && url.pathname === '/api/managed-app-server/restart') {
-      const body = await readJsonBody(request);
-      if (body.confirmed !== true || typeof body.operationId !== 'string' || !body.operationId.trim()) {
-        throw new RequestError(400, '请先确认中断风险，再重启 Codex 内核。');
-      }
-      try {
-        sendJson(response, 202, managedAppServer.restart(body.operationId.trim()));
-      } catch (error) {
-        if (error?.code === 'managed_app_server_restarting') throw new RequestError(409, error.message);
-        throw error;
-      }
-      return;
-    }
-
-    if (request.method === 'GET' && url.pathname === '/api/official-remote/status') {
-      if (!managedAppServer.client.ready) throw new RequestError(503, 'Codex 内核未就绪，无法读取官方工作站状态。');
-      const result = await managedAppServer.client.request('remoteControl/status/read', {});
-      sendJson(response, 200, { status: result.status, environmentId: result.environmentId });
-      return;
-    }
-    if (request.method === 'POST' && url.pathname === '/api/official-remote/pairing') {
-      if (!managedAppServer.client.ready) throw new RequestError(503, 'Codex 内核未就绪，无法生成官方配对码。');
-      const status = await managedAppServer.client.request('remoteControl/status/read', {});
-      if (status.status !== 'connected') throw new RequestError(409, '当前 Codex 内核未连接 OpenAI Remote，无法配对。');
-      const result = await managedAppServer.client.request('remoteControl/pairing/start', { manualCode: true });
-      if (!result.manualPairingCode || !result.environmentId) throw new RequestError(502, 'Codex 内核未返回有效的官方配对码。');
-      // One-time code: return only to the authenticated station controller; never persist or log it.
-      sendJson(response, 200, { manualPairingCode: result.manualPairingCode,
-        environmentId: result.environmentId, expiresAt: result.expiresAt });
-      return;
-    }
-
-    if (request.method === 'GET' && url.pathname === '/api/health') {
-      // Status readers consume the workstation's cached sample. A phone query
-      // must not trigger PowerShell, process-identity, or app-server checks.
-      sendJson(response, 200, {
-        status: 'ok', resident: true, version: runtimeVersion,
-        execution: { ...executionHealth.state, ready: executionHealth.state.ready && sharedServer?.ready === true,
-          mode: executionMode },
-        managedAppServer: managedAppServer.snapshot(),
-        ...runtimeDiscovery.state,
-        sharedAppServerConnected: sharedServer?.ready === true,
-        sharedRecoveryAvailable: runtimeDiscovery.state.desktop?.installed === true,
+    if (request.method === 'POST' && url.pathname === '/api/service/restart') {
+      const body = await readJsonBody(request);
+      if (body.confirmed !== true) throw new RequestError(400, '请确认重启工作站服务后再继续。');
+      sendJson(response, 202, await requestServiceRestart(stateRoot)); return;
+    }
+    if (request.method === 'POST' && url.pathname === '/api/managed-app-server/restart') {
+      const body = await readJsonBody(request);
+      if (body.confirmed !== true || typeof body.operationId !== 'string' || !body.operationId.trim()) {
+        throw new RequestError(400, '请先确认中断风险，再重启 Codex 内核。');
+      }
+      try {
+        sendJson(response, 202, managedAppServer.restart(body.operationId.trim()));
+      } catch (error) {
+        if (error?.code === 'managed_app_server_restarting') throw new RequestError(409, error.message);
+        throw error;
+      }
+      return;
+    }
+
+    if (request.method === 'GET' && url.pathname === '/api/official-remote/status') {
+      if (!managedAppServer.client.ready) throw new RequestError(503, 'Codex 内核未就绪，无法读取官方工作站状态。');
+      const result = await managedAppServer.client.request('remoteControl/status/read', {});
+      sendJson(response, 200, { status: result.status, environmentId: result.environmentId });
+      return;
+    }
+    if (request.method === 'POST' && url.pathname === '/api/official-remote/pairing') {
+      if (!managedAppServer.client.ready) throw new RequestError(503, 'Codex 内核未就绪，无法生成官方配对码。');
+      const status = await managedAppServer.client.request('remoteControl/status/read', {});
+      if (status.status !== 'connected') throw new RequestError(409, '当前 Codex 内核未连接 OpenAI Remote，无法配对。');
+      const result = await managedAppServer.client.request('remoteControl/pairing/start', { manualCode: true });
+      if (!result.manualPairingCode || !result.environmentId) throw new RequestError(502, 'Codex 内核未返回有效的官方配对码。');
+      // One-time code: return only to the authenticated station controller; never persist or log it.
+      sendJson(response, 200, { manualPairingCode: result.manualPairingCode,
+        environmentId: result.environmentId, expiresAt: result.expiresAt });
+      return;
+    }
+
+    if (request.method === 'GET' && url.pathname === '/api/health') {
+      // Status readers consume the workstation's cached sample. A phone query
+      // must not trigger PowerShell, process-identity, or app-server checks.
+      sendJson(response, 200, {
+        status: 'ok', resident: true, version: runtimeVersion,
+        execution: { ...executionHealth.state, ready: executionHealth.state.ready && sharedServer?.ready === true,
+          mode: executionMode },
+        managedAppServer: managedAppServer.snapshot(),
+        ...runtimeDiscovery.state,
+        sharedAppServerConnected: sharedServer?.ready === true,
+        sharedRecoveryAvailable: runtimeDiscovery.state.desktop?.installed === true,
         mode: options.lan ? 'lan' : 'loopback',
         tokenRequired: Boolean(options.token),
         nativeImageTransport: sharedServer ? 'shared-app-server' : null,
-        transportMode: sharedServer?.ready === true ? 'lan-shared' : 'unavailable',
+        transportMode: sharedServer?.ready === true ? 'lan-shared' : 'unavailable',
       });
       return;
-    }
-
-    const imageMatch = /^\/api\/images\/([a-f0-9]{64})$/.exec(url.pathname);
-    if (request.method === 'GET' && imageMatch) {
-      let image = attachmentCache.get(imageMatch[1])
-        || recoverLocalImage(imageMatch[1], url.searchParams.get('recovery') || '');
-      const contextThreadId = url.searchParams.get('threadId') || '';
-      const contextTurnId = url.searchParams.get('turnId') || '';
-      if (!image && sharedServer && contextThreadId && contextTurnId
-        && contextThreadId.length <= 128 && contextTurnId.length <= 128) {
-        try {
-          normalizeTurn(await sharedServer.turnContext(contextThreadId, contextTurnId));
-          image = attachmentCache.get(imageMatch[1]);
-        } catch {}
-      }
-      if (!image) throw new RequestError(404, '这张图片已失效，无法从工作站重新读取。');
-      const thumbnail = url.searchParams.get('variant') === 'thumbnail';
-      const asset = thumbnail ? await attachmentThumbnail(image) : { buffer: image.buffer, mimeType: image.mimeType };
-      sendJson(response, 200, { url: `data:${asset.mimeType};base64,${asset.buffer.toString('base64')}` });
+    }
+
+    const imageMatch = /^\/api\/images\/([a-f0-9]{64})$/.exec(url.pathname);
+    if (request.method === 'GET' && imageMatch) {
+      let image = attachmentCache.get(imageMatch[1])
+        || recoverLocalImage(imageMatch[1], url.searchParams.get('recovery') || '');
+      const contextThreadId = url.searchParams.get('threadId') || '';
+      const contextTurnId = url.searchParams.get('turnId') || '';
+      if (!image && sharedServer && contextThreadId && contextTurnId
+        && contextThreadId.length <= 128 && contextTurnId.length <= 128) {
+        try {
+          normalizeTurn(await sharedServer.turnContext(contextThreadId, contextTurnId));
+          image = attachmentCache.get(imageMatch[1]);
+        } catch {}
+      }
+      if (!image) throw new RequestError(404, '这张图片已失效，无法从工作站重新读取。');
+      const thumbnail = url.searchParams.get('variant') === 'thumbnail';
+      const asset = thumbnail ? await attachmentThumbnail(image) : { buffer: image.buffer, mimeType: image.mimeType };
+      sendJson(response, 200, { url: `data:${asset.mimeType};base64,${asset.buffer.toString('base64')}` });
       return;
     }
 
     const fileMatch = /^\/api\/files\/([a-f0-9]{64})$/.exec(url.pathname);
-    if (request.method === 'GET' && fileMatch) {
+    if (request.method === 'GET' && fileMatch) {
       const file = fileCache.get(fileMatch[1]);
       if (!file) throw new RequestError(404, '文件授权已失效，请重新读取对话。');
       let stat;
@@ -241,47 +243,47 @@ async function handleRequest(request, response) {
       }
       if (stat.size > MAX_ATTACHMENT_BYTES) throw new RequestError(413, '暂只支持下载不超过 16 MiB 的文件。');
       sendJson(response, 200, { name: file.name, size: file.size, dataBase64: fs.readFileSync(file.path).toString('base64') });
-      return;
-    }
-
-    if (url.pathname.startsWith('/api/app-server/') || url.pathname === '/api/wait') {
-      throw new RequestError(410, '此连接方式已停用。请检查 Codex 内核状态。', { code: 'unsupported_control' });
-    }
-    const taskPath = /^\/api\/threads\/([^/]+)/.exec(url.pathname);
-    if (taskPath && (url.pathname.endsWith('/takeover') || url.pathname === `/api/threads/${taskPath[1]}`)) {
-      throw new RequestError(410, '此连接方式已停用。', { code: 'unsupported_control' });
-    }
-    if (url.searchParams.has('hostId') && url.searchParams.get('hostId') !== 'local') {
-      throw new RequestError(410, '此对话的连接方式已停用，请检查 Codex 内核状态。', { code: 'unsupported_control' });
-    }
-    if (!executionHealth.state.ready || sharedServer?.ready !== true) {
-      throw new RequestError(503, 'Codex 内核未就绪。请重启工作站服务；若仍失败，运行 relax doctor。',
-        { code: 'full_control_required' });
-    }
-
-    if (request.method === 'GET' && url.pathname === '/api/models') {
-      sendJson(response, 200, await sharedServer.models());
-      return;
-    }
+      return;
+    }
+
+    if (url.pathname.startsWith('/api/app-server/') || url.pathname === '/api/wait') {
+      throw new RequestError(410, '此连接方式已停用。请检查 Codex 内核状态。', { code: 'unsupported_control' });
+    }
+    const taskPath = /^\/api\/threads\/([^/]+)/.exec(url.pathname);
+    if (taskPath && (url.pathname.endsWith('/takeover') || url.pathname === `/api/threads/${taskPath[1]}`)) {
+      throw new RequestError(410, '此连接方式已停用。', { code: 'unsupported_control' });
+    }
+    if (url.searchParams.has('hostId') && url.searchParams.get('hostId') !== 'local') {
+      throw new RequestError(410, '此对话的连接方式已停用，请检查 Codex 内核状态。', { code: 'unsupported_control' });
+    }
+    if (!executionHealth.state.ready || sharedServer?.ready !== true) {
+      throw new RequestError(503, 'Codex 内核未就绪。请重启工作站服务；若仍失败，运行 relax doctor。',
+        { code: 'full_control_required' });
+    }
+
+    if (request.method === 'GET' && url.pathname === '/api/models') {
+      sendJson(response, 200, await sharedServer.models());
+      return;
+    }
 
     if (request.method === 'GET' && url.pathname === '/api/threads') {
       const limit = boundedInteger(url.searchParams.get('limit'), 20, 1, 200);
       const archived = url.searchParams.get('archived') === 'true';
-      sendJson(response, 200, await sharedCatalog.threads(limit, archived));
+      sendJson(response, 200, await sharedCatalog.threads(limit, archived));
       return;
     }
 
     if (request.method === 'GET' && url.pathname === '/api/projects') {
-      sendJson(response, 200, { projects: (await sharedCatalog.projects()).projects });
+      sendJson(response, 200, { projects: (await sharedCatalog.projects()).projects });
       return;
     }
 
     if (request.method === 'GET' && url.pathname === '/api/usage-limits') {
-      sendJson(response, 200, await sharedServer.usage());
+      sendJson(response, 200, await sharedServer.usage());
       return;
     }
 
-    if (request.method === 'GET' && url.pathname === '/api/usage-events') {
+    if (request.method === 'GET' && url.pathname === '/api/usage-events') {
       const execution = sharedServer;
       response.startEvents();
       const emit = value => { if (!response.destroyed) response.event('usage', value); };
@@ -294,186 +296,186 @@ async function handleRequest(request, response) {
     }
 
     const createThreadMatch = /^\/api\/projects\/([^/]+)\/threads$/.exec(url.pathname);
-    if (request.method === 'POST' && createThreadMatch) {
-      await requireExecutionWritable();
+    if (request.method === 'POST' && createThreadMatch) {
+      await requireExecutionWritable();
       const projectId = decodeURIComponent(createThreadMatch[1]);
-      const body = await readJsonBody(request);
-      if (body.transport === 'app-server' || (body.hostId && body.hostId !== 'local')) {
-        throw new RequestError(410, '此连接方式已停用，请检查 Codex 内核状态。', { code: 'unsupported_control' });
-      }
-      const projects = (await sharedCatalog.projects()).projects;
-      const project = projects.find(item => item.projectId === projectId);
-      if (projectId !== '__unassigned__' && !project) throw new RequestError(404, '没有找到对应项目。');
-      const execution = sharedServer;
-      await execution.connect();
-      const rpc = (method, params) => execution.request(method, params);
-      let target = appServerEvents.projectlessThreadTarget(projectRoot);
-      if (project) {
-        const nativeProjects = await appServerEvents.readProjects(rpc);
-        const nativeId = nativeProjects.find(item => item.id === project.projectId)?.id;
-        if (!nativeId) throw new RequestError(404, 'Codex 内核中没有找到对应项目，请刷新项目列表。');
-        target = { projectId:nativeId, cwd:project.path };
-      }
-      const { input } = appServerTurnArguments('', body);
-      const created = await appServerEvents.createThread(rpc, target, input, body);
-      const prompt = input.filter(part => part.type === 'text').map(part => part.text).join('\n');
-      void generateAndSetThreadTitle({
-        request: rpc,
-        subscribe: listener => {
-          execution.on('notification', listener);
-          return () => execution.off('notification', listener);
-        },
-        threadId: created.threadId,
-        prompt,
-        cwd: target.cwd || null,
-      }).catch(error => console.error(`生成对话标题失败：${error.message}`));
-      sendJson(response, 201, { ...created, hostId:'local' });
-      return;
+      const body = await readJsonBody(request);
+      if (body.transport === 'app-server' || (body.hostId && body.hostId !== 'local')) {
+        throw new RequestError(410, '此连接方式已停用，请检查 Codex 内核状态。', { code: 'unsupported_control' });
+      }
+      const projects = (await sharedCatalog.projects()).projects;
+      const project = projects.find(item => item.projectId === projectId);
+      if (projectId !== '__unassigned__' && !project) throw new RequestError(404, '没有找到对应项目。');
+      const execution = sharedServer;
+      await execution.connect();
+      const rpc = (method, params) => execution.request(method, params);
+      let target = appServerEvents.projectlessThreadTarget(projectRoot);
+      if (project) {
+        const nativeProjects = await appServerEvents.readProjects(rpc);
+        const nativeId = nativeProjects.find(item => item.id === project.projectId)?.id;
+        if (!nativeId) throw new RequestError(404, 'Codex 内核中没有找到对应项目，请刷新项目列表。');
+        target = { projectId:nativeId, cwd:project.path };
+      }
+      const { input } = appServerTurnArguments('', body);
+      const created = await appServerEvents.createThread(rpc, target, input, body);
+      const prompt = input.filter(part => part.type === 'text').map(part => part.text).join('\n');
+      void generateAndSetThreadTitle({
+        request: rpc,
+        subscribe: listener => {
+          execution.on('notification', listener);
+          return () => execution.off('notification', listener);
+        },
+        threadId: created.threadId,
+        prompt,
+        cwd: target.cwd || null,
+      }).catch(error => console.error(`生成对话标题失败：${error.message}`));
+      sendJson(response, 201, { ...created, hostId:'local' });
+      return;
     }
 
-    const timelineMatch = /^\/api\/threads\/([^/]+)\/timeline$/.exec(url.pathname);
-    if (request.method === 'GET' && timelineMatch) {
-      const threadId = decodeURIComponent(timelineMatch[1]);
-      const timeline = normalizeSharedTimeline(await sharedServer.timeline(threadId, sharedHistoryPageOptions()));
-      const knownUpdatedAt = Number(url.searchParams.get('knownUpdatedAt'));
-      const knownTurnId = url.searchParams.get('knownTurnId') || '';
-      const knownTurnStatus = url.searchParams.get('knownTurnStatus') || '';
-      const knownHistoryView = url.searchParams.get('knownHistoryView') || '';
-      const latest = timeline.turns.at(-1);
-      const knownIndex = knownTurnId ? timeline.turns.findIndex(turn => turn.id === knownTurnId) : -1;
-      const sameHistoryView = knownHistoryView === timeline.historyView;
-      const unchanged = sameHistoryView
-        && knownIndex === timeline.turns.length - 1
-        && timeline.thread.status === 'idle' && latest?.status !== 'inProgress'
-        && knownTurnStatus && knownTurnStatus !== 'inProgress'
-        && (!Number.isFinite(knownUpdatedAt) || knownUpdatedAt <= 0 || timeline.thread.updatedAt === knownUpdatedAt);
-      const partial = !unchanged && sameHistoryView && knownIndex >= 0
-        ? { ...timeline, turns: timeline.turns.slice(knownIndex), partialFromTurnId: knownTurnId }
-        : timeline;
-      sendJson(response, 200, unchanged ? { ...timeline, turns: [], notModified: true } : partial);
-      return;
-    }
+    const timelineMatch = /^\/api\/threads\/([^/]+)\/timeline$/.exec(url.pathname);
+    if (request.method === 'GET' && timelineMatch) {
+      const threadId = decodeURIComponent(timelineMatch[1]);
+      const timeline = normalizeSharedTimeline(await sharedServer.timeline(threadId, sharedHistoryPageOptions()));
+      const knownUpdatedAt = Number(url.searchParams.get('knownUpdatedAt'));
+      const knownTurnId = url.searchParams.get('knownTurnId') || '';
+      const knownTurnStatus = url.searchParams.get('knownTurnStatus') || '';
+      const knownHistoryView = url.searchParams.get('knownHistoryView') || '';
+      const latest = timeline.turns.at(-1);
+      const knownIndex = knownTurnId ? timeline.turns.findIndex(turn => turn.id === knownTurnId) : -1;
+      const sameHistoryView = knownHistoryView === timeline.historyView;
+      const unchanged = sameHistoryView
+        && knownIndex === timeline.turns.length - 1
+        && timeline.thread.status === 'idle' && latest?.status !== 'inProgress'
+        && knownTurnStatus && knownTurnStatus !== 'inProgress'
+        && (!Number.isFinite(knownUpdatedAt) || knownUpdatedAt <= 0 || timeline.thread.updatedAt === knownUpdatedAt);
+      const partial = !unchanged && sameHistoryView && knownIndex >= 0
+        ? { ...timeline, turns: timeline.turns.slice(knownIndex), partialFromTurnId: knownTurnId }
+        : timeline;
+      sendJson(response, 200, unchanged ? { ...timeline, turns: [], notModified: true } : partial);
+      return;
+    }
 
     const approvalMatch = /^\/api\/threads\/([^/]+)\/approvals$/.exec(url.pathname);
-    if (request.method === 'POST' && approvalMatch) {
-      const threadId = decodeURIComponent(approvalMatch[1]);
-      await requireExecutionWritable(threadId);
-      const body = await readJsonBody(request);
+    if (request.method === 'POST' && approvalMatch) {
+      const threadId = decodeURIComponent(approvalMatch[1]);
+      await requireExecutionWritable(threadId);
+      const body = await readJsonBody(request);
       sendJson(response, 200, await sharedServer.respondApproval(threadId, body)); return;
     }
 
     const eventsMatch = /^\/api\/threads\/([^/]+)\/events$/.exec(url.pathname);
-    if (request.method === 'GET' && eventsMatch) {
-      const threadId = decodeURIComponent(eventsMatch[1]);
-      const after = Number(url.searchParams.get('afterSeq'));
-      const requestedSync = url.searchParams.get('syncId') && url.searchParams.get('syncEpoch') && Number.isSafeInteger(after) && after >= 0
-        ? { id: url.searchParams.get('syncId'), epoch: url.searchParams.get('syncEpoch'), after } : undefined;
-      const knownUpdatedAt = Number(url.searchParams.get('knownUpdatedAt'));
-      const known = url.searchParams.get('knownTurnId') ? {
-        updatedAt: Number.isFinite(knownUpdatedAt) ? knownUpdatedAt : 0,
-        turnId: url.searchParams.get('knownTurnId'),
-        turnStatus: url.searchParams.get('knownTurnStatus') || '',
-      } : undefined;
-      await streamSharedThread(response, threadId, sharedServer,
-        normalizeSharedTimeline, requestedSync, known);
-      return;
-    }
+    if (request.method === 'GET' && eventsMatch) {
+      const threadId = decodeURIComponent(eventsMatch[1]);
+      const after = Number(url.searchParams.get('afterSeq'));
+      const requestedSync = url.searchParams.get('syncId') && url.searchParams.get('syncEpoch') && Number.isSafeInteger(after) && after >= 0
+        ? { id: url.searchParams.get('syncId'), epoch: url.searchParams.get('syncEpoch'), after } : undefined;
+      const knownUpdatedAt = Number(url.searchParams.get('knownUpdatedAt'));
+      const known = url.searchParams.get('knownTurnId') ? {
+        updatedAt: Number.isFinite(knownUpdatedAt) ? knownUpdatedAt : 0,
+        turnId: url.searchParams.get('knownTurnId'),
+        turnStatus: url.searchParams.get('knownTurnStatus') || '',
+      } : undefined;
+      await streamSharedThread(response, threadId, sharedServer,
+        normalizeSharedTimeline, requestedSync, known);
+      return;
+    }
 
     const contextMatch = /^\/api\/threads\/([^/]+)\/context$/.exec(url.pathname);
     if (request.method === 'GET' && contextMatch) {
       const threadId = decodeURIComponent(contextMatch[1]);
       const current = readContextUsage(threadId);
-      const native = await sharedServer.readContext(threadId);
+      const native = await sharedServer.readContext(threadId);
       sendJson(response, 200, { ...current, ...(native.model ? { model: native.model, thinking: native.thinking, serviceTier: native.serviceTier,
         permissionMode: native.permissionMode, permissionModes: native.permissionModes } : {}), ...(native.available ? native : {}) });
       return;
     }
 
     const sharedAction = /^\/api\/threads\/([^/]+)\/(history|settings|permissions)$/.exec(url.pathname);
-    if (sharedAction) {
+    if (sharedAction) {
       const id = decodeURIComponent(sharedAction[1]);
       if (request.method === 'GET' && sharedAction[2] === 'history') {
-        sendJson(response, 200, normalizeSharedTimeline(await sharedServer.history(id, url.searchParams.get('cursor'), sharedHistoryPageOptions())));
+        sendJson(response, 200, normalizeSharedTimeline(await sharedServer.history(id, url.searchParams.get('cursor'), sharedHistoryPageOptions())));
         return;
       }
-      if (request.method === 'POST' && sharedAction[2] === 'settings') {
-        await requireExecutionWritable(id);
+      if (request.method === 'POST' && sharedAction[2] === 'settings') {
+        await requireExecutionWritable(id);
         const body = await readJsonBody(request);
         sendJson(response, 200, await sharedServer.settings(id, body.model, body.thinking, body.serviceTier));
         return;
       }
-      if (request.method === 'POST' && sharedAction[2] === 'permissions') {
-        await requireExecutionWritable(id);
+      if (request.method === 'POST' && sharedAction[2] === 'permissions') {
+        await requireExecutionWritable(id);
         const body = await readJsonBody(request);
         sendJson(response, 200, await sharedServer.permissions(id, body.mode));
         return;
-      }
-    }
-
-    const sharedOperationGroup = /^\/api\/threads\/([^/]+)\/turns\/([^/]+)\/groups\/([^/]+)\/items$/.exec(url.pathname);
-    if (request.method === 'GET' && sharedOperationGroup) {
-      const threadId = decodeURIComponent(sharedOperationGroup[1]);
-      const turnId = decodeURIComponent(sharedOperationGroup[2]);
-      const groupId = decodeURIComponent(sharedOperationGroup[3]);
-      const page = await sharedServer.operationGroupItems(threadId, turnId, groupId, url.searchParams.get('offset'));
-      sendJson(response, 200, { turnId: page.turnId, groupId: page.groupId,
-        entries: page.items.map(normalizeItem).filter(Boolean), nextOffset: page.nextOffset, total: page.total });
-      return;
-    }
-
-    const archiveMatch = /^\/api\/threads\/([^/]+)\/(archive|unarchive)$/.exec(url.pathname);
-    if (request.method === 'POST' && archiveMatch) {
-      const threadId = decodeURIComponent(archiveMatch[1]);
-      await requireExecutionWritable(threadId);
+      }
+    }
+
+    const sharedOperationGroup = /^\/api\/threads\/([^/]+)\/turns\/([^/]+)\/groups\/([^/]+)\/items$/.exec(url.pathname);
+    if (request.method === 'GET' && sharedOperationGroup) {
+      const threadId = decodeURIComponent(sharedOperationGroup[1]);
+      const turnId = decodeURIComponent(sharedOperationGroup[2]);
+      const groupId = decodeURIComponent(sharedOperationGroup[3]);
+      const page = await sharedServer.operationGroupItems(threadId, turnId, groupId, url.searchParams.get('offset'));
+      sendJson(response, 200, { turnId: page.turnId, groupId: page.groupId,
+        entries: page.items.map(normalizeItem).filter(Boolean), nextOffset: page.nextOffset, total: page.total });
+      return;
+    }
+
+    const archiveMatch = /^\/api\/threads\/([^/]+)\/(archive|unarchive)$/.exec(url.pathname);
+    if (request.method === 'POST' && archiveMatch) {
+      const threadId = decodeURIComponent(archiveMatch[1]);
+      await requireExecutionWritable(threadId);
       await sharedServer.request(`thread/${archiveMatch[2]}`, { threadId });
       sendJson(response, 200, { threadId, archived: archiveMatch[2] === 'archive' });
       return;
     }
 
-    const queueMatch = /^\/api\/threads\/([^/]+)\/queue$/.exec(url.pathname);
-    if (queueMatch) {
-      const threadId = decodeURIComponent(queueMatch[1]);
-      await sharedServer.connect();
-      const rpc = (method, params) => sharedServer.request(method, params);
-      if (request.method === 'GET') { sendJson(response, 200, await appServerEvents.readQueue(rpc, threadId)); return; }
-      if (request.method === 'POST') {
-        await requireExecutionWritable(threadId);
-        const args = appServerTurnArguments(threadId, await readJsonBody(request));
-        sendJson(response, 202, await appServerEvents.addQueue(rpc, threadId, args.input, crypto.randomUUID())); return;
-      }
-    }
+    const queueMatch = /^\/api\/threads\/([^/]+)\/queue$/.exec(url.pathname);
+    if (queueMatch) {
+      const threadId = decodeURIComponent(queueMatch[1]);
+      await sharedServer.connect();
+      const rpc = (method, params) => sharedServer.request(method, params);
+      if (request.method === 'GET') { sendJson(response, 200, await appServerEvents.readQueue(rpc, threadId)); return; }
+      if (request.method === 'POST') {
+        await requireExecutionWritable(threadId);
+        const args = appServerTurnArguments(threadId, await readJsonBody(request));
+        sendJson(response, 202, await appServerEvents.addQueue(rpc, threadId, args.input, crypto.randomUUID())); return;
+      }
+    }
 
     const queueItemMatch = /^\/api\/threads\/([^/]+)\/queue\/([a-f0-9-]+)(?:\/(steer))?$/.exec(url.pathname);
     if (queueItemMatch) {
       const threadId = decodeURIComponent(queueItemMatch[1]);
       const itemId = queueItemMatch[2];
-      await sharedServer.connect();
-      const action = request.method === 'DELETE' ? 'delete' : queueItemMatch[3] === 'steer' ? 'steer' : null;
-      if (!action) throw new RequestError(405, '不支持的队列操作');
-      await requireExecutionWritable(threadId);
-      sendJson(response, 200, await appServerEvents.changeQueue((method, params) => sharedServer.request(method, params), threadId, itemId, action)); return;
-    }
+      await sharedServer.connect();
+      const action = request.method === 'DELETE' ? 'delete' : queueItemMatch[3] === 'steer' ? 'steer' : null;
+      if (!action) throw new RequestError(405, '不支持的队列操作');
+      await requireExecutionWritable(threadId);
+      sendJson(response, 200, await appServerEvents.changeQueue((method, params) => sharedServer.request(method, params), threadId, itemId, action)); return;
+    }
 
-    const interruptMatch = /^\/api\/threads\/([^/]+)\/interrupt$/.exec(url.pathname);
-    if (request.method === 'POST' && interruptMatch) {
-      const threadId = decodeURIComponent(interruptMatch[1]);
-      await requireExecutionWritable(threadId);
-      const body = await readJsonBody(request);
-      if (!body.turnId) throw new RequestError(400, '缺少活动轮次 ID。');
-      await sharedServer.interrupt(threadId, body.turnId);
-      sendJson(response, 200, { requested: true });
-      return;
+    const interruptMatch = /^\/api\/threads\/([^/]+)\/interrupt$/.exec(url.pathname);
+    if (request.method === 'POST' && interruptMatch) {
+      const threadId = decodeURIComponent(interruptMatch[1]);
+      await requireExecutionWritable(threadId);
+      const body = await readJsonBody(request);
+      if (!body.turnId) throw new RequestError(400, '缺少活动轮次 ID。');
+      await sharedServer.interrupt(threadId, body.turnId);
+      sendJson(response, 200, { requested: true });
+      return;
     }
 
     const messageMatch = /^\/api\/threads\/([^/]+)\/messages$/.exec(url.pathname);
-    if (request.method === 'POST' && messageMatch) {
-      const threadId = decodeURIComponent(messageMatch[1]);
-      await requireExecutionWritable(threadId);
-      const body = await readJsonBody(request);
-      if (body.hostId && body.hostId !== 'local') throw new RequestError(410, '此对话的连接方式已停用。', { code: 'unsupported_control' });
-      sendJson(response, 200, { success: true, data: await sharedServer.send(appServerTurnArguments(threadId, body)) });
-      return;
-    }
+    if (request.method === 'POST' && messageMatch) {
+      const threadId = decodeURIComponent(messageMatch[1]);
+      await requireExecutionWritable(threadId);
+      const body = await readJsonBody(request);
+      if (body.hostId && body.hostId !== 'local') throw new RequestError(410, '此对话的连接方式已停用。', { code: 'unsupported_control' });
+      sendJson(response, 200, { success: true, data: await sharedServer.send(appServerTurnArguments(threadId, body)) });
+      return;
+    }
 
     sendJson(response, 404, { error: '未找到请求的资源。' });
   } catch (error) {
@@ -481,27 +483,27 @@ async function handleRequest(request, response) {
       if (!response.writableEnded) response.end();
       return;
     }
-    const status = error instanceof RequestError || error instanceof ThreadWriterConflictError ? (error.statusCode || 409) : 502;
-    sendJson(response, status, {
-      error: error instanceof Error ? error.message : String(error),
-      code: error?.code,
-      threadId: error?.threadId,
-      readOnly: error?.readOnly,
-      details: error?.details,
+    const status = error instanceof RequestError || error instanceof ThreadWriterConflictError ? (error.statusCode || 409) : 502;
+    sendJson(response, status, {
+      error: error instanceof Error ? error.message : String(error),
+      code: error?.code,
+      threadId: error?.threadId,
+      readOnly: error?.readOnly,
+      details: error?.details,
     });
   }
 }
 
 const server = http.createServer(handleRequest);
-const lanSocket = attachLanSocket(server, { token: options.token, dispatch: handleRequest,
-  uploadsRoot,
-  authorizeDevice: (clientId, credential) => authorizeLanDevice(stateRoot, clientId, credential),
+const lanSocket = attachLanSocket(server, { token: options.token, dispatch: handleRequest,
+  uploadsRoot,
+  authorizeDevice: (clientId, credential) => authorizeLanDevice(stateRoot, clientId, credential),
 });
 
-let control;
-void managedAppServer.start();
-executionHealth.start();
-runtimeDiscovery.start();
+let control;
+void managedAppServer.start();
+executionHealth.start();
+runtimeDiscovery.start();
 server.on('error', error => {
   console.error('Bridge 监听失败：', error.message);
   process.exit(1);
@@ -509,14 +511,19 @@ server.on('error', error => {
 server.listen(options.port, options.lan ? '0.0.0.0' : '127.0.0.1', async () => {
   try {
     if (process.env.CODEX_REMOTE_INSTANCE && process.env.CODEX_REMOTE_CONTROL_SECRET && process.env.CODEX_REMOTE_READY_PATH) {
-      control = await openControl({ instanceId: process.env.CODEX_REMOTE_INSTANCE,
-        secret: process.env.CODEX_REMOTE_CONTROL_SECRET, shutdown: shutDown, actions: {
+      control = await openControl({ instanceId: process.env.CODEX_REMOTE_INSTANCE,
+        secret: process.env.CODEX_REMOTE_CONTROL_SECRET, shutdown: shutDown, actions: {
           'refresh-execution': refreshExecution,
-          'restart-managed-app-server': () => {
-            const state = managedAppServer.snapshot();
-            return state.launcherRestartRequired ? managedAppServer.restart(crypto.randomUUID()) : state;
-          },
-        } });
+          'relay-start': () => relayManager.run('relay-start'),
+          'relay-status': () => relayManager.run('relay-status'),
+          'relay-stop': () => relayManager.run('relay-stop'),
+          'relay-pair': () => relayManager.run('relay-pair'),
+          'relay-revoke': () => relayManager.run('relay-revoke'),
+          'restart-managed-app-server': () => {
+            const state = managedAppServer.snapshot();
+            return state.launcherRestartRequired ? managedAppServer.restart(crypto.randomUUID()) : state;
+          },
+        } });
       writeRecord(process.env.CODEX_REMOTE_READY_PATH, { instanceId: process.env.CODEX_REMOTE_INSTANCE,
         pid: process.pid, controlPort: control.port });
     }
@@ -536,9 +543,10 @@ async function shutDown() {
   shuttingDown = true;
   lanSocket.close();
   server.close();
-  executionHealth?.stop();
+  executionHealth?.stop();
   runtimeDiscovery.stop();
-  managedAppServer.close();
+  await relayManager.close();
+  managedAppServer.close();
   await control?.close();
   process.exit(0);
 }
@@ -715,73 +723,73 @@ function appServerTurnArguments(threadId, body) {
   return value;
 }
 
-function normalizeTimeline(data) {
-  const source = data && typeof data === 'object' ? data : {};
-  const sourceTurns = Array.isArray(source.turns) ? source.turns : source.thread?.turns;
-  const turns = Array.isArray(sourceTurns) ? sourceTurns.map(normalizeTurn) : [];
-  return {
+function normalizeTimeline(data) {
+  const source = data && typeof data === 'object' ? data : {};
+  const sourceTurns = Array.isArray(source.turns) ? source.turns : source.thread?.turns;
+  const turns = Array.isArray(sourceTurns) ? sourceTurns.map(normalizeTurn) : [];
+  return {
     schemaVersion: 1,
     thread: normalizeThread(source.thread),
     turns,
   };
 }
 
-function normalizeSharedTimeline({ thread, nextCursor, sync }) {
-  const timeline = normalizeTimeline({ thread: { ...thread, title: thread.name || thread.title || '', hostId: 'local', transport: 'shared-app-server' } });
-  return { ...timeline,
-    historyView: 'grouped-lazy-skeleton-v12',
-    ...(nextCursor !== undefined ? { nextCursor } : {}), ...(sync ? { sync } : {}) };
-}
+function normalizeSharedTimeline({ thread, nextCursor, sync }) {
+  const timeline = normalizeTimeline({ thread: { ...thread, title: thread.name || thread.title || '', hostId: 'local', transport: 'shared-app-server' } });
+  return { ...timeline,
+    historyView: 'grouped-lazy-skeleton-v13',
+    ...(nextCursor !== undefined ? { nextCursor } : {}), ...(sync ? { sync } : {}) };
+}
 
-function normalizeThread(thread) {
+function normalizeThread(thread) {
   const source = thread && typeof thread === 'object' ? thread : {};
   return {
-    id: source.id || '',
-    title: source.name || source.title || source.preview || '',
-    status: statusText(source.status),
-    updatedAt: Number(source.updatedAt) || 0,
-    recencyAt: Number(source.recencyAt ?? source.updatedAt) || 0,
-    projectId: source.projectId || '',
+    id: source.id || '',
+    title: source.name || source.title || source.preview || '',
+    status: statusText(source.status),
+    updatedAt: Number(source.updatedAt) || 0,
+    recencyAt: Number(source.recencyAt ?? source.updatedAt) || 0,
+    projectId: source.projectId || '',
     cwd: source.cwd || '',
     hostId: source.hostId || '',
-    transport: source.transport || 'shared-app-server',
-    readOnly: source.readOnly === true,
-    readOnlyReason: source.readOnlyReason || '',
+    transport: source.transport || 'shared-app-server',
+    readOnly: source.readOnly === true,
+    readOnlyReason: source.readOnlyReason || '',
   };
 }
 
-function normalizeTurn(turn) {
-  const source = turn && typeof turn === 'object' ? turn : {};
-  const turnId = source.id || '';
-  const entries = collapseSubAgentEntries(Array.isArray(source.items) ? source.items.map(normalizeItem).filter(Boolean) : []);
-  for (const entry of entries) {
-    const images = [...(entry.attachments || []), entry.image, ...Object.values(entry.imageAssets || {})].filter(Boolean);
-    for (const image of images) if (image.remotePath && !image.recoveryTurnId) image.recoveryTurnId = turnId;
-  }
-  return {
-    id: turnId,
-    status: statusText(source.status),
+function normalizeTurn(turn) {
+  const source = turn && typeof turn === 'object' ? turn : {};
+  const turnId = source.id || '';
+  const entries = collapseSubAgentEntries(Array.isArray(source.items) ? source.items.map(normalizeItem).filter(Boolean) : []);
+  for (const entry of entries) {
+    const images = [...(entry.attachments || []), entry.image, ...Object.values(entry.imageAssets || {})].filter(Boolean);
+    for (const image of images) if (image.remotePath && !image.recoveryTurnId) image.recoveryTurnId = turnId;
+  }
+  return {
+    id: turnId,
+    status: statusText(source.status),
     startedAt: source.startedAt || null,
     completedAt: source.completedAt || null,
-    durationMs: source.durationMs ?? null,
-    error: source.error ?? null,
-    entries,
-  };
-}
-
-function normalizeItem(item) {
-  if (!item || typeof item !== 'object') return null;
-
-  if (item.type === 'lazyOperationGroup') {
-    return {
-      type: 'activity',
-      id: item.id || '',
-      kind: 'lazyOperationGroup',
-      turnId: item.turnId || '',
-      groupId: item.groupId || '',
-      operationTypes: Array.isArray(item.operationTypes) ? item.operationTypes : [],
-    };
-  }
+    durationMs: source.durationMs ?? null,
+    error: source.error ?? null,
+    entries,
+  };
+}
+
+function normalizeItem(item) {
+  if (!item || typeof item !== 'object') return null;
+
+  if (item.type === 'lazyOperationGroup') {
+    return {
+      type: 'activity',
+      id: item.id || '',
+      kind: 'lazyOperationGroup',
+      turnId: item.turnId || '',
+      groupId: item.groupId || '',
+      operationTypes: Array.isArray(item.operationTypes) ? item.operationTypes : [],
+    };
+  }
 
   if (item.type === 'contextCompaction') {
     return {
@@ -807,9 +815,9 @@ function normalizeItem(item) {
     }
   }
 
-  if (item.type === 'userMessage') {
-    const { text, files } = extractUserText(item.content);
-    const attachments = [...normalizeAttachments(item.content), ...files];
+  if (item.type === 'userMessage') {
+    const { text, files } = extractUserText(item.content);
+    const attachments = [...normalizeAttachments(item.content), ...files];
     if (!text && !attachments.length) return null;
     return {
       clientId: item.clientId,
@@ -835,248 +843,259 @@ function normalizeItem(item) {
     };
   }
 
-  if (item.type === 'reasoning') {
-    const detail = Array.isArray(item.summary)
-      ? item.summary.map(summaryText).filter(Boolean).join('\n')
-      : summaryText(item.summary);
-    return {
-      type: 'activity',
-      id: item.id || '',
-      kind: 'reasoning',
-      title: '思考摘要',
-      detail,
-    };
-  }
-
-  if (item.type === 'commandExecution') {
-    return {
-      type: 'activity',
-      id: item.id || '',
-      kind: 'command',
-      title: '命令',
-      titleOnly: true,
-      status: statusText(item.status),
-      command: item.command,
-      cwd: item.cwd,
-      exitCode: item.exitCode,
-      durationMs: item.durationMs,
-    };
-  }
-
-  if (item.type === 'mcpToolCall') {
-    return {
-      type: 'activity',
-      id: item.id || '',
-      kind: 'tool',
-      title: '工具',
-      titleOnly: true,
-      status: statusText(item.status),
-      server: item.server,
-      tool: item.tool,
-      arguments: item.arguments,
-      durationMs: item.durationMs,
-      error: item.error,
-    };
-  }
-
-  if (item.type === 'dynamicToolCall') {
-    return {
-      type: 'activity',
-      id: item.id || '',
-      kind: 'tool',
-      title: '工具',
-      titleOnly: true,
-      status: statusText(item.status),
-      namespace: item.namespace,
-      tool: item.tool,
-      arguments: item.arguments,
-      durationMs: item.durationMs,
-      success: item.success,
-    };
-  }
-
-  if (item.type === 'fileChange') {
-    return {
-      type: 'activity',
-      id: item.id || '',
-      kind: 'fileChange',
-      title: '文件修改',
-      titleOnly: true,
-      status: statusText(item.status),
-      changes: Array.isArray(item.changes) ? item.changes : [],
-    };
-  }
-
-  if (item.type === 'webSearch') {
-    return {
-      type: 'activity',
-      id: item.id || '',
-      kind: 'webSearch',
-      title: '网页搜索',
-      titleOnly: true,
-      query: item.query || item.action?.query || '',
-      ...(item.action && typeof item.action === 'object' ? { action: item.action } : {}),
-    };
-  }
-
+  if (item.type === 'reasoning') {
+    const detail = Array.isArray(item.summary)
+      ? item.summary.map(summaryText).filter(Boolean).join('\n')
+      : summaryText(item.summary);
+    return {
+      type: 'activity',
+      id: item.id || '',
+      kind: 'reasoning',
+      title: '思考摘要',
+      detail,
+    };
+  }
+
+  if (item.type === 'commandExecution') {
+    return {
+      type: 'activity',
+      id: item.id || '',
+      kind: 'command',
+      title: '命令',
+      titleOnly: true,
+      status: statusText(item.status),
+      command: item.command,
+      cwd: item.cwd,
+      exitCode: item.exitCode,
+      durationMs: item.durationMs,
+    };
+  }
+
+  if (item.type === 'mcpToolCall') {
+    return {
+      type: 'activity',
+      id: item.id || '',
+      kind: 'tool',
+      title: '工具',
+      titleOnly: true,
+      status: statusText(item.status),
+      server: item.server,
+      tool: item.tool,
+      arguments: item.arguments,
+      durationMs: item.durationMs,
+      error: item.error,
+    };
+  }
+
+  if (item.type === 'dynamicToolCall') {
+    return {
+      type: 'activity',
+      id: item.id || '',
+      kind: 'tool',
+      title: '工具',
+      titleOnly: true,
+      status: statusText(item.status),
+      namespace: item.namespace,
+      tool: item.tool,
+      arguments: item.arguments,
+      durationMs: item.durationMs,
+      success: item.success,
+    };
+  }
+
+  if (item.type === 'fileChange') {
+    return {
+      type: 'activity',
+      id: item.id || '',
+      kind: 'fileChange',
+      title: '文件修改',
+      titleOnly: true,
+      status: statusText(item.status),
+      changes: Array.isArray(item.changes) ? item.changes : [],
+    };
+  }
+
+  if (item.type === 'webSearch') {
+    return {
+      type: 'activity',
+      id: item.id || '',
+      kind: 'webSearch',
+      title: '网页搜索',
+      titleOnly: true,
+      query: item.query || item.action?.query || '',
+      ...(item.action && typeof item.action === 'object' ? { action: item.action } : {}),
+    };
+  }
+
   if (item.type === 'imageView') {
-    return {
-      type: 'activity',
-      id: item.id || '',
-      kind: 'imageView',
-      title: '查看图片',
-      titleOnly: true,
-      path: item.path || '',
-      image: typeof item.path === 'string' && item.path
-        ? normalizeAttachment({ type: 'localImage', path: item.path })
-        : null,
-    };
-  }
-
-  if (item.type === 'imageGeneration') {
-    const image = typeof item.savedPath === 'string' && item.savedPath
-      ? normalizeAttachment({ type: 'localImage', path: item.savedPath, name: '生成的图片' })
+    const image = typeof item.path === 'string' && item.path
+      ? normalizeAttachment({ type: 'localImage', path: item.path })
       : null;
+    if (image?.available) {
+      return {
+        type: 'message',
+        id: item.id || '',
+        role: 'assistant',
+        phase: 'commentary',
+        text: '',
+        attachments: [image],
+      };
+    }
     return {
-      type: 'activity',
-      id: item.id || '',
-      kind: 'imageGeneration',
-      title: '生成图片',
-      titleOnly: true,
-      status: statusText(item.status),
+      type: 'activity',
+      id: item.id || '',
+      kind: 'imageView',
+      title: '查看图片',
+      titleOnly: true,
+      path: item.path || '',
       image,
-      failure: item.failure || null,
-      transparentBackground: item.transparentBackground === true,
-    };
-  }
-
-  if (item.type === 'subAgentActivity') {
-    return {
-      type: 'activity',
-      id: item.id || '',
-      kind: 'subAgent',
-      title: '子任务',
-      titleOnly: true,
-      status: statusText(item.kind),
-      agentPath: item.agentPath || '',
-      agentThreadId: item.agentThreadId || '',
-    };
-  }
-
-  if (item.type === 'collabAgentToolCall') {
-    return {
-      type: 'activity',
-      id: item.id || '',
-      kind: 'collaboration',
-      title: '任务协作',
-      titleOnly: true,
-      status: statusText(item.status),
-      tool: item.tool || '',
-      prompt: item.prompt || '',
-      senderThreadId: item.senderThreadId || '',
-      receiverThreadIds: Array.isArray(item.receiverThreadIds) ? item.receiverThreadIds : [],
-      model: item.model || '',
-      reasoningEffort: item.reasoningEffort || '',
-      agentsStates: item.agentsStates && typeof item.agentsStates === 'object' ? item.agentsStates : {},
-    };
-  }
-
-  return {
+    };
+  }
+
+  if (item.type === 'imageGeneration') {
+    const image = typeof item.savedPath === 'string' && item.savedPath
+      ? normalizeAttachment({ type: 'localImage', path: item.savedPath, name: '生成的图片' })
+      : null;
+    return {
+      type: 'activity',
+      id: item.id || '',
+      kind: 'imageGeneration',
+      title: '生成图片',
+      titleOnly: true,
+      status: statusText(item.status),
+      image,
+      failure: item.failure || null,
+      transparentBackground: item.transparentBackground === true,
+    };
+  }
+
+  if (item.type === 'subAgentActivity') {
+    return {
+      type: 'activity',
+      id: item.id || '',
+      kind: 'subAgent',
+      title: '子任务',
+      titleOnly: true,
+      status: statusText(item.kind),
+      agentPath: item.agentPath || '',
+      agentThreadId: item.agentThreadId || '',
+    };
+  }
+
+  if (item.type === 'collabAgentToolCall') {
+    return {
+      type: 'activity',
+      id: item.id || '',
+      kind: 'collaboration',
+      title: '任务协作',
+      titleOnly: true,
+      status: statusText(item.status),
+      tool: item.tool || '',
+      prompt: item.prompt || '',
+      senderThreadId: item.senderThreadId || '',
+      receiverThreadIds: Array.isArray(item.receiverThreadIds) ? item.receiverThreadIds : [],
+      model: item.model || '',
+      reasoningEffort: item.reasoningEffort || '',
+      agentsStates: item.agentsStates && typeof item.agentsStates === 'object' ? item.agentsStates : {},
+    };
+  }
+
+  return {
     type: 'activity',
     id: item.id || '',
     kind: item.type || 'event',
     title: item.type || '事件',
     status: statusText(item.status),
     detail: JSON.stringify(item, null, 2),
-  };
-}
-
-function collapseSubAgentEntries(entries) {
-  const agents = new Map();
-  let firstIndex = -1;
-  const retained = [];
-  const ensureAgent = threadId => {
-    if (!threadId) return null;
-    let agent = agents.get(threadId);
-    if (!agent) {
-      agent = { threadId, name: '', status: 'pendingInit', objective: '', model: '', reasoningEffort: '' };
-      agents.set(threadId, agent);
-    }
-    return agent;
-  };
-  const setProtocolStatus = (agent, status) => {
-    if (!agent || !status || status === 'unknown') return;
-    const terminal = ['interrupted', 'completed', 'errored', 'shutdown', 'notFound'];
-    if (terminal.includes(agent.status) && ['pendingInit', 'running'].includes(status)) return;
-    if (status === 'shutdown' && agent.status === 'completed') return;
-    agent.status = status;
-  };
-  for (const entry of entries) {
-    if (entry.kind === 'subAgent') {
-      if (firstIndex < 0) firstIndex = retained.length;
-      const agent = ensureAgent(entry.agentThreadId);
-      if (!agent) continue;
-      agent.name = subAgentDisplayName(entry.agentPath) || agent.name;
-      const activityStatus = {
-        started: 'running',
-        interacted: 'running',
-        interrupted: 'interrupted',
-        completed: 'completed',
-      }[entry.status];
-      agent.activity = entry.status;
-      setProtocolStatus(agent, activityStatus);
-      continue;
-    }
-    if (entry.kind === 'collaboration') {
-      const receiverIds = entry.receiverThreadIds || [];
-      const createsAgent = entry.tool === 'spawnAgent';
-      const updatesKnownAgent = receiverIds.some(threadId => agents.has(threadId));
-      if (!createsAgent && !updatesKnownAgent) {
-        retained.push(entry);
-        continue;
-      }
-      if (firstIndex < 0) firstIndex = retained.length;
-      for (const threadId of receiverIds) {
-        const agent = ensureAgent(threadId);
-        if (!agent) continue;
-        if (entry.prompt) agent.objective = entry.prompt;
-        if (entry.model) agent.model = entry.model;
-        if (entry.reasoningEffort) agent.reasoningEffort = entry.reasoningEffort;
-        setProtocolStatus(agent, statusText(entry.agentsStates?.[threadId]?.status));
-        if (entry.status === 'failed' && !entry.agentsStates?.[threadId]?.status) agent.status = 'errored';
-        if (entry.status === 'interrupted' && !entry.agentsStates?.[threadId]?.status) agent.status = 'interrupted';
-      }
-      continue;
-    }
-    retained.push(entry);
-  }
-  if (!agents.size) return retained;
-  retained.splice(firstIndex < 0 ? retained.length : firstIndex, 0, {
-    type: 'activity',
-    id: `subagents:${[...agents.keys()].join(':')}`,
-    kind: 'subAgentGroup',
-    title: '子 Agent',
-    agents: [...agents.values()],
-  });
-  return retained;
-}
-
-function subAgentDisplayName(agentPath) {
-  const segment = String(agentPath || '').split('/').map(value => value.trim()).filter(value => value && value !== 'root').at(-1);
-  if (!segment) return '';
-  const text = segment.replace(/[_-]+/g, ' ').replace(/\s+/g, ' ').trim().toLowerCase();
-  return text ? text[0].toUpperCase() + text.slice(1) : '';
-}
-
-function sharedHistoryPageOptions() {
-  return {
-    maxTurns: SHARED_HISTORY_PAGE_TURNS,
-    maxBytes: SHARED_HISTORY_PAGE_BYTES,
-    measure: value => Buffer.byteLength(JSON.stringify(normalizeSharedTimeline(value))),
-  };
-}
-
-function normalizeAttachments(content) {
+  };
+}
+
+function collapseSubAgentEntries(entries) {
+  const agents = new Map();
+  let firstIndex = -1;
+  const retained = [];
+  const ensureAgent = threadId => {
+    if (!threadId) return null;
+    let agent = agents.get(threadId);
+    if (!agent) {
+      agent = { threadId, name: '', status: 'pendingInit', objective: '', model: '', reasoningEffort: '' };
+      agents.set(threadId, agent);
+    }
+    return agent;
+  };
+  const setProtocolStatus = (agent, status) => {
+    if (!agent || !status || status === 'unknown') return;
+    const terminal = ['interrupted', 'completed', 'errored', 'shutdown', 'notFound'];
+    if (terminal.includes(agent.status) && ['pendingInit', 'running'].includes(status)) return;
+    if (status === 'shutdown' && agent.status === 'completed') return;
+    agent.status = status;
+  };
+  for (const entry of entries) {
+    if (entry.kind === 'subAgent') {
+      if (firstIndex < 0) firstIndex = retained.length;
+      const agent = ensureAgent(entry.agentThreadId);
+      if (!agent) continue;
+      agent.name = subAgentDisplayName(entry.agentPath) || agent.name;
+      const activityStatus = {
+        started: 'running',
+        interacted: 'running',
+        interrupted: 'interrupted',
+        completed: 'completed',
+      }[entry.status];
+      agent.activity = entry.status;
+      setProtocolStatus(agent, activityStatus);
+      continue;
+    }
+    if (entry.kind === 'collaboration') {
+      const receiverIds = entry.receiverThreadIds || [];
+      const createsAgent = entry.tool === 'spawnAgent';
+      const updatesKnownAgent = receiverIds.some(threadId => agents.has(threadId));
+      if (!createsAgent && !updatesKnownAgent) {
+        retained.push(entry);
+        continue;
+      }
+      if (firstIndex < 0) firstIndex = retained.length;
+      for (const threadId of receiverIds) {
+        const agent = ensureAgent(threadId);
+        if (!agent) continue;
+        if (entry.prompt) agent.objective = entry.prompt;
+        if (entry.model) agent.model = entry.model;
+        if (entry.reasoningEffort) agent.reasoningEffort = entry.reasoningEffort;
+        setProtocolStatus(agent, statusText(entry.agentsStates?.[threadId]?.status));
+        if (entry.status === 'failed' && !entry.agentsStates?.[threadId]?.status) agent.status = 'errored';
+        if (entry.status === 'interrupted' && !entry.agentsStates?.[threadId]?.status) agent.status = 'interrupted';
+      }
+      continue;
+    }
+    retained.push(entry);
+  }
+  if (!agents.size) return retained;
+  retained.splice(firstIndex < 0 ? retained.length : firstIndex, 0, {
+    type: 'activity',
+    id: `subagents:${[...agents.keys()].join(':')}`,
+    kind: 'subAgentGroup',
+    title: '子 Agent',
+    agents: [...agents.values()],
+  });
+  return retained;
+}
+
+function subAgentDisplayName(agentPath) {
+  const segment = String(agentPath || '').split('/').map(value => value.trim()).filter(value => value && value !== 'root').at(-1);
+  if (!segment) return '';
+  const text = segment.replace(/[_-]+/g, ' ').replace(/\s+/g, ' ').trim().toLowerCase();
+  return text ? text[0].toUpperCase() + text.slice(1) : '';
+}
+
+function sharedHistoryPageOptions() {
+  return {
+    maxTurns: SHARED_HISTORY_PAGE_TURNS,
+    maxBytes: SHARED_HISTORY_PAGE_BYTES,
+    measure: value => Buffer.byteLength(JSON.stringify(normalizeSharedTimeline(value))),
+  };
+}
+
+function normalizeAttachments(content) {
   if (!Array.isArray(content)) return [];
   const items = content.filter(item => item && !['text', 'input_text'].includes(item.type)).map(item => ({ ...item }));
   const text = content.filter(item => ['text', 'input_text'].includes(item?.type)).map(item => item.text || '').join('\n');
@@ -1119,19 +1138,19 @@ function markdownImageAssets(text) {
   return assets;
 }
 
-function markdownFileAssets(text) {
+function markdownFileAssets(text) {
   const assets = Object.create(null);
   function visit(tokens) {
     for (const token of tokens) {
       if (token.type === 'link_open') {
         const value = token.attrGet('href');
         if (value && !Object.hasOwn(assets, value)) {
-          let localPath;
-          try { localPath = decodeURIComponent(value); } catch { localPath = ''; }
-          if (/^\/?[a-z]:[\\/]/i.test(localPath)) {
-            localPath = localPath.replace(/^\/(?=[a-z]:)/i, '');
-            localPath = localPath.replace(/:(\d+)(?::\d+)?$/, '');
-            const asset = rememberLocalFile(localPath);
+          let localPath;
+          try { localPath = decodeURIComponent(value); } catch { localPath = ''; }
+          if (/^\/?[a-z]:[\\/]/i.test(localPath)) {
+            localPath = localPath.replace(/^\/(?=[a-z]:)/i, '');
+            localPath = localPath.replace(/:(\d+)(?::\d+)?$/, '');
+            const asset = rememberLocalFile(localPath);
             if (asset) assets[value] = { remotePath: asset.id, name: asset.name, size: asset.size };
           }
         }
@@ -1174,7 +1193,7 @@ function splitUploadedImages(text) {
     const paths = children.map(token => {
       try { return path.resolve(decodeURIComponent(token.attrGet('src') || '')); } catch { return ''; }
     });
-    if (paths.some(file => path.dirname(file).toLowerCase() !== uploadsRoot.toLowerCase()
+    if (paths.some(file => path.dirname(file).toLowerCase() !== uploadsRoot.toLowerCase()
       || !/^[a-f0-9]{64}\.(png|webp)$/.test(path.basename(file)))) continue;
     for (const file of paths) attachments.push(normalizeAttachment({ type: 'localImage', path: file, name: '移动端图片' }));
     for (let line = block.map[0]; line < block.map[1]; line++) removed.add(line);
@@ -1201,23 +1220,23 @@ function normalizeAttachment(item) {
     name,
     mimeType: cached?.mimeType || item.mimeType || '',
     available: Boolean(cached),
-    remotePath: cached ? cached.id : '',
-    recoveryToken: cached?.recoveryToken || '',
+    remotePath: cached ? cached.id : '',
+    recoveryToken: cached?.recoveryToken || '',
     url: '',
     thumbnailUrl: '',
   };
 }
 
-function cacheLocalImage(filePath, name) {
-  try {
-    const resolved = path.resolve(filePath);
-    const stat = fs.statSync(resolved);
-    const mimeType = imageMimeType(resolved);
-    if (!stat.isFile() || !mimeType || stat.size > MAX_ATTACHMENT_BYTES) return null;
-    const cached = rememberAttachment(fs.readFileSync(resolved), mimeType, name,
-      localImageRecoveryToken(resolved, stat));
-    void attachmentThumbnail(cached).catch(() => {});
-    return cached;
+function cacheLocalImage(filePath, name) {
+  try {
+    const resolved = path.resolve(filePath);
+    const stat = fs.statSync(resolved);
+    const mimeType = imageMimeType(resolved);
+    if (!stat.isFile() || !mimeType || stat.size > MAX_ATTACHMENT_BYTES) return null;
+    const cached = rememberAttachment(fs.readFileSync(resolved), mimeType, name,
+      localImageRecoveryToken(resolved, stat));
+    void attachmentThumbnail(cached).catch(() => {});
+    return cached;
   } catch {
     return null;
   }
@@ -1235,65 +1254,65 @@ function cacheDataImage(dataUrl, name) {
   }
 }
 
-function rememberAttachment(buffer, mimeType, name, recoveryToken = '') {
-  const id = crypto.createHash('sha256').update(buffer).digest('hex');
-  if (!attachmentCache.has(id)) {
+function rememberAttachment(buffer, mimeType, name, recoveryToken = '') {
+  const id = crypto.createHash('sha256').update(buffer).digest('hex');
+  if (!attachmentCache.has(id)) {
     while (attachmentCache.size >= MAX_CACHED_ATTACHMENTS) {
       attachmentCache.delete(attachmentCache.keys().next().value);
-    }
-    attachmentCache.set(id, { id, buffer, mimeType, name, recoveryToken });
-  } else if (recoveryToken && !attachmentCache.get(id).recoveryToken) {
-    attachmentCache.get(id).recoveryToken = recoveryToken;
-  }
-  return attachmentCache.get(id);
-}
-
-function localImageRecoveryToken(filePath, stat) {
-  const iv = crypto.randomBytes(12);
-  const cipher = crypto.createCipheriv('aes-256-gcm', imageCapabilityKey, iv);
-  const payload = Buffer.from(JSON.stringify([filePath, stat.size, stat.mtimeMs]));
-  const encrypted = Buffer.concat([cipher.update(payload), cipher.final()]);
-  return Buffer.concat([iv, cipher.getAuthTag(), encrypted]).toString('base64url');
-}
-
-function recoverLocalImage(id, token) {
-  if (!token || token.length > 2048) return null;
-  try {
-    const value = Buffer.from(token, 'base64url');
-    if (value.length < 29) return null;
-    const decipher = crypto.createDecipheriv('aes-256-gcm', imageCapabilityKey, value.subarray(0, 12));
-    decipher.setAuthTag(value.subarray(12, 28));
-    const [filePath, size, mtimeMs] = JSON.parse(Buffer.concat([
-      decipher.update(value.subarray(28)), decipher.final(),
-    ]).toString('utf8'));
-    if (typeof filePath !== 'string' || !path.isAbsolute(filePath)
-      || !Number.isSafeInteger(size) || size <= 0 || size > MAX_ATTACHMENT_BYTES
-      || typeof mtimeMs !== 'number' || !Number.isFinite(mtimeMs)) return null;
-    const stat = fs.statSync(filePath);
-    const mimeType = imageMimeType(filePath);
-    if (!stat.isFile() || stat.size !== size || stat.mtimeMs !== mtimeMs || !mimeType) return null;
-    const buffer = fs.readFileSync(filePath);
-    if (crypto.createHash('sha256').update(buffer).digest('hex') !== id) return null;
-    return rememberAttachment(buffer, mimeType, path.basename(filePath), token);
-  } catch {
-    return null;
-  }
-}
-
-async function attachmentThumbnail(image) {
-  if (!image.thumbnail) {
-    image.thumbnail = sharp(image.buffer, { limitInputPixels: 40_000_000 }).rotate()
-      .resize({ width: 640, height: 640, fit: 'inside', withoutEnlargement: true })
-      .webp({ quality: 78, effort: 4 })
-      .toBuffer()
-      .then(buffer => ({ buffer, mimeType: 'image/webp' }))
-      .catch(error => {
-        image.thumbnail = null;
-        throw error;
-      });
-  }
-  return image.thumbnail;
-}
+    }
+    attachmentCache.set(id, { id, buffer, mimeType, name, recoveryToken });
+  } else if (recoveryToken && !attachmentCache.get(id).recoveryToken) {
+    attachmentCache.get(id).recoveryToken = recoveryToken;
+  }
+  return attachmentCache.get(id);
+}
+
+function localImageRecoveryToken(filePath, stat) {
+  const iv = crypto.randomBytes(12);
+  const cipher = crypto.createCipheriv('aes-256-gcm', imageCapabilityKey, iv);
+  const payload = Buffer.from(JSON.stringify([filePath, stat.size, stat.mtimeMs]));
+  const encrypted = Buffer.concat([cipher.update(payload), cipher.final()]);
+  return Buffer.concat([iv, cipher.getAuthTag(), encrypted]).toString('base64url');
+}
+
+function recoverLocalImage(id, token) {
+  if (!token || token.length > 2048) return null;
+  try {
+    const value = Buffer.from(token, 'base64url');
+    if (value.length < 29) return null;
+    const decipher = crypto.createDecipheriv('aes-256-gcm', imageCapabilityKey, value.subarray(0, 12));
+    decipher.setAuthTag(value.subarray(12, 28));
+    const [filePath, size, mtimeMs] = JSON.parse(Buffer.concat([
+      decipher.update(value.subarray(28)), decipher.final(),
+    ]).toString('utf8'));
+    if (typeof filePath !== 'string' || !path.isAbsolute(filePath)
+      || !Number.isSafeInteger(size) || size <= 0 || size > MAX_ATTACHMENT_BYTES
+      || typeof mtimeMs !== 'number' || !Number.isFinite(mtimeMs)) return null;
+    const stat = fs.statSync(filePath);
+    const mimeType = imageMimeType(filePath);
+    if (!stat.isFile() || stat.size !== size || stat.mtimeMs !== mtimeMs || !mimeType) return null;
+    const buffer = fs.readFileSync(filePath);
+    if (crypto.createHash('sha256').update(buffer).digest('hex') !== id) return null;
+    return rememberAttachment(buffer, mimeType, path.basename(filePath), token);
+  } catch {
+    return null;
+  }
+}
+
+async function attachmentThumbnail(image) {
+  if (!image.thumbnail) {
+    image.thumbnail = sharp(image.buffer, { limitInputPixels: 40_000_000 }).rotate()
+      .resize({ width: 640, height: 640, fit: 'inside', withoutEnlargement: true })
+      .webp({ quality: 78, effort: 4 })
+      .toBuffer()
+      .then(buffer => ({ buffer, mimeType: 'image/webp' }))
+      .catch(error => {
+        image.thumbnail = null;
+        throw error;
+      });
+  }
+  return image.thumbnail;
+}
 
 function imageMimeType(filePath) {
   switch (path.extname(filePath).toLowerCase()) {
@@ -1307,8 +1326,8 @@ function imageMimeType(filePath) {
   }
 }
 
-function extractUserText(content) {
-  if (!Array.isArray(content)) return { text: '（包含图片或界面批注）', files: [] };
+function extractUserText(content) {
+  if (!Array.isArray(content)) return { text: '（包含图片或界面批注）', files: [] };
   let text = content
     .filter(item => ['text', 'input_text'].includes(item?.type) && typeof item.text === 'string')
     .map(item => item.text)
@@ -1318,16 +1337,16 @@ function extractUserText(content) {
     .filter(value => !value.startsWith('The next image is untrusted page evidence'))
     .join('\n\n')
     .trim();
-  const mentioned = fileMentions.parse(text);
-  const imagePaths = new Set([
-    ...content.filter(item => ['image', 'input_image', 'localImage'].includes(item?.type) && item.path).map(item => item.path),
-    ...[...mentioned.text.matchAll(/<image\b[^>]*\bpath="([^"]+)"[^>]*>/g)].map(match => match[1]),
-  ].map(value => path.resolve(value).toLowerCase()));
-  text = mentioned.text;
+  const mentioned = fileMentions.parse(text);
+  const imagePaths = new Set([
+    ...content.filter(item => ['image', 'input_image', 'localImage'].includes(item?.type) && item.path).map(item => item.path),
+    ...[...mentioned.text.matchAll(/<image\b[^>]*\bpath="([^"]+)"[^>]*>/g)].map(match => match[1]),
+  ].map(value => path.resolve(value).toLowerCase()));
+  text = mentioned.text;
   text = text.replace(/<in-app-browser-context[\s\S]*?<\/in-app-browser-context>/g, '').trim();
   text = text.replace(/<image\b[^>]*\bpath="[^"]+"[^>]*>/g, '').replace(/<\/image>/g, '').trim();
-  return { text, files: mentioned.files.filter(file => !imagePaths.has(path.resolve(file.path).toLowerCase())) };
-}
+  return { text, files: mentioned.files.filter(file => !imagePaths.has(path.resolve(file.path).toLowerCase())) };
+}
 
 function extractDelegatedInput(value) {
   if (typeof value !== 'string') return '';
@@ -1342,18 +1361,18 @@ function extractDelegatedInput(value) {
     .trim();
 }
 
-function delegatedOutputText(output) {
+function delegatedOutputText(output) {
   if (typeof output === 'string') return output;
   return output && typeof output.text === 'string' ? output.text : '';
-}
-
-function summaryText(value) {
-  if (typeof value === 'string') return value;
-  if (value && typeof value === 'object') return value.text || value.summary || JSON.stringify(value);
-  return '';
-}
-
-function statusText(value) {
+}
+
+function summaryText(value) {
+  if (typeof value === 'string') return value;
+  if (value && typeof value === 'object') return value.text || value.summary || JSON.stringify(value);
+  return '';
+}
+
+function statusText(value) {
   if (typeof value === 'string') return value;
   if (value && typeof value === 'object') return value.type || value.status || 'unknown';
   return value == null ? 'unknown' : String(value);
@@ -1383,10 +1402,10 @@ function parseOptions(args) {
   let port = Number.parseInt(process.env.CODEX_REMOTE_BRIDGE_PORT || '45831', 10);
   let lan = process.env.CODEX_REMOTE_BRIDGE_LAN === 'true';
   let token = process.env.CODEX_REMOTE_BRIDGE_TOKEN?.trim() || '';
-  if (process.env.CODEX_REMOTE_APP_SERVER === 'true') throw new Error('此连接方式已停用。');
+  if (process.env.CODEX_REMOTE_APP_SERVER === 'true') throw new Error('此连接方式已停用。');
   for (let i = 0; i < args.length; i += 1) {
     if (args[i] === '--lan') lan = true;
-    if (args[i] === '--app-server') throw new Error('此连接方式已停用。');
+    if (args[i] === '--app-server') throw new Error('此连接方式已停用。');
     if (args[i] === '--port' && args[i + 1]) port = Number.parseInt(args[++i], 10);
     if (args[i] === '--token' && args[i + 1]) token = args[++i];
   }
@@ -1394,10 +1413,10 @@ function parseOptions(args) {
     throw new Error('端口必须位于 1024 到 65535 之间。');
   }
   if (lan && !token) token = crypto.randomBytes(32).toString('base64url');
-  return { port, lan, token };
+  return { port, lan, token };
 }
 
-function boundedInteger(value, fallback, minimum, maximum) {
-  const parsed = Number.parseInt(value || '', 10);
-  return Number.isFinite(parsed) ? Math.min(maximum, Math.max(minimum, parsed)) : fallback;
-}
+function boundedInteger(value, fallback, minimum, maximum) {
+  const parsed = Number.parseInt(value || '', 10);
+  return Number.isFinite(parsed) ? Math.min(maximum, Math.max(minimum, parsed)) : fallback;
+}