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

package/dist/src/server.mjs

@@ -6,7 +6,8 @@ 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 { 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';
@@ -17,7 +18,6 @@ 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 { activeDebugPort, serveDebugResource } from './debug-ui.mjs';
 import { authorizeLanDevice } from './self-relay/lan-authorizations.mjs';
 import { generateAndSetThreadTitle } from './thread-title-generation.mjs';
 import { desktopHost } from './platform/windows/desktop-host.mjs';
@@ -33,15 +33,25 @@ 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',
+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']);
+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));
@@ -58,7 +68,6 @@ const options = parseOptions(process.argv.slice(2));
 const runtimeVersion = readRuntimeVersion();
 
 const webRoot = path.resolve(path.dirname(fileURLToPath(import.meta.url)), '..', 'web');
-const repositoryRoot = path.resolve(webRoot, '..', '..');
 const projectRoot = os.homedir();
 const { codexDataRoot, stateRoot, sessionsRoot, uploadsRoot } = runtimePaths();
 const markdownItScript = fs.readFileSync(path.join(webRoot, 'vendor', 'markdown-it.umd.min.js'));
@@ -70,9 +79,6 @@ 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 legacyUploadsRoot = path.resolve(webRoot, '..', 'uploads');
-const allowedUploadsRoots = [uploadsRoot, legacyUploadsRoot,
-  ...JSON.parse(process.env.CODEX_REMOTE_LEGACY_UPLOADS_ROOTS || '[]')];
 const sessionPathCache = new Map();
 const sessionSettingsCache = new Map();
 const liveActivityCache = new Map();
