orbit-codex-bridge 0.1.3 → 0.1.7

package/lib/rpc.mjs

@@ -3,7 +3,9 @@ import { spawn } from 'node:child_process';
 import { createInterface } from 'node:readline';
 import fs from 'node:fs';
 import path from 'node:path';
+import crypto from 'node:crypto';
 import WebSocket from 'ws';
+import { approvalResponse } from './approvals.mjs';
 
 export function findCodexBinary() {
   if (process.env.ORBIT_CODEX_BIN) return process.env.ORBIT_CODEX_BIN;
@@ -25,6 +27,7 @@ export class CodexRpc extends EventEmitter {
     this.tokenFile = tokenFile;
     this.pending = new Map();
     this.approvals = new Map();
+    this.approvalNamespace = crypto.randomUUID();
     this.threads = new Map();
     this.starting = new Set();
     this.sequence = 0;
@@ -106,16 +109,21 @@ export class CodexRpc extends EventEmitter {
       return;
     }
     if (message.id !== undefined && message.method) {
-      const supported = ['item/commandExecution/requestApproval','item/fileChange/requestApproval','item/tool/requestUserInput','item/permissions/requestApproval'];
+      const supported = ['item/commandExecution/requestApproval','item/fileChange/requestApproval','item/tool/requestUserInput','item/permissions/requestApproval','mcpServer/elicitation/request'];
       if (!supported.includes(message.method) || !this.threads.has(message.params?.threadId)) {
         this.send({ id: message.id, error: { code: -32601, message: 'This client does not implement the requested host tool.' } });
         return;
       }
-      this.approvals.set(String(message.id), message);
-      this.emit('event', { method: 'orbit/approval', params: { requestId: String(message.id), method: message.method, ...message.params } });
+      const requestId = `${this.approvalNamespace}:${message.id}`;
+      this.approvals.set(requestId, message);
+      this.emit('event', { method: 'orbit/approval', params: { ...message.params, requestId, method: message.method } });
       return;
     }
-    if (message.method === 'serverRequest/resolved') this.approvals.delete(String(message.params?.requestId));
+    if (message.method === 'serverRequest/resolved') {
+      const requestId = `${this.approvalNamespace}:${message.params?.requestId}`;
+      this.approvals.delete(requestId);
+      message = { ...message, params:{ ...message.params, requestId } };
+    }
     if (message.method === 'turn/started' && this.threads.has(message.params?.threadId)) this.threads.get(message.params.threadId).turnId = message.params.turn.id;
     if (message.method === 'turn/completed' && this.threads.has(message.params?.threadId)) {
       const thread = this.threads.get(message.params.threadId);
@@ -130,25 +138,71 @@ 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 startThread({ cwd, model = null, projectId = null, writable = true } = {}) {
+    await this.connect();
+    const result = await this.request('thread/start', {
+      cwd,
+      projectId,
+      approvalPolicy: 'on-request',
+      sandbox: writable ? 'workspace-write' : 'read-only',
+      ...(model ? { model } : {})
+    });
+    const thread = result?.thread;
+    if (typeof thread?.id !== 'string' || !/^[a-zA-Z0-9_-]{8,120}$/.test(thread.id)) {
+      throw new Error('Codex 未返回有效的新会话 ID。');
+    }
+    this.threads.set(thread.id, {
+      turnId:null,lastCompletedTurnId:null,writable:Boolean(writable),
+      model:result.model||thread.model||null,
+      effort:result.reasoningEffort??thread.reasoningEffort??null,
+      collaborationMode:result.collaborationMode||{mode:'default',settings:{}}
+    });
+    return { threadId:thread.id, model:result.model||thread.model||null, cwd:thread.cwd||cwd, projectId:thread.projectId||projectId };
+  }
+
+  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); }
+    } finally {
+      this.starting.delete(id);
+      this.emit('event', { method:'orbit/turn-settled', params:{ threadId:id } });
+    }
   }
 
   async interrupt(id) {
@@ -160,24 +214,10 @@ export class CodexRpc extends EventEmitter {
   replyApproval(id, body) {
     const request = this.approvals.get(String(id));
     if (!request) throw new Error('审批已结束或不属于当前桥接实例。');
-    let result;
-    if (request.method === 'item/tool/requestUserInput') {
-      const answers = {};
-      for (const question of request.params.questions || []) {
-        const value = body.answers?.[question.id];
-        if (typeof value !== 'string' || !value.trim() || value.length > 4000) throw new Error('请回答所有问题。');
-        answers[question.id] = { answers: [value] };
-      }
-      result = { answers };
-    } else if (request.method === 'item/permissions/requestApproval') {
-      if (body.decision !== 'decline') throw new Error('首版暂不支持扩大权限，请在本机处理。');
-      result = { permissions: {}, scope: 'turn' };
-    } else {
-      if (!['accept','decline'].includes(body.decision)) throw new Error('无效审批决定。');
-      result = { decision: body.decision };
-    }
+    const result = approvalResponse(request, body);
     this.send({ id: request.id, result });
     this.approvals.delete(String(id));
+    this.emit('event', { method:'serverRequest/resolved', params:{ threadId:request.params.threadId, requestId:String(id) } });
     return { resolved: true };
   }
 
@@ -198,6 +238,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/lib/store.mjs

@@ -92,6 +92,7 @@ export class NativeStore {
       id: row.id, title: row.name || row.title || '未命名会话',
       preview: cleanText(row.preview || row.first_user_message || '').slice(0, 220), cwd,
       projectId: row.project_id || cwd || 'ungrouped', projectName: projects.get(row.project_id)?.name || leaf,
+      nativeProjectId: row.project_id || null,
       source: row.source, provider: row.model_provider, model: row.model || null,
       archived: Boolean(row.archived), pinned: Boolean(row.is_pinned), locked: this.locked(row.id),
       createdAt: row.created_at_ms || row.created_at * 1000, updatedAt: row.updated_at_ms || row.updated_at * 1000,
@@ -103,6 +104,11 @@ export class NativeStore {
     try { projects = new Map(this.state.prepare('SELECT id,name FROM projects').all().map(project => [project.id, project])); } catch {}
     return this.state.prepare('SELECT * FROM threads ORDER BY updated_at DESC').all().map(row => this.summary(row, projects));
   }
+  projectWorkspaces() {
+    try {
+      return this.state.prepare('SELECT projects.id AS projectId,projects.name AS label,project_roots.path AS cwd FROM projects JOIN project_roots ON project_roots.project_id=projects.id ORDER BY projects.position,project_roots.position').all();
+    } catch { return []; }
+  }
   historyFor(id, before = null, limit = 60) {
     const row = this.row(id);
     if (!row) return null;

package/lib/updates.mjs

@@ -0,0 +1,97 @@
+const registryUrl = 'https://registry.npmjs.org/orbit-codex-bridge/latest';
+const versionPattern = /^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][a-zA-Z0-9-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][a-zA-Z0-9-]*))*))?(?:\+[a-zA-Z0-9-]+(?:\.[a-zA-Z0-9-]+)*)?$/;
+
+function parseVersion(value) {
+  if (typeof value !== 'string' || value.length > 120) throw new Error('版本格式无效。');
+  const match = value.match(versionPattern);
+  if (!match) throw new Error('版本格式无效。');
+  return { core:match.slice(1, 4).map(part => BigInt(part)), prerelease:match[4]?.split('.') || [] };
+}
+
+export function compareVersions(left, right) {
+  const first = parseVersion(left);
+  const second = parseVersion(right);
+  for (let index = 0; index < 3; index++) {
+    if (first.core[index] !== second.core[index]) return first.core[index] > second.core[index] ? 1 : -1;
+  }
+  if (!first.prerelease.length || !second.prerelease.length) {
+    return first.prerelease.length === second.prerelease.length ? 0 : first.prerelease.length ? -1 : 1;
+  }
+  for (let index = 0; index < Math.max(first.prerelease.length, second.prerelease.length); index++) {
+    const firstPart = first.prerelease[index];
+    const secondPart = second.prerelease[index];
+    if (firstPart === secondPart) continue;
+    if (firstPart === undefined || secondPart === undefined) return firstPart === undefined ? -1 : 1;
+    const firstNumeric = /^\d+$/.test(firstPart);
+    const secondNumeric = /^\d+$/.test(secondPart);
+    if (firstNumeric !== secondNumeric) return firstNumeric ? -1 : 1;
+    return firstNumeric ? BigInt(firstPart) > BigInt(secondPart) ? 1 : -1 : firstPart > secondPart ? 1 : -1;
+  }
+  return 0;
+}
+
+export function updateCommand(platform = process.platform) {
+  return `${platform === 'win32' ? 'npx.cmd' : 'npx'} --yes --package=orbit-codex-bridge@latest orbit login`;
+}
+
+async function readMetadata(response) {
+  if (!response.ok || !response.body) throw new Error('更新服务暂不可用。');
+  const reader = response.body.getReader();
+  const chunks = [];
+  let bytes = 0;
+  try {
+    while (true) {
+      const { done, value } = await reader.read();
+      if (done) break;
+      bytes += value.byteLength;
+      if (bytes > 256 * 1024) throw new Error('版本信息过大。');
+      chunks.push(Buffer.from(value));
+    }
+    return JSON.parse(Buffer.concat(chunks).toString('utf8'));
+  } finally { await reader.cancel().catch(() => {}); }
+}
+
+export function createUpdateChecker(currentVersion, {
+  fetchImpl = globalThis.fetch,
+  now = Date.now,
+  platform = process.platform,
+  timeout = 5000,
+  cacheLifetime = 6 * 60 * 60 * 1000,
+  failureLifetime = 5 * 60 * 1000,
+  minimumInterval = 60000
+} = {}) {
+  parseVersion(currentVersion);
+  let result = { currentVersion, latestVersion:null, available:false, status:'unchecked', checkedAt:null, command:updateCommand(platform) };
+  let inFlight = null;
+  const snapshot = () => ({ ...result });
+  async function check({ force = false } = {}) {
+    if (inFlight) return inFlight;
+    const age = result.checkedAt === null ? Infinity : Math.max(0, now() - result.checkedAt);
+    const lifetime = force ? minimumInterval : result.status === 'unavailable' ? failureLifetime : cacheLifetime;
+    if (age < lifetime) return snapshot();
+    inFlight = (async () => {
+      try {
+        const response = await fetchImpl(registryUrl, {
+          headers:{ Accept:'application/json' }, signal:AbortSignal.timeout(timeout), redirect:'error', cache:'no-store'
+        });
+        const metadata = await readMetadata(response);
+        if (metadata.name !== 'orbit-codex-bridge') throw new Error('包信息不一致。');
+        const comparison = compareVersions(metadata.version, currentVersion);
+        result = {
+          currentVersion, latestVersion:metadata.version, available:comparison > 0,
+          status:comparison > 0 ? 'update-available' : comparison < 0 ? 'ahead' : 'up-to-date',
+          checkedAt:now(), command:updateCommand(platform)
+        };
+      } catch {
+        result = {
+          currentVersion, latestVersion:null, available:false, status:'unavailable', checkedAt:now(),
+          command:updateCommand(platform), message:'暂时无法检查更新，请稍后重试。'
+        };
+      }
+      return snapshot();
+    })();
+    try { return await inFlight; }
+    finally { inFlight = null; }
+  }
+  return { check, snapshot };
+}

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "orbit-codex-bridge",
-  "version": "0.1.3",
+  "version": "0.1.7",
   "type": "module",
