orbit-codex-bridge 0.1.0 → 0.1.1

package/public/index.html

@@ -7,11 +7,30 @@
 <body>
 <section id="cloud-login-screen" class="pair-screen" hidden>
 <div class="pair-art"><a class="brand light" href="/"><img src="/icon.svg" alt=""><span>orbit<span class="brand-dot">.</span></span><small>SECURE CLOUD</small></a><div class="pair-copy"><span class="eyebrow">YOUR DEVICES. YOUR SESSION.</span><h1>连接你的<br>个人工作空间。</h1><p>通过账号连接云端工作台。会话仍留在你的电脑上。</p></div><span class="art-caption">DEVICE-BOUND / LOCAL-FIRST</span></div>
-<div class="pair-form-wrap"><div class="pair-form"><span class="mini-badge">CLOUD WORKSPACE</span><div id="cloud-auth-tabs" class="cloud-auth-tabs" role="group" aria-label="账号入口" hidden><button id="cloud-show-login" class="active" type="button" aria-pressed="true">登录</button><button id="cloud-show-register" type="button" aria-pressed="false">创建账号</button></div><h2 id="cloud-auth-title">登录 Orbit</h2><p id="cloud-auth-description">登录后，继续连接你的电脑和原有会话。</p><form id="cloud-login-form"><label for="cloud-username">用户名</label><input id="cloud-username" autocomplete="username" maxlength="64" autocapitalize="none" spellcheck="false" required><label for="cloud-password">密码</label><input id="cloud-password" type="password" autocomplete="current-password" maxlength="256" required><button class="primary full" type="submit">安全登录 <span>↗</span></button><p id="cloud-login-error" class="error" role="alert"></p></form><form id="cloud-register-form" hidden><label for="register-username">用户名</label><input id="register-username" autocomplete="username" minlength="3" maxlength="64" autocapitalize="none" spellcheck="false" aria-describedby="register-username-help" required><small id="register-username-help" class="field-help">3–64 位，可用英文字母、数字、点、连字符和下划线。</small><label for="register-display-name">显示名称 <span class="optional">选填</span></label><input id="register-display-name" autocomplete="nickname" maxlength="120" placeholder="你希望我们如何称呼你"><label for="register-password">设置密码</label><input id="register-password" type="password" autocomplete="new-password" minlength="12" maxlength="256" placeholder="至少 12 个字符" required><label for="register-password-confirm">确认密码</label><input id="register-password-confirm" type="password" autocomplete="new-password" minlength="12" maxlength="256" required><p class="registration-note">免费账号可连接 1 台电脑。注册后即可添加电脑。</p><button class="primary full" type="submit">创建账号并继续 <span>↗</span></button><p id="cloud-register-error" class="error" role="alert"></p></form><p id="cloud-registration-notice" class="field-help" hidden>当前暂停自助注册，请联系管理员开通账号。</p><p class="cloud-admin-link"><a href="/admin">管理员入口</a></p></div></div>
+<div class="pair-form-wrap"><div class="pair-form">
+<span class="mini-badge">CLOUD WORKSPACE</span>
+<div id="cloud-auth-tabs" class="cloud-auth-tabs" role="group" aria-label="账号入口" hidden><button id="cloud-show-login" class="active" type="button" aria-pressed="true">登录</button><button id="cloud-show-register" type="button" aria-pressed="false">创建账号</button></div>
+<h2 id="cloud-auth-title">登录 Orbit</h2><p id="cloud-auth-description">登录后，继续连接你的电脑和原有会话。</p>
+<form id="cloud-login-form">
+<label for="cloud-username">用户名</label><input id="cloud-username" autocomplete="username" maxlength="64" autocapitalize="none" spellcheck="false" required>
+<label for="cloud-password">密码</label><input id="cloud-password" type="password" autocomplete="current-password" maxlength="256" required>
+<button class="primary full" type="submit">安全登录 <span>↗</span></button><p id="cloud-login-error" class="error" role="alert"></p>
+</form>
+<form id="cloud-register-form" hidden>
+<label for="register-username">用户名</label><input id="register-username" autocomplete="username" minlength="3" maxlength="64" autocapitalize="none" spellcheck="false" aria-describedby="register-username-help" required>
+<small id="register-username-help" class="field-help">3–64 位，可用英文字母、数字、点、连字符和下划线。</small>
+<label for="register-display-name">显示名称 <span class="optional">选填</span></label><input id="register-display-name" autocomplete="nickname" maxlength="120" placeholder="你希望我们如何称呼你">
+<label for="register-password">设置密码</label><input id="register-password" type="password" autocomplete="new-password" minlength="6" maxlength="256" placeholder="至少 6 个字符" required>
+<label for="register-password-confirm">确认密码</label><input id="register-password-confirm" type="password" autocomplete="new-password" minlength="6" maxlength="256" required>
+<p class="registration-note">免费账号可连接 1 台电脑。注册后即可添加电脑。</p>
+<button class="primary full" type="submit">创建账号并继续 <span>↗</span></button><p id="cloud-register-error" class="error" role="alert"></p>
+</form>
+<p id="cloud-registration-notice" class="field-help" hidden>当前暂停自助注册，请联系管理员开通账号。</p><p class="cloud-admin-link"><a href="/admin">管理员入口</a></p>
+</div></div>
 </section>
 <section id="cloud-device-screen" class="devices-view cloud-device-screen" hidden>
 <header class="cloud-device-header"><div><span class="eyebrow">YOUR CONNECTED COMPUTERS</span><h1 id="cloud-devices-title">选择要连接的电脑</h1><p id="cloud-device-message">只显示绑定到你账号的设备。</p><p id="cloud-device-quota"></p></div><div class="cloud-device-actions"><button id="cloud-refresh-devices" class="button small" type="button">刷新状态</button><button id="cloud-add-computer" class="primary" type="button">添加电脑</button><button id="cloud-logout-picker" class="button small" type="button">退出登录</button></div></header>
