orbit-codex-bridge 0.1.3 → 0.1.7

package/server.mjs

@@ -5,13 +5,15 @@ import os from 'node:os';
 import crypto from 'node:crypto';
 import { fileURLToPath } from 'node:url';
 import { WebSocketServer, WebSocket } from 'ws';
-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';
+import { createUpdateChecker } from './lib/updates.mjs';
 
 const root = path.dirname(fileURLToPath(import.meta.url));
-const packageVersion = JSON.parse(fs.readFileSync(path.join(root,'package.json'),'utf8')).version;
+const packageManifest = JSON.parse(fs.readFileSync(path.join(root,'package.json'),'utf8'));
+const packageVersion = packageManifest.version;
 const sessionLifetime = 12 * 60 * 60 * 1000;
 const attachmentLifetime = 30 * 60 * 1000;
 const attachmentRetention = 24 * 60 * 60 * 1000;
@@ -46,107 +48,9 @@ function cleanupStaleAttachments(store) {
   }
 }
 
-const excludedProjectEntries=new Set([
-  '.git','.codex','.orbit-attachments','node_modules','.venv','venv','dist','build',
-  '.ssh','.aws','.azure','.config','.npm','.docker','secrets','credentials'
-]);
-const excludedProjectFiles=/^(?:\.env(?:\..*)?|\.npmrc|\.pypirc|\.netrc|\.git-credentials|id_(?:rsa|ed25519)(?:\.pub)?|.*(?:secret|credential)(?:\..*)?|.*\.(?:pem|p12|pfx|key|keystore))$/i;
-
-function checkedProjectEntry(row,relativePath=''){
-  if(!row?.cwd||typeof relativePath!=='string'||relativePath.length>1024||relativePath.includes('\0'))throw new Error('项目文件路径无效。');
-  const root=fs.realpathSync(row.cwd);
-  if(!fs.statSync(root).isDirectory())throw new Error('会话工作目录不可用。');
-  const parts=relativePath?relativePath.split(/[\\/]/):[];
-  if(parts.some(part=>!part||part==='.'||part==='..'))throw new Error('不允许访问项目目录之外的路径。');
-  let current=root;
-  for(const part of parts){
-    if(excludedProjectEntries.has(part.toLowerCase())||excludedProjectFiles.test(part))throw new Error('此系统目录或凭证文件不开放传输。');
-    current=path.join(current,part);
-    const stat=fs.lstatSync(current);
-    if(stat.isSymbolicLink())throw new Error('不支持通过符号链接传输文件。');
-  }
-  const resolved=path.resolve(current);
-  const relative=path.relative(root,resolved);
-  if(relative==='..'||relative.startsWith(`..${path.sep}`)||path.isAbsolute(relative))throw new Error('不允许访问项目目录之外的路径。');
-  return {root,path:resolved,stat:fs.statSync(resolved),relative:parts.join(path.sep)};
-}
-
-function projectFileList(row,relativePath=''){
-  const directory=checkedProjectEntry(row,relativePath);
-  if(!directory.stat.isDirectory())throw new Error('所选路径不是文件夹。');
-  const entries=[];
-  const visit=(current,relative,depth)=>{
-    if(depth>8||entries.length>=1000)return;
-    for(const name of fs.readdirSync(current)){
-      if(excludedProjectEntries.has(name.toLowerCase())||excludedProjectFiles.test(name))continue;
-      const target=path.join(current,name);
-      let stat;
-      try{stat=fs.lstatSync(target)}catch{continue}
-      if(stat.isSymbolicLink())continue;
-      const child=relative?`${relative}/${name}`:name;
-      if(stat.isDirectory())entries.push({name,path:child,type:'directory',size:null,updatedAt:stat.mtimeMs});
-      else if(stat.isFile())entries.push({name,path:child,type:'file',size:stat.size,updatedAt:stat.mtimeMs});
-      if(stat.isDirectory())visit(target,child,depth+1);
-      if(entries.length>=1000)break;
-    }
-  };
-  visit(directory.path,directory.relative,0);
-  entries.sort((left,right)=>left.type===right.type?left.name.localeCompare(right.name):left.type==='directory'?-1:1);
-  return {path:directory.relative,entries:entries.slice(0,1000),truncated:entries.length>=1000};
-}
-
-const projectMimeTypes=new Map([
-  ['.txt','text/plain; charset=utf-8'],['.md','text/markdown; charset=utf-8'],['.json','application/json'],
-  ['.csv','text/csv; charset=utf-8'],['.html','text/html; charset=utf-8'],['.css','text/css; charset=utf-8'],
-  ['.js','text/javascript; charset=utf-8'],['.ts','text/plain; charset=utf-8'],['.xml','application/xml'],
-  ['.pdf','application/pdf'],['.png','image/png'],['.jpg','image/jpeg'],['.jpeg','image/jpeg'],['.gif','image/gif'],
-  ['.webp','image/webp'],['.svg','image/svg+xml'],['.zip','application/zip']
-]);
-
-function sendFileRange(request,response,row,relativePath){
-  const file=checkedProjectEntry(row,relativePath);
-  if(!file.stat.isFile())throw new Error('所选路径不是文件。');
-  if(file.stat.size>8*1024*1024)throw Object.assign(new Error('单个文件下载不得超过 8 MiB。'),{status:413});
-  const filename=path.basename(file.path);
-  const fallback=filename.replace(/[^\x20-\x7e]|["\\;]/g,'_');
-  const encoded=encodeURIComponent(filename).replace(/[!'()*]/g,character=>`%${character.charCodeAt(0).toString(16).toUpperCase()}`);
-  const etag=`"orbit-${file.stat.size}-${Math.trunc(file.stat.mtimeMs)}"`;
-  const headers={
-    'Content-Type':projectMimeTypes.get(path.extname(filename).toLowerCase())||'application/octet-stream',
-    'Accept-Ranges':'bytes',
-    'ETag':etag,
-    'Content-Disposition':`attachment; filename="${fallback}"; filename*=UTF-8''${encoded}`,
-    'X-Content-Type-Options':'nosniff'
-  };
-  if(request.headers['if-none-match']===etag){response.writeHead(304,headers);return response.end()}
-  const ifRange=request.headers['if-range'];
-  const range=ifRange&&ifRange!==etag?null:request.headers.range;
-  if(!range){
-    response.writeHead(200,{...headers,'Content-Length':file.stat.size});
-    if(request.method==='HEAD')return response.end();
-    return fs.createReadStream(file.path).pipe(response);
-  }
-  const match=String(range).match(/^bytes=(\d*)-(\d*)$/);
-  if(!match||(!match[1]&&!match[2])){response.writeHead(416,{...headers,'Content-Range':`bytes */${file.stat.size}`});return response.end()}
-  let start,end;
-  if(!match[1]){
-    const suffix=Number(match[2]);
-    if(!Number.isSafeInteger(suffix)||suffix<=0)return response.writeHead(416,{'Content-Range':`bytes */${file.stat.size}`}).end();
-    start=Math.max(0,file.stat.size-suffix);end=file.stat.size-1;
-  }else{
-    start=Number(match[1]);end=match[2]?Number(match[2]):file.stat.size-1;
-  }
-  if(!Number.isSafeInteger(start)||!Number.isSafeInteger(end)||start<0||start>=file.stat.size||end<start){
-    response.writeHead(416,{...headers,'Content-Range':`bytes */${file.stat.size}`});return response.end();
-  }
-  end=Math.min(end,file.stat.size-1);
-  const length=end-start+1;
-  response.writeHead(206,{...headers,'Content-Length':length,'Content-Range':`bytes ${start}-${end}/${file.stat.size}`});
-  if(request.method==='HEAD')return response.end();
-  fs.createReadStream(file.path,{start,end}).pipe(response);
-}
-
 export function createOrbitServer(options = {}) {
+  const clientOnly=options.clientOnly ?? packageManifest.orbitDistribution==='client';
+  const updateChecker=options.updateChecker || createUpdateChecker(packageVersion);
   const home = options.home || process.env.ORBIT_CODEX_HOME || process.env.CODEX_HOME || path.join(os.homedir(), '.codex');
   const dataDir = options.dataDir || path.join(root, '.runtime');
   fs.mkdirSync(dataDir, { recursive: true, mode: 0o700 });
@@ -156,8 +60,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.resume(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 {
@@ -192,6 +118,21 @@ export function createOrbitServer(options = {}) {
     }).finally(() => { modelLoading = null; });
     return modelLoading;
   }
+  function workspaceCatalog() {
+    const workspaces=new Map();
+    workspaces.set('personal',{id:'personal',cwd:path.join(dataDir,'workspaces','personal'),projectId:null,label:'个人会话 · 不绑定项目',isDefault:true});
+    const add=(directory,label,projectId=null)=>{
+      try{
+        const resolved=fs.realpathSync(directory);
+        if(!fs.statSync(resolved).isDirectory())return;
+        const key=`${projectId||''}:${process.platform==='win32'?resolved.toLowerCase():resolved}`;
+        if(!workspaces.has(key))workspaces.set(key,{id:key,cwd:resolved,label,projectId,isDefault:false});
+      }catch{}
+    };
+    for(const workspace of store.projectWorkspaces?.()||[])add(workspace.cwd,workspace.label,workspace.projectId);
+    for(const thread of store.list())if(thread.cwd)add(thread.cwd,thread.projectName||path.basename(thread.cwd),thread.nativeProjectId||null);
+    return [...workspaces.values()].sort((left,right)=>Number(right.isDefault)-Number(left.isDefault)||left.label.localeCompare(right.label));
+  }
   const publicUrl = options.publicUrl || process.env.ORBIT_PUBLIC_URL || '';
   if (publicUrl && new URL(publicUrl).protocol !== 'https:') throw new Error('ORBIT_PUBLIC_URL 必须使用 HTTPS。');
   const host = options.host || process.env.ORBIT_HOST || '127.0.0.1';
@@ -206,6 +147,7 @@ export function createOrbitServer(options = {}) {
   let port = Number(options.port ?? process.env.ORBIT_PORT ?? 4318);
   let revision = store.revision();
   let timer;
+  let updateTimer;
   let lastDesktopConnect = 0;
   let lastAttachmentCleanup=Date.now();
 
@@ -266,7 +208,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,15 +249,16 @@ 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,
+      product: 'Orbit', version: packageVersion, updates:updateChecker.snapshot(), device: os.hostname(), platform: process.platform, home,
       threadCount: threads.length, projectCount: new Set(threads.map(thread => thread.projectId)).size,
       archivedCount: threads.filter(thread => thread.archived).length, lockedCount: threads.filter(thread => thread.locked).length,
       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 +277,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 +316,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, '已取消实时跟随。');
     }
   }
 
@@ -420,7 +366,9 @@ export function createOrbitServer(options = {}) {
         const session = sessionFor(request);
         if (!session) return json(response, 401, { error: '请先配对这台电脑。' });
         if (request.method === 'GET' && url.pathname === '/api/status') return json(response, 200, status(session));
+        if (request.method === 'GET' && url.pathname === '/api/updates') return json(response, 200, await updateChecker.check({force:true}));
         if (request.method === 'GET' && url.pathname === '/api/threads') return json(response, 200, { threads: store.list(), revision });
+        if (request.method === 'GET' && url.pathname === '/api/workspaces') return json(response, 200, { workspaces:workspaceCatalog() });
         if (request.method === 'GET' && url.pathname === '/api/models') return json(response, 200, { models: await modelCatalog() });
         if (request.method === 'POST' && url.pathname === '/api/logout') {
           sessions.delete(session.key);
@@ -429,9 +377,11 @@ export function createOrbitServer(options = {}) {
           return json(response, 200, { ok: true }, { 'Set-Cookie': 'orbit_session=; HttpOnly; SameSite=Strict; Path=/; Max-Age=0' });
         }
         if (request.method === 'POST' && url.pathname === '/api/pair/qr') {
+          if(clientOnly)return json(response,404,{error:'电脑连接器不提供网页配对，请在工作台登录账号。'});
           const body = await readBody(request);
           const connection = status(session).connectionUrls.find(value => value === body.url);
           if (!connection) return json(response, 400, { error: '请选择桥接服务提供的连接地址。' });
+          const {default:QRCode}=await import('qrcode');
           return json(response, 200, { image: await QRCode.toDataURL(`${connection}/#pair=${encodeURIComponent(pairingKey)}`, { width: 280, margin: 2 }), warning: '扫码者将能查看本机会话。仅向可信设备展示。' });
         }
         const uploadMatch=url.pathname.match(/^\/api\/threads\/([a-zA-Z0-9_-]{8,120})\/attachments$/);
@@ -445,18 +395,6 @@ export function createOrbitServer(options = {}) {
           removeAttachment(session,body.attachmentId);
           return json(response,200,{removed:true});
         }
-        const filesMatch=url.pathname.match(/^\/api\/threads\/([a-zA-Z0-9_-]{8,120})\/files$/);
-        if(request.method==='GET'&&filesMatch){
-          const row=store.row(filesMatch[1]);
-          if(!row)return json(response,404,{error:'会话不存在。'});
-          return json(response,200,projectFileList(row,url.searchParams.get('path')||''));
-        }
-        const fileMatch=url.pathname.match(/^\/api\/threads\/([a-zA-Z0-9_-]{8,120})\/file$/);
-        if(request.method==='GET'&&fileMatch){
-          const row=store.row(fileMatch[1]);
-          if(!row)return json(response,404,{error:'会话不存在。'});
-          return sendFileRange(request,response,row,url.searchParams.get('path')||'');
-        }
         const match = url.pathname.match(/^\/api\/threads\/([a-zA-Z0-9_-]{8,120})\/messages$/);
         if (request.method === 'GET' && match) {
           const history = store.historyFor(match[1], url.searchParams.get('before'), url.searchParams.get('limit') || 60);
@@ -464,6 +402,7 @@ export function createOrbitServer(options = {}) {
         }
         return json(response, 404, { error: '接口不存在。' });
       }
+      if(clientOnly)return json(response,404,{error:'这是 Orbit 电脑连接器。请在 Orbit 工作台登录并选择这台电脑。'});
       if (request.method !== 'GET' && request.method !== 'HEAD') return json(response, 405, { error: '不支持的方法。' });
       let file;
       let type;
@@ -472,7 +411,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;
       }
@@ -521,9 +460,34 @@ export function createOrbitServer(options = {}) {
   async function command(socket, session, message) {
     const body = message.params || {};
     const id = body.threadId;
+    if (message.method === 'thread.create') {
+      if (executionMode !== 'desktop' || !resumeManager) throw new Error('当前执行通道不支持在本机 Codex 会话库创建会话。');
+      if (typeof body.text !== 'string' || !body.text.trim() || body.text.length > 20000) throw new Error('新会话的首条消息不能为空，且不得超过 20000 个字符。');
+      if (!['default','plan'].includes(body.mode || 'default')) throw new Error('新会话模式无效。');
+      const workspace=workspaceCatalog().find(entry=>entry.id===body.workspaceId);
+      if(!workspace)throw new Error('项目空间不可用，请刷新后重新选择。');
+      if(workspace.isDefault)fs.mkdirSync(workspace.cwd,{recursive:true,mode:0o700});
+      let model=null;
+      if(body.model!==undefined&&body.model!==null){
+        if(typeof body.model!=='string')throw new Error('模型选择无效。');
+        model=(await modelCatalog()).find(entry=>entry.model===body.model)?.model||null;
+        if(!model)throw new Error('所选模型不可用，请刷新模型列表。');
+      }
+      const created=await resumeManager.startNew({cwd:workspace.cwd,projectId:workspace.projectId,model,text:body.text.trim(),writable:true,mode:body.mode||'default',onCreated:threadId=>{
+        unwatchDesktop(socket);
+        session.enabled.set(threadId,{sharedExecution:false,desktop:false,writable:true,expires:Date.now()+1800000});
+        if(socket.readyState!==WebSocket.OPEN)return;
+        socket.subscription=threadId;
+        socket.desktopSubscription=threadId;
+        desktopWatchers.set(threadId,(desktopWatchers.get(threadId)||0)+1);
+      }});
+      if(!(desktopWatchers.get(created.threadId)>0))void resumeManager.release(created.threadId).catch(()=>{});
+      if(created.startError)created.startError=safeError(new Error(created.startError));
+      return created;
+    }
     if (message.method === 'thread.subscribe') {
       const row = id ? store.row(id) : null;
-      if (id && !row) throw new Error('会话不存在。');
+      if (id && !row && !resumeManager?.has(id)) throw new Error('会话不存在。');
       if (socket.desktopSubscription && socket.desktopSubscription !== (id || null)) unwatchDesktop(socket);
       socket.subscription = id || null;
       let runtime = null;
@@ -532,8 +496,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 +507,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});
+        && !row?.archived && !String(row?.source||'').startsWith('{')) {
+        const desktop = runtime.mode !== 'same-id-resume';
+        session.enabled.set(id, {sharedExecution:desktop,desktop,writable:!desktop&&runtime.permissionMode!=='read-only',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.entries()].filter(([,request]) => request.params.threadId === id).map(([requestId,request]) => ({ ...request.params, requestId, 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 +526,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&&runtime.permissionMode!=='read-only', 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 +545,52 @@ 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') return { goal:runtime.goal || null };
+      if (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 桌面持有，目标修改需要桌面 owner 支持。草稿可以继续编辑，当前未保存。');
+      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 桌面持有，目标状态修改需要桌面 owner 支持。');
+      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 桌面持有，目标清除需要桌面 owner 支持。');
+      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 +601,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 +626,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 +656,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 +674,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,9 +722,16 @@ 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;
+    if(clientOnly){
+      void updateChecker.check();
+      updateTimer=setInterval(()=>{void updateChecker.check();},6*60*60*1000);
+      updateTimer.unref();
+    }
     timer = setInterval(() => {
       try {
         tryDesktopConnect();
@@ -720,11 +761,14 @@ export function createOrbitServer(options = {}) {
   }, 30000);
   heartbeat.unref();
   async function close() {
-    clearInterval(timer); clearInterval(heartbeat);
+    clearInterval(timer); clearInterval(heartbeat); clearInterval(updateTimer);
     for (const socket of sockets) unwatchDesktop(socket);
     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));

package/lib/device-auth.mjs

@@ -1,69 +0,0 @@
-import crypto from 'node:crypto';
-
-const digest = value => crypto.createHash('sha256').update(value).digest('hex');
-
-export class DeviceAuthorization {
-  constructor({ lifetime = 5 * 60 * 1000, now = Date.now } = {}) {
-    this.lifetime = lifetime;
-    this.now = now;
-    this.pending = new Map();
-    this.codes = new Map();
-  }
-
-  cleanup() {
-    for (const [key, value] of this.pending) {
-      if (value.expiresAt > this.now()) continue;
-      this.pending.delete(key);
-      this.codes.delete(value.userCode);
-    }
-  }
-
-  start(name) {
-    this.cleanup();
-    if (typeof name !== 'string' || !name.trim() || name.length > 120 || /[\u0000-\u001f\u007f]/.test(name)) {
-      throw new Error('电脑名称格式无效。');
-    }
-    if (this.pending.size >= 1000) throw Object.assign(new Error('连接请求过多，请稍后再试。'), {status:429});
-    const deviceCode = crypto.randomBytes(32).toString('base64url');
-    let userCode;
-    do { userCode = crypto.randomBytes(5).toString('hex').toUpperCase(); } while (this.codes.has(userCode));
-    const key = digest(deviceCode);
-    const entry = {name:name.trim(), userCode, expiresAt:this.now() + this.lifetime, result:null};
-    this.pending.set(key, entry);
-    this.codes.set(userCode, key);
-    return {deviceCode, userCode, expiresIn:Math.floor(this.lifetime / 1000), interval:2};
-  }
-
-  preview(userCode) {
-    this.cleanup();
-    if (typeof userCode !== 'string') return null;
-    const entry = this.pending.get(this.codes.get(userCode));
-    return entry && !entry.result ? {name:entry.name, userCode:entry.userCode, expiresAt:entry.expiresAt} : null;
-  }
-
-  approve(userCode, issue) {
-    if (!this.preview(userCode)) throw Object.assign(new Error('连接请求已失效，请在电脑重新运行 orbit login。'), {status:410});
-    const entry = this.pending.get(this.codes.get(userCode));
-    entry.result = issue(entry.name);
-  }
-
-  poll(deviceCode) {
-    this.cleanup();
-    if (typeof deviceCode !== 'string' || !/^[a-zA-Z0-9_-]{43}$/.test(deviceCode)) return {status:410};
-    const key = digest(deviceCode);
-    const entry = this.pending.get(key);
-    if (!entry) return {status:410};
-    if (!entry.result) return {status:202};
-    return {status:200, result:structuredClone(entry.result)};
-  }
-
-  acknowledge(deviceCode) {
-    if (typeof deviceCode !== 'string' || !/^[a-zA-Z0-9_-]{43}$/.test(deviceCode)) return false;
-    const key = digest(deviceCode);
-    const entry = this.pending.get(key);
-    if (!entry?.result) return false;
-    this.pending.delete(key);
-    this.codes.delete(entry.userCode);
-    return true;
-  }
-}