@walkhi/code-relax 0.1.0-beta.22 → 0.1.0-beta.23

package/dist/src/server.mjs

@@ -18,13 +18,16 @@ 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 { createRelayManager } from './self-relay/lifecycle.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 { SharedCatalog } from './shared-catalog.mjs';
 import { requestRecovery, recoveryStatus } from './shared-recovery.mjs';
 import { requestServiceRestart } from './service-restart.mjs';
+import { TurnModelHistory } from './turn-model-history.mjs';
+
+const turnModelHistory = new TurnModelHistory();
 
 const MAX_ATTACHMENT_BYTES = 16 * 1024 * 1024;
 const MAX_CACHED_ATTACHMENTS = 32;
@@ -85,8 +88,8 @@ const sessionSettingsCache = new Map();
 const liveActivityCache = new Map();
 let sharedServer = null;
 const managedAppServer = new ManagedAppServer({ stateRoot, host: desktopHost });
-const runtimeDiscovery = new RuntimeDiscovery({ stateRoot, host: desktopHost, url: managedAppServerUrl });
-const relayManager = createRelayManager(stateRoot);
+const runtimeDiscovery = new RuntimeDiscovery({ stateRoot, host: desktopHost, url: managedAppServerUrl });
+const relayManager = createRelayManager(stateRoot);
 let sharedCatalog = null, executionMode = 'ordinary';
 function selectSharedExecution(enabled) {
   const next = enabled ? managedAppServer.client : null;
@@ -195,9 +198,10 @@ async function handleRequest(request, response) {
     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.
+      const executionReady = executionHealth.state.ready && sharedServer?.ready === true;
       sendJson(response, 200, {
         status: 'ok', resident: true, version: runtimeVersion,
-        execution: { ...executionHealth.state, ready: executionHealth.state.ready && sharedServer?.ready === true,
+        execution: { ...executionHealth.state, ready: executionReady, canWrite: executionReady,
           mode: executionMode },
         managedAppServer: managedAppServer.snapshot(),
         ...runtimeDiscovery.state,
@@ -283,7 +287,7 @@ async function handleRequest(request, response) {
       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); };
@@ -292,45 +296,45 @@ async function handleRequest(request, response) {
       execution.on('usage', emit); execution.on('usage-error', failed); execution.on('disconnected', disconnected);
       response.once('close', () => { execution.off('usage', emit); execution.off('usage-error', failed); execution.off('disconnected', disconnected); });
       try { emit(await execution.usage()); } catch (error) { failed(error); }
-      return;
-    }
-
-    if (request.method === 'GET' && url.pathname === '/api/turn-events') {
-      response.startEvents();
-      const listener = ({ method, params }) => {
-        if (!['turn/started', 'turn/completed'].includes(method)) return;
-        const threadId = params?.threadId, turnId = params?.turn?.id;
-        if (typeof threadId === 'string' && typeof turnId === 'string' && !response.destroyed) {
-          response.event('turn', { method, threadId, turnId });
-        }
-      };
-      const disconnected = () => response.end();
-      sharedServer.on('notification', listener);
-      sharedServer.on('disconnected', disconnected);
-      response.once('close', () => {
-        sharedServer.off('notification', listener);
-        sharedServer.off('disconnected', disconnected);
-      });
-      return;
-    }
-
-    const activeTurnMatch = /^\/api\/threads\/([^/]+)\/active-turn$/.exec(url.pathname);
-    if (request.method === 'GET' && activeTurnMatch) {
-      const threadId = decodeURIComponent(activeTurnMatch[1]);
-      await sharedServer.connect();
-      const { thread } = await sharedServer.request('thread/read', { threadId, includeTurns: false });
-      const status = typeof thread.status === 'string' ? thread.status : thread.status?.type;
-      let turnId = null;
-      if (status === 'active') {
-        const page = await sharedServer.request('thread/turns/list', {
-          threadId, limit: 1, sortDirection: 'desc', itemsView: 'summary',
-        });
-        const latest = page.data?.[0];
-        if (latest?.status === 'inProgress') turnId = latest.id;
-      }
-      sendJson(response, 200, { turnId });
-      return;
-    }
+      return;
+    }
+
+    if (request.method === 'GET' && url.pathname === '/api/turn-events') {
+      response.startEvents();
+      const listener = ({ method, params }) => {
+        if (!['turn/started', 'turn/completed'].includes(method)) return;
+        const threadId = params?.threadId, turnId = params?.turn?.id;
+        if (typeof threadId === 'string' && typeof turnId === 'string' && !response.destroyed) {
+          response.event('turn', { method, threadId, turnId });
+        }
+      };
+      const disconnected = () => response.end();
+      sharedServer.on('notification', listener);
+      sharedServer.on('disconnected', disconnected);
+      response.once('close', () => {
+        sharedServer.off('notification', listener);
+        sharedServer.off('disconnected', disconnected);
+      });
+      return;
+    }
+
+    const activeTurnMatch = /^\/api\/threads\/([^/]+)\/active-turn$/.exec(url.pathname);
+    if (request.method === 'GET' && activeTurnMatch) {
+      const threadId = decodeURIComponent(activeTurnMatch[1]);
+      await sharedServer.connect();
+      const { thread } = await sharedServer.request('thread/read', { threadId, includeTurns: false });
+      const status = typeof thread.status === 'string' ? thread.status : thread.status?.type;
+      let turnId = null;
+      if (status === 'active') {
+        const page = await sharedServer.request('thread/turns/list', {
+          threadId, limit: 1, sortDirection: 'desc', itemsView: 'summary',
+        });
+        const latest = page.data?.[0];
+        if (latest?.status === 'inProgress') turnId = latest.id;
+      }
+      sendJson(response, 200, { turnId });
+      return;
+    }
 
     const createThreadMatch = /^\/api\/projects\/([^/]+)\/threads$/.exec(url.pathname);
     if (request.method === 'POST' && createThreadMatch) {
@@ -374,22 +378,11 @@ async function handleRequest(request, response) {
     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);
+      if (request.socketRequest) {
+        response.on('progress', () => sharedServer.keepSnapshotAlive(threadId, timeline.sync));
+        response.once('close', () => sharedServer.keepSnapshotAlive(threadId, timeline.sync));
+      }
+      sendJson(response, 200, timeline);
       return;
     }
 
@@ -407,17 +400,18 @@ async function handleRequest(request, response) {
       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);
+        normalizeSharedTimeline, requestedSync);
       return;
     }
 
+    const modelChangesMatch = /^\/api\/threads\/([^/]+)\/model-changes$/.exec(url.pathname);
+    if (request.method === 'GET' && modelChangesMatch) {
+      const threadId = decodeURIComponent(modelChangesMatch[1]);
+      if (!/^[0-9a-f]{8}-[0-9a-f-]{20,55}$/i.test(threadId)) throw new RequestError(400, '对话 ID 无效。');
+      sendJson(response, 200, await turnModelHistory.read(findSessionPath(threadId), (url.searchParams.get('turnIds') || '').split(',').filter(Boolean)));
+      return;
+    }
     const contextMatch = /^\/api\/threads\/([^/]+)\/context$/.exec(url.pathname);
     if (request.method === 'GET' && contextMatch) {
       const threadId = decodeURIComponent(contextMatch[1]);
@@ -449,17 +443,6 @@ async function handleRequest(request, response) {
       }
     }
 
-    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]);
@@ -477,8 +460,9 @@ async function handleRequest(request, response) {
       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 body = await readJsonBody(request);
+        const args = appServerTurnArguments(threadId, body);
+        sendJson(response, 202, await appServerEvents.addQueue(rpc, threadId, args.input, crypto.randomUUID(), body.containsVoiceInput)); return;
       }
     }
 