-<section id="cloud-onboarding" class="cloud-onboarding" hidden><div><span class="mini-badge">FIRST CONNECTION</span><h2>一条命令，连接你的电脑</h2><p>电脑需要运行 Codex 桌面应用。Windows 用户复制下面命令到 PowerShell 运行。</p><ol><li>命令会检查 Node.js 24+，缺少时通过 winget 安装。</li><li>浏览器打开后登录此 Orbit 账号，确认添加这台电脑。</li><li>授权完成后，终端会启动 Orbit 并显示手机配对二维码；用手机扫描完成首次连接。</li></ol><div class="cloud-command-box"><pre class="cloud-install-command"><code id="cloud-install-command"></code></pre><button id="cloud-copy-install" class="button small" type="button">复制命令</button></div><p id="cloud-install-status" class="cloud-install-status" role="status"></p><p class="cloud-release-note">如果电脑没有 winget，请先从 nodejs.org 安装 Node.js 24+。winget 可能会请求系统安装授权。</p><p class="cloud-release-note">电脑端 npm 安装包尚未发布；发布后这条命令即可直接使用。</p><p class="cloud-release-note">macOS / Linux：先安装 Node.js 24+，再运行 <code>npx --yes --package=orbit-codex-bridge orbit login</code>。</p></div></section>
+<section id="cloud-onboarding" class="cloud-onboarding" hidden><div><span class="mini-badge">FIRST CONNECTION</span><h2>一条命令，连接你的电脑</h2><p>电脑需要运行 Codex 桌面应用。Windows 用户复制下面命令到 PowerShell 运行。</p><ol><li>命令会检查 Node.js 24+，缺少时通过 winget 安装。</li><li>浏览器打开后登录此 Orbit 账号，确认添加这台电脑。</li><li>授权完成后，终端会启动 Orbit 并显示手机配对二维码；用手机扫描完成首次连接。</li></ol><div class="cloud-command-box"><pre class="cloud-install-command"><code id="cloud-install-command"></code></pre><button id="cloud-copy-install" class="button small" type="button">复制命令</button></div><p id="cloud-install-status" class="cloud-install-status" role="status"></p><p class="cloud-release-note">如果电脑没有 winget，请先从 nodejs.org 安装 Node.js 24+。winget 可能会请求系统安装授权。</p><p class="cloud-release-note">macOS / Linux：先安装 Node.js 24+，再运行 <code>npx --yes --package=orbit-codex-bridge orbit login</code>。</p></div></section>
 <div id="cloud-devices-list" class="device-grid cloud-device-list"></div></section>
 <section id="pair-screen" class="pair-screen" hidden>
 <div class="pair-art"><a class="brand light" href="/"><img src="/icon.svg" alt=""><span>orbit<span class="brand-dot">.</span></span></a><div class="orbital-art"><div class="orbit-ring ring-one"></div><div class="orbit-ring ring-two"></div><div class="orbit-core">o</div><span class="orbit-point"></span></div><div class="pair-copy"><span class="eyebrow">YOUR WORK. IN YOUR ORBIT.</span><h1>会话留在电脑，<br>灵感随你出发。</h1><p>不复制上下文，不从头再来。<br>从熟悉的项目，找到原来的对话。</p></div><span class="art-caption">LOCAL FIRST / BUILT FOR CONTINUITY</span></div>

package/relay-agent.mjs

