orbit-codex-bridge 0.1.3 → 0.1.6

package/README.md

@@ -30,15 +30,15 @@ orbit login
 1. 命令会打开电脑授权页面，登录或注册 Orbit 账号，确认添加这台电脑。
 2. 手机打开 [orbit.cubesugar.tech](https://orbit.cubesugar.tech)，登录同一账号。
 3. 登录后选择这台电脑；账号会自动完成安全配对，无需扫码或输入本机密钥。
-4. 选择原有会话，开始使用。尚未加载的会话可先在 Codex 桌面打开，再点“重新连接”。
+4. 选择任意普通原有会话即可连接。Orbit 优先接入 Codex 桌面当前执行者；桌面未加载时尝试由 Codex App Server 按原会话 ID 接续，不会新建对话。若该会话仍被其他执行者占用，会明确提示并拒绝重复写入。
 
-授权信息保存在电脑本地，下次启动会自动复用。连接器默认在当前用户的后台运行，可以关闭安装终端；断网后自动重连，工作进程异常退出后自动恢复。电脑需要保持开机、联网，Codex 桌面需要保持运行。电脑重启后运行 `orbit start` 恢复连接。
+授权信息保存在电脑本地，下次启动会自动复用。连接器默认在当前用户的后台运行，可以关闭安装终端；断网后自动重连，工作进程异常退出后自动恢复。电脑需要保持开机、联网。桌面热接管需 Codex 桌面运行；若会话未由桌面持有，则尝试通过 Codex App Server 按原 ID 接续。电脑重启后运行 `orbit start` 恢复连接。
 
 ## 会话输入
 
 - `普通`：按原会话的 Codex 模型、权限和设置继续。
-- `计划`：使用 Codex 原生 Plan 协作模式开始新一轮；不会改动正在运行的轮次。
-- `目标（本轮）`：将本轮消息作为明确目标继续推进。本版桌面 IPC 尚未开放持久 Goal 状态 API，因此不会伪装成 Codex 侧的长期目标追踪。
+- `计划`：通过 Codex App Server `turn/start.collaborationMode` 或桌面 IPC 使用原生 Plan 协作模式；不会要求切回电脑，也不会改动正在运行的轮次。
+- `目标`：通过 Codex 原生 `thread/goal/*` API 为原会话设置持久 Goal，支持预算、暂停、继续和清除；桌面 owner 模式可查看目标状态，但当前 IPC 不公开 Goal 写操作，因此需在 Codex 桌面管理。
 - `添加文件`：每次最多 5 个、每个最多 8 MiB。文件经账号设备中继传到本机，并暂存在项目内 `.orbit-attachments`；Codex 读取原路径。待发送文件 30 分钟清理，已发送文件保留最多 24 小时，任务完成后会提前删除。
 - `电脑文件`：浏览当前会话项目并下载文件；限制在项目根目录内，排除 `.git`、`.codex`、密钥/环境文件和符号链接，单文件最大 8 MiB。
 - 文件附件仅支持已登录账号、在线的自有电脑，以及已加载并已自动热接管的 Codex 桌面原会话。归档会话、子代理和独立续接不支持。

package/lib/desktop.mjs

@@ -233,7 +233,16 @@ export class DesktopRpc extends EventEmitter {
     }
     if (this.attaching.has(id)) return this.attaching.get(id);
     const operation = (async () => {
-      const owner = await this.request('thread-owner-discovery', { conversationId: id, hostId: 'local' });
+      let owner=null;
+      for(let attempt=0;attempt<2;attempt++){
+        try{
+          owner=await this.request('thread-owner-discovery',{conversationId:id,hostId:'local'});
+        }catch(error){
+          if(error.code!=='DESKTOP_THREAD_UNAVAILABLE'||attempt===1)throw error;
+        }
+        if(owner?.ownerClientId)break;
+        if(attempt===0)await new Promise(resolve=>setTimeout(resolve,180));
+      }
       if (!owner.ownerClientId) throw new DesktopUnavailableError('这条原会话尚未在 Codex 桌面加载。请在电脑上打开它，再点击“重新连接”。');
       const result = await this.request('thread-follower-read-model-settings', { conversationId: id }, owner.ownerClientId);
       if (result.settings?.resumeState !== 'resumed') throw new Error('桌面会话尚未就绪，请先在 Codex 中打开。');

package/lib/resume-manager.mjs

@@ -0,0 +1,177 @@
+import { EventEmitter } from 'node:events';
+import { CodexRpc } from './rpc.mjs';
+
+export class ResumeManager extends EventEmitter {
+  constructor({ home, createRpc = () => new CodexRpc({ home }) } = {}) {
+    super();
+    this.home = home;
+    this.createRpc = createRpc;
+    this.sessions = new Map();
+    this.pending = new Map();
+  }
+
+  has(id) {
+    return this.sessions.has(id);
+  }
+
+  ids() {
+    return [...this.sessions.keys()];
+  }
+
+  rpcFor(id) {
+    return this.sessions.get(id)?.rpc || null;
+  }
+
+  rpcForApproval(requestId) {
+    for (const { rpc } of this.sessions.values()) if (rpc.approvals.has(String(requestId))) return rpc;
+    return null;
+  }
+
+  runtime(id) {
+    const session = this.sessions.get(id);
+    const thread = session?.rpc.threads.get(id);
+    if (!session || !thread) return null;
+    return {
+      threadId:id, attached:Boolean(session.rpc.connected), mode:'same-id-resume',
+      ownerClientId:null, connectionId:null, turnId:thread.turnId || null, revision:null,
+      permissionMode:thread.writable ? 'workspace-write' : 'read-only',
+      model:session.model || null, effort:null, collaborationMode:'default',
+      goal:session.goal || null, context:null, messages:[],
+      approvals:[...session.rpc.approvals.values()]
+        .filter(request => request.params?.threadId === id)
+        .map(request => ({ ...request.params, requestId:String(request.id), method:request.method }))
+    };
+  }
+
+  async resume(id, { model = null } = {}) {
+    const current = this.sessions.get(id);
+    if (current) {
+      if (!current.closing) {
+        current.releaseWhenIdle = false;
+        return this.runtime(id);
+      }
+      await current.closing;
+    }
+    const pending = this.pending.get(id);
+    if (pending) return pending;
+
+    const operation = (async () => {
+      const rpc = this.createRpc({ home:this.home, threadId:id });
+      try {
+        await rpc.resume(id, true);
+        const goalResult = typeof rpc.request === 'function'
+          ? await rpc.request('thread/goal/get', { threadId:id }).catch(() => ({ goal:null }))
+          : { goal:null };
+        const session = { id, rpc, model, goal:goalResult.goal || null, releaseWhenIdle:false, closing:null, eventListener:null };
+        session.eventListener = event => this.onEvent(session, event);
+        rpc.on('event', session.eventListener);
+        this.sessions.set(id, session);
+        this.emit('event', { method:'orbit/engine', params:{
+          connected:true, mode:'desktop', desktopConnected:false, resumedConnected:true
+        } });
+        return this.runtime(id);
+      } catch (error) {
+        await rpc.close();
+        if (/already has an active writer/i.test(error.message)) {
+          throw Object.assign(new Error('这条原会话仍由 Codex 桌面或其他执行器占用；未启动第二个执行器。请稍后重试。'), { code:'DESKTOP_THREAD_BUSY' });
+        }
+        throw error;
+      }
+    })();
+    this.pending.set(id, operation);
+    try { return await operation; }
+    finally { if (this.pending.get(id) === operation) this.pending.delete(id); }
+  }
+
+  onEvent(session, event) {
+    if (event.method === 'thread/goal/updated' && event.params?.threadId === session.id) {
+      session.goal = event.params.goal || null;
+      this.emit('event', event);
+      return;
+    }
+    if (event.method === 'thread/goal/cleared' && event.params?.threadId === session.id) {
+      session.goal = null;
+      this.emit('event', event);
+      return;
+    }
+    if (event.method === 'orbit/engine') {
+      if (!event.params?.connected && !session.closing) {
+        this.sessions.delete(session.id);
+        this.emit('released', session.id);
+        this.emit('lost', session.id, '本机 Codex App Server 已断开；请重新连接这条原会话。', 'APP_SERVER_DISCONNECTED');
+        this.emit('event', { method:'orbit/desktop', params:{
+          threadId:session.id, mode:'same-id-resume', attached:false, turnId:null,
+          reason:'本机 Codex App Server 已断开；请重新连接这条原会话。',
+          reasonCode:'APP_SERVER_DISCONNECTED'
+        } });
+        this.emit('event', { method:'orbit/engine', params:{
+          connected:this.sessions.size>0, mode:'desktop', desktopConnected:false,
+          resumedConnected:this.sessions.size>0
+        } });
+      }
+      return;
+    }
+    this.emit('event', event);
+    if (event.method === 'turn/completed' && event.params?.threadId === session.id
+      && session.releaseWhenIdle && !session.rpc.threads.get(session.id)?.turnId) {
+      void this.closeSession(session);
+    }
+  }
+
+  async setGoal(id, { objective, tokenBudget = null }) {
+    const session = this.sessions.get(id);
+    if (!session || session.closing) throw new Error('原会话 App Server 接续已失效，请重新连接。');
+    const result = await session.rpc.request('thread/goal/set', {
+      threadId:id, origin:'user', objective, status:'active', tokenBudget
+    });
+    session.goal = result.goal;
+    return result.goal;
+  }
+
+  async setGoalStatus(id, status) {
+    const session = this.sessions.get(id);
+    if (!session || session.closing) throw new Error('原会话 App Server 接续已失效，请重新连接。');
+    const result = await session.rpc.request('thread/goal/set', { threadId:id, origin:'user', status });
+    session.goal = result.goal;
+    return result.goal;
+  }
+
+  async clearGoal(id) {
+    const session = this.sessions.get(id);
+    if (!session || session.closing) throw new Error('原会话 App Server 接续已失效，请重新连接。');
+    const result = await session.rpc.request('thread/goal/clear', { threadId:id, origin:'user' });
+    if (result.cleared) session.goal = null;
+    return result;
+  }
+
+  async release(id) {
+    const session = this.sessions.get(id);
+    if (!session) return;
+    if (session.rpc.threads.get(id)?.turnId) {
+      session.releaseWhenIdle = true;
+      return;
+    }
+    await this.closeSession(session);
+  }
+
+  async closeSession(session) {
+    if (session.closing) return session.closing;
+    session.closing = (async () => {
+      await session.rpc.close();
+      session.rpc.off('event', session.eventListener);
+      if (this.sessions.get(session.id) === session) this.sessions.delete(session.id);
+      this.emit('released', session.id);
+      this.emit('event', { method:'orbit/engine', params:{
+        connected:this.sessions.size>0, mode:'desktop', desktopConnected:false,
+        resumedConnected:this.sessions.size>0
+      } });
+    })();
+    return session.closing;
+  }
+
+  async close() {
+    const sessions = [...this.sessions.values()];
+    await Promise.all(sessions.map(session => this.closeSession(session)));
+    this.sessions.clear();
+  }
+}

package/lib/rpc.mjs

@@ -130,23 +130,44 @@ export class CodexRpc extends EventEmitter {
     if (this.threads.has(id)) return;
     const result = await this.request('thread/resume', { threadId: id, excludeTurns: true, sandbox: writable ? 'workspace-write' : 'read-only', approvalPolicy: 'on-request' });
     if (result.thread.id !== id) throw new Error('返回的会话 ID 不一致，已拒绝发送消息。');
-    this.threads.set(id, { turnId: null, lastCompletedTurnId: null });
+    this.threads.set(id, {
+      turnId:null,lastCompletedTurnId:null,writable:Boolean(writable),
+      model:result.model||result.thread.model||null,
+      effort:result.reasoningEffort??result.thread.reasoningEffort??null,
+      collaborationMode:result.collaborationMode||{mode:'default',settings:{}}
+    });
   }
 
-  async startTurn(id, text, writable, settings = null) {
+  async startTurn(id, text, writable, settings = null, options = {}) {
     if (this.starting.has(id)) throw new Error('此会话正在发送，请勿并发提交。');
     this.starting.add(id);
     try {
       await this.resume(id, writable);
       const thread = this.threads.get(id);
       if (thread.turnId) throw new Error('此会话仍在执行，请等待完成或停止后再发送。');
+      const baseMode=thread.collaborationMode||{mode:'default',settings:{}};
+      const collaborationMode={
+        mode:options.mode==='plan'?'plan':baseMode.mode==='plan'?'default':baseMode.mode||'default',
+        settings:{
+          ...baseMode.settings,
+          model:settings?.model||baseMode.settings?.model||thread.model||'',
+          reasoning_effort:settings?.effort??baseMode.settings?.reasoning_effort??thread.effort??null,
+          developer_instructions:options.mode==='plan'||baseMode.mode==='plan'
+            ? null
+            : baseMode.settings?.developer_instructions??null
+        }
+      };
       const result = await this.request('turn/start', {
         threadId: id, input: [{ type: 'text', text }], approvalPolicy: 'on-request',
         sandboxPolicy: writable ? { type: 'workspaceWrite', networkAccess: false, excludeTmpdirEnvVar: true, excludeSlashTmp: true } : { type: 'readOnly' },
+        collaborationMode,
         ...(settings ? { model: settings.model, effort: settings.effort } : {})
       });
       const completed = thread.lastCompletedTurnId === result.turn.id;
       thread.turnId = completed ? null : result.turn.id;
+      thread.collaborationMode=collaborationMode;
+      if(settings?.model)thread.model=settings.model;
+      if(settings&&Object.hasOwn(settings,'effort'))thread.effort=settings.effort;
       return { threadId: id, turnId: result.turn.id, completed };
     } finally { this.starting.delete(id); }
   }
@@ -198,6 +219,11 @@ export class CodexRpc extends EventEmitter {
   }
 
   close() {
+    const child = this.child;
+    const exited = !child || child.exitCode !== null || child.signalCode !== null
+      ? Promise.resolve()
+      : new Promise(resolve => child.once('exit', resolve));
     this.disconnect(new Error('服务已停止。'));
+    return exited;
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "orbit-codex-bridge",
-  "version": "0.1.3",
+  "version": "0.1.6",
   "type": "module",
   "description": "Connect your original Codex desktop conversations to Orbit on the web.",
   "engines": {
@@ -27,7 +27,7 @@
     "test": "node --test test/*.test.mjs",
     "test:browser": "node --test test/browser/*.test.mjs",
     "test:native": "node test/native-smoke.mjs",
-    "check": "node --check cli.mjs && node --check server.mjs && node --check lib/store.mjs && node --check lib/rpc.mjs && node --check lib/desktop.mjs && node --check lib/device-auth.mjs && node --check lib/connector-service.mjs && node --check public/app.js && node --check public/connect.js && node --check relay-server.mjs && node --check relay-store.mjs && node --check relay-agent.mjs && node --check public/admin.js"
+    "check": "node --check cli.mjs && node --check server.mjs && node --check lib/store.mjs && node --check lib/rpc.mjs && node --check lib/desktop.mjs && node --check lib/resume-manager.mjs && node --check lib/device-auth.mjs && node --check lib/connector-service.mjs && node --check public/app.js && node --check public/connect.js && node --check relay-server.mjs && node --check relay-store.mjs && node --check relay-agent.mjs && node --check public/admin.js"
   },
   "dependencies": {
     "dompurify": "^3.3.0",

package/public/app.js

@@ -25,7 +25,7 @@ const paths = {
 const icon = name => `<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true">${paths[name] || paths.inbox}</svg>`;
 function decorate(parent = document) { parent.querySelectorAll('[data-icon]').forEach(element => { element.innerHTML = icon(element.dataset.icon); }); }
 function markdown(text) { return DOMPurify.sanitize(marked.parse(String(text || ''), { breaks: true }), { ALLOWED_TAGS: ['p','br','strong','b','em','i','s','del','ul','ol','li','blockquote','pre','code','h1','h2','h3','h4','h5','h6','hr','a','table','thead','tbody','tr','th','td','sup','sub','kbd','details','summary'], ALLOWED_ATTR: ['href','title','start','colspan','rowspan'], ALLOW_DATA_ATTR: false, ALLOW_ARIA_ATTR: false }); }
-const state = { threads: [], status: null, selected: null, selectionVersion: 0, historyStatus: 'idle', historyError: '', filter: 'all', project: null, search: '', view: 'sessions', socket: null, pending: new Map(), enabled: new Map(), baseMessages: [], olderMessages: [], cursor: null, liveMessages: new Map(), desktopMessages: [], desktopRuntime: null, selectedSettings: null, models: [], contextUsage: null, settingsBusy: false, reopenModelAfterGrant: false, pendingModelChoice: null, cloudMode: false, cloudUser: null, cloudDevices: [], cloudDeviceId: null, approvals: new Map(), pendingAttachments: [], reconnect: 0, loggedOut: false, busy: false, turnId: null };
+const state = { threads: [], status: null, selected: null, selectionVersion: 0, historyStatus: 'idle', historyError: '', filter: 'all', project: null, search: '', view: 'sessions', socket: null, pending: new Map(), enabled: new Map(), baseMessages: [], olderMessages: [], cursor: null, liveMessages: new Map(), desktopMessages: [], desktopRuntime: null, selectedSettings: null, goal:null, models: [], contextUsage: null, settingsBusy: false, reopenModelAfterGrant: false, pendingModelChoice: null, cloudMode: false, cloudUser: null, cloudDevices: [], cloudDeviceId: null, approvals: new Map(), pendingAttachments: [], reconnect: 0, loggedOut: false, busy: false, turnId: null };
 let refreshTimer;
 let toastTimer;
 let reconnectTimer;
@@ -314,12 +314,13 @@ function connectSocket() {
     if (message.method === 'turn/completed') { state.busy = false; state.turnId = null; updateMode(); scheduleRefresh(); }
     if (message.method === 'orbit/desktop' && state.status?.execution.mode === 'desktop') {
       state.desktopRuntime = params;
+      if(params.threadId===state.selected?.id)state.goal=params.attached?params.goal||null:null;
       if (!params.attached) { state.enabled.delete(params.threadId); state.selectedSettings = null; }
       if (params.attached) mergeDesktopMessages(params.messages || []);
       state.turnId = params.attached ? params.turnId : null;
       state.busy = Boolean(state.turnId);
       state.approvals = new Map((params.attached ? params.approvals || [] : []).map(approval => [approval.requestId, approval]));
-      renderMessages(); renderApprovals(); updateMode();
+      renderMessages();renderApprovals();renderList();updateMode();
     }
     if (message.method === 'thread/tokenUsage/updated' && state.status?.execution.mode !== 'desktop') {
       const usage = params.tokenUsage || params.tokenUsageInfo;
@@ -340,6 +341,7 @@ function connectSocket() {
         state.busy = false; state.turnId = null;
         state.reopenModelAfterGrant = false;
         state.desktopRuntime = {threadId:params.threadId,attached:false,reason:params.reason,reasonCode:params.reasonCode};
+        state.goal=null;renderGoalStatus();
         if (select('#model-dialog').open) select('#model-dialog').close();
         if (select('#control-dialog').open) select('#control-dialog').close();
         state.approvals.clear(); renderApprovals(); updateMode();
@@ -357,9 +359,15 @@ function connectSocket() {
       toast(params.error || '下一轮模型参数未应用，请重新选择。');
     }
     if (message.method === 'orbit/engine') {
-      if (state.status?.execution) state.status.execution.connected = Boolean(params.connected);
+      if (state.status?.execution) {
+        state.status.execution.connected = Boolean(params.connected);
+        if(params.desktopConnected!==undefined)state.status.execution.desktopConnected=Boolean(params.desktopConnected);
+        else if(params.mode==='desktop')state.status.execution.desktopConnected=Boolean(params.connected);
+        if(params.resumedConnected!==undefined)state.status.execution.resumedConnected=Boolean(params.resumedConnected);
+      }
       if (!params.connected) {
         state.enabled.clear(); state.desktopRuntime = null; state.selectedSettings = null; state.pendingModelChoice = null;
+        state.goal=null;renderGoalStatus();
         if (select('#model-dialog').open) select('#model-dialog').close();
         if (select('#control-dialog').open) select('#control-dialog').close();
         state.reopenModelAfterGrant = false;
@@ -368,6 +376,16 @@ function connectSocket() {
       }
       updateMode();
     }
+    if(message.method==='thread/goal/updated'&&params.threadId===state.selected?.id){
+      state.goal=params.goal||null;
+      if(state.desktopRuntime)state.desktopRuntime={...state.desktopRuntime,goal:state.goal};
+      renderGoalStatus();
+    }
+    if(message.method==='thread/goal/cleared'&&params.threadId===state.selected?.id){
+      state.goal=null;
+      if(state.desktopRuntime)state.desktopRuntime={...state.desktopRuntime,goal:null};
+      renderGoalStatus();
+    }
     if (message.method === 'orbit/approval') { state.approvals.set(params.requestId, params); renderApprovals(); }
     if (message.method === 'serverRequest/resolved') { state.approvals.delete(String(params.requestId)); renderApprovals(); }
     if (message.method === 'error') toast(params.error?.message || params.message || '执行发生错误，请查看会话状态。');
@@ -418,6 +436,7 @@ async function subscribeThread(id) {
     state.busy = Boolean(result.turnId);
     state.approvals = new Map((result.approvals || []).map(approval => [approval.requestId, approval]));
     state.pendingAttachments=result.attachments||[];
+    state.goal=result.runtime?.goal||null;
     renderComposerAttachments();
     if (desktop && result.control) {
       controlRenewTimer = setTimeout(() => {
@@ -426,12 +445,12 @@ async function subscribeThread(id) {
         }
       },Math.max(1000,result.control.expires - Date.now() - 120000));
     }
-    renderMessages(); renderApprovals();
+    renderMessages();renderApprovals();renderList();
   } catch (error) {
     if (id === state.selected?.id && selectionVersion === state.selectionVersion && attempt === desktopConnectionAttempt) {
       state.enabled.delete(id); state.selectedSettings = null; state.turnId = null; state.busy = false;
       state.desktopRuntime = {threadId:id,attached:false,reason:error.message,reasonCode:error.code};
-      state.approvals.clear(); renderApprovals();
+      state.approvals.clear();renderApprovals();renderList();
     }
     throw error;
   } finally {
@@ -469,17 +488,21 @@ function renderProjects() {
 function filteredThreads() {
   return state.threads.filter(thread => (!state.project || thread.projectId === state.project)
     && (state.filter !== 'archived' || thread.archived)
-    && (state.filter !== 'locked' || thread.locked)
     && (state.filter !== 'pinned' || thread.pinned)
     && `${thread.title} ${thread.projectName} ${thread.preview}`.toLowerCase().includes(state.search.toLowerCase()))
     .sort((left, right) => Number(right.pinned) - Number(left.pinned) || right.updatedAt - left.updatedAt);
 }
+function threadAvailabilityBadge(thread) {
+  if(thread.archived)return '<span class="tag archived">已归档</span>';
+  if(String(thread.source).startsWith('{'))return '<span class="tag">子代理</span>';
+  return '<span class="tag">原会话</span>';
+}
 function renderList() {
   const threads = filteredThreads();
   select('#thread-count').textContent = threads.length;
   select('#list-title').textContent = state.project ? (state.threads.find(thread => thread.projectId === state.project)?.projectName || '项目会话') : state.filter === 'archived' ? '已归档' : state.filter === 'pinned' ? '已置顶' : '所有会话';
   select('#list-footer-text').textContent = `${state.threads.length} 条原生记录 · 自动同步`;
-  select('#thread-list').innerHTML = threads.map(thread => `<button class="thread-item ${state.selected?.id === thread.id ? 'selected' : ''}" data-thread="${escapeHtml(thread.id)}"><div class="thread-meta"><span class="project-initial">${escapeHtml(thread.projectName.slice(0,1).toUpperCase())}</span><span class="project-label">${escapeHtml(thread.projectName)}</span><time>${ago(thread.updatedAt)}</time></div><h3>${escapeHtml(thread.title)}</h3><p>${escapeHtml(thread.preview || '点击查看原生会话记录')}</p><div class="thread-badges">${thread.pinned ? '<span class="tag pinned">已置顶</span>' : ''}${thread.locked ? '<span class="tag busy"><i class="tiny-dot"></i>原客户端占用</span>' : '<span class="tag">可查看</span>'}${thread.archived ? '<span class="tag archived">已归档</span>' : ''}<span class="tag">${escapeHtml(thread.provider || 'Codex')}</span></div></button>`).join('') || '<div class="empty">没有找到匹配的会话。<br>试试其他关键词或筛选条件。</div>';
+  select('#thread-list').innerHTML = threads.map(thread => `<button class="thread-item ${state.selected?.id === thread.id ? 'selected' : ''}" data-thread="${escapeHtml(thread.id)}"><div class="thread-meta"><span class="project-initial">${escapeHtml(thread.projectName.slice(0,1).toUpperCase())}</span><span class="project-label">${escapeHtml(thread.projectName)}</span><time>${ago(thread.updatedAt)}</time></div><h3>${escapeHtml(thread.title)}</h3><p>${escapeHtml(thread.preview || '点击查看原生会话记录')}</p><div class="thread-badges">${thread.pinned ? '<span class="tag pinned">已置顶</span>' : ''}${threadAvailabilityBadge(thread)}${thread.archived ? '<span class="tag archived">已归档</span>' : ''}<span class="tag">${escapeHtml(thread.provider || 'Codex')}</span></div></button>`).join('') || '<div class="empty">没有找到匹配的会话。<br>试试其他关键词或筛选条件。</div>';
   document.querySelectorAll('[data-filter]').forEach(button => {
     const active = button.dataset.filter === state.filter;
     button.classList.toggle('active', active); button.setAttribute('aria-pressed', String(active));
@@ -489,6 +512,8 @@ function renderWelcome() {
   const projects = new Set(state.threads.map(thread => thread.projectId));
   const archived = state.threads.filter(thread => thread.archived).length;
   select('#welcome').innerHTML = `<div class="welcome-heading"><div><h2>你的工作，都在这里。</h2><p>连接本机 Codex，从上次停下的地方找到灵感。</p></div><span class="date-label">${new Date().toLocaleDateString('zh-CN', { timeZone:'Asia/Shanghai', month:'long', day:'numeric', weekday:'long' })}</span></div><div class="hero"><div class="hero-grid"></div><div class="hero-orbit"><i></i></div><span class="eyebrow">KEEP THE CONTEXT. FIND YOUR FLOW.</span><h2>工作在电脑上，<br>灵感不必。</h2><p>一个入口，查看真实的项目与原生会话。<br>不再复制粘贴，也不必重新解释。</p><span class="hero-status"><i class="tiny-dot"></i> 本机直读 · 默认只读保护</span></div><div class="stats-grid"><div class="stat-card"><span>${icon('inbox')}原生会话</span><strong>${state.threads.length}</strong><small>来自本机，而非演示数据</small></div><div class="stat-card"><span>${icon('folder')}项目空间</span><strong>${projects.size}</strong><small>按原生归属 / 工作目录分组</small></div><div class="stat-card"><span>${icon('archive')}归档记录</span><strong>${archived}</strong><small>旧上下文，也值得保留</small></div></div><div class="section-heading"><h3>最近的上下文</h3><span>从熟悉的对话开始 ↗</span></div>${state.threads.filter(thread => !thread.archived).slice(0,3).map(thread => `<button class="recent-card" data-thread="${escapeHtml(thread.id)}"><span class="recent-icon">${icon('inbox')}</span><div><strong>${escapeHtml(thread.title)}</strong><p>${escapeHtml(thread.projectName)} · ${ago(thread.updatedAt)}</p></div><span>↗</span></button>`).join('')}<div class="honesty-note">${icon('info')}<span>原生会话列表与历史记录直接读取。授权后可通过桌面 IPC 接入已加载的 Codex 会话；尚未加载的会话需先在 Codex 桌面打开，不会新建或迁移执行器。</span></div>`;
+  select('#welcome .hero-status').innerHTML=`<i class="tiny-dot"></i> 已连接电脑 · 打开原会话即可继续`;
+  select('#welcome .honesty-note span').textContent='点击任意普通原会话，即可从当前上下文继续；不会新建会话。计划和目标使用 Codex 原生功能。';
 }
 async function openThread(id) {
   const thread = state.threads.find(entry => entry.id === id); if (!thread) return;
@@ -499,6 +524,7 @@ async function openThread(id) {
   select('#turn-mode').value='default';
   state.historyStatus = 'loading'; state.historyError = '';
   state.selected = thread; state.baseMessages = []; state.olderMessages = []; state.liveMessages.clear(); state.desktopMessages = []; state.desktopRuntime = null; state.selectedSettings = null; state.contextUsage = null; state.approvals.clear(); state.cursor = null; state.busy = false; state.turnId = null;
+  state.goal=null;
   select('#welcome').hidden = true; select('#chat').hidden = false; select('#workspace').classList.add('chat-open');
   select('#chat-title').textContent = thread.title;
   select('#chat-subtitle').textContent = `${thread.projectName} / ${thread.provider || 'Codex'}${thread.model ? ` · ${thread.model}` : ''}`;
@@ -722,18 +748,21 @@ function updateMode() {
   const desktop = state.status?.execution.mode === 'desktop';
   const desktopConnected = desktop && state.status.execution.connected;
   const attached = desktopConnected && state.desktopRuntime?.attached === true;
-  const blocked = thread.archived || (desktop ? !attached || desktopConnecting : thread.locked && !control && state.status?.execution.mode !== 'endpoint');
+  const sameIdResume = attached && state.desktopRuntime?.mode === 'same-id-resume';
+  const appServerExecution=['same-id-resume','endpoint','cold-resume'].includes(state.desktopRuntime?.mode)
+    || ['endpoint','cold-resume'].includes(state.status?.execution.mode);
+  const nativePlanAvailable=Boolean(control&&(desktop?attached:appServerExecution));
+  const blocked = thread.archived || String(thread.source).startsWith('{') || desktopConnecting;
   select('#enable-control').disabled = Boolean(blocked || control);
-  select('#enable-control').textContent = control ? desktop ? '热接管中' : '接续已授权' : thread.archived ? '归档只读' : desktopConnecting && desktop ? '连接中…' : desktop && !desktopConnected ? '桌面未连接' : desktop && !attached ? '原会话未连接' : blocked ? '原客户端占用' : desktop ? '重新接管' : '接续会话';
+  select('#enable-control').textContent = control ? '已连接' : desktopConnecting && desktop ? '连接中…' : thread.archived ? '已归档' : String(thread.source).startsWith('{') ? '请打开父会话' : '继续会话';
   select('#mode-banner').classList.toggle('controlled', Boolean(control));
   const banner = desktop
-    ? desktopConnecting ? '正在连接这条原会话；历史仍可查看。'
-      : !desktopConnected ? 'Codex 桌面连接已断开。请保持桌面应用运行，再点击“重新连接”。'
-      : !attached ? state.desktopRuntime?.reason || '这条原会话尚未连接。请先在 Codex 桌面打开它，再点击“重新连接”。'
-      : control ? '热接管中 · 与电脑共用同一 Codex 执行实例；消息、运行状态和审批实时同步。'
-      : '这条原会话已连接 · 点击“重新接管”恢复控制。'
-    : control ? `原 ID 接续 · ${control.writable ? '工作区可写 / 操作需审批' : '只读执行沙箱'} · ${control.sharedExecution ? '目标服务已加载此会话' : '独立执行实例'}`
-      : thread.locked ? '原客户端持有此会话：独立接续不会抢占桌面执行。' : '只读镜像：查看原生历史不会启动执行实例。';
+    ? desktopConnecting ? '正在连接原会话…'
+      : !attached ? state.desktopRuntime?.reason || '正在连接原会话…'
+      : control ? sameIdResume ? '已连接；在原会话中使用 Codex 原生功能。' : '已连接；操作在电脑上的 Codex 中执行。'
+      : '正在连接原会话…'
+    : control ? '已连接；继续在原会话中工作。'
+      : '连接后直接在这条原会话中继续。';
   const modeBanner = select('#mode-banner');
   if (!modeBanner.querySelector('.mode-copy')) modeBanner.innerHTML = `${icon('shield')}<span class="mode-copy"></span><button type="button" class="button small" id="reconnect-desktop">重新连接</button>`;
   modeBanner.querySelector('.mode-copy').textContent = banner;
@@ -741,24 +770,88 @@ function updateMode() {
   retryButton.hidden = !desktop || attached && !desktopConnecting;
   retryButton.disabled = !connected || desktopConnecting;
   retryButton.textContent = desktopConnecting ? '连接中…' : '重新连接';
-  select('#composer-mode').innerHTML = `${icon('shield')}${control ? desktop ? '热接管 · 桌面权限' : control.writable ? '工作区可写 · 按需审批' : '接续执行 · 只读沙箱' : '原生记录 · 只读镜像'}`;
-  const waitingForTurn = state.busy && (!desktop || !state.turnId);
+  select('#composer-mode').innerHTML = `${icon('shield')}${control ? '原会话' : '连接中'}`;
+  const waitingForTurn = state.busy && (!desktop || !state.turnId || sameIdResume);
   select('#send-message').disabled = !control || !connected || desktop && (!attached || desktopConnecting) || waitingForTurn || state.settingsBusy || !select('#message-input').value.trim();
-  select('#send-message').title = state.busy && desktop ? '追加指令到当前桌面任务' : '沿用原会话发送';
+  select('#send-message').title = state.busy && desktop && !sameIdResume ? '追加指令到当前桌面任务' : '沿用原会话发送';
   select('#stop-turn').hidden = !state.busy || !state.turnId || !control;
-  select('#message-input').placeholder = state.busy && desktop ? '追加指令给电脑上正在运行的任务…' : control ? '沿着原来的上下文继续…' : desktop ? '连接原桌面会话后继续…' : '先确认接续方式，再沿着这条会话继续…';
-  select('#turn-mode').disabled=!control||!desktop||desktopConnecting||state.busy;
-  select('#attach-files').disabled=!control||!desktop||desktopConnecting||state.pendingAttachments.length>=5||state.settingsBusy;
+  select('#message-input').placeholder = state.busy && desktop && !sameIdResume ? '追加指令给电脑上正在运行的任务…' : state.busy && sameIdResume ? '原会话正在执行，请等待本轮完成…' : control ? '沿着原来的上下文继续…' : desktop ? '连接后在原会话中继续…' : '继续这条原会话…';
+  select('#turn-mode').disabled=!nativePlanAvailable||desktopConnecting||state.busy;
+  select('#attach-files').disabled=!control||!desktop||sameIdResume||desktopConnecting||state.pendingAttachments.length>=5||state.settingsBusy;
   select('#file-input').disabled=select('#attach-files').disabled;
-  select('#turn-mode').title=state.busy?'当前桌面任务中无法切换模式。':!desktop?'仅 Codex 桌面原会话支持模式选择。':'模式仅作用于新一轮消息。';
+  select('#turn-mode').title=state.busy?'当前任务中无法切换模式。':!nativePlanAvailable?'当前执行通道不支持原生协作模式。':'通过 Codex 原生协作模式控制下一轮。';
   const mode=select('#turn-mode').value;
-  select('#composer-note').textContent=mode==='plan'
-    ? '计划模式先分析并列出步骤，等待你确认后再执行。只影响下一轮。'
-    : mode==='goal'
-      ? '目标模式将本轮消息作为明确目标；Codex 桌面 IPC 暂不提供持久目标状态设置。'
-      : control ? desktop ? '消息进入原 Codex 桌面会话；任务不会迁移或重启。文件暂存 30 分钟。断线不会自动重发。' : '原会话 ID 不变；断线不会自动重发消息。'
-        : '只读查看不会唤醒或打断电脑上的执行。';
+  select('#composer-note').textContent=sameIdResume
+      ? state.busy ? '原会话正在执行；请等待当前轮次结束。' 
+      : mode==='plan'?'Codex 原生计划模式；只作用于本轮。'
+        :'消息和目标都直接作用于这条原会话。'
+    : mode==='plan'
+    ? '使用 Codex 原生计划模式；计划完成后按原生流程继续。'
+    : control ? '消息继续发送到这条原会话；不会创建新会话。'
+        : '连接原会话后即可继续。';
   renderModelStatus();
+  renderGoalStatus();
+}
+const goalStatusNames={active:'进行中',paused:'已暂停',blocked:'受阻',usageLimited:'用量受限',budgetLimited:'预算已用尽',complete:'已完成'};
+function nativeGoalWritable() {
+  const runtime=state.desktopRuntime;
+  return Boolean(state.selected&&state.enabled.has(state.selected.id)
+    &&(runtime?.mode==='same-id-resume'||state.status?.execution.mode!=='desktop'));
+}
+function renderGoalStatus() {
+  const button=select('#goal-button');
+  if(!button)return;
+  const goal=state.goal||state.desktopRuntime?.goal||null;
+  button.textContent=goal?`目标 · ${goalStatusNames[goal.status]||goal.status}`:'设置目标';
+  button.classList.toggle('active',Boolean(goal));
+  button.disabled=!state.selected||state.selected.archived||String(state.selected.source).startsWith('{');
+  button.title='管理这条原会话中的 Codex 原生持续目标。';
+}
+function openGoalDialog() {
+  if(!state.selected)return;
+  const goal=state.goal||state.desktopRuntime?.goal||null;
+  const writable=nativeGoalWritable();
+  select('#goal-objective').value=goal?.objective||'';
+  select('#goal-token-budget').value=goal?.tokenBudget??'';
+  select('#goal-current-status').textContent=goal
+    ? `${goalStatusNames[goal.status]||goal.status} · 已用 ${goal.tokensUsed||0} tokens${goal.tokenBudget?` / ${goal.tokenBudget}`:''}`
+    : '尚未设置持续目标。';
+  const desktopOwned=state.status?.execution.mode==='desktop'&&state.desktopRuntime?.mode!=='same-id-resume';
+  select('#goal-description').textContent=desktopOwned
+    ? '目标状态与 Codex 桌面同步。目标编辑暂不可用，请在本机 Codex 中管理。'
+    : writable
+      ? '使用 Codex 原生 Goal；目标会跨轮次保留，不会转换成提示词。'
+      : '连接原会话后，可在这里创建和管理 Codex 原生持续目标。';
+  select('#goal-objective').disabled=!writable;
+  select('#goal-token-budget').disabled=!writable;
+  select('#save-goal').disabled=!writable;
+  select('#pause-goal').disabled=!writable||!goal;
+  select('#clear-goal').disabled=!writable||!goal;
+  select('#pause-goal').textContent=goal?.status==='paused'?'继续目标':'暂停目标';
+  select('#save-goal').textContent=goal?'更新目标':'开始追求目标';
+  select('#goal-error').textContent='';
+  select('#goal-dialog').showModal();
+}
+async function updateGoalStatus(status) {
+  if(!state.selected||!nativeGoalWritable())return;
+  const id=state.selected.id,selectionVersion=state.selectionVersion;
+  try{
+    const result=await rpc('thread.goal.status',{threadId:id,status});
+    if(selectionVersion!==state.selectionVersion||id!==state.selected?.id)return;
+    state.goal=result.goal||null;
+    if(state.desktopRuntime)state.desktopRuntime={...state.desktopRuntime,goal:state.goal};
+    select('#goal-current-status').textContent=state.goal?`${goalStatusNames[state.goal.status]||state.goal.status} · 已用 ${state.goal.tokensUsed||0} tokens${state.goal.tokenBudget?` / ${state.goal.tokenBudget}`:''}`:'尚未设置持续目标。';
+    renderGoalStatus();toast(status==='paused'?'已暂停原生目标。':'已继续原生目标。');
+  }catch(error){select('#goal-error').textContent=error.message;}
+}
+async function clearGoal() {
+  if(!state.selected||!nativeGoalWritable())return;
+  try{
+    await rpc('thread.goal.clear',{threadId:state.selected.id});
+    state.goal=null;
+    if(state.desktopRuntime)state.desktopRuntime={...state.desktopRuntime,goal:null};
+    select('#goal-dialog').close();renderGoalStatus();toast('已清除原生目标。');
+  }catch(error){select('#goal-error').textContent=error.message;}
 }
 function renderComposerAttachments() {
   select('#composer-attachments').innerHTML=state.pendingAttachments.map(file=>
@@ -856,8 +949,16 @@ function renderDevices() {
   const status = state.status;
   const url = status.connectionUrls.find(address => !address.includes('127.0.0.1')) || status.connectionUrls[0];
   const desktop = status.execution.mode === 'desktop';
-  const executionStatus = desktop ? status.execution.connected ? 'Codex 桌面 IPC 已连接' : 'Codex 桌面 IPC 未连接' : status.execution.mode === 'endpoint' ? 'App Server 端点' : '独立执行器';
-  const hotStatus = desktop && status.desktopHotAttachVerified ? '已验证实时会话' : desktop && status.desktopHotAttachReady ? '可授权热接管' : '未连接';
+  const desktopConnected = status.execution.desktopConnected ?? status.execution.connected;
+  const resumedConnected = Boolean(status.execution.resumedConnected);
+  const executionStatus = desktop
+    ? desktopConnected ? 'Codex 桌面 IPC 已连接'
+      : resumedConnected ? 'Codex App Server 原 ID 接续'
+        : '等待本机 Codex 执行器'
+    : status.execution.mode === 'endpoint' ? 'App Server 端点' : '独立执行器';
+  const hotStatus = desktop && desktopConnected
+    ? status.desktopHotAttachVerified ? '已发现实时会话' : '支持自动热接管'
+    : desktop && resumedConnected ? '原 ID 接续中' : '打开会话时自动连接';
   select('#devices-view').innerHTML = `<div class="devices-heading"><span class="eyebrow">CONNECTED TO YOUR WORLD</span><h1>设备与连接</h1><p>电脑负责执行。你的设备，只需要保持连接。</p></div><div class="device-grid"><section class="device-card"><div class="device-big-icon">${icon('monitor')}</div><h2>${escapeHtml(status.device)}<span class="capability-state">本机桥接在线</span></h2><p>直接读取本机原生会话与历史记录，不复制到第三方数据库。</p><dl><dt>原生会话</dt><dd>${state.threads.length} 条 / ${new Set(state.threads.map(thread => thread.projectId)).size} 个空间</dd><dt>数据目录</dt><dd>${escapeHtml(status.home)}</dd><dt>消息通道</dt><dd>${location.protocol === 'https:' ? 'WSS · TLS 加密' : 'WS · 本机 / 可信局域网演示'}</dd><dt>执行连接</dt><dd>${executionStatus}</dd><dt>热接管</dt><dd>${hotStatus}</dd></dl></section><section class="device-card"><div class="device-big-icon">${icon('devices')}</div><h2>把工作台带在身边</h2><p>${status.lanEnabled || status.secureTransport ? '在可信设备上打开地址并配对，即可查看同一份原生记录。二维码包含控制凭据，切勿公开。' : '当前仅监听本机。手机同 Wi-Fi 体验，请停止本次服务，再运行 start.ps1 -Lan。'}</p><div class="connection-url"><code>${escapeHtml(url)}</code><button class="icon-button" id="copy-url" aria-label="复制连接地址">${icon('copy')}</button></div><button id="show-qr" class="button small">显示配对二维码</button><div id="qr-container" class="qr-wrap" hidden></div><p>${status.secureTransport ? '已配置 HTTPS 入口；请确认反向代理正确转发 WebSocket。' : '注意：HTTP / WS 不加密，不要将此端口直接暴露公网。公网必须配置 HTTPS / WSS 与独立鉴权。'}</p></section><section class="device-card wide"><h2>能力状态，透明可见。</h2><div class="capability-row"><span>原生项目 / 全量本机会话 / 归档记录</span><span class="capability-state">真实数据已接入</span></div><div class="capability-row"><span>历史分页 / WebSocket 实时更新</span><span class="capability-state">可体验</span></div><div class="capability-row"><span>接入 Codex 桌面已加载的原会话</span><span class="capability-state ${hotStatus === '未连接' ? 'pending' : ''}">${hotStatus}</span></div><div class="capability-row"><span>追加指令 / 停止任务 / 审批同步</span><span class="capability-state ${status.execution.connected && desktop ? '' : 'pending'}">${desktop && status.execution.connected ? '同一桌面执行实例' : '桌面未连接'}</span></div><div class="capability-row"><span>公网中继 / 多用户 / 计费 / 推送</span><span class="capability-state pending">未实现</span></div><p>Orbit 是独立第三方原型，非 OpenAI 官方产品。桌面 IPC 属内部接口，升级后需重新做兼容测试；商业发布前还需独立安全审计。</p></section></div>`;
   const cloudRow = select('#devices-view .capability-row:last-of-type');
   cloudRow.querySelector('span:first-child').textContent = '多用户云中继 / 设备管理后台';
@@ -1190,7 +1291,40 @@ select('#model-form').addEventListener('submit', async event => {
   finally { button.disabled = false; state.settingsBusy = false; updateMode(); }
 });
 select('#message-input').addEventListener('input', updateMode);
+const goalButton=document.createElement('button');
+select('#turn-mode option[value="goal"]')?.remove();
+goalButton.id='goal-button';
+goalButton.type='button';
+goalButton.className='button small goal-button';
+goalButton.textContent='设置目标';
+goalButton.setAttribute('aria-label','设置 Codex 原生持久目标');
+select('#turn-mode').insertAdjacentElement('afterend',goalButton);
+goalButton.onclick=openGoalDialog;
 select('#turn-mode').addEventListener('change',updateMode);
+select('#goal-form').addEventListener('submit',async event=>{
+  event.preventDefault();
+  if(!state.selected||!nativeGoalWritable())return;
+  const button=select('#save-goal');
+  const id=state.selected.id,selectionVersion=state.selectionVersion;
+  const budgetText=select('#goal-token-budget').value.trim();
+  const tokenBudget=budgetText?Number(budgetText):null;
+  button.disabled=true;select('#goal-error').textContent='';
+  try{
+    const result=await rpc('thread.goal.set',{
+      threadId:id,objective:select('#goal-objective').value.trim(),tokenBudget
+    });
+    if(selectionVersion!==state.selectionVersion||id!==state.selected?.id)return;
+    state.goal=result.goal||null;
+    if(state.desktopRuntime)state.desktopRuntime={...state.desktopRuntime,goal:state.goal};
+    select('#goal-dialog').close();renderGoalStatus();toast('已设置 Codex 原生持久目标。');
+  }catch(error){select('#goal-error').textContent=error.message;}
+  finally{button.disabled=false;}
+});
+select('#pause-goal').onclick=()=>updateGoalStatus(state.goal?.status==='paused'?'active':'paused');
+select('#clear-goal').onclick=clearGoal;
+select('#cancel-goal').onclick=()=>select('#goal-dialog').close();
+select('[data-filter="locked"]')?.remove();
+renderGoalStatus();
 select('#browse-files').onclick=()=>{
   if(!state.selected)return;
   browseProjectFiles();
@@ -1223,7 +1357,7 @@ select('#composer').addEventListener('submit', async event => {
   event.preventDefault(); if (select('#send-message').disabled) return;
   const id = state.selected.id; const inputText = select('#message-input').value.trim(); const wasBusy = state.busy;
   const turnId = state.turnId;
-  const steering = wasBusy && state.status.execution.mode === 'desktop';
+  const steering = wasBusy && state.status.execution.mode === 'desktop' && state.desktopRuntime?.mode !== 'same-id-resume';
   const mode=select('#turn-mode').value;
   const attachmentIds=state.pendingAttachments.map(file=>file.id);
   const text=inputText|| (attachmentIds.length?`请查看并处理以下附件：${state.pendingAttachments.map(file=>file.label).join('、')}`:'');

package/public/goal.css

@@ -0,0 +1,7 @@
+.goal-button.active{background:#edf3e3;border-color:#dce7cd;color:#456337}
+#goal-dialog label{display:block;font-size:11px;color:#718563;margin:16px 0 7px}
+#goal-dialog textarea,#goal-dialog input{display:block;width:100%;border:1px solid #dce4d1;border-radius:8px;padding:11px 12px;background:#fff;color:#405139;font-size:12px}
+#goal-dialog textarea{resize:vertical;min-height:100px;line-height:1.7}
+#goal-dialog textarea:disabled,#goal-dialog input:disabled{background:#f0f2ec;color:#929b87}
+#goal-dialog .dialog-actions{flex-wrap:wrap}
+@media(max-width:760px){#goal-dialog{padding:22px 18px}#goal-dialog .dialog-actions{gap:7px}#goal-dialog .dialog-actions button{font-size:10px;padding:8px 10px}}

package/public/index.html

@@ -3,6 +3,7 @@
 <head>
 <meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1,viewport-fit=cover"><meta name="theme-color" content="#153c37"><meta name="description" content="Orbit，让原生 Codex 会话随行。"><title>Orbit · 会话随行</title><link rel="icon" href="/icon.svg" type="image/svg+xml"><link rel="manifest" href="/manifest.webmanifest"><link rel="stylesheet" href="/style.css"><script src="/vendor/marked.js" defer></script><script src="/vendor/purify.js" defer></script><script src="/app.js" defer></script>
 <link rel="stylesheet" href="/layout.css">
+<link rel="stylesheet" href="/goal.css">
 </head>
 <body>
 <section id="cloud-login-screen" class="pair-screen" hidden>
@@ -51,6 +52,7 @@
 </section><section id="devices-view" class="devices-view" hidden></section>
 </main>
 </div>
+<dialog id="goal-dialog"><form id="goal-form"><h2>会话目标</h2><p id="goal-description">设置 Codex 持续追求的原生目标；目标会保存在这条原会话中。</p><label for="goal-objective">目标</label><textarea id="goal-objective" rows="4" maxlength="5000" placeholder="描述希望 Codex 持续完成的结果"></textarea><label for="goal-token-budget">Token 预算（可选）</label><input id="goal-token-budget" type="number" min="1" max="10000000" step="1" placeholder="不设置"><p id="goal-current-status" class="model-note"></p><p id="goal-error" class="error" role="alert"></p><div class="dialog-actions"><button id="clear-goal" type="button" class="button">清除目标</button><button id="pause-goal" type="button" class="button">暂停目标</button><button id="cancel-goal" type="button" class="button">取消</button><button id="save-goal" type="submit" class="primary">开始追求目标</button></div></form></dialog>
 <dialog id="control-dialog"><form id="control-form"><span class="mini-badge">CONTINUE, NOT FORK</span><h2 id="control-title">授权热接管</h2><p id="control-description">保持原会话与桌面执行实例，不创建新会话或独立执行器。</p><div class="notice"><span data-icon="shield"></span><span id="control-notice">指令会交给原 Codex 桌面会话执行，并沿用其权限与审批策略。</span></div><label class="check-row" id="allow-write-row"><input id="allow-write" type="checkbox"><span>允许修改此会话的工作区文件<small>默认只读。扩大权限仍需要审批；不会启用无限制执行。</small></span></label><label class="check-row"><input id="control-confirm" type="checkbox" required><span id="control-confirm-copy">我确认授权此设备控制这条原生会话。</span></label><div class="dialog-actions"><button type="button" id="cancel-control" class="button">先只读查看</button><button class="primary" id="confirm-control-button" type="submit">授权热接管 <span>↗</span></button></div><p id="control-error" class="error" role="alert"></p></form></dialog>
 <dialog id="model-dialog"><form id="model-form"><h2>会话参数</h2><p id="model-description">更改将在这条会话的下一轮生效。</p><label for="model-select">模型</label><select id="model-select" required></select><label for="effort-select">推理级别</label><select id="effort-select"></select><p id="model-note" class="model-note"></p><p id="model-error" class="error" role="alert"></p><div class="dialog-actions"><button id="cancel-model" type="button" class="button">取消</button><button id="authorize-model" type="button" class="primary" hidden>先授权热接管</button><button id="apply-model" type="submit" class="primary">应用到下一轮</button></div></form></dialog>
 <dialog id="file-browser-dialog" class="file-browser-dialog"><section class="file-browser-panel"><header><div><h2>电脑项目文件</h2><p id="file-browser-path">项目根目录</p></div><button id="close-file-browser" class="button small" type="button">关闭</button></header><p class="file-browser-notice">仅浏览当前会话工作目录；系统目录、凭证文件及符号链接不会开放。单个文件最大 8 MiB。</p><div id="file-browser-list" class="file-browser-list" aria-live="polite"></div><p id="file-browser-error" class="error" role="alert"></p></section></dialog>

package/server.mjs

@@ -9,6 +9,7 @@ import QRCode from 'qrcode';
 import { NativeStore } from './lib/store.mjs';
 import { CodexRpc } from './lib/rpc.mjs';
 import { DesktopRpc } from './lib/desktop.mjs';
+import { ResumeManager } from './lib/resume-manager.mjs';
 
 const root = path.dirname(fileURLToPath(import.meta.url));
 const packageVersion = JSON.parse(fs.readFileSync(path.join(root,'package.json'),'utf8')).version;
@@ -156,8 +157,30 @@ export function createOrbitServer(options = {}) {
   const store = options.store || new NativeStore(home);
   cleanupStaleAttachments(store);
   const endpoint = options.endpoint ?? process.env.ORBIT_APP_SERVER_URL ?? '';
-  const rpc = options.rpc || options.desktopRpc || (endpoint ? new CodexRpc({ home, endpoint, tokenFile: process.env.ORBIT_APP_SERVER_TOKEN_FILE }) : new DesktopRpc());
-  const executionMode = rpc.mode || (endpoint ? 'endpoint' : 'cold-resume');
+  const injectedRpc = options.rpc || options.desktopRpc || null;
+  const rpc = injectedRpc || new DesktopRpc();
+  const executionMode = rpc.mode || (injectedRpc ? endpoint ? 'endpoint' : 'cold-resume' : 'desktop');
+  const resumeManager = options.resumeManager || (executionMode === 'desktop' && (!injectedRpc || options.enableResumeFallback === true)
+    ? new ResumeManager({
+      home,
+      createRpc:options.createResumeRpc || (({ home:resumeHome }) => new CodexRpc({
+        home:resumeHome, endpoint, tokenFile:process.env.ORBIT_APP_SERVER_TOKEN_FILE
+      }))
+    })
+    : null);
+  function runtimeForThread(id) {
+    return resumeManager?.runtime(id) || rpc.runtime?.(id) || null;
+  }
+  async function attachThread(id) {
+    if (executionMode !== 'desktop') return null;
+    if (resumeManager?.has(id)) return resumeManager.runtime(id);
+    try { return await rpc.attach(id); }
+    catch (error) {
+      const row = store.row(id);
+      if (!resumeManager || !row || row.archived || String(row.source).startsWith('{')) throw error;
+      return resumeManager.resume(id, { model:row.model || null });
+    }
+  }
   const listModels = options.listModels || (async () => {
     const catalogRpc = new CodexRpc({ home, endpoint, tokenFile: process.env.ORBIT_APP_SERVER_TOKEN_FILE });
     try {
@@ -266,7 +289,8 @@ export function createOrbitServer(options = {}) {
     if(!row||row.archived||String(row.source).startsWith('{'))return json(response,400,{error:'归档会话或子代理不能接收文件。'});
     if(executionMode!=='desktop'||!rpc.connected)return json(response,409,{error:'文件传输仅支持已连接的 Codex 桌面原会话。'});
     if(!controlFor(session,threadId))return json(response,403,{error:'请先连接并接管这条原会话。'});
-    if(!rpc.runtime(threadId)?.attached)return json(response,409,{error:'请先在 Codex 桌面打开此会话并重新连接。'});
+    const runtime=runtimeForThread(threadId);
+    if(!runtime?.attached||runtime.mode==='same-id-resume')return json(response,409,{error:'该会话当前通过原 ID 接续运行；文件传输需要桌面热接管。'});
     for(const [id,attachment]of session.attachments)if(attachment.expires<Date.now())removeAttachment(session,id);
     if([...session.attachments.values()].filter(item=>item.threadId===threadId&&!item.consumed).length>=maxPendingAttachments)return json(response,429,{error:`这条会话最多可暂存 ${maxPendingAttachments} 个待发送文件。`});
     const rawName=url.searchParams.get('name')||'';
@@ -306,6 +330,7 @@ export function createOrbitServer(options = {}) {
 
   function status(session) {
     const threads = store.list();
+    const resumedIds = resumeManager?.ids() || [];
     for (const id of session.enabled.keys()) controlFor(session, id);
     return {
       product: 'Orbit', version: packageVersion, device: os.hostname(), platform: process.platform, home,
@@ -314,7 +339,7 @@ export function createOrbitServer(options = {}) {
       bridge: 'connected', transport: 'websocket', readOnlyMirror: true,
       desktopHotAttachReady: executionMode === 'desktop' && rpc.connected,
       desktopHotAttachVerified: executionMode === 'desktop' && [...rpc.threads.values()].some(thread => thread.state),
-      execution: { connected: rpc.connected, mode: executionMode, enabled: [...session.enabled.keys()], grants: Object.fromEntries(session.enabled), owned: [...rpc.threads.keys()] },
+      execution: { connected: Boolean(rpc.connected || resumedIds.length), desktopConnected:Boolean(rpc.connected), resumedConnected:Boolean(resumedIds.length), mode: executionMode, enabled: [...session.enabled.keys()], grants: Object.fromEntries(session.enabled), owned: [...new Set([...rpc.threads.keys(), ...resumedIds])] },
       connectionUrls: [publicUrl || `http://127.0.0.1:${port}`, ...(host === '0.0.0.0' ? lanAddresses().map(address => `http://${address}:${port}`) : [])],
       secureTransport: Boolean(publicUrl), lanEnabled: host === '0.0.0.0'
     };
@@ -333,6 +358,7 @@ export function createOrbitServer(options = {}) {
   }
 
   async function applyQueuedDesktopSettings(id, runtime) {
+    if(executionMode!=='desktop'||resumeManager?.has(id))return;
     if (!runtime?.attached || runtime.turnId || queuedSettingsInFlight.has(id)) return;
     queuedSettingsInFlight.add(id);
     try {
@@ -371,7 +397,8 @@ export function createOrbitServer(options = {}) {
     if (count > 1) desktopWatchers.set(id, count - 1);
     else {
       desktopWatchers.delete(id);
-      rpc.detach(id, '已取消实时跟随。');
+      if (resumeManager?.has(id)) void resumeManager.release(id).catch(() => {});
+      else rpc.detach(id, '已取消实时跟随。');
     }
   }
 
@@ -472,7 +499,7 @@ export function createOrbitServer(options = {}) {
         file = path.join(root, relative);
         type = mime;
       } else {
-        const files = { '/': ['index.html','text/html'], '/app.js': ['app.js','text/javascript'], '/style.css': ['style.css','text/css'], '/layout.css': ['layout.css','text/css'], '/icon.svg': ['icon.svg','image/svg+xml'], '/manifest.webmanifest': ['manifest.webmanifest','application/manifest+json'] };
+        const files = { '/': ['index.html','text/html'], '/app.js': ['app.js','text/javascript'], '/style.css': ['style.css','text/css'], '/layout.css': ['layout.css','text/css'], '/goal.css':['goal.css','text/css'], '/icon.svg': ['icon.svg','image/svg+xml'], '/manifest.webmanifest': ['manifest.webmanifest','application/manifest+json'] };
         if (!files[url.pathname]) return json(response, 404, { error: '页面不存在。' });
         const [name, mime] = files[url.pathname]; file = path.join(root, 'public', name); type = mime;
       }
@@ -532,8 +559,10 @@ export function createOrbitServer(options = {}) {
           socket.desktopSubscription = id;
           desktopWatchers.set(id, (desktopWatchers.get(id) || 0) + 1);
         }
-        try { runtime = await rpc.attach(id); }
-        catch (error) {
+        try {
+          runtime = await attachThread(id);
+          if (!runtime?.attached) throw new Error('原会话没有可用的 Codex 执行器。');
+        } catch (error) {
           unwatchDesktop(socket);
           lostListener(id,error.message,error.code);
           runtime = {
@@ -541,14 +570,17 @@ export function createOrbitServer(options = {}) {
             reason:safeError(error),reasonCode:error.code || 'DESKTOP_NOT_READY'
           };
         }
+        if (resumeManager?.has(id) && (desktopWatchers.get(id) || 0) === 0) void resumeManager.release(id).catch(() => {});
       }
       if (executionMode === 'desktop' && runtime?.attached && body.autoControl === true
         && !row.archived && !String(row.source).startsWith('{')) {
-        session.enabled.set(id, {sharedExecution:true,desktop:true,writable:false,expires:Date.now() + 1800000});
+        const desktop = runtime.mode !== 'same-id-resume';
+        session.enabled.set(id, {sharedExecution:desktop,desktop,writable:!desktop,expires:Date.now() + 1800000});
       }
       const control = controlFor(session, id);
-      const approvals = control ? (executionMode === 'desktop' ? runtime?.approvals || [] : [...rpc.approvals.values()].filter(request => request.params.threadId === id).map(request => ({ ...request.params, requestId: String(request.id), method: request.method }))) : [];
-      return { subscribed: id || null, control, runtime, settings: control ? session.preferences.get(id) || null : null, turnId: runtime?.turnId || rpc.threads.get(id)?.turnId || null, approvals, attachments:[...session.attachments.values()].filter(item=>item.threadId===id&&!item.consumed&&item.expires>Date.now()).map(({id,label,size,mimeType})=>({id,label,size,mimeType})) };
+      const activeRpc = resumeManager?.rpcFor(id) || rpc;
+      const approvals = control ? (executionMode === 'desktop' ? runtime?.approvals || [] : [...activeRpc.approvals.values()].filter(request => request.params.threadId === id).map(request => ({ ...request.params, requestId: String(request.id), method: request.method }))) : [];
+      return { subscribed: id || null, control, runtime, settings: control ? session.preferences.get(id) || null : null, turnId: runtime?.turnId || activeRpc.threads.get(id)?.turnId || null, approvals, attachments:[...session.attachments.values()].filter(item=>item.threadId===id&&!item.consumed&&item.expires>Date.now()).map(({id,label,size,mimeType})=>({id,label,size,mimeType})) };
     }
     if (message.method === 'thread.enable') {
       const row = store.row(id);
@@ -557,12 +589,13 @@ export function createOrbitServer(options = {}) {
       if (body.confirm !== true) throw new Error('必须明确确认接续方式。');
       if (executionMode === 'desktop') {
         let runtime;
-        try { runtime = await rpc.attach(id); }
+        try { runtime = await attachThread(id); }
         catch (error) { lostListener(id,error.message,error.code); throw error; }
         if (!runtime.attached) throw new Error('桌面实时快照未就绪，未授权控制。');
-        const control = { sharedExecution: true, desktop: true, writable: false, expires: Date.now() + 1800000 };
+        const desktop = runtime.mode !== 'same-id-resume';
+        const control = { sharedExecution:desktop, desktop, writable:!desktop, expires: Date.now() + 1800000 };
         session.enabled.set(id, control);
-        return { threadId: id, ...control, mode: 'desktop', turnId: runtime.turnId };
+        return { threadId: id, ...control, mode:runtime.mode || 'desktop', turnId: runtime.turnId };
       }
       let sharedExecution = false;
       if (endpoint) {
@@ -575,11 +608,51 @@ export function createOrbitServer(options = {}) {
       session.enabled.set(id, control);
       return { threadId: id, ...control, mode: endpoint ? 'endpoint' : 'cold-resume' };
     }
+    if (message.method === 'thread.goal.get') {
+      if (!store.row(id)) throw new Error('会话不存在。');
+      if (!controlFor(session, id)) throw new Error('请先连接并接管这条会话。');
+      const runtime = runtimeForThread(id);
+      if (runtime?.mode === 'same-id-resume' || executionMode === 'desktop' && runtime?.attached) return { goal:runtime.goal || null };
+      if (rpc.threads?.has(id) && typeof rpc.request === 'function') return rpc.request('thread/goal/get', { threadId:id });
+      return { goal:null };
+    }
+    if (message.method === 'thread.goal.set') {
+      const row = store.row(id);
+      if (!row || row.archived || String(row.source).startsWith('{')) throw new Error('归档会话或子代理不能设置持续目标。');
+      if (!controlFor(session, id)) throw new Error('请先连接并接管这条会话。');
+      if (typeof body.objective !== 'string' || !body.objective.trim() || body.objective.length > 5000) throw new Error('目标内容不能为空，且不得超过 5000 个字符。');
+      const tokenBudget = body.tokenBudget === undefined || body.tokenBudget === null ? null : body.tokenBudget;
+      if (tokenBudget !== null && (!Number.isSafeInteger(tokenBudget) || tokenBudget < 1 || tokenBudget > 10000000)) throw new Error('目标 token 预算必须在 1 至 10000000 之间。');
+      const runtime = runtimeForThread(id);
+      if (runtime?.mode === 'same-id-resume') return { goal:await resumeManager.setGoal(id, { objective:body.objective.trim(), tokenBudget }) };
+      if (executionMode === 'desktop' && runtime?.attached) throw new Error('当前 Codex 桌面 IPC 未公开原生 Goal 写入接口；请在电脑端设置目标。不会用提示词模拟原生 Goal。');
+      if (rpc.threads?.has(id) && typeof rpc.request === 'function') return rpc.request('thread/goal/set', {
+        threadId:id, origin:'user', objective:body.objective.trim(), status:'active', tokenBudget
+      });
+      throw new Error('当前执行通道不支持原生 Goal 写入。');
+    }
+    if (message.method === 'thread.goal.status') {
+      if (!controlFor(session, id) || !store.row(id)) throw new Error('请先连接并接管这条会话。');
+      if (!['active','paused','blocked','complete'].includes(body.status)) throw new Error('无效的目标状态。');
+      const runtime = runtimeForThread(id);
+      if (runtime?.mode === 'same-id-resume') return { goal:await resumeManager.setGoalStatus(id, body.status) };
+      if (executionMode === 'desktop' && runtime?.attached) throw new Error('当前 Codex 桌面 IPC 未公开原生 Goal 状态接口；不会伪造目标状态。');
+      if (rpc.threads?.has(id) && typeof rpc.request === 'function') return rpc.request('thread/goal/set', { threadId:id, origin:'user', status:body.status });
+      throw new Error('当前执行通道不支持原生 Goal 状态更新。');
+    }
+    if (message.method === 'thread.goal.clear') {
+      if (!controlFor(session, id) || !store.row(id)) throw new Error('请先连接并接管这条会话。');
+      const runtime = runtimeForThread(id);
+      if (runtime?.mode === 'same-id-resume') return resumeManager.clearGoal(id);
+      if (executionMode === 'desktop' && runtime?.attached) throw new Error('当前 Codex 桌面 IPC 未公开原生 Goal 清除接口；请在电脑端清除目标。');
+      if (rpc.threads?.has(id) && typeof rpc.request === 'function') return rpc.request('thread/goal/clear', { threadId:id, origin:'user' });
+      throw new Error('当前执行通道不支持原生 Goal 清除。');
+    }
     if (message.method === 'turn.start') {
       const approval = controlFor(session, id);
       if (!approval) throw new Error('请先确认这条会话的接续方式。');
       const mode=body.mode??'default';
-      if(!['default','plan','goal'].includes(mode))throw new Error('对话模式无效。');
+      if(!['default','plan'].includes(mode))throw new Error('目标已改为会话级原生 Goal，请使用“目标”管理；不再用提示词模拟。');
       const attachmentIds=body.attachmentIds===undefined?[]:body.attachmentIds;
       if(!Array.isArray(attachmentIds)||attachmentIds.length>maxPendingAttachments||new Set(attachmentIds).size!==attachmentIds.length
         ||attachmentIds.some(attachmentId=>typeof attachmentId!=='string'))throw new Error('文件附件列表无效。');
@@ -590,16 +663,23 @@ export function createOrbitServer(options = {}) {
         return attachment;
       });
       let text=body.text.trim()||(attachments.length?`请查看并处理以下附件：${attachments.map(file=>file.label).join('、')}`:'');
-      if(mode==='goal')text=`请将本轮请求作为需要完成的目标，主动推进直到完成，并汇报结果；如果受阻，请明确说明原因。\n\n本轮目标：\n${text}`;
-      if(body.mode==='plan')text=`请先分析任务并制定清晰的分步计划，说明后等待我确认；在我确认前不要执行任何修改。\n\n任务：\n${text}`;
       if (executionMode === 'desktop') {
+        const runtime=runtimeForThread(id);
+        if(runtime?.mode==='same-id-resume'){
+          if(attachments.length)throw new Error('文件传输目前需要桌面热接管；请在电脑上打开这条原会话后重新连接。');
+          const resumedRpc=resumeManager?.rpcFor(id);
+          if(!resumedRpc)throw new Error('原会话接续连接已失效，请重新打开这条会话。');
+          const settings=session.preferences.get(id);
+          return resumedRpc.startTurn(id,text,approval.writable,settings?.pending?settings:settings||null,{mode});
+        }
         const result=await rpc.startTurn(id,text,{mode,attachments});
         for(const attachment of attachments){attachment.consumed=true;attachment.expires=Date.now()+attachmentRetention;consumedAttachments.set(attachment.id,attachment);}
         return result;
       }
-      if(mode!=='default'||attachments.length)throw new Error('计划/目标模式和文件附件仅支持 Codex 桌面热接管。');
+      if(attachments.length)throw new Error('文件附件仅支持 Codex 桌面热接管。');
       if (!rpc.threads.has(id) && !endpoint && store.locked(id)) throw new Error('会话已被其他进程占用，未发送消息。');
-      return rpc.startTurn(id,text,approval.writable,session.preferences.get(id)||null);
+      if(mode==='plan'&&typeof rpc.startTurn!=='function')throw new Error('当前执行通道不支持原生协作模式。');
+      return rpc.startTurn(id,text,approval.writable,session.preferences.get(id)||null,{mode});
     }
     if (message.method === 'thread.settings') {
       if (!controlFor(session, id) || !store.row(id)) throw new Error('没有此会话的控制授权。');
@@ -608,8 +688,16 @@ export function createOrbitServer(options = {}) {
       if (!model || (body.effort !== null && !model.supportedReasoningEfforts.includes(body.effort))) throw new Error('所选模型或推理级别不可用，请重新加载目录。');
       if (executionMode === 'desktop') {
         if (typeof body.expectedModel !== 'string' || !Object.hasOwn(body, 'expectedEffort')) throw new Error('缺少当前模型版本，请刷新会话。');
-        const runtime = rpc.runtime(id);
+        const runtime = runtimeForThread(id);
         if (!runtime.attached) throw new Error('桌面实时快照未就绪，请重新连接会话。');
+        if(runtime.mode==='same-id-resume'){
+          if(runtime.turnId)throw new Error('当前任务正在执行，请等待完成后再切换模型参数。');
+          const settings={model:body.model,effort:body.effort};
+          session.preferences.set(id,settings);
+          const resumedSession=resumeManager.sessions.get(id);
+          if(resumedSession)resumedSession.model=body.model;
+          return {...settings,applied:true,mode:'next-turn'};
+        }
         if (runtime.model !== body.expectedModel || runtime.effort !== body.expectedEffort) throw new Error('模型设置已变化，请刷新后重试。');
         if (runtime.turnId) {
           session.preferences.set(id,{
@@ -630,6 +718,7 @@ export function createOrbitServer(options = {}) {
     if (message.method === 'turn.steer') {
       if (!controlFor(session, id)) throw new Error('没有此会话的控制授权。');
       if (executionMode !== 'desktop') throw new Error('当前执行通道不支持向桌面任务追加指令。');
+      if(runtimeForThread(id)?.mode==='same-id-resume')throw new Error('当前原会话通过 App Server 接续；请等待本轮完成后再发送下一条消息。');
       const attachmentIds=body.attachmentIds===undefined?[]:body.attachmentIds;
       if(!Array.isArray(attachmentIds)||attachmentIds.length>maxPendingAttachments||new Set(attachmentIds).size!==attachmentIds.length
         ||attachmentIds.some(attachmentId=>typeof attachmentId!=='string'))throw new Error('文件附件列表无效。');
@@ -647,19 +736,26 @@ export function createOrbitServer(options = {}) {
     }
     if (message.method === 'turn.interrupt') {
       if (!controlFor(session, id)) throw new Error('没有此会话的控制授权。');
-      if (executionMode === 'desktop') return rpc.interrupt(id, body.turnId);
+      if (executionMode === 'desktop') {
+        if(resumeManager?.has(id))return resumeManager.rpcFor(id).interrupt(id);
+        return rpc.interrupt(id, body.turnId);
+      }
       return rpc.interrupt(id);
     }
     if (message.method === 'approval.reply') {
-      const approval = rpc.approvals.get(String(body.requestId));
+      const approvalRpc=resumeManager?.rpcForApproval(body.requestId)||rpc;
+      const approval = approvalRpc.approvals.get(String(body.requestId));
       if (!approval || !controlFor(session, approval.params.threadId)) throw new Error('没有此审批的控制授权。');
-      return rpc.replyApproval(body.requestId, body);
+      return approvalRpc.replyApproval(body.requestId, body);
     }
     throw new Error('不支持的操作。');
   }
 
   const eventListener = event => {
-    if (!/^(item\/|turn\/|thread\/status|orbit\/|serverRequest\/resolved|error$)/.test(event.method)) return;
+    if (!/^(item\/|turn\/|thread\/(status|goal\/)|orbit\/|serverRequest\/resolved|error$)/.test(event.method)) return;
+    if(event.method==='orbit/engine'&&event.params?.connected===false&&resumeManager?.ids().length){
+      event={...event,params:{...event.params,connected:true,desktopConnected:false,resumedConnected:true}};
+    }
     if(event.method==='turn/completed'&&event.params?.threadId){
       for(const session of sessions.values())for(const [id,attachment]of session.attachments){
         if(attachment.threadId===event.params.threadId&&attachment.consumed)removeAttachment(session,id);
@@ -688,6 +784,8 @@ export function createOrbitServer(options = {}) {
   };
   rpc.on('event', eventListener);
   rpc.on('lost', lostListener);
+  resumeManager?.on('event', eventListener);
+  resumeManager?.on('lost', lostListener);
   async function listen() {
     await new Promise((resolve, reject) => { server.once('error', reject); server.listen(port, host, resolve); });
     port = server.address().port;
@@ -725,6 +823,9 @@ export function createOrbitServer(options = {}) {
     for(const session of sessions.values())removeSessionAttachments(session);
     for (const socket of sockets) socket.terminate();
     rpc.off('event', eventListener); rpc.off('lost', lostListener); rpc.close();
+    resumeManager?.off('event', eventListener);
+    resumeManager?.off('lost', lostListener);
+    if(resumeManager)await resumeManager.close();
     await new Promise(resolve => wss.close(resolve));
     server.closeAllConnections();
     await new Promise(resolve => server.close(resolve));