@walkhi/code-relax 0.1.0-beta.6 → 0.1.0-beta.65

package/dist/src/desktop-launcher.mjs

@@ -1,51 +1,62 @@
 import fs from 'node:fs';
 import path from 'node:path';
 import { setTimeout as delay } from 'node:timers/promises';
-import { readRecord, writeRecord } from './service-lifecycle.mjs';
-import { ManagedAppServer, managedAppServerUrl as sharedUrl, managedPortAvailable as portAvailable } from './managed-app-server.mjs';
+import { readRecord, lifecycle } from './service-lifecycle.mjs';
+import * as serviceHost from './platform/service-host.mjs';
+import { managedPortAvailable as portAvailable } from './managed-app-server.mjs';
+import { readManagedEndpoint } from './managed-endpoint.mjs';
 export { portAvailable };
-export async function launchDesktop(mode, { stateRoot, host, environment = process.env, available = portAvailable, wait = delay, timeout = 30000, recoveryId, progress = () => {} }) {
-  if (!['shared', 'ordinary'].includes(mode)) throw new Error('无效的 Desktop 启动模式。');
+function desktopEnvironment(stateRoot, environment) {
+  const childEnv = { ...environment };
+  for (const key of ['CODEX_APP_SERVER_WS_URL', 'CODEX_APP_SERVER_FORCE_CLI', 'CODEX_APP_TOOLS_PIPE_PATH']) delete childEnv[key];
+  const runtime = readRecord(path.join(stateRoot, 'codex-runtime.json'));
+  if (runtime?.codexHome) childEnv.CODEX_HOME = runtime.codexHome;
+  childEnv.CODEX_APP_SERVER_WS_URL = readManagedEndpoint(stateRoot);
+  return childEnv;
+}
+
+// Opening the optional UI does not start, restart or supervise the kernel.
+export async function startDesktop({ stateRoot, host, environment = process.env, restart = false }) {
+  const info = await host.inspect();
+  if (!info.desktop) throw new Error('未安装 Codex 桌面端。');
+  if (info.running && !restart) return { status: 'running', message: 'Codex 桌面端已启动。' };
+  if (info.running) await host.closeDesktop(info.desktop);
+  await host.startDesktop(info.desktop, desktopEnvironment(stateRoot, environment));
+  return { status: 'accepted', message: restart ? '已提交 Codex 桌面端重启请求。' : '已提交 Codex 桌面端启动请求。' };
+}
+
+export async function launchDesktop({ stateRoot, host, environment = process.env, wait = delay, timeout = 30000, recoveryId, progress = () => {}, service = lifecycle({ stateRoot, host: serviceHost }) }) {
   fs.mkdirSync(stateRoot, { recursive: true });
   const recovery = readRecord(path.join(stateRoot, 'shared-recovery.lock'));
-  if (recovery && recovery.operationId !== recoveryId) throw new Error('完整控制正在启动，请先查看 shared-recovery-status。');
-  const lock = path.join(stateRoot, 'desktop-launch.lock');
+  if (recovery && recovery.operationId !== recoveryId) throw new Error('Codex 内核正在启动，请用 relax doctor 查看恢复状态。');
+  const lock = path.join(stateRoot, 'desktop-launch.lock');
   let descriptor;
-  let managed;
-  try { descriptor = fs.openSync(lock, 'wx'); }
-  catch (error) {
-    if (error.code === 'EEXIST') throw new Error('另一个 Desktop 启动操作正在进行；若上次异常退出，请确认没有启动器运行后移除 desktop-launch.lock。');
-    throw error;
-  }
-  try {
-    const info = await host.inspect();
-    const connected = await host.sharedServiceUrl();
-    if (info.running) {
-      if ((mode === 'shared') === Boolean(connected)) {
-        writeRecord(path.join(stateRoot, 'execution-mode.json'), { mode });
-        return { reused: true, mode };
-      }
-      throw new Error('请先保存任务并完全退出 Codex Desktop，再切换模式；不会自动结束正在运行的任务。');
-    }
-    const childEnv = { ...environment };
-    for (const key of ['CODEX_APP_SERVER_WS_URL', 'CODEX_APP_SERVER_FORCE_CLI', 'CODEX_APP_TOOLS_PIPE_PATH']) delete childEnv[key];
-    if (mode === 'shared') {
-      progress('starting-app-server');
-      managed = new ManagedAppServer({ stateRoot, host, environment, available, wait, timeout });
-      if (!await managed.start()) throw new Error(managed.snapshot().error || '受管 app-server 未就绪。');
-      childEnv.CODEX_APP_SERVER_WS_URL = sharedUrl;
-    }
-    // Ordinary Desktop must not terminate a shared server that may still be executing tasks.
+  try { descriptor = fs.openSync(lock, 'wx'); }
+  catch (error) {
+    if (error.code === 'EEXIST') throw new Error('另一个 Desktop 启动操作正在进行；若上次异常退出，请确认没有启动器运行后移除 desktop-launch.lock。');
+    throw error;
+  }
+  try {
+    const info = await host.inspect();
+    if (!info.desktop) throw new Error('未安装 Codex Desktop，请使用 relax start 启动工作站。');
+    const connected = await host.sharedServiceUrl();
+    if (info.running) {
+      if (connected) return { reused: true };
+      throw new Error('请先保存任务并完全退出 Codex Desktop，再接入 Codex 内核；不会自动结束正在运行的任务。');
+    }
+    progress('starting-app-server');
+    const health = await service.status();
+    if (!health.running || !health.managedAppServer?.ready) throw new Error(health.managedAppServer?.error || '工作站 Codex 内核未就绪。');
+    const childEnv = desktopEnvironment(stateRoot, environment);
     progress('starting-desktop');
-    await host.start(info.desktop, [], childEnv, []);
-    const deadline = Date.now() + timeout;
-    while (true) {
-      const ready = mode === 'shared' ? await host.sharedServiceUrl() : (await host.inspect()).running;
-      if (ready) break;
-      if (Date.now() >= deadline) throw new Error('Desktop 尚未按所选模式就绪，未启动 Bridge。请查看 Desktop 窗口后重试。');
-      await wait(500);
-    }
-    writeRecord(path.join(stateRoot, 'execution-mode.json'), { mode });
-    return { reused: false, mode };
-  } finally { managed?.close(); fs.closeSync(descriptor); fs.rmSync(lock, { force: true }); }
+    await host.startDesktop(info.desktop, childEnv);
+    const deadline = Date.now() + timeout;
+    while (true) {
+      const ready = await host.desktopReady();
+      if (ready) break;
+      if (Date.now() >= deadline) throw new Error('Desktop 尚未接入 Codex 内核。请查看 Desktop 窗口后重试。');
+      await wait(500);
+    }
+    return { reused: false };
+  } finally { fs.closeSync(descriptor); fs.rmSync(lock, { force: true }); }
 }

package/dist/src/dots-approval-timeline.mjs

@@ -0,0 +1,99 @@
+const itemTime = item => item.dotsReceipt?.sentAt ? Date.parse(item.dotsReceipt.sentAt)
+  : item.startedAtMs ?? item.receivedAtMs;
+const terminal = status => ['resolved', 'expired'].includes(status);
+
+// Approval records have their own official room source. Keep them with the
+// account-scoped hosted cache, then place them in the chat's observed positions.
+export class DotsApprovalTimeline {
+  constructor(server) { this.server = server; this.states = new Map(); }
+
+  async state(threadId) {
+    const scope = this.server.historyScope(threadId);
+    if (!scope) throw new Error('读取点点审批历史需要账号身份。');
+    let state = this.states.get(scope);
+    if (!state) {
+      state = { scope, threadId, epoch: this.server.epoch, records: new Map() };
+      state.ready = (async () => {
+        const saved = await this.server.historyCache?.get(scope, 'approval-records');
+        for (const record of saved?.data || []) {
+          // A display record never reactivates an old pending request.
+          state.records.set(this.key(record), terminal(record.status) ? record : { ...record, status: 'expired' });
+        }
+      })();
+      this.states.set(scope, state);
+    }
+    await state.ready;
+    this.check(threadId, state);
+    return state;
+  }
+
+  check(threadId, state) {
+    if (state.scope !== this.server.historyScope(threadId) || state.epoch !== this.server.epoch) throw new Error('点点审批历史的账号连接已变化。');
+  }
+
+  key(item) { return JSON.stringify([typeof item.requestId, item.requestId]); }
+
+  merge(state, incoming) {
+    let changed = false;
+    for (const item of incoming) {
+      const key = this.key(item), previous = state.records.get(key);
+      const merged = { ...previous, ...item, id: previous?.id || item.id,
+        receivedAtMs: previous?.receivedAtMs ?? item.receivedAtMs,
+        ...(previous?.result && item.result == null ? { result: previous.result } : {}),
+        ...(previous?.afterItemId ? { afterItemId: previous.afterItemId } : {}) };
+      if (JSON.stringify(previous) !== JSON.stringify(merged)) { state.records.set(key, merged); changed = true; }
+    }
+    return changed;
+  }
+
+  save(state) {
+    return this.server.historyCache?.put(state.scope, 'approval-records', { data: [...state.records.values()] });
+  }
+
+  targets(sourceThreadId) {
+    return [...this.states.values()].filter(state => state.scope === this.server.historyScope(state.threadId)
+      && [...state.records.values()].some(record => record.params.threadId === sourceThreadId)).map(state => state.threadId);
+  }
+
+  async observe(threadId, records, turns) {
+    const state = await this.state(threadId);
+    const incoming = records.map(record => {
+      const turn = turns?.find(turn => turn.id === record.turnId);
+      const afterItemId = turn?.items.filter(item => item.type !== 'approval').at(-1)?.id;
+      return { ...record, ...(afterItemId ? { afterItemId } : {}) };
+    });
+    if (this.merge(state, incoming)) await this.save(state);
+    this.check(threadId, state);
+  }
+
+  overlay(threadId, turns, range = {}) {
+    const state = this.states.get(this.server.historyScope(threadId));
+    if (!state) return turns;
+    const ids = new Set([...state.records.values()].map(item => item.id));
+    const result = turns.map(turn => ({ ...turn, items: turn.items.filter(item => item.type !== 'approval' || !ids.has(item.id)) }));
+    for (const approval of [...state.records.values()].sort((a, b) => a.receivedAtMs - b.receivedAtMs)) {
+      if (Number.isFinite(range.fromMs) && approval.receivedAtMs < range.fromMs
+        || Number.isFinite(range.toMs) && approval.receivedAtMs > range.toMs) continue;
+      let turn = result.find(turn => turn.id === approval.roomMessageId || turn.id === approval.turnId);
+      if (!turn) {
+        if (!Number.isFinite(range.fromMs)) continue;
+        const positions = result.flatMap(turn => turn.items.map(item => ({ turn, item, time: itemTime(item) })))
+          .filter(position => Number.isFinite(position.time));
+        turn = positions.filter(position => position.time <= approval.receivedAtMs).at(-1)?.turn || positions[0]?.turn;
+      }
+      if (!turn) continue;
+      const after = turn.items.findIndex(item => item.id === approval.afterItemId);
+      if (after >= 0) {
+        let index = after + 1;
+        while (turn.items[index]?.type === 'approval' && turn.items[index].receivedAtMs <= approval.receivedAtMs) index++;
+        turn.items.splice(index, 0, approval);
+      } else {
+        const next = turn.items.findIndex(item => Number.isFinite(itemTime(item)) && itemTime(item) > approval.receivedAtMs);
+        turn.items.splice(next < 0 ? turn.items.length : next, 0, approval);
+      }
+    }
+    return result;
+  }
+
+  clear() { this.states.clear(); }
+}

package/dist/src/dots-avatar.mjs

@@ -0,0 +1,42 @@
+import sharp from 'sharp';
+
+// Resolve Desktop's saved snapshot on the workstation. Signed URLs never go to the phone.
+export function createDotsAvatarReader(localServer) {
+  const cache = new Map();
+  return async (profile, identity) => {
+    if (!profile.avatarFileId) return '';
+    const key = JSON.stringify([identity.accountId, identity.userId, profile.avatarFileId]);
+    if (!cache.has(key)) {
+      const work = (async () => {
+        const auth = await localServer.request('getAuthStatus', { includeToken: true, refreshToken: false });
+        const principal = JSON.parse(Buffer.from(auth.authToken.split('.')[1], 'base64url'))['https://api.openai.com/auth'];
+        if (principal?.chatgpt_account_id !== identity.accountId || principal.chatgpt_user_id !== identity.userId) {
+          throw new Error('头像账号已变化，请刷新对话。');
+        }
+        const response = await fetch(`https://chatgpt.com/backend-api/files/download/${encodeURIComponent(profile.avatarFileId)}?download_intent=false&inline=true`, {
+          headers: { Authorization: `Bearer ${auth.authToken}`, 'ChatGPT-Account-Id': identity.accountId },
+          redirect: 'error', signal: AbortSignal.timeout(15000),
+        });
+        if (!response.ok) { await response.body?.cancel(); throw new Error(`点点头像资料读取失败（${response.status}）`); }
+        const { download_url: downloadUrl } = await response.json();
+        const url = new URL(downloadUrl);
+        const authenticated = url.origin === 'https://chatgpt.com' && url.pathname === '/backend-api/estuary/content';
+        if (url.protocol !== 'https:' || !(authenticated || url.hostname.endsWith('.oaiusercontent.com'))) throw new Error('点点头像下载地址无效。');
+        const image = await fetch(url, { redirect: 'error', signal: AbortSignal.timeout(15000),
+          ...(authenticated ? { headers: { Authorization: `Bearer ${auth.authToken}`, 'ChatGPT-Account-Id': identity.accountId } } : {}) });
+        if (!image.ok) { await image.body?.cancel(); throw new Error(`点点头像下载失败（${image.status}）`); }
+        const chunks = []; let size = 0;
+        for await (const chunk of image.body) {
+          size += chunk.length;
+          if (size > 4 * 1024 * 1024) throw new Error('点点头像超过 4 MiB。');
+          chunks.push(chunk);
+        }
+        const thumbnail = await sharp(Buffer.concat(chunks)).resize(96, 96, { fit: 'inside', withoutEnlargement: true }).webp().toBuffer();
+        return `data:image/webp;base64,${thumbnail.toString('base64')}`;
+      })();
+      cache.set(key, work);
+      work.catch(() => { if (cache.get(key) === work) cache.delete(key); });
+    }
+    return cache.get(key);
+  };
+}

package/dist/src/dots-chat-projection.mjs

@@ -0,0 +1,50 @@
+import { createHash } from 'node:crypto';
+import { dotsImageReference } from './dots-message-images.mjs';
+
+const nonempty = value => typeof value === 'string' && value.trim().length > 0;
+
+export function dotsChatRevision(turns) {
+  const latest = dotsChatTailRevision(turns);
+  const message = dotsChatMessageRevision(turns);
+  // A message can keep streaming while a later agent action is already visible.
+  return !latest || latest === message ? latest
+    : createHash('sha256').update(JSON.stringify([latest, message])).digest('hex');
+}
+
+// A bounded disk-head probe compares the same last visible item on both sides.
+// The full transcript revision also tracks an earlier streaming message.
+export function dotsChatTailRevision(turns) {
+  return chatItemRevision(turns.at(-1)?.items.at(-1));
+}
+
+export function dotsChatMessageRevision(turns) {
+  for (let turnIndex = turns.length - 1; turnIndex >= 0; turnIndex--) {
+    const items = turns[turnIndex].items;
+    for (let itemIndex = items.length - 1; itemIndex >= 0; itemIndex--) {
+      const item = items[itemIndex];
+      if (item.type === 'userMessage' || item.type === 'agentMessage') return chatItemRevision(item);
+    }
+  }
+  // A recent window containing only agent actions cannot acknowledge a chat message.
+  return undefined;
+}
+
+function chatItemRevision(item) {
+  if (!item) return '';
+  const content = item.type === 'userMessage' ? item.content.map(part => {
+    const reference = dotsImageReference(part);
+    if (!reference?.url) return part;
+    // Renewing an official storage signature does not create a new message.
+    const url = new URL(reference.url);
+    return { ...part, url: url.origin + url.pathname };
+  }) : item.type === 'subAgentActivity' ? [item.kind, item.agentThreadId, item.agentPath]
+    : [item.text || '', item.attachments || []];
+  // Identity and displayed content survive reconnects; internal work does not affect this marker.
+  return createHash('sha256').update(JSON.stringify([item.id, item.type, content])).digest('hex');
+}
+// Execution events remain separate from room user/agent messages.
+export function projectDotsChatItem(item) {
+  if (item?.type !== 'subAgentActivity' || !nonempty(item.id) || !nonempty(item.agentThreadId)
+    || !['started', 'interacted', 'completed', 'interrupted'].includes(item.kind)) return null;
+  return { type: item.type, id: item.id, kind: item.kind, agentThreadId: item.agentThreadId, agentPath: item.agentPath || '' };
+}