-  "description": "Connect your original Codex desktop conversations to Orbit on the web.",
+  "description": "Connect your computer and original Codex conversations to Orbit.",
   "engines": {
     "node": ">=24"
   },
@@ -14,25 +14,26 @@
     "orbit",
     "server.mjs",
     "relay-agent.mjs",
-    "relay-server.mjs",
-    "relay-store.mjs",
-    "lib/",
-    "public/"
+    "lib/approvals.mjs",
+    "lib/client-files.mjs",
+    "lib/connector-service.mjs",
+    "lib/desktop.mjs",
+    "lib/resume-manager.mjs",
+    "lib/rpc.mjs",
+    "lib/store.mjs",
+    "lib/updates.mjs",
+    "scripts/verify-client-package.mjs"
   ],
   "scripts": {
-    "start": "node --env-file-if-exists=.env.local server.mjs",
-    "relay": "node --env-file-if-exists=.env.relay relay-server.mjs",
-    "relay:agent": "node --env-file-if-exists=.env.local relay-agent.mjs",
-    "prepublishOnly": "npm run check && npm test",
-    "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"
+    "start": "node server.mjs",
+    "prepublishOnly": "node scripts/verify-client-package.mjs"
   },
   "dependencies": {
-    "dompurify": "^3.3.0",
-    "marked": "^17.0.0",
-    "qrcode": "^1.5.4",
     "ws": "^8.18.3"
-  }
+  },
+  "publishConfig": {
+    "registry": "https://registry.npmjs.org/",
+    "access": "public"
+  },
+  "orbitDistribution": "client"
 }