@@ -14,6 +14,11 @@ export function createRelayAgent(options = {}) {
   const deviceId = options.deviceId || process.env.ORBIT_RELAY_DEVICE_ID || '';
   const onReady = options.onReady || (() => {});
   const onError = options.onError || (() => {});
+  const onState = options.onState || (() => {});
+  const heartbeatInterval = options.heartbeatInterval ?? 15000;
+  const heartbeatTimeout = options.heartbeatTimeout ?? 45000;
+  const reconnectDelay = options.reconnectDelay ?? 1000;
+  if (heartbeatInterval <= 0 || heartbeatTimeout <= heartbeatInterval || reconnectDelay < 0) throw new Error('连接心跳参数无效。');
   if (relay.username || relay.password || relay.search || relay.hash || relay.pathname !== '/agent'
     || !(relay.protocol === 'wss:' || relay.protocol === 'ws:' && isLoopback(relay))) {
     throw new Error('ORBIT_RELAY_URL 必须为 wss://域名/agent；仅本地测试允许 ws。');
@@ -27,6 +32,7 @@ export function createRelayAgent(options = {}) {
   let stopped = true;
   let reconnectTimer;
   let readyTimer;
+  let heartbeatTimer;
   let retry = 0;
   const bridges = new Map();
   const requests = new Set();
@@ -59,10 +65,12 @@ export function createRelayAgent(options = {}) {
       }
     };
     const headers = {};
-    for (const name of ['accept','content-type','cookie','host','origin','user-agent']) {
+    for (const name of ['accept','content-type','cookie','user-agent']) {
       const value = message.headers?.[name];
       if (typeof value === 'string') headers[name] = value;
     }
+    headers.host = local.host;
+    headers.origin = local.origin;
     const request = transport.request(target,{method:message.method,headers,timeout:25000},response => {
       const chunks = [];
       let size = 0;
@@ -95,8 +103,8 @@ export function createRelayAgent(options = {}) {
     target.protocol = target.protocol === 'https:' ? 'wss:' : 'ws:';
     const localSocket = new WebSocket(target,{
       headers:{
-        Cookie:message.headers?.cookie || '', Origin:message.headers?.origin || '',
-        Host:message.headers?.host || local.host
+        Cookie:message.headers?.cookie || '', Origin:local.origin,
+        Host:local.host
       },
       maxPayload:maxBody,handshakeTimeout:8000
     });
@@ -122,8 +130,29 @@ export function createRelayAgent(options = {}) {
     if (stopped) return;
     const cloudSocket = new WebSocket(relay,{maxPayload:18*1024*1024,handshakeTimeout:10000});
     socket = cloudSocket;
+    onState({status:'connecting'});
     readyTimer = setTimeout(() => cloudSocket.terminate(),15000);
-    cloudSocket.on('open',() => cloudSocket.send(JSON.stringify({type:'agent-auth',token,deviceId})));
+    let pendingPing = null;
+    let pingSentAt = 0;
+    cloudSocket.on('open',() => {
+      cloudSocket.send(JSON.stringify({type:'agent-auth',token,deviceId}));
+      heartbeatTimer = setInterval(() => {
+        if (socket !== cloudSocket || cloudSocket.readyState !== WebSocket.OPEN) return;
+        if (pendingPing !== null) {
+          if (Date.now() - pingSentAt >= heartbeatTimeout) {
+            onError(new Error('云端心跳超时，正在自动重连。'));
+            cloudSocket.terminate();
+          }
+          return;
+        }
+        pendingPing = `${Date.now()}`;
+        pingSentAt = Date.now();
+        cloudSocket.ping(pendingPing);
+      },heartbeatInterval);
+    });
+    cloudSocket.on('pong',data => {
+      if (data.toString() === pendingPing) pendingPing = null;
+    });
     cloudSocket.on('error',error => { if (!stopped) onError(error); });
     cloudSocket.on('message',raw => {
       if (socket !== cloudSocket) return;
@@ -131,7 +160,7 @@ export function createRelayAgent(options = {}) {
       try { message = JSON.parse(raw.toString()); } catch { cloudSocket.close(1003,'Invalid relay message'); return; }
       if (!message || typeof message !== 'object') return;
       if (message.type === 'agent-ready') {
-        clearTimeout(readyTimer);retry = 0;onReady(message);return;
+        clearTimeout(readyTimer);retry = 0;onState({status:'online'});onReady(message);return;
       }
       if (message.type === 'http-request') return localRequest(message,cloudSocket);
       if (message.type === 'ws-open') return openLocalSocket(message,cloudSocket);
@@ -151,11 +180,19 @@ export function createRelayAgent(options = {}) {
         else bridge.socket.terminate();
       }
     });
-    cloudSocket.on('close',() => {
+    cloudSocket.on('close',(code,reason) => {
       if (socket !== cloudSocket) return;
-      socket = null;clearTimeout(readyTimer);clearLocalConnections();
+      socket = null;clearTimeout(readyTimer);clearInterval(heartbeatTimer);clearLocalConnections();
       if (!stopped) {
-        const delay = Math.min(30000,1000 * 2 ** Math.min(5,retry++));
+        if (code === 1008 || code === 1012 && reason.toString() === 'Replaced by a newer agent') {
+          stopped = true;
+          const detail = code === 1008 ? '电脑凭证被拒绝，请检查账号或重新登录。' : '连接已由另一个 Orbit 实例接管。';
+          onState({status:'blocked',reason:detail});
+          onError(new Error(detail));
+          return;
+        }
+        const delay = Math.min(30000,reconnectDelay * 2 ** Math.min(5,retry++));
+        onState({status:'reconnecting',retryIn:delay,reason:reason.toString() || `连接断开 (${code})`});
         reconnectTimer = setTimeout(connect,delay);
       }
     });
@@ -164,7 +201,7 @@ export function createRelayAgent(options = {}) {
   return {
     start() { if (!stopped) return; stopped = false;connect(); },
     stop() {
-      stopped = true;clearTimeout(reconnectTimer);clearTimeout(readyTimer);
+      stopped = true;clearTimeout(reconnectTimer);clearTimeout(readyTimer);clearInterval(heartbeatTimer);
       const previous = socket;socket = null;previous?.terminate();clearLocalConnections();
     }
   };

package/relay-store.mjs

@@ -21,7 +21,7 @@ function safeString(value, label, max = 120) {
 }
 
 function validPassword(value) {
-  if(typeof value!=='string'||value.length<12||value.length>256||/[\u0000-\u001f\u007f]/.test(value))throw new Error('密码需要 12–256 个字符，不能包含控制字符。');
+  if(typeof value!=='string'||value.length<6||value.length>256||/[\u0000-\u001f\u007f]/.test(value))throw new Error('密码需要 6–256 个字符，不能包含控制字符。');
   return value;
 }
 

package/server.mjs

@@ -11,6 +11,7 @@ import { CodexRpc } from './lib/rpc.mjs';
 import { DesktopRpc } from './lib/desktop.mjs';
 
 const root = path.dirname(fileURLToPath(import.meta.url));
+const packageVersion = JSON.parse(fs.readFileSync(path.join(root,'package.json'),'utf8')).version;
 const sessionLifetime = 12 * 60 * 60 * 1000;
 const safeError = error => String(error.message || error).replace(/Bearer\s+\S+/gi, 'Bearer [REDACTED]').replace(/(?:sk-|sk_)[\w-]{12,}/g, '[REDACTED]').slice(0, 700);
 
@@ -118,7 +119,7 @@ export function createOrbitServer(options = {}) {
     const threads = store.list();
     for (const id of session.enabled.keys()) controlFor(session, id);
     return {
-      product: 'Orbit', version: '0.1.0', device: os.hostname(), platform: process.platform, home,
+      product: 'Orbit', version: packageVersion, 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,
@@ -308,7 +309,8 @@ export function createOrbitServer(options = {}) {
     const body = message.params || {};
     const id = body.threadId;
     if (message.method === 'thread.subscribe') {
-      if (id && !store.row(id)) throw new Error('会话不存在。');
+      const row = id ? store.row(id) : null;
+      if (id && !row) throw new Error('会话不存在。');
       if (socket.desktopSubscription && socket.desktopSubscription !== (id || null)) unwatchDesktop(socket);
       socket.subscription = id || null;
       let runtime = null;
@@ -327,6 +329,10 @@ export function createOrbitServer(options = {}) {
           };
         }
       }
+      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 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 };
@@ -476,10 +482,10 @@ export function createOrbitServer(options = {}) {
 if (process.argv[1] && path.resolve(process.argv[1]) === fileURLToPath(import.meta.url)) {
   const app = createOrbitServer();
   const info = await app.listen();
-  console.log(`Orbit 0.1.0 · ${info.url}`);
+  console.log(`Orbit ${packageVersion} · ${info.url}`);
   console.log(`Native conversations: ${app.store.list().length} · default read-only`);
   console.log(`Pairing key file: ${info.credentialPath}`);
-  console.log(`Execution channel: ${app.rpc.mode || 'cold-resume'} · desktop hot-attach is opt-in per conversation.`);
+  console.log(`Execution channel: ${app.rpc.mode || 'cold-resume'} · desktop chats support automatic hot attach.`);
   const shutdown = async () => { await app.close(); process.exit(0); };
   process.once('SIGINT', shutdown); process.once('SIGTERM', shutdown);
 }