@walkhi/code-relax 0.1.0-beta.8 → 0.1.0-beta.9

package/dist/src/server.mjs

@@ -1,20 +1,16 @@
 import crypto from 'node:crypto';
 import fs from 'node:fs';
 import http from 'node:http';
-import net from 'node:net';
 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 { validateInlineImage, persistLegacyImage } from './message-images.mjs';
+import { validateInlineImage } from './message-images.mjs';
 import { ThreadWriterConflictError } from './shared-app-server.mjs';
 import { ManagedAppServer, managedAppServerUrl } from './managed-app-server.mjs';
 import { streamSharedThread } from './shared-thread-stream.mjs';
-import { AppServerClient } from './app-server-client.mjs';
-import { AppServerTaskStore, AppServerTaskTransport } from './app-server-tasks.mjs';
-import { supplementThreadCatalog } from './thread-catalog.mjs';
 import appServerEvents from '../shared/app-server-events.cjs';
 import { runtimePaths } from './platform/windows/runtime-paths.mjs';
 import { openControl } from './service-control.mjs';
@@ -23,13 +19,11 @@ import { ExecutionHealth } from './execution-health.mjs';
 import { activeDebugPort, serveDebugResource } from './debug-ui.mjs';
 import { authorizeLanDevice } from './self-relay/lan-authorizations.mjs';
 import { generateAndSetThreadTitle } from './thread-title-generation.mjs';
-import { DesktopMonitor } from './platform/windows/desktop-monitor.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';
 
-const MAX_FRAME_BYTES = 32 * 1024 * 1024;
 const MAX_ATTACHMENT_BYTES = 16 * 1024 * 1024;
 const MAX_CACHED_ATTACHMENTS = 32;
 const MAX_CACHED_FILES = 64;
@@ -47,15 +41,6 @@ const ALLOWED_MODELS = new Set([
   'gpt-5.3-codex-spark',
 ]);
 const ALLOWED_THINKING = new Set(['low', 'medium', 'high', 'xhigh', 'max', 'ultra']);
-const ALLOWED_TOOLS = new Set([
-  'create_thread',
-  'get_usage_limits',
-  'list_projects',
-  'list_threads',
-  'read_thread',
-  'send_message_to_thread',
-  'wait_threads',
-]);
 
 function readRuntimeVersion() {
   let directory = path.dirname(fileURLToPath(import.meta.url));
@@ -70,8 +55,6 @@ function readRuntimeVersion() {
 
 const options = parseOptions(process.argv.slice(2));
 const runtimeVersion = readRuntimeVersion();
-const pipePath = process.env.CODEX_APP_TOOLS_PIPE_PATH?.trim();
-let sourceThreadId = (process.env.CODEX_THREAD_ID || process.env.CODEX_SESSION_ID)?.trim();
 
 const webRoot = path.resolve(path.dirname(fileURLToPath(import.meta.url)), '..', 'web');
 const repositoryRoot = path.resolve(webRoot, '..', '..');
@@ -81,7 +64,6 @@ const markdownItScript = fs.readFileSync(path.join(webRoot, 'vendor', 'markdown-
 const markdownSandbox = { atob };
 vm.runInNewContext(markdownItScript.toString(), markdownSandbox);
 const imageMarkdown = markdownSandbox.markdownit({ html: false });
-let nextRequestId = 0;
 const attachmentCache = new Map();
 const fileCache = new Map();
 const fileCapabilitySecret = crypto.randomBytes(32);
@@ -93,11 +75,7 @@ const allowedUploadsRoots = [uploadsRoot, legacyUploadsRoot,
 const sessionPathCache = new Map();
 const sessionSettingsCache = new Map();
 const liveActivityCache = new Map();
-const messageQueues = new Map();
 let sharedServer = null;
-const desktopMonitor = new DesktopMonitor({
-  read: (tool, args, pipe) => callTool(tool, args, 5000, pipe),
-});
 const managedAppServer = new ManagedAppServer({ stateRoot, host: desktopHost });
 let sharedCatalog = null, executionMode = 'ordinary';
 function selectSharedExecution(enabled) {
@@ -115,16 +93,14 @@ const executionHealth = new ExecutionHealth(async () => {
   // same service, so closing Desktop must not disable phone writes.
   selectSharedExecution(managed.ready);
   executionMode = sharedServer ? 'shared' : 'ordinary';
-  const basicReady = Boolean(desktop.running && sourceThreadId && desktopMonitor.pipe);
   const managedRestarting = managed.state === 'restarting';
-  const ready = !managedRestarting && (sharedServer ? sharedServer.ready === true : basicReady);
+  const ready = !managedRestarting && sharedServer?.ready === true;
   const state = managedRestarting ? 'restarting'
-    : ready ? (sharedServer ? 'full' : 'basic') : !desktop.running ? 'offline' : 'unavailable';
+    : ready ? 'full' : !desktop.running ? 'offline' : 'unavailable';
   return { state, ready, canWrite: ready, mode: executionMode,
     desktop: { state: !desktop.running ? 'stopped' : attached ? 'managed' : 'ordinary', attachedToManagedServer: attached } };
 });
 async function refreshExecution() {
-  sourceThreadId = readRecord(path.join(stateRoot, 'bridge-startup-context.json'))?.sourceThreadId || sourceThreadId;
   await executionHealth.refresh();
   return { mode: executionMode };
 }
@@ -135,25 +111,13 @@ async function requireExecutionWritable(threadId) {
   }
   const execution = await executionHealth.refresh();
   if (!execution.canWrite) {
-    const message = execution.mode === 'shared'
-      ? 'Codex 内核尚未建立可写连接，请稍后重新检测。'
-      : 'Codex Desktop 尚未建立基础控制连接，请稍后重新检测。';
-    throw new RequestError(409, message, { code: 'execution_not_writable', execution });
+    throw new RequestError(503, 'Codex 内核未就绪。请在电脑上重启 Codex；若仍失败，运行 relax doctor。',
+      { code: 'full_control_required', execution });
   }
   if (threadId && sharedServer) sharedServer.requireWritable(threadId);
   return execution;
 }
-managedAppServer.client.on('subscription-error', error => console.error('完整控制任务取消订阅失败：', error.message));
-const queueWorkers = new Map();
-const appServer = new AppServerClient({ cwd: projectRoot });
-const appServerTasks = new AppServerTaskTransport({
-  client: appServer,
-  store: new AppServerTaskStore(path.join(stateRoot, 'app-server-tasks.json')),
-});
-appServer.on('protocol-error', error => console.error(`app-server 协议错误：${error.message}`));
-appServer.on('server-request', request => {
-  console.log(`app-server 等待客户端处理反向请求：${request.method} (${request.id})`);
-});
+managedAppServer.client.on('subscription-error', error => console.error('Codex 内核任务取消订阅失败：', error.message));
 
 async function handleRequest(request, response) {
   try {
@@ -186,7 +150,7 @@ 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 并启用完整控制后再继续。');
+      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') {
@@ -215,32 +179,23 @@ async function handleRequest(request, response) {
       const recovering = ['scheduled', 'running'].includes(recovery?.status);
       sendJson(response, 200, {
         status: 'ok', resident: true, version: runtimeVersion,
-        execution: { ...executionHealth.state, ready: executionHealth.state.ready && (!sharedServer || sharedServer.ready),
+        execution: { ...executionHealth.state, ready: executionHealth.state.ready && sharedServer?.ready === true,
           ...(recovering ? { state: 'recovering' } : {}), mode: executionMode },
         managedAppServer: managedAppServer.snapshot(),
         desktop: executionHealth.state.desktop || { state: 'stopped', attachedToManagedServer: false },
         desktopRestartRecommended: executionHealth.state.desktop?.state === 'ordinary' && managedAppServer.snapshot().ready,
         recovery: recovery ? { operationId: recovery.operationId, status: recovery.status, stage: recovery.stage, error: recovery.error } : null,
         debugUiPort: await activeDebugPort(stateRoot, options.port),
-        desktopConnected: Boolean(desktopMonitor.pipe),
-        sharedAppServerConnected: sharedServer?.ready === true,
-        sharedRecoveryAvailable: true,
-        desktopOrderingReady: Boolean(desktopMonitor.snapshot),
-        toolCount: 0,
+        sharedAppServerConnected: sharedServer?.ready === true,
+        sharedRecoveryAvailable: true,
         mode: options.lan ? 'lan' : 'loopback',
         tokenRequired: Boolean(options.token),
         nativeImageTransport: sharedServer ? 'shared-app-server' : null,
-        transportMode: sharedServer ? 'lan-shared' : 'lan-legacy',
-        appServer: {
-          state: appServer.state,
-          cliVersion: appServer.cliVersion,
-          taskCount: appServerTasks.store.list().length,
-        },
+        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])
@@ -262,7 +217,7 @@ async function handleRequest(request, response) {
     }
 
     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;
@@ -273,68 +228,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 (request.method === 'GET' && url.pathname === '/api/models') {
-      if (!usesSharedTask({ hostId: url.searchParams.get('hostId') })) throw new RequestError(400, '当前连接不支持即时模型设置。');
-      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 内核未就绪。请在电脑上重启 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';
-      const catalog = sharedCatalog;
-      const sharedSnapshot = Boolean(catalog);
-      let desktopCatalog;
-      if (catalog) desktopCatalog = await catalog.threads(limit, archived);
-      else {
-        if (archived) throw new RequestError(400, '当前连接不支持归档对话。请启用完整控制。');
-        const listing = await callTool('list_threads', { limit: Math.min(limit, 50) });
-        if (!listing.success) { sendToolResult(response, listing); return; }
-        const projects = await callTool('list_projects', {});
-        if (!projects.success) { sendToolResult(response, projects); return; }
-        const catalogProjects = projects.data.projects || [];
-        desktopCatalog = { ...supplementThreadCatalog(listing.data, catalogProjects, codexDataRoot, limit),
-          projects: catalogProjects };
-      }
-      let appServerThreads = archived ? [] : appServerTasks.store.list().map(record => ({
-        id: record.id,
-        kind: 'codex',
-        hostId: 'app-server',
-        title: record.title,
-        cwd: record.cwd,
-        projectId: record.projectId,
-        updatedAt: record.updatedAt,
-        recencyAt: record.recencyAt ?? record.updatedAt,
-        status: 'unknown',
-        transport: 'app-server',
-      }));
-      if (appServerThreads.length) {
-        try { appServerThreads = await appServerTasks.listTasks(); } catch {}
-      }
-      sendJson(response, 200, mergeThreadCatalog(desktopCatalog, appServerThreads, limit, sharedSnapshot));
+      sendJson(response, 200, await sharedCatalog.threads(limit, archived));
       return;
     }
 
     if (request.method === 'GET' && url.pathname === '/api/projects') {
-      if (sharedCatalog) {
-        sendJson(response, 200, { projects: (await sharedCatalog.projects()).projects });
-        return;
-      }
-      const result = await callTool('list_projects', {});
-      sendToolResult(response, result);
+      sendJson(response, 200, { projects: (await sharedCatalog.projects()).projects });
       return;
     }
 
     if (request.method === 'GET' && url.pathname === '/api/usage-limits') {
-      if (sharedServer) sendJson(response, 200, await sharedServer.usage());
-      else sendToolResult(response, await callTool('get_usage_limits', {}));
+      sendJson(response, 200, await sharedServer.usage());
       return;
     }
 
-    if (request.method === 'GET' && url.pathname === '/api/usage-events' && sharedServer) {
+    if (request.method === 'GET' && url.pathname === '/api/usage-events') {
       const execution = sharedServer;
       response.startEvents();
       const emit = value => { if (!response.destroyed) response.event('usage', value); };
@@ -346,171 +280,96 @@ async function handleRequest(request, response) {
       return;
     }
 
-    if (request.method === 'GET' && url.pathname === '/api/app-server/status') {
-      sendJson(response, 200, appServerBridgeStatus());
-      return;
-    }
-
-    if (request.method === 'POST' && url.pathname === '/api/app-server/start') {
-      await requireExecutionWritable();
-      await appServer.start();
-      sendJson(response, 200, appServerBridgeStatus());
-      return;
-    }
-
     const createThreadMatch = /^\/api\/projects\/([^/]+)\/threads$/.exec(url.pathname);
     if (request.method === 'POST' && createThreadMatch) {
       await requireExecutionWritable();
       const projectId = decodeURIComponent(createThreadMatch[1]);
-      const body = createThreadBody(await readJsonBody(request));
-      let projects = [];
-      if (body.transport !== 'app-server' || projectId !== '__unassigned__') {
-        const projectsResult = sharedCatalog
-          ? { success: true, data: { projects: (await sharedCatalog.projects()).projects } }
-          : await callTool('list_projects', {});
-        if (!projectsResult.success) {
-          sendJson(response, 502, { error: '无法读取 Codex Desktop 项目。', details: projectsResult.data });
-          return;
-        }
-        projects = Array.isArray(projectsResult.data?.projects) ? projectsResult.data.projects : [];
-      }
-      if (body.transport === 'app-server') {
-        const target = appServerProjectTarget(projectId, projects);
-        const result = await appServerTasks.createTask({
-          cwd: target.cwd,
-          projectId: target.projectId,
-          input: appServerTurnArguments('', body).input,
-        });
-        sendJson(response, 201, {
-          threadId: result.record.id,
-          hostId: 'app-server',
-          transport: 'app-server',
-          turnId: result.turn.id,
-        });
-        return;
-      }
-      const project = projects.find(item => item.projectId === projectId);
-      if (usesSharedTask({ hostId:project?.hostId || body.hostId })) {
-        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, '完整控制中没有找到对应项目，请刷新项目列表。');
-          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 argumentsValue = await createThreadArguments(projectId, body, projects);
-      sendToolResult(response, await callTool('create_thread', argumentsValue, 90_000));
-      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);
+    const timelineMatch = /^\/api\/threads\/([^/]+)\/timeline$/.exec(url.pathname);
     if (request.method === 'GET' && timelineMatch) {
       const threadId = decodeURIComponent(timelineMatch[1]);
-      if (!appServerTasks.owns(threadId) && usesSharedTask({ hostId: url.searchParams.get('hostId') })) {
-        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;
-      }
-      if (appServerTasks.owns(threadId)) {
-        const thread = await appServerTasks.readTask(threadId, {
-          includeTurns: true,
-          turnLimit: boundedInteger(url.searchParams.get('turnLimit'), 10, 1, 10),
-        });
-        sendJson(response, 200, normalizeAppServerTimeline(thread));
-        return;
-      }
-      const argumentsValue = readThreadArguments(url, threadId, 10);
-      const result = await callTool('read_thread', argumentsValue);
-      if (result.success) {
-        const timeline = normalizeTimeline(result.data);
-        enrichTimelineWithLocalActivity(timeline, threadId);
-        sendJson(response, 200, timeline);
-      } else {
-        sendJson(response, 502, { error: 'Codex Desktop 工具返回失败。', details: result.data });
-      }
-      return;
-    }
+      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);
-      if (!usesSharedTask({ hostId: url.searchParams.get('hostId') }) || appServerTasks.owns(threadId)) {
-        sendJson(response, 409, { error: '当前执行模式不支持手机审批，请在工作站处理。' }); return;
-      }
-      const body = await readJsonBody(request);
+      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]);
-      if (!appServerTasks.owns(threadId) && usesSharedTask({ hostId: url.searchParams.get('hostId') })) {
-        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 (appServerTasks.owns(threadId)) {
-        await streamAppServerThreadEvents(request, response, threadId);
-        return;
-      }
-      await streamThreadEvents(
-        request,
-        response,
-        threadId,
-        url.searchParams.get('hostId')?.trim(),
-      );
-      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 = usesSharedTask({ hostId: url.searchParams.get('hostId') }) ? 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;
@@ -519,7 +378,6 @@ async function handleRequest(request, response) {
     const sharedAction = /^\/api\/threads\/([^/]+)\/(history|settings|permissions)$/.exec(url.pathname);
     if (sharedAction) {
       const id = decodeURIComponent(sharedAction[1]);
-      if (!usesSharedTask({ hostId: url.searchParams.get('hostId') }) || appServerTasks.owns(id)) throw new RequestError(400, '此连接不支持该操作。');
       if (request.method === 'GET' && sharedAction[2] === 'history') {
         sendJson(response, 200, normalizeSharedTimeline(await sharedServer.history(id, url.searchParams.get('cursor'), sharedHistoryPageOptions())));
         return;
@@ -543,9 +401,6 @@ async function handleRequest(request, response) {
       const threadId = decodeURIComponent(sharedOperationGroup[1]);
       const turnId = decodeURIComponent(sharedOperationGroup[2]);
       const groupId = decodeURIComponent(sharedOperationGroup[3]);
-      if (!usesSharedTask({ hostId: url.searchParams.get('hostId') }) || appServerTasks.owns(threadId)) {
-        throw new RequestError(400, '此连接不支持操作组分页。');
-      }
       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 });
@@ -556,187 +411,55 @@ async function handleRequest(request, response) {
     if (request.method === 'POST' && archiveMatch) {
       const threadId = decodeURIComponent(archiveMatch[1]);
       await requireExecutionWritable(threadId);
-      if (!usesSharedTask({ hostId: url.searchParams.get('hostId') }) || appServerTasks.owns(threadId)) {
-        throw new RequestError(400, '当前连接不支持归档对话。请启用完整控制。');
-      }
       await sharedServer.request(`thread/${archiveMatch[2]}`, { threadId });
       sendJson(response, 200, { threadId, archived: archiveMatch[2] === 'archive' });
       return;
     }
 
-    const readMatch = /^\/api\/threads\/([^/]+)$/.exec(url.pathname);
-    if (request.method === 'DELETE' && readMatch) {
-      const threadId = decodeURIComponent(readMatch[1]);
-      await requireExecutionWritable(threadId);
-      if (!appServerTasks.owns(threadId)) {
-        throw new RequestError(400, '仅支持删除由独立 app-server 通道创建的任务。');
-      }
-      await appServerTasks.deleteTask(threadId);
-      messageQueues.delete(threadId);
-      sendJson(response, 200, { deleted: true, threadId, transport: 'app-server' });
-      return;
-    }
-    if (request.method === 'GET' && readMatch) {
-      const threadId = decodeURIComponent(readMatch[1]);
-      if (appServerTasks.owns(threadId)) {
-        sendJson(response, 200, { thread: await appServerTasks.readTask(threadId, {
-          includeTurns: true,
-          turnLimit: boundedInteger(url.searchParams.get('turnLimit'), 10, 1, 10),
-        }) });
-        return;
-      }
-      const argumentsValue = readThreadArguments(url, threadId, 10, 12_000);
-      sendToolResult(response, await callTool('read_thread', argumentsValue));
-      return;
-    }
-
-    const queueMatch = /^\/api\/threads\/([^/]+)\/queue$/.exec(url.pathname);
-    if (queueMatch) {
-      const threadId = decodeURIComponent(queueMatch[1]);
-      if (!appServerTasks.owns(threadId) && usesSharedTask({ hostId: url.searchParams.get('hostId') })) {
-        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;
-        }
-      }
-      if (request.method === 'GET') {
-        sendJson(response, 200, { items: publicQueue(threadId) });
-        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 body = await readJsonBody(request);
-        const argumentsValue = appServerTasks.owns(threadId)
-          ? appServerTurnArguments(threadId, body)
-          : await messageArguments(threadId, body);
-        const item = {
-          id: crypto.randomUUID(),
-          ...argumentsValue,
-          transport: appServerTasks.owns(threadId) ? 'app-server' : 'desktop-tools',
-          displayPrompt: messageDisplayText(body),
-          text: typeof body.prompt === 'string' ? body.prompt.trim() : '',
-          attachments: (body.images || []).map(id => ({ type:'image', available:true, url:id.startsWith('data:') ? id : `/api/attachments/${id}`, thumbnailUrl:id.startsWith('data:') ? id : `/api/attachments/${id}/thumbnail` })),
-          createdAt: new Date().toISOString(),
-          error: '',
-        };
-        const queue = messageQueues.get(threadId) || [];
-        queue.push(item);
-        messageQueues.set(threadId, queue);
-        ensureQueueWorker(threadId);
-        sendJson(response, 202, { items: publicQueue(threadId) });
-        return;
-      }
-    }
+        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];
-      if (!appServerTasks.owns(threadId) && usesSharedTask({ hostId: url.searchParams.get('hostId') })) {
-        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 queue = messageQueues.get(threadId) || [];
-      const index = queue.findIndex(item => item.id === itemId);
-      if (index < 0) {
-        sendJson(response, 404, { error: '没有找到该排队消息。' });
-        return;
-      }
-      if (request.method === 'DELETE' && !queueItemMatch[3]) {
-        await requireExecutionWritable(threadId);
-        queue.splice(index, 1);
-        sendJson(response, 200, { items: publicQueue(threadId) });
-        return;
-      }
-      if (request.method === 'POST' && queueItemMatch[3] === 'steer') {
-        await requireExecutionWritable(threadId);
-        const [item] = queue.splice(index, 1);
-        const result = await steerQueuedItem(threadId, item);
-        if (!result.success) {
-          queue.splice(index, 0, item);
-          sendJson(response, 502, { error: '插队发送失败。', details: result.data });
-          return;
-        }
-        sendJson(response, 200, { items: publicQueue(threadId) });
-        return;
-      }
-    }
-
-    const takeoverMatch = /^\/api\/threads\/([^/]+)\/takeover$/.exec(url.pathname);
-    if (request.method === 'POST' && takeoverMatch) {
-      const threadId = decodeURIComponent(takeoverMatch[1]);
+      await sharedServer.connect();
+      const action = request.method === 'DELETE' ? 'delete' : queueItemMatch[3] === 'steer' ? 'steer' : null;
+      if (!action) throw new RequestError(405, '不支持的队列操作');
       await requireExecutionWritable(threadId);
-      if (appServerTasks.owns(threadId)) {
-        sendJson(response, 200, { thread: (await appServerTasks.listTasks()).find(t => t.id === threadId) });
-        return;
-      }
-      if (messageQueues.get(threadId)?.length || queueWorkers.has(threadId)) throw new RequestError(409, '请先处理此聊天的排队消息。');
-      const result = await callTool('read_thread', { threadId, turnLimit: 1, includeOutputs: false });
-      if (!result.success) throw new RequestError(502, '无法确认 Desktop 聊天状态。');
-      const timeline = normalizeTimeline(result.data);
-      const thread = timeline.thread;
-      if (thread.hostId && thread.hostId !== 'local') throw new RequestError(400, '只支持本机聊天。');
-      if (!['idle', 'notLoaded'].includes(thread.status) || timeline.turns.some(t => t.status === 'inProgress')) throw new RequestError(409, '只允许接管已空闲的聊天，请等当前轮次结束。');
-      if (!findSessionPath(threadId)) throw new RequestError(400, '未找到此聊天的本机历史。');
-      sendJson(response, 200, { thread: await appServerTasks.adoptTask({ ...thread, id: threadId }) });
-      return;
-    }
+      sendJson(response, 200, await appServerEvents.changeQueue((method, params) => sharedServer.request(method, params), threadId, itemId, action)); return;
+    }
 
-    const interruptMatch = /^\/api\/threads\/([^/]+)\/interrupt$/.exec(url.pathname);
+    const interruptMatch = /^\/api\/threads\/([^/]+)\/interrupt$/.exec(url.pathname);
     if (request.method === 'POST' && interruptMatch) {
       const threadId = decodeURIComponent(interruptMatch[1]);
       await requireExecutionWritable(threadId);
-      if (!appServerTasks.owns(threadId) && usesSharedTask({ hostId: url.searchParams.get('hostId') })) {
-        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;
-      }
-      if (!appServerTasks.owns(threadId)) throw new RequestError(409, '请先接管空闲聊天。');
-      const body = await readJsonBody(request);
-      const thread = await appServerTasks.readTask(threadId, { turnLimit: 1 });
-      const active = thread.turns?.at(-1);
-      if (!body.turnId || active?.id !== body.turnId || statusText(active.status) !== 'inProgress') throw new RequestError(409, '此轮次已经结束或发生变化。');
-      // Stop also clears pending messages so the queue cannot restart work.
-      messageQueues.delete(threadId);
-      await appServerTasks.interruptTurn(threadId, body.turnId);
-      sendJson(response, 200, { requested: true });
-      return;
+      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 (!appServerTasks.owns(threadId) && usesSharedTask(body)) {
-        sendJson(response, 200, { success: true, data: await sharedServer.send(appServerTurnArguments(threadId, body)) });
-      } else if (appServerTasks.owns(threadId)) {
-        const args = appServerTurnArguments(threadId, body);
-        const current = await appServerTasks.readTask(threadId, { turnLimit: 1 });
-        const active = current.turns?.at(-1);
-        sendJson(response, 200, statusText(active?.status) === 'inProgress'
-          ? await appServerTasks.steerTurn(threadId, active.id, args.input)
-          : await appServerTasks.startTurn(threadId, args));
-      } else {
-        sendToolResult(response, await callTool('send_message_to_thread', await messageArguments(threadId, body)));
-      }
-      return;
-    }
-
-    if (request.method === 'POST' && url.pathname === '/api/wait') {
-      const body = await readJsonBody(request);
-      sendToolResult(response, await callTool('wait_threads', body, 130_000));
-      return;
-    }
+      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) {
@@ -760,17 +483,7 @@ const lanSocket = attachLanSocket(server, { token: options.token, dispatch: hand
   authorizeDevice: (clientId, credential) => authorizeLanDevice(stateRoot, clientId, credential),
 });
 
-if (options.appServer) {
-  try {
-    await appServer.start();
-  } catch (error) {
-    console.error(`app-server 启动失败：${error instanceof Error ? error.message : String(error)}`);
-    process.exit(2);
-  }
-}
-
 let control;
-desktopMonitor.start();
 void managedAppServer.start();
 executionHealth.start();
 server.on('error', error => {
@@ -807,147 +520,14 @@ async function shutDown() {
   shuttingDown = true;
   lanSocket.close();
   server.close();
-  desktopMonitor?.stop();
   executionHealth?.stop();
   managedAppServer.close();
-  await appServer.close();
   await control?.close();
   process.exit(0);
 }
 process.on('SIGTERM', shutDown);
 process.on('SIGINT', shutDown);
 
-async function callTool(tool, argumentsValue, timeoutMs = 60_000, targetPipe) {
-  if (!sourceThreadId) throw new RequestError(503, '基础控制尚未绑定调用上下文；请在 Codex 对话启动一次 Code Relax。电脑管理连接仍可使用。');
-  if (!ALLOWED_TOOLS.has(tool)) {
-    throw new RequestError(403, `工具 ${tool} 不在 Bridge 允许列表中。`);
-  }
-
-  const invocationId = crypto.randomUUID();
-  const rpc = await callDesktop('tools/call', {
-    arguments: argumentsValue,
-    callId: `codex-remote-${invocationId}`,
-    namespace: 'codex_app',
-    threadId: sourceThreadId,
-    tool,
-    turnId: `codex-remote-turn-${invocationId}`,
-  }, timeoutMs, targetPipe);
-
-  const result = rpc.result;
-  if (!result || typeof result.success !== 'boolean') {
-    throw new BridgeError('Codex Desktop 没有返回有效的工具结果。', rpc);
-  }
-
-  const items = Array.isArray(result.contentItems) ? result.contentItems : [];
-  let data = items;
-  if (items.length === 1 && items[0]?.type === 'inputText' && typeof items[0].text === 'string') {
-    try {
-      data = JSON.parse(items[0].text);
-    } catch {
-      data = items[0].text;
-    }
-  }
-
-  return { success: result.success, data };
-}
-
-function callDesktop(method, params, timeoutMs, targetPipe = desktopMonitor?.pipe || pipePath) {
-  if (!targetPipe) return Promise.reject(new RequestError(503, 'Desktop 工具通道尚未就绪。'));
-  return new Promise((resolve, reject) => {
-    const socket = net.createConnection(targetPipe);
-    const requestId = ++nextRequestId;
-    const payload = Buffer.from(JSON.stringify({ jsonrpc: '2.0', id: requestId, method, params }), 'utf8');
-    const header = Buffer.allocUnsafe(4);
-    header.writeUInt32LE(payload.length, 0);
-    let pending = Buffer.alloc(0);
-    let expectedLength = null;
-    let settled = false;
-
-    const finish = (callback, value) => {
-      if (settled) return;
-      settled = true;
-      clearTimeout(timer);
-      socket.destroy();
-      callback(value);
-    };
-
-    const timer = setTimeout(() => {
-      finish(reject, new BridgeError('等待 Codex Desktop 响应超时。'));
-    }, timeoutMs);
-
-    socket.once('connect', () => socket.write(Buffer.concat([header, payload])));
-    socket.on('data', chunk => {
-      pending = Buffer.concat([pending, chunk]);
-      if (expectedLength === null && pending.length >= 4) {
-        expectedLength = pending.readUInt32LE(0);
-        pending = pending.subarray(4);
-        if (expectedLength <= 0 || expectedLength > MAX_FRAME_BYTES) {
-          finish(reject, new BridgeError(`Codex Desktop 返回了无效帧长度：${expectedLength}。`));
-          return;
-        }
-      }
-
-      if (expectedLength !== null && pending.length >= expectedLength) {
-        try {
-          const responseValue = JSON.parse(pending.subarray(0, expectedLength).toString('utf8'));
-          if (responseValue.error) {
-            finish(reject, new BridgeError('Codex Desktop 工具调用失败。', responseValue.error));
-          } else if (responseValue.id !== requestId) {
-            finish(reject, new BridgeError('Codex Desktop 返回了不匹配的请求 ID。'));
-          } else {
-            finish(resolve, responseValue);
-          }
-        } catch (error) {
-          finish(reject, new BridgeError('无法解析 Codex Desktop 响应。', undefined, error));
-        }
-      }
-    });
-    socket.once('error', error => finish(reject, new BridgeError(
-      '无法连接 Codex Desktop Pipe。桌面版可能已重启，请重新启动 Bridge。',
-      undefined,
-      error,
-    )));
-    socket.once('close', () => {
-      if (!settled) finish(reject, new BridgeError('Codex Desktop Pipe 在返回结果前关闭。'));
-    });
-  });
-}
-
-function sendToolResult(response, result) {
-  if (result.success) {
-    sendJson(response, 200, result.data);
-  } else {
-    sendJson(response, 502, { error: 'Codex Desktop 工具返回失败。', details: result.data });
-  }
-}
-
-function appServerBridgeStatus() {
-  return {
-    ...appServer.snapshot(),
-    platformFamily: appServer.initializeResult?.platformFamily || null,
-    platformOs: appServer.initializeResult?.platformOs || null,
-    taskCount: appServerTasks.store.list().length,
-    ownershipError: appServerTasks.store.loadError?.message || null,
-  };
-}
-
-function readThreadArguments(url, threadId, defaultTurnLimit, defaultOutputLimit = 4_000) {
-  const argumentsValue = {
-    threadId,
-    turnLimit: boundedInteger(url.searchParams.get('turnLimit'), defaultTurnLimit, 1, 10),
-    includeOutputs: booleanValue(url.searchParams.get('includeOutputs'), true),
-    maxOutputCharsPerItem: boundedInteger(
-      url.searchParams.get('maxOutputCharsPerItem'),
-      defaultOutputLimit,
-      500,
-      100_000,
-    ),
-  };
-  const hostId = url.searchParams.get('hostId')?.trim();
-  if (hostId) argumentsValue.hostId = hostId;
-  return argumentsValue;
-}
-
 function readContextUsage(threadId) {
   if (!/^[0-9a-f]{8}-[0-9a-f-]{20,55}$/i.test(threadId)) {
     return { available: false };
@@ -1070,108 +650,6 @@ function findSessionPath(threadId) {
   return null;
 }
 
-function enrichTimelineWithLocalActivity(timeline, threadId) {
-  const turn = timeline.turns.at(-1);
-  if (!turn || turn.status !== 'inProgress') return;
-  if (turn.entries.some(entry => entry?.type === 'activity' && entry.status === 'inProgress')) return;
-  const pending = readPendingLocalActivity(threadId);
-  if (!pending || (pending.turnId && pending.turnId !== turn.id)) return;
-  turn.entries.push(pending.entry);
-}
-
-function readPendingLocalActivity(threadId) {
-  const sessionPath = findSessionPath(threadId);
-  if (!sessionPath) return null;
-  let handle;
-  try {
-    const stat = fs.statSync(sessionPath);
-    const cacheKey = `${stat.size}:${stat.mtimeMs}`;
-    const cached = liveActivityCache.get(sessionPath);
-    if (cached?.key === cacheKey) return cached.value;
-    const readLength = Math.min(stat.size, MAX_LIVE_ACTIVITY_TAIL_BYTES);
-    const buffer = Buffer.allocUnsafe(readLength);
-    handle = fs.openSync(sessionPath, 'r');
-    fs.readSync(handle, buffer, 0, readLength, stat.size - readLength);
-    const lines = buffer.toString('utf8').split(/\r?\n/);
-    if (readLength < stat.size) lines.shift();
-    const pending = new Map();
-    for (const line of lines) {
-      if (!line.includes('"custom_tool_call')) continue;
-      let event;
-      try { event = JSON.parse(line); } catch { continue; }
-      if (event?.type !== 'response_item') continue;
-      const payload = event.payload;
-      const callId = payload?.call_id;
-      if (!callId) continue;
-      if (payload.type === 'custom_tool_call') pending.set(callId, payload);
-      if (payload.type === 'custom_tool_call_output') pending.delete(callId);
-    }
-    const payload = [...pending.values()].at(-1);
-    const value = payload ? pendingActivity(payload) : null;
-    liveActivityCache.set(sessionPath, { key: cacheKey, value });
-    return value;
-  } catch {
-    liveActivityCache.delete(sessionPath);
-    return null;
-  } finally {
-    if (handle !== undefined) fs.closeSync(handle);
-  }
-}
-
-function pendingActivity(payload) {
-  const input = typeof payload.input === 'string' ? payload.input : '';
-  const nestedTool = input.match(/tools\.([A-Za-z0-9_]+)\s*\(/)?.[1] || payload.name || 'tool';
-  const id = `live:${payload.call_id}`;
-  const common = { type: 'activity', id, status: 'inProgress', transient: true };
-  const turnId = payload.internal_chat_message_metadata_passthrough?.turn_id || '';
-  if (nestedTool === 'exec_command') {
-    return {
-      turnId,
-      entry: {
-        ...common,
-        kind: 'command',
-        title: '命令',
-        command: jsonStringField(input, 'cmd'),
-        cwd: jsonStringField(input, 'workdir'),
-      },
-    };
-  }
-  if (nestedTool === 'apply_patch') {
-    return { turnId, entry: { ...common, kind: 'fileChange', title: '文件修改', changes: [] } };
-  }
-  if (nestedTool === 'web__run') {
-    return {
-      turnId,
-      entry: { ...common, kind: 'webSearch', title: '网页搜索', query: jsonStringField(input, 'q') },
-    };
-  }
-  if (nestedTool === 'view_image') {
-    return {
-      turnId,
-      entry: { ...common, kind: 'imageView', title: '查看图片', path: jsonStringField(input, 'path') },
-    };
-  }
-  const parts = nestedTool.replace(/^mcp__/, '').split('__');
-  return {
-    turnId,
-    entry: {
-      ...common,
-      kind: 'tool',
-      title: '工具',
-      server: parts.length > 1 ? parts.shift() : 'functions',
-      tool: parts.join('/') || nestedTool,
-      arguments: {},
-    },
-  };
-}
-
-function jsonStringField(source, field) {
-  const pattern = new RegExp(`(?:["']${field}["']|${field})\\s*:\\s*("(?:\\\\.|[^"\\\\])*")`);
-  const match = pattern.exec(source);
-  if (!match) return '';
-  try { return JSON.parse(match[1]); } catch { return ''; }
-}
-
 function messagePayload(body) {
   const prompt = typeof body.prompt === 'string' ? body.prompt.trim() : '';
   if (body.images !== undefined && (!Array.isArray(body.images) || body.images.length > 4)) {
@@ -1208,26 +686,6 @@ function messagePayload(body) {
   return payload;
 }
 
-async function messageArguments(threadId, body) {
-  const payload = messagePayload(body);
-  payload.images = await Promise.all(payload.images.map(image => image.startsWith('data:') ? persistLegacyImage(image, uploadsRoot) : image));
-  let prompt = payload.prompt;
-  if (payload.images.length) {
-    prompt += (prompt ? '\n\n' : '') + payload.images
-      .map((file, index) => `![手机图片 ${index + 1}](${file.replaceAll('\\', '/')})`)
-      .join('\n\n');
-  }
-  const argumentsValue = { threadId, prompt };
-  if (payload.hostId) argumentsValue.hostId = payload.hostId;
-  if (payload.model) argumentsValue.model = payload.model;
-  if (payload.thinking) argumentsValue.thinking = payload.thinking;
-  return argumentsValue;
-}
-
-function usesSharedTask(body) {
-  return Boolean(sharedServer && (!body.hostId || body.hostId === 'local'));
-}
-
 function appServerTurnArguments(threadId, body) {
   const payload = messagePayload(body);
   const input = [];
@@ -1240,334 +698,23 @@ function appServerTurnArguments(threadId, body) {
   return value;
 }
 
-function messageDisplayText(body) {
-  const prompt = typeof body.prompt === 'string' ? body.prompt.trim() : '';
-  const imageCount = Array.isArray(body.images) ? body.images.length : 0;
-  return prompt || (imageCount ? `[${imageCount} 张图片]` : '');
-}
-
-function createThreadBody(body) {
-  const payload = messagePayload(body);
-  return { ...body, prompt: payload.prompt, transport: body.transport === 'app-server' ? 'app-server' : 'desktop-tools' };
-}
-
-function appServerProjectTarget(projectId, projects) {
-  if (projectId === '__unassigned__') return appServerEvents.projectlessThreadTarget(projectRoot);
-  const project = projects.find(item => item?.projectId === projectId);
-  if (!project) throw new RequestError(404, '没有找到对应项目。');
-  if (project.hostId && project.hostId !== 'local') {
-    throw new RequestError(400, '独立 app-server 当前只支持本机项目。');
-  }
-  if (typeof project.path !== 'string' || !path.isAbsolute(project.path)) {
-    throw new RequestError(400, '项目没有可用的本机路径。');
-  }
-  return { projectId, cwd: project.path };
-}
-
-function mergeThreadCatalog(catalog, appThreads, limit, sharedSnapshot = Boolean(sharedServer)) {
-  const owned = new Map(appThreads.map(thread => [thread.id, thread]));
-  const pinnedThreads = (catalog.pinnedThreads || []).map(thread => owned.get(thread.id) || thread);
-  const pinnedIds = new Set(pinnedThreads.map(thread => thread.id));
-  if (sharedSnapshot) {
-    const listed = new Set([...pinnedIds, ...(catalog.threads || []).map(thread => thread.id)]);
-    const threads = (catalog.threads || []).map(thread => owned.get(thread.id) || thread);
-    threads.push(...appThreads.filter(thread => !listed.has(thread.id)));
-    threads.sort((left, right) => threadRecency(right) - threadRecency(left));
-    return { ...catalog, pinnedThreads: [], threads: threads.slice(0, limit) };
-  }
-  const desktopThreads = (catalog.threads || []).filter(thread => !owned.has(thread.id));
-  const merged = [...desktopThreads, ...appThreads.filter(thread => !pinnedIds.has(thread.id))]
-    .sort((left, right) => threadRecency(right) - threadRecency(left))
-    .slice(0, limit);
-  return { ...catalog, pinnedThreads, threads: merged };
-}
-
-async function createThreadArguments(projectId, body, projects) {
-  const { threadId, hostId, ...message } = await messageArguments('', body);
-  if (projectId === '__unassigned__') return { ...message, target: { type:'projectless' } };
-  const project = projects.find(item => item?.projectId === projectId);
-  if (!project) throw new RequestError(404, '没有找到对应项目。');
-  return { ...message, target:{ type:'project', projectId, environment:{ type:'local' } } };
-}
-
-function publicQueue(threadId) {
-  return (messageQueues.get(threadId) || []).map(item => ({
-    id: item.id,
-    prompt: item.displayPrompt || item.prompt,
-    text: item.text, attachments:item.attachments || [],
-    model: item.model || '',
-    thinking: item.thinking || item.effort || '',
-    createdAt: item.createdAt,
-    error: item.error || '',
-  }));
-}
-
-function queueArguments(item) {
-  const value = { threadId: item.threadId, prompt: item.prompt };
-  if (item.hostId) value.hostId = item.hostId;
-  if (item.model) value.model = item.model;
-  if (item.thinking) value.thinking = item.thinking;
-  return value;
-}
-
-async function sendQueuedItem(threadId, item) {
-  await requireExecutionWritable(threadId);
-  if (item.transport === 'app-server') {
-    try {
-      return { success: true, data: await appServerTasks.startTurn(threadId, item) };
-    } catch (error) {
-      return { success: false, data: error instanceof Error ? error.message : String(error) };
-    }
-  }
-  return callTool('send_message_to_thread', queueArguments(item));
-}
-
-async function steerQueuedItem(threadId, item) {
-  if (item.transport !== 'app-server') return callTool('send_message_to_thread', queueArguments(item));
-  try {
-    const thread = await appServerTasks.readTask(threadId, { includeTurns: true, turnLimit: 1 });
-    const activeTurn = thread.turns?.at(-1);
-    if (!activeTurn || statusText(activeTurn.status) !== 'inProgress') {
-      throw new Error('当前没有可引导的 app-server 活动轮次。');
-    }
-    return {
-      success: true,
-      data: await appServerTasks.steerTurn(threadId, activeTurn.id, item.input),
-    };
-  } catch (error) {
-    return { success: false, data: error instanceof Error ? error.message : String(error) };
-  }
-}
-
-function ensureQueueWorker(threadId) {
-  if (queueWorkers.has(threadId)) return;
-  const worker = runQueueWorker(threadId)
-    .catch(error => {
-      const item = messageQueues.get(threadId)?.[0];
-      if (item) item.error = error instanceof Error ? error.message : String(error);
-    })
-    .finally(() => queueWorkers.delete(threadId));
-  queueWorkers.set(threadId, worker);
-}
-
-async function runQueueWorker(threadId) {
-  while (true) {
-    const queue = messageQueues.get(threadId) || [];
-    const item = queue[0];
-    if (!item || item.error) return;
-    let timeline;
-    if (item.transport === 'app-server') {
-      const thread = await appServerTasks.readTask(threadId, { includeTurns: true, turnLimit: 1 });
-      timeline = normalizeAppServerTimeline(thread);
-    } else {
-      const readArguments = {
-        threadId,
-        turnLimit: 1,
-        includeOutputs: false,
-        maxOutputCharsPerItem: 500,
-      };
-      if (item.hostId) readArguments.hostId = item.hostId;
-      const threadResult = await callTool('read_thread', readArguments, 15_000);
-      if (!threadResult.success) throw new BridgeError('读取排队任务状态失败。', threadResult.data);
-      timeline = normalizeTimeline(threadResult.data);
-    }
-    const active = timeline.thread.status === 'active' || timeline.turns.at(-1)?.status === 'inProgress';
-    if (active) {
-      await delay(2_000);
-      continue;
-    }
-    if (messageQueues.get(threadId) !== queue || queue[0]?.id !== item.id) continue;
-    const sendResult = await sendQueuedItem(threadId, item);
-    if (!sendResult.success) throw new BridgeError('发送排队消息失败。', sendResult.data);
-    if (queue[0]?.id === item.id) queue.shift();
-  }
-}
-
-async function streamAppServerThreadEvents(request, response, threadId) {
-  response.startEvents();
-
-  let closed = false;
-  let pushPending = false;
-  let pushing = false;
-  let previousHash = '';
-  let updateTimer = null;
-  let resolveClosed;
-  const closedPromise = new Promise(resolve => { resolveClosed = resolve; });
-  response.once('close', () => { closed = true; resolveClosed(); });
-
-  const pushUpdate = async () => {
-    if (closed) return;
-    if (pushing) { pushPending = true; return; }
-    pushing = true;
-    try {
-      const thread = await appServerTasks.readTask(threadId, { includeTurns: true, turnLimit: 2 });
-      const timeline = normalizeAppServerTimeline(thread);
-      const update = {
-        thread: timeline.thread,
-        turns: timeline.turns.slice(-2),
-        turn: timeline.turns.at(-1) || null,
-        queue: publicQueue(threadId),
-      };
-      const serialized = JSON.stringify(update);
-      const hash = crypto.createHash('sha256').update(serialized).digest('base64url');
-      if (hash !== previousHash) {
-        sendEvent(response, 'update', update);
-        previousHash = hash;
-      }
-    } catch (error) {
-      sendEvent(response, 'bridge-error', { error: error instanceof Error ? error.message : String(error) });
-    } finally {
-      pushing = false;
-      if (pushPending && !closed) {
-        pushPending = false;
-        void pushUpdate();
-      }
-    }
-  };
-  const scheduleUpdate = event => {
-    if (closed || event.threadId !== threadId || updateTimer) return;
-    updateTimer = setTimeout(() => {
-      updateTimer = null;
-      void pushUpdate();
-    }, 60);
-  };
-  appServerTasks.on('thread-event', scheduleUpdate);
-  await pushUpdate();
-
-  await closedPromise;
-  closed = true;
-  if (updateTimer) clearTimeout(updateTimer);
-  appServerTasks.off('thread-event', scheduleUpdate);
-  if (!response.writableEnded) response.end();
-}
-
-async function streamThreadEvents(request, response, threadId, hostId) {
-  response.startEvents();
-
-  let closed = false;
-  let previousHash = '';
-  response.once('close', () => { closed = true; });
-
-  while (!closed) {
-    let intervalMs = 2_500;
-    try {
-      const argumentsValue = {
-        threadId,
-        turnLimit: 2,
-        includeOutputs: true,
-        maxOutputCharsPerItem: 4_000,
-      };
-      if (hostId) argumentsValue.hostId = hostId;
-      const result = await callTool('read_thread', argumentsValue);
-      if (!result.success) {
-        throw new BridgeError('Codex Desktop 工具返回失败。', result.data);
-      }
-
-      const timeline = normalizeTimeline(result.data);
-      enrichTimelineWithLocalActivity(timeline, threadId);
-      const update = {
-        thread: timeline.thread,
-        turns: timeline.turns.slice(-2),
-        turn: timeline.turns.at(-1) || null,
-        queue: publicQueue(threadId),
-      };
-      const serialized = JSON.stringify(update);
-      const hash = crypto.createHash('sha256').update(serialized).digest('base64url');
-      if (hash !== previousHash) {
-        sendEvent(response, 'update', update);
-        previousHash = hash;
-      }
-      if (timeline.thread.status === 'active' || update.turn?.status === 'inProgress') {
-        intervalMs = 1_000;
-      }
-    } catch (error) {
-      sendEvent(response, 'bridge-error', {
-        error: error instanceof Error ? error.message : String(error),
-      });
-      intervalMs = 3_000;
-    }
-
-    await delay(intervalMs);
-  }
-
-  if (!response.writableEnded) response.end();
-}
-
-function sendEvent(response, eventName, value) {
-  if (response.destroyed || response.writableEnded) return;
-  response.event(eventName, value);
-}
-
-function normalizeTimeline(data, reverseTurns = true) {
-  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) : [];
-  if (reverseTurns) turns.reverse();
-  if (reverseTurns) restoreEmptyTurnMessages(source.thread?.id, turns);
-  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 normalizeAppServerTimeline(thread) {
-  const record = appServerTasks.store.get(thread?.id);
-  return normalizeTimeline({
-    thread: {
-      ...thread,
-      title: thread?.name || thread?.title || record?.title || '',
-      projectId: record?.projectId || '',
-      hostId: 'app-server',
-      transport: 'app-server',
-    },
-  }, false);
-}
-
 function normalizeSharedTimeline({ thread, nextCursor, sync }) {
-  return { ...normalizeTimeline({ thread: { ...thread, title: thread.name || thread.title || '', hostId: 'local', transport: 'shared-app-server' } }, false),
+  return { ...normalizeTimeline({ thread: { ...thread, title: thread.name || thread.title || '', hostId: 'local', transport: 'shared-app-server' } }),
     historyView: 'grouped-lazy-skeleton-v11',
     ...(nextCursor !== undefined ? { nextCursor } : {}), ...(sync ? { sync } : {}) };
 }
 
-function restoreEmptyTurnMessages(threadId, turns) {
-  const missing = new Map(turns.filter(turn => turn.entries.length === 0).map(turn => [turn.id, turn]));
-  if (!missing.size || !threadId) return;
-  const sessionPath = findSessionPath(threadId);
-  if (!sessionPath) return;
-  const handle = fs.openSync(sessionPath, 'r');
-  try {
-    const size = fs.fstatSync(handle).size;
-    const length = Math.min(size, MAX_SETTINGS_SCAN_BYTES);
-    const buffer = Buffer.allocUnsafe(length);
-    fs.readSync(handle, buffer, 0, length, size - length);
-    const lines = buffer.toString('utf8').split(/\r?\n/);
-    if (length < size) lines.shift();
-    let turnId;
-    for (const line of lines) {
-      if (!line.trim()) continue;
-      let event;
-      try { event = JSON.parse(line); } catch { continue; }
-      const item = event.payload;
-      if (event.type === 'event_msg' && item?.type === 'task_started') turnId = item.turn_id;
-      if (event.type === 'turn_context') turnId = item?.turn_id;
-      const turn = missing.get(turnId);
-      if (!turn || event.type !== 'response_item') continue;
-      let entry;
-      if (item.type === 'function_call_output' && item.namespace === 'codex_app' && ['create_thread', 'send_message_to_thread'].includes(item.name)) {
-        const text = extractDelegatedInput(item.output);
-        if (text) entry = { type: 'message', id: item.id, role: 'user', source: 'remote', ...splitUploadedImages(text) };
-      } else if (item.type === 'message' && ['user', 'assistant'].includes(item.role) && item.channel !== 'analysis') {
-        const text = (item.content || []).filter(part => ['input_text', 'output_text'].includes(part.type)).map(part => part.text || '').join('\n');
-        if (text) entry = item.role === 'user'
-          ? normalizeItem({ type: 'userMessage', id: item.id, content: item.content.map(part => ({ ...part, type: part.type === 'input_text' ? 'text' : part.type })) })
-          : normalizeItem({ type: 'agentMessage', id: item.id, phase: item.phase || item.channel, text });
-      }
-      if (entry) turn.entries.push(entry);
-    }
-  } finally { fs.closeSync(handle); }
-}
-
 function normalizeThread(thread) {
   const source = thread && typeof thread === 'object' ? thread : {};
   return {
@@ -1579,7 +726,7 @@ function normalizeThread(thread) {
     projectId: source.projectId || '',
     cwd: source.cwd || '',
     hostId: source.hostId || '',
-    transport: source.transport || (source.hostId === 'app-server' ? 'app-server' : 'desktop-tools'),
+    transport: source.transport || 'shared-app-server',
     readOnly: source.readOnly === true,
     readOnlyReason: source.readOnlyReason || '',
   };
@@ -1831,10 +978,6 @@ function sharedHistoryPageOptions() {
   };
 }
 
-function threadRecency(thread) {
-  return Number(thread?.recencyAt ?? thread?.updatedAt) || 0;
-}
-
 function normalizeAttachments(content) {
   if (!Array.isArray(content)) return [];
   const items = content.filter(item => item && !['text', 'input_text'].includes(item.type)).map(item => ({ ...item }));
@@ -2116,10 +1259,6 @@ function statusText(value) {
   return value == null ? 'unknown' : String(value);
 }
 
-function delay(milliseconds) {
-  return new Promise(resolve => setTimeout(resolve, milliseconds));
-}
-
 function sendJson(response, statusCode, value) {
   if (response.json) { response.json(statusCode, value); return; }
   sendBuffer(response, statusCode, 'application/json; charset=utf-8', Buffer.from(JSON.stringify(value)));
@@ -2144,10 +1283,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() || '';
-  let appServer = process.env.CODEX_REMOTE_APP_SERVER === 'true';
+  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') appServer = true;
+    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];
   }
@@ -2155,32 +1294,10 @@ function parseOptions(args) {
     throw new Error('端口必须位于 1024 到 65535 之间。');
   }
   if (lan && !token) token = crypto.randomBytes(32).toString('base64url');
-  return { port, lan, token, appServer };
-}
-
-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 booleanValue(value, fallback) {
-  if (value === 'true') return true;
-  if (value === 'false') return false;
-  return fallback;
+  return { port, lan, token };
 }
 
-class BridgeError extends Error {
-  constructor(message, details, options) {
-    super(message, options ? { cause: options } : undefined);
-    this.details = details;
-  }
-}
-
-class RequestError extends Error {
-  constructor(statusCode, message, details) {
-    super(message);
-    this.statusCode = statusCode;
-    this.details = details;
-    this.code = details?.code;
-  }
+function boundedInteger(value, fallback, minimum, maximum) {
+  const parsed = Number.parseInt(value || '', 10);
+  return Number.isFinite(parsed) ? Math.min(maximum, Math.max(minimum, parsed)) : fallback;
 }