package/relay-agent.mjs

@@ -69,9 +69,7 @@ export function createRelayAgent(options = {}) {
           requests.delete(request);
           resolve({statusCode:response.statusCode || 502,headers:{
             'content-type':response.headers['content-type'] || 'application/json',
-            ...(response.headers['set-cookie'] ? {'set-cookie':response.headers['set-cookie']} : {}),
-            ...Object.fromEntries(['content-disposition','content-length','accept-ranges','content-range','etag']
-              .filter(name=>typeof response.headers[name]==='string').map(name=>[name,response.headers[name]]))
+            ...(response.headers['set-cookie'] ? {'set-cookie':response.headers['set-cookie']} : {})
           },body:Buffer.concat(chunks)});
         });
       });
@@ -99,7 +97,7 @@ export function createRelayAgent(options = {}) {
     const body = Buffer.from(message.body || '', 'base64');
     if (body.length > maxBody) return;
     const headers = {};
-    for (const name of ['accept','content-type','cookie','user-agent','range','if-range','if-none-match']) {
+    for (const name of ['accept','content-type','cookie','user-agent']) {
       const value = message.headers?.[name];
       if (typeof value === 'string') headers[name] = value;
     }

package/scripts/verify-client-package.mjs

@@ -0,0 +1,34 @@
+import fs from 'node:fs';
+import path from 'node:path';
+import { fileURLToPath } from 'node:url';
+import { isDeepStrictEqual } from 'node:util';
+import { clientFiles, clientManifest } from '../lib/client-files.mjs';
+
+export function verifyClientPackage(directory) {
+  const root=fs.realpathSync(directory);
+  const manifest=JSON.parse(fs.readFileSync(path.join(root,'package.json'),'utf8'));
+  if (!isDeepStrictEqual(manifest,clientManifest(manifest))) throw new Error('客户端 package.json 不符合发布白名单。');
+  const allowed=new Set(['package.json','package-lock.json','README.md',...clientFiles]);
+  const found=new Set();
+  const visit=(current,prefix='')=>{
+    for(const entry of fs.readdirSync(current,{withFileTypes:true})){
+      if(!prefix&&entry.name==='node_modules'){
+        if(!entry.isDirectory()||entry.isSymbolicLink())throw new Error('node_modules 必须是普通目录。');
+        continue;
+      }
+      const relative=prefix+entry.name;
+      if(entry.isSymbolicLink())throw new Error(`客户端发布目录不允许符号链接：${relative}`);
+      if(entry.isDirectory())visit(path.join(current,entry.name),`${relative}/`);
+      else if(entry.isFile()&&allowed.has(relative))found.add(relative);
+      else throw new Error(`客户端包含非白名单文件：${relative}`);
+    }
+  };
+  visit(root);
+  for(const filename of ['package.json','README.md',...clientFiles])if(!found.has(filename))throw new Error(`客户端缺少文件：${filename}`);
+  return {version:manifest.version,files:[...found].sort()};
+}
+
+if(process.argv[1]&&path.resolve(process.argv[1])===fileURLToPath(import.meta.url)){
+  const result=verifyClientPackage(path.resolve(path.dirname(fileURLToPath(import.meta.url)),'..'));
+  console.log(`Client package verified: ${result.version} · ${result.files.length} files`);
+}