@@ -119,8 +125,7 @@ async function handleRequest(request, response) {
     const url = new URL(request.url || '/', `http://${request.headers.host || 'localhost'}`);
 
     if (!request.socketRequest) {
-      if (serveDebugResource(request, response, stateRoot, options.port)) return;
-      sendJson(response, 404, { error: 'Bridge 调试页面未开启，或请求的资源不存在。' });
+      sendJson(response, 404, { error: '此端口不提供网页。' });
       return;
     }
 
@@ -167,6 +172,24 @@ async function handleRequest(request, response) {
       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.
@@ -176,7 +199,6 @@ async function handleRequest(request, response) {
           mode: executionMode },
         managedAppServer: managedAppServer.snapshot(),
         ...runtimeDiscovery.state,
-        debugUiPort: await activeDebugPort(stateRoot, options.port),
         sharedAppServerConnected: sharedServer?.ready === true,
         sharedRecoveryAvailable: runtimeDiscovery.state.desktop?.installed === true,
         mode: options.lan ? 'lan' : 'loopback',
@@ -352,7 +374,8 @@ async function handleRequest(request, response) {
         turnId: url.searchParams.get('knownTurnId'),
         turnStatus: url.searchParams.get('knownTurnStatus') || '',
       } : undefined;
-      await streamSharedThread(response, threadId, sharedServer, normalizeSharedTimeline, requestedSync, known);
+      await streamSharedThread(response, threadId, sharedServer,
+        normalizeSharedTimeline, requestedSync, known);
       return;
     }
 
@@ -470,8 +493,9 @@ async function handleRequest(request, response) {
 }
 
 const server = http.createServer(handleRequest);
-const lanSocket = attachLanSocket(server, { token: options.token, dispatch: handleRequest,
-  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;
@@ -703,8 +727,9 @@ function normalizeTimeline(data) {
 }
 
 function normalizeSharedTimeline({ thread, nextCursor, sync }) {
-  return { ...normalizeTimeline({ thread: { ...thread, title: thread.name || thread.title || '', hostId: 'local', transport: 'shared-app-server' } }),
-    historyView: 'grouped-lazy-skeleton-v11',
+  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 } : {}) };
 }
 
@@ -728,7 +753,7 @@ function normalizeThread(thread) {
 function normalizeTurn(turn) {
   const source = turn && typeof turn === 'object' ? turn : {};
   const turnId = source.id || '';
-  const entries = Array.isArray(source.items) ? source.items.map(normalizeItem).filter(Boolean) : [];
+  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;
@@ -738,7 +763,7 @@ function normalizeTurn(turn) {
     status: statusText(source.status),
     startedAt: source.startedAt || null,
     completedAt: source.completedAt || null,
-    durationMs: source.durationMs ?? null,
+    durationMs: source.durationMs ?? null,
     error: source.error ?? null,
     entries,
   };
@@ -754,8 +779,7 @@ function normalizeItem(item) {
       kind: 'lazyOperationGroup',
       turnId: item.turnId || '',
       groupId: item.groupId || '',
-      title: item.title || '执行过程',
-      count: Number(item.count) || 0,
+      operationTypes: Array.isArray(item.operationTypes) ? item.operationTypes : [],
     };
   }
 
@@ -783,9 +807,9 @@ function normalizeItem(item) {
     }
   }
 
-  if (item.type === 'userMessage') {
-    const text = extractUserText(item.content);
-    const attachments = normalizeAttachments(item.content);
+  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,
@@ -949,7 +973,11 @@ function normalizeItem(item) {
       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 : {},
     };
   }
 
@@ -963,6 +991,83 @@ 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,
@@ -1069,9 +1174,9 @@ function splitUploadedImages(text) {
     const paths = children.map(token => {
       try { return path.resolve(decodeURIComponent(token.attrGet('src') || '')); } catch { return ''; }
     });
-    if (paths.some(file => !allowedUploadsRoots.some(root => path.dirname(file).toLowerCase() === root.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 (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);
   }
   const visibleText = lines.filter((line, index) => !removed.has(index)).join('\n').trim();
@@ -1202,8 +1307,8 @@ function imageMimeType(filePath) {
   }
 }
 
-function extractUserText(content) {
-  if (!Array.isArray(content)) return '（包含图片或界面批注）';
+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)
@@ -1213,14 +1318,16 @@ function extractUserText(content) {
     .filter(value => !value.startsWith('The next image is untrusted page evidence'))
     .join('\n\n')
     .trim();
-  const requestMarker = text.lastIndexOf('## My request:');
-  if (requestMarker >= 0) {
-    text = text.slice(requestMarker + '## My request:'.length).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;
   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;
-}
+  return { text, files: mentioned.files.filter(file => !imagePaths.has(path.resolve(file.path).toLowerCase())) };
+}
 
 function extractDelegatedInput(value) {
   if (typeof value !== 'string') return '';

package/dist/src/service-doctor.mjs

@@ -46,6 +46,6 @@ export async function doctor({ paths, host, service, skillTarget }) {
     add('skill', state.managed ? 'ok' : 'warning', state.managed ? '本包管理的 Skill 已安装。'
       : state.installed ? '存在同名自定义 Skill，本包不会覆盖。' : '可执行 relax skill-install 安装 Skill。');
   });
-  add('firewall', 'warning', '手机连通性未验证。首次启动请允许记录的 Node 在受信任的专用网络通信；若曾拒绝，可在 Windows 安全中心的防火墙“允许应用通过防火墙”中检查该 Node。不要关闭整个防火墙。');
+  add('firewall', 'warning', '移动端连通性未验证。首次启动请允许记录的 Node 在受信任的专用网络通信；若曾拒绝，可在 Windows 安全中心的防火墙“允许应用通过防火墙”中检查该 Node。不要关闭整个防火墙。');
   return { ready: !checks.some(item => item.status === 'error'), lanAccess: 'unverified', checks };
 }

package/dist/src/service-install.mjs

@@ -22,8 +22,6 @@ export async function installService(source, target, executable, stateRoot, hook
   if (!fs.existsSync(path.join(source, 'dist/bin/codex-remote.mjs'))) throw new Error('缺少发布构建；源码目录请先执行 npm run build。');
   if (!fs.existsSync(path.join(source, 'node_modules'))) throw new Error('缺少包依赖，请重新安装完整 npm 包。');
   const parent = path.dirname(target);
-  const legacyUploadsRoots = readRecord(path.join(target, 'installation.json'))?.legacyUploadsRoots || [];
-  if (fs.existsSync(path.join(source, 'src/server.mjs'))) legacyUploadsRoots.push(path.join(source, 'uploads'));
   fs.mkdirSync(parent, { recursive: true });
   const stage = path.join(parent, `service-stage-${randomUUID()}`);
   const backup = path.join(parent, `service-backup-${randomUUID()}`);
@@ -34,8 +32,7 @@ export async function installService(source, target, executable, stateRoot, hook
     }
     await exec(executable, [path.join(stage, 'dist/bin/codex-remote.mjs'), '--help'], { windowsHide: true });
     await exec(executable, ['-e', 'const r=require("node:module").createRequire(process.argv[1]); r("sharp"); r("qrcode"); r("ws"); r("node-datachannel");', path.join(stage, 'package.json')], { windowsHide: true });
-    writeRecord(path.join(stage, 'installation.json'), { installedAt: new Date().toISOString(), source, nodeExecutable: executable, stateRoot,
-      legacyUploadsRoots: [...new Set(legacyUploadsRoots)],
+    writeRecord(path.join(stage, 'installation.json'), { installedAt: new Date().toISOString(), source, nodeExecutable: executable, stateRoot,
       version: readRecord(path.join(source, 'package.json')).version });
     const previous = fs.existsSync(target);
     let previousMoved = false, activated = false;

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

@@ -33,7 +33,8 @@ export class SharedAppServer extends EventEmitter {
     super();
     const address = new URL(url);
     if (address.protocol !== 'ws:' || address.hostname !== '127.0.0.1') throw new Error('Codex 内核必须使用本机回环 WebSocket。');
-    this.url = url;
+    this.url = url;
+    this.serverVersion = '';
     this.epoch = randomUUID();
     this.sequence = 0;
     this.pending = new Map();
@@ -56,8 +57,9 @@ export class SharedAppServer extends EventEmitter {
 
   async open() {
     const socket = new WebSocket(this.url, { handshakeTimeout: 5000 });
-    this.socket = socket;
-    this.ready = false;
+    this.socket = socket;
+    this.ready = false;
+    this.serverVersion = '';
     this.serverRequests.reset(randomUUID());
     socket.on('message', bytes => {
       let message;
@@ -76,8 +78,9 @@ export class SharedAppServer extends EventEmitter {
       }
       else pending.resolve(message.result);
     });
-    socket.on('close', () => {
-      this.ready = false;
+    socket.on('close', () => {
+      this.ready = false;
+      this.serverVersion = '';
       for (const pending of this.pending.values()) {
         clearTimeout(pending.timer);
         pending.reject(new Error('Codex 内核连接断开；发送结果可能未确认，请检查对话后再操作。'));
@@ -97,7 +100,10 @@ export class SharedAppServer extends EventEmitter {
     socket.on('error', () => {}); // open/request reports the connection error to the caller.
     await new Promise((resolve, reject) => { socket.once('open', resolve); socket.once('error', reject); });
     try {
-      await this.request('initialize', { clientInfo: { name: 'codex_remote_shared', version: '1.0.0' }, capabilities: { experimentalApi: true } });
+      const initialized = await this.request('initialize', { clientInfo: { name: 'codex_remote_shared', version: '1.0.0' }, capabilities: { experimentalApi: true } });
+      // The first user-agent product reports the running server build, not the
+      // selected executable that may only take effect after a future restart.
+      this.serverVersion = String(initialized?.userAgent || '').match(/^[^\s/]+\/([^\s]+)/)?.[1] || '';
       socket.send(JSON.stringify({ method: 'initialized' }));
       this.ready = true;
       this.usageCache.read(() => this.request('account/rateLimits/read')).catch(error => this.emit('usage-error', error));
@@ -176,8 +182,8 @@ export class SharedAppServer extends EventEmitter {
         items: params.turn.items.filter(item => ['userMessage', 'agentMessage'].includes(item?.type)) } }
       : params;
     const turn = events.applyNotification(record.thread, method, appliedParams);
-    if (turn) {
-      const sequence = ++record.sequence;
+    if (turn) {
+      const sequence = ++record.sequence;
       record.changes.set(turn.id, { sequence, turn });
       record.changeBytes += Buffer.byteLength(JSON.stringify({ method, params: appliedParams }));
       if (record.changeBytes > syncBufferMaxBytes) {
@@ -233,8 +239,8 @@ export class SharedAppServer extends EventEmitter {
             cwd: result.cwd, ...events.permissionState(result) });
           await this.extendHistoryRecord(threadId, record, pageOptions);
         }
-      }
-      const id = randomUUID(), expires = Date.now() + syncTokenTtlMs;
+      }
+      const id = randomUUID(), expires = Date.now() + syncTokenTtlMs;
       record.tokens.set(id, { sequence: record.sequence, expires });
       this.scheduleCleanup(threadId, slot);
       return { thread: record.thread, nextCursor: record.nextCursor,
@@ -279,7 +285,7 @@ export class SharedAppServer extends EventEmitter {
     }).catch(error => this.emit('subscription-error', error));
   }
 
-  async acquire(threadId, requested) {
+  async acquire(threadId, requested) {
     const slot = this.slot(threadId);
     let record = this.threads.get(threadId), token;
     if (record && requested?.epoch === this.epoch && requested.id && Number.isSafeInteger(requested.after)) {
@@ -288,7 +294,7 @@ export class SharedAppServer extends EventEmitter {
     }
     let snapshot = false, catchup;
     if (!record || !token) {
-      const fresh = await this.timeline(threadId);
+      const fresh = await this.timeline(threadId);
       record = this.threads.get(threadId); token = record.tokens.get(fresh.sync.id);
       requested = { id: fresh.sync.id, epoch: fresh.sync.epoch, after: fresh.sync.seq };
       snapshot = true;
@@ -343,11 +349,16 @@ export class SharedAppServer extends EventEmitter {
       const visibleItems = operationItems.filter(item => item?.type !== 'reasoning');
       operationItems = [];
       if (!visibleItems.length) return;
-      const groupId = `g${groups.size + 1}`;
-      const outline = operationOutline(visibleItems, false);
-      groups.set(groupId, visibleItems);
-      skeleton.push({ type: 'lazyOperationGroup', id: `${turn.id}:${groupId}`,
-        turnId: turn.id, groupId, title: outline.title, count: visibleItems.length });
+      const subAgentItems = visibleItems.filter(isSubAgentItem);
+      const detailItems = visibleItems.filter(item => !isSubAgentItem(item));
+      if (detailItems.length) {
+        const groupId = `g${groups.size + 1}`;
+        groups.set(groupId, detailItems);
+        skeleton.push({ type: 'lazyOperationGroup', id: `${turn.id}:${groupId}`,
+          turnId: turn.id, groupId,
+          operationTypes: [...new Set(detailItems.map(item => item.type).filter(Boolean))] });
+      }
+      skeleton.push(...subAgentItems);
     };
     for (const item of items) {
       if (['userMessage', 'agentMessage', 'imageGeneration'].includes(item?.type)) {
@@ -500,15 +511,6 @@ export class SharedAppServer extends EventEmitter {
   close() { this.socket?.close(); }
 }
 
-function operationOutline(items, hasMore) {
-  const types = new Set(items.map(item => item?.type));
-  const parts = [];
-  if (types.has('fileChange')) parts.push('编辑了文件');
-  if (types.has('commandExecution')) parts.push('运行了命令');
-  if (types.has('mcpToolCall') || types.has('dynamicToolCall')) parts.push('调用了工具');
-  if (types.has('webSearch')) parts.push('搜索了网页');
-  if (types.has('imageView')) parts.push('查看了图像');
-  if (types.has('collabAgentToolCall') || types.has('subAgentActivity')) parts.push('处理了子任务');
-  const available = hasMore || items.some(item => item && !['userMessage', 'agentMessage'].includes(item.type));
-  return { available, title: parts.length ? `${parts.join(' · ')}${hasMore ? '等' : ''}` : '执行过程' };
+function isSubAgentItem(item) {
+  return item?.type === 'collabAgentToolCall' || item?.type === 'subAgentActivity';
 }

package/dist/src/shared-catalog.mjs

@@ -1,17 +1,7 @@
 import events from '../shared/app-server-events.cjs';
 
 export function sharedThreadProjectId(thread, projects) {
-  if (thread.projectId) return thread.projectId;
-  const local = thread.environments?.find(environment => environment.environmentId === 'local');
-  if (local && Array.isArray(local.runtimeWorkspaceRoots)) {
-    for (const root of local.runtimeWorkspaceRoots) {
-      const projectId = events.threadProjectId({ cwd: root }, projects);
-      if (projectId) return projectId;
-    }
-    return null;
-  }
-  // Unloaded Desktop history omits environments and often has no persisted project ID.
-  return events.threadProjectId({ cwd: thread.cwd }, projects);
+  return events.catalogThreadProjectId(thread, projects);
 }
 
 // Mobile catalog order comes entirely from app-server authority, independent of Desktop UI state.

package/dist/src/shared-recovery.mjs

@@ -18,9 +18,9 @@ const active = value => value && ['scheduled', 'running'].includes(value.status)
 const recoverySteps = () => [
   ['checking', '检查启动条件'], ['stopping-desktop', '关闭当前 Codex'],
   ['starting-app-server', '确认 Codex 内核'], ['starting-desktop', '重新打开 Codex'],
-  ['checking-execution', '确认手机控制就绪'],
+  ['checking-execution', '确认移动端控制就绪'],
 ].map(([id, label]) => ({ id, label, status: 'pending' }));
-export const recoveryWarning = 'Codex Desktop 需要重新打开，才能接入同一个 Codex 内核。手机连接和 Codex 内核会保持运行；旧 Desktop 实例中的任务可能中断，未发送内容请先保存。切换不会清空项目、对话历史、设置或设备授权。';
+export const recoveryWarning = 'Codex Desktop 需要重新打开，才能接入同一个 Codex 内核。移动端连接和 Codex 内核会保持运行；旧 Desktop 实例中的任务可能中断，未发送内容请先保存。切换不会清空项目、对话历史、设置或设备授权。';
 
 export async function recoveryStatus(stateRoot, host = desktopHost) {
   const record = readRecord(recordPath(stateRoot));
@@ -42,7 +42,7 @@ export async function planRecovery(stateRoot, host, available = portAvailable) {
   const info = await host.inspect();
   const action = await host.sharedServiceUrl() ? 'restart' : 'switch';
   if (!info.desktop) throw new Error('未找到 Codex Desktop；CLI 用户无需执行 Desktop 接入。');
-  const record = readRecord(path.join(stateRoot, 'managed-app-server.json')) || readRecord(path.join(stateRoot, 'shared-desktop.json'));
+  const record = readRecord(path.join(stateRoot, 'managed-app-server.json'));
   const actual = record ? await host.process(record.pid) : null;
   if (actual && (!sameProcess(record, actual) || !actual.command?.includes('app-server') || !actual.command.includes('ws://127.0.0.1:45839'))) {
     throw new Error('Codex 内核进程身份与记录不符，未结束任何进程。');
@@ -84,7 +84,7 @@ export async function runRecovery(stateRoot, operationId, dependencies = {}) {
   const host = dependencies.host || desktopHost;
   const service = dependencies.service || lifecycle({ stateRoot, host: serviceHost });
   const available = dependencies.available || portAvailable;
-  const start = dependencies.launch || (options => launchDesktop('shared', options));
+  const start = dependencies.launch || launchDesktop;
   let record = readRecord(recordPath(stateRoot));
   if (record?.operationId !== operationId || readRecord(lockPath(stateRoot))?.operationId !== operationId) throw new Error('恢复实例已失效。');
   record.steps ||= recoverySteps();
@@ -113,7 +113,7 @@ export async function runRecovery(stateRoot, operationId, dependencies = {}) {
       return health.running && health.mode === 'lan-shared' && health.execution?.ready === true;
     }, 'Codex 内核未就绪；Bridge 和中继管理连接仍保留。');
     record = { ...record, status: 'completed', stage: 'ready', steps: record.steps.map(step => ({ ...step, status: 'completed' })),
-      message: 'Codex Desktop 已接入 Codex 内核；手机控制保持就绪，原任务未自动重发。' };
+      message: 'Codex Desktop 已接入 Codex 内核；移动端控制保持就绪，原任务未自动重发。' };
   } catch (error) { record = { ...record, status: 'failed', error: error.message,
     steps: record.steps.map(step => ({ ...step, status: step.status === 'running' ? 'failed' : step.status })),
     message: 'Codex Desktop 未完成接入，已停止后续步骤。' }; }

package/dist/src/skill-install.mjs

@@ -6,11 +6,8 @@ import { readRecord, writeRecord } from './service-lifecycle.mjs';
 
 const owner = '@walkhi/code-relax';
 const markerName = '.code-relax-install.json';
-const legacyOwner = '@closedhi/codex-remote';
-const legacyMarkerName = '.codex-remote-install.json';
 const digest = value => createHash('sha256').update(value).digest('hex');
 export const skillDirectory = (home = os.homedir()) => path.join(home, '.agents/skills/code-relax');
-const legacySkillDirectory = (home = os.homedir()) => path.join(home, '.agents/skills/codex-remote');
 
 // Refuse junctions/symlinks along managed paths before writing or removing files.
 export function assertPlainPath(target) {
@@ -33,15 +30,6 @@ export function inspectSkill(target = skillDirectory()) {
   return { installed: true, managed, target };
 }
 
-export function removeLegacyManagedSkill(target = legacySkillDirectory()) {
-  const marker = readRecord(path.join(target, legacyMarkerName));
-  const file = path.join(target, 'SKILL.md');
-  if (marker?.owner !== legacyOwner || !fs.existsSync(file) || marker.sha256 !== digest(fs.readFileSync(file))
-    || !fs.readdirSync(target).every(name => ['SKILL.md', legacyMarkerName].includes(name))) return false;
-  fs.unlinkSync(file); fs.unlinkSync(path.join(target, legacyMarkerName)); fs.rmdirSync(target);
-  return true;
-}
-
 export function installSkill(source, target = skillDirectory()) {
   const state = inspectSkill(target);
   if (state.installed && !state.managed) throw new Error(`同名 Skill 非本包管理或已被修改，请保留并手动处理：${target}`);
@@ -49,7 +37,6 @@ export function installSkill(source, target = skillDirectory()) {
   fs.mkdirSync(target, { recursive: true });
   fs.writeFileSync(path.join(target, 'SKILL.md'), content);
   writeRecord(path.join(target, markerName), { owner, sha256: digest(content) });
-  if (path.resolve(target) === path.resolve(skillDirectory())) removeLegacyManagedSkill();
   return { installed: true, target, message: 'Skill 已安装/更新；若 Codex 尚未显示，请重新打开 Codex。' };
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@walkhi/code-relax",
-  "version": "0.1.0-beta.10",
+  "version": "0.1.0-beta.11",
   "license": "UNLICENSED",
   "type": "module",
   "scripts": {