@@ -510,8 +494,8 @@ async function handleRequest(request, response) {
       await requireExecutionWritable(threadId);
       const body = await readJsonBody(request);
       if (body.hostId && body.hostId !== 'local') throw new RequestError(410, '此对话的连接方式已停用。', { code: 'unsupported_control' });
-      const submitted = await sharedServer.send(appServerTurnArguments(threadId, body));
-      sendJson(response, 200, { success: true, data: submitted.result, usage: submitted.usage });
+      const submitted = await sharedServer.send(appServerTurnArguments(threadId, body));
+      sendJson(response, 200, { success: true, data: submitted.result, usage: submitted.usage });
       return;
     }
 
@@ -543,7 +527,7 @@ void managedAppServer.start();
 executionHealth.start();
 runtimeDiscovery.start();
 server.on('error', error => {
-  console.error('桌面服务监听失败：', error.message);
+  console.error('桌面服务监听失败：', error.message);
   process.exit(1);
 });
 server.listen(options.port, options.lan ? '0.0.0.0' : '127.0.0.1', async () => {
@@ -551,12 +535,12 @@ server.listen(options.port, options.lan ? '0.0.0.0' : '127.0.0.1', async () => {
     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: {
-          'refresh-execution': refreshExecution,
-          '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'),
+          'refresh-execution': refreshExecution,
+          '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;
@@ -566,10 +550,10 @@ server.listen(options.port, options.lan ? '0.0.0.0' : '127.0.0.1', async () => {
         pid: process.pid, controlPort: control.port });
     }
   } catch (error) {
-    console.error('桌面服务管理通道启动失败：', error.message);
+    console.error('桌面服务管理通道启动失败：', error.message);
     process.exit(1);
   }
-  console.log(`Code Relax 桌面服务已启动：http://127.0.0.1:${options.port}/`);
+  console.log(`Code Relax 桌面服务已启动：http://127.0.0.1:${options.port}/`);
   if (options.lan) {
     console.log('LAN 模式使用鉴权 WebSocket，仅适合受信任局域网测试，不要暴露到公网。');
   }
@@ -582,8 +566,8 @@ async function shutDown() {
   lanSocket.close();
   server.close();
   executionHealth?.stop();
-  runtimeDiscovery.stop();
-  await relayManager.close();
+  runtimeDiscovery.stop();
+  await relayManager.close();
   managedAppServer.close();
   await control?.close();
   process.exit(0);
@@ -749,12 +733,12 @@ function messagePayload(body) {
   return payload;
 }
 
-function appServerTurnArguments(threadId, body) {
+function appServerTurnArguments(threadId, body) {
   const payload = messagePayload(body);
   const input = [];
   if (payload.prompt) input.push({ type: 'text', text: payload.prompt });
   for (const image of payload.images) input.push(image.startsWith('data:') ? { type: 'image', url: image } : { type: 'localImage', path: image });
-  const value = { threadId, input, ...appServerEvents.mobileTurnSource(body.clientUserMessageId) };
+  const value = { threadId, input, ...appServerEvents.mobileTurnSource(body.clientUserMessageId, body.containsVoiceInput) };
   if (typeof body.clientUserMessageId === 'string' && /^[a-f0-9]{32}$/.test(body.clientUserMessageId)) value.clientUserMessageId = body.clientUserMessageId;
   if (payload.model) value.model = payload.model;
   if (payload.thinking) value.effort = payload.thinking;
@@ -775,7 +759,7 @@ function normalizeTimeline(data) {
 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',
+    historyView: 'item-pages-v1',
     ...(nextCursor !== undefined ? { nextCursor } : {}), ...(sync ? { sync } : {}) };
 }
 
@@ -799,7 +783,7 @@ function normalizeThread(thread) {
 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) : []);
+  const entries = 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;
@@ -811,6 +795,7 @@ function normalizeTurn(turn) {
     completedAt: source.completedAt || null,
     durationMs: source.durationMs ?? null,
     error: source.error ?? null,
+    ...(source.itemPage ? { itemPage: source.itemPage } : {}),
     entries,
   };
 }
@@ -818,17 +803,6 @@ function normalizeTurn(turn) {
 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 {
       type: 'activity',
@@ -965,28 +939,28 @@ function normalizeItem(item) {
     };
   }
 
-  if (item.type === 'imageView') {
-    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 {
+  if (item.type === 'imageView') {
+    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: 'imageView',
       title: '查看图片',
       titleOnly: true,
       path: item.path || '',
-      image,
+      image,
     };
   }
 
@@ -1048,83 +1022,6 @@ function normalizeItem(item) {
   };
 }
 
-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,
@@ -1367,7 +1264,7 @@ function imageMimeType(filePath) {
 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')
+    .filter(item => ['text', 'input_text'].includes(item?.type) && typeof item.text === 'string' && !appServerEvents.isMobileInputNotice(item))
     .map(item => item.text)
     // Codex injects project instructions as user-role context, not chat input.
     .filter(value => !/^\s*# AGENTS\.md instructions(?: for [^\r\n]+)?\r?\n\s*<INSTRUCTIONS>[\s\S]*<\/INSTRUCTIONS>\s*$/.test(value))