orbit-codex-bridge 0.1.0 → 0.1.2

package/public/app.js

@@ -25,18 +25,20 @@ 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, cloudPairCode: null, approvals: new Map(), 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, models: [], contextUsage: null, settingsBusy: false, reopenModelAfterGrant: false, pendingModelChoice: null, cloudMode: false, cloudUser: null, cloudDevices: [], cloudDeviceId: null, approvals: new Map(), reconnect: 0, loggedOut: false, busy: false, turnId: null };
 let refreshTimer;
 let toastTimer;
 let reconnectTimer;
+let controlRenewTimer;
 let desktopConnectionAttempt = 0;
 let desktopConnecting = false;
 let workspaceGeneration = 0;
 let cloudRegistrationEnabled = false;
 let cloudAuthVersion = 0;
+let cloudConnecting = false;
 const computerInstallCommands = {
-  windows:'$minimum = 24; $node = Get-Command node -ErrorAction SilentlyContinue; if (-not $node -or [int](node -p "process.versions.node.split(\'.\')[0]" 2>$null) -lt $minimum) { if (-not (Get-Command winget -ErrorAction SilentlyContinue)) { throw "需要 Node.js 24+；未检测到 winget，请先从 https://nodejs.org 安装 Node.js 24+。" }; winget install --id OpenJS.NodeJS --exact --source winget --silent --accept-source-agreements --accept-package-agreements; if ($LASTEXITCODE -ne 0) { throw "Node.js 安装失败。" }; $env:Path = "$env:ProgramFiles\\nodejs;$env:Path" }; if ([int](node -p "process.versions.node.split(\'.\')[0]") -lt $minimum) { throw "Node.js 24+ 安装未完成，请重新打开 PowerShell 后重试。" }; npx --yes --package=orbit-codex-bridge orbit login',
-  unix:'npx --yes --package=orbit-codex-bridge orbit login'
+  windows:'$minimum = 24; $node = Get-Command node.exe -ErrorAction SilentlyContinue; $nodeMajor = if ($node) { [int](& $node.Source -p "parseInt(process.versions.node)") } else { 0 }; if ($nodeMajor -lt $minimum) { if (-not (Get-Command winget.exe -ErrorAction SilentlyContinue)) { throw "Node.js 24+ 未安装且找不到 winget；请先从 https://nodejs.org 安装 Node.js 24+。" }; winget.exe install --id OpenJS.NodeJS --exact --source winget --silent --accept-source-agreements --accept-package-agreements; if ($LASTEXITCODE -ne 0) { throw "Node.js 安装失败。" }; $env:Path = "$env:ProgramFiles\\nodejs;$env:Path"; $node = Get-Command node.exe -ErrorAction SilentlyContinue; $nodeMajor = if ($node) { [int](& $node.Source -p "parseInt(process.versions.node)") } else { 0 } }; if (-not $node -or $nodeMajor -lt $minimum) { throw "Node.js 24+ 安装未完成，请关闭并重新打开 PowerShell 后重试。" }; npx.cmd --yes --package=orbit-codex-bridge@latest orbit login',
+  unix:'npx --yes --package=orbit-codex-bridge@latest orbit login'
 };
 
 function setCloudAuthMode(register = false) {
@@ -58,7 +60,7 @@ function setCloudAuthMode(register = false) {
 }
 
 async function loadCloudConfig() {
-  const response = await fetch('/api/cloud/config', { cache:'no-store' });
+  const response = await fetch('/api/cloud/config', { cache:'no-store', signal:AbortSignal.timeout(15000) });
   if (!response.ok) throw new Error('无法读取账号设置，请刷新页面重试。');
   const config = await response.json();
   cloudRegistrationEnabled = config.registrationEnabled === true;
@@ -67,10 +69,9 @@ async function loadCloudConfig() {
   if (!cloudRegistrationEnabled) setCloudAuthMode(false);
 }
 
-function captureCloudPairCode() {
+function discardCloudPairCode() {
   const fragment=new URLSearchParams(location.hash.slice(1));
   if(!fragment.has('pair'))return;
-  state.cloudPairCode=fragment.get('pair');
   history.replaceState(null,'',location.pathname+location.search);
 }
 
@@ -92,23 +93,40 @@ async function api(url, body, signal) {
   const generation = workspaceGeneration;
   const headers = {};
   if (body !== undefined) headers['Content-Type'] = 'application/json';
-  if (state.cloudMode && state.cloudDeviceId && !url.startsWith('/api/cloud/')) headers['X-Orbit-Device-Id'] = state.cloudDeviceId;
+  if (state.cloudMode && state.cloudDeviceId && (!url.startsWith('/api/cloud/') || url === '/api/cloud/connect')) headers['X-Orbit-Device-Id'] = state.cloudDeviceId;
   const options = body === undefined ? { headers } : { method: 'POST', headers, body: JSON.stringify(body) };
   if (signal) options.signal = signal;
-  const response = await fetch(url, options);
-  const result = await response.json();
+  let response;
+  let result;
+  try {
+    response = await fetch(url, {...options, signal:signal || AbortSignal.timeout(35000)});
+    result = await response.json();
+  } catch (error) {
+    if (generation !== workspaceGeneration) throw Object.assign(new Error('工作台已切换。'), {code:'STALE_WORKSPACE'});
+    if (signal?.aborted) throw error;
+    throw new Error(error.name === 'TimeoutError' ? '连接超时，请检查电脑端和网络后重试。' : '无法连接 Orbit 服务，请检查网络后重试。');
+  }
   if (generation !== workspaceGeneration) throw Object.assign(new Error('工作台已切换。'),{code:'STALE_WORKSPACE'});
-  if (response.status === 401 && state.cloudMode && result.code === 'cloud_login_required') showCloudLogin(result.error);
-  else if (response.status === 401 && state.cloudMode && !state.cloudPairCode && !url.startsWith('/api/cloud/')) showPairing();
-  else if (response.status === 401 && !state.cloudMode && url !== '/api/pair' && !url.startsWith('/api/cloud/')) showPairing();
-  if (!response.ok) throw new Error(result.error || '请求失败。');
+  if (!response.ok) {
+    const error = Object.assign(new Error(result.error || '请求失败。'), {status:response.status, code:result.code});
+    if (response.status === 401 && state.cloudMode && (result.code === 'cloud_login_required' || url.startsWith('/api/cloud/') && url !== '/api/cloud/login')) {
+      showCloudLogin(result.error);
+      error.handled = true;
+    } else if (response.status === 401 && !state.cloudMode && url !== '/api/pair' && !url.startsWith('/api/cloud/')) {
+      showPairing();
+      error.handled = true;
+    }
+    throw error;
+  }
   return result;
 }
-function showPairing() {
+function showPairing(error = '') {
   state.loggedOut = true; clearTimeout(reconnectTimer);
   state.socket?.close();
   select('#workspace').hidden = true; select('#pair-screen').hidden = false;
   select('#cloud-login-screen').hidden = true; select('#cloud-device-screen').hidden = true;
+  select('#pair-error').textContent = error;
+  select('#pair-screen .pair-form > p').textContent = '输入电脑上的配对密钥。会话内容仅向已配对的设备开放。';
   const fragment = new URLSearchParams(location.hash.slice(1));
   if (fragment.has('pair')) { select('#pair-code').value = fragment.get('pair'); history.replaceState(null, '', location.pathname); }
 }
@@ -130,21 +148,48 @@ function showCloudDevices(message = '') {
   state.cloudDeviceId = null; localStorage.removeItem('orbit_cloud_device_id');
   select('#workspace').hidden = true; select('#pair-screen').hidden = true; select('#cloud-login-screen').hidden = true;
   select('#cloud-device-screen').hidden = false;
+  select('#cloud-device-message').setAttribute('role', 'status');
   const quota = state.cloudUser?.maxDevices || 1;
   select('#cloud-devices-title').textContent = state.cloudDevices.length ? '选择要连接的电脑' : '连接你的第一台电脑';
   const greeting = `已登录 ${state.cloudUser?.displayName || state.cloudUser?.username}。`;
-  select('#cloud-device-message').textContent = state.cloudPairCode
-    ? `${greeting}选择发起连接的电脑，完成本机配对。${message ? ` ${message}` : ''}`
-    : message || greeting + (state.cloudDevices.length ? '选择一台电脑继续。' : '先添加你自己的电脑，连接后即可查看原有会话。');
+  select('#cloud-device-message').textContent = message || greeting + (state.cloudDevices.length ? '选择一台电脑继续，无需输入配对密钥。' : '先添加你自己的电脑，连接后即可查看原有会话。');
   select('#cloud-device-quota').textContent = `套餐 ${state.cloudUser?.plan || 'free'} · 已添加 ${state.cloudDevices.length} / ${quota} 台电脑`;
   select('#cloud-add-computer').disabled = state.cloudDevices.length >= quota;
   select('#cloud-add-computer').title = state.cloudDevices.length >= quota ? '已达到设备上限，可移除旧电脑或联系管理员调整额度。' : '';
   select('#cloud-onboarding').hidden = state.cloudDevices.length > 0;
   select('#cloud-devices-list').innerHTML = state.cloudDevices.map(device =>
-    `<article class="cloud-computer-card"><button class="device-card cloud-device-option" data-cloud-device="${escapeHtml(device.id)}" ${device.status !== 'active' || !device.online ? 'disabled' : ''}><div class="device-big-icon">${icon('monitor')}</div><h2>${escapeHtml(device.name)}<span class="capability-state ${device.online ? '' : 'pending'}">${device.online ? '在线 · 点击连接' : '等待电脑上线'}</span></h2><p>${device.lastSeen ? `最近在线 · ${ago(device.lastSeen)}` : '请在这台电脑保存连接配置，启动 Orbit 和 Agent。'}</p></button><footer><span>${device.online ? '仅你的账号可连接' : '启动电脑端后刷新状态'}</span><button type="button" class="button small" data-cloud-revoke="${escapeHtml(device.id)}">移除电脑</button></footer></article>`
+    `<article class="cloud-computer-card"><button type="button" class="device-card cloud-device-option" data-cloud-device="${escapeHtml(device.id)}" ${device.status !== 'active' ? 'disabled' : ''}><div class="device-big-icon">${icon('monitor')}</div><h2>${escapeHtml(device.name)}<span class="capability-state ${device.online ? '' : 'pending'}">${device.online ? '在线 · 点击连接' : '电脑离线 · 点击检查'}</span></h2><p>${device.lastSeen ? `最近在线 · ${ago(device.lastSeen)}` : '请在电脑终端运行 orbit login，启动后台连接器。'}</p></button><footer><span>${device.online ? '仅你的账号可连接' : '点击可重新检查上线状态'}</span><button type="button" class="button small" data-cloud-revoke="${escapeHtml(device.id)}">移除电脑</button></footer></article>`
   ).join('');
 }
 
+async function connectCloudDevice(deviceId) {
+  if (cloudConnecting) return;
+  cloudConnecting = true;
+  const button = select(`[data-cloud-device="${CSS.escape(deviceId)}"]`);
+  if (button) {
+    button.disabled = true;
+    button.setAttribute('aria-busy', 'true');
+    button.querySelector('.capability-state').textContent = '正在连接…';
+  }
+  select('#cloud-device-message').textContent = '正在检查电脑连接，请稍候…';
+  try {
+    const profile = await api('/api/cloud/me');
+    state.cloudUser = profile.user;
+    state.cloudDevices = profile.devices || [];
+    const device = state.cloudDevices.find(item => item.id === deviceId && item.status === 'active');
+    if (!device) { showCloudDevices('这台电脑已被移除或不属于当前账号，请重新选择。'); return; }
+    if (!device.online) { showCloudDevices(`电脑“${device.name}”尚未上线。请确认电脑已联网，在电脑终端运行 orbit login，后台启动后再点击连接。`); return; }
+    state.cloudDeviceId = deviceId;
+    localStorage.setItem('orbit_cloud_device_id', deviceId);
+    await boot();
+  } catch (error) {
+    if (!error.handled && error.code !== 'STALE_WORKSPACE') showCloudDevices(error.message);
+  } finally {
+    cloudConnecting = false;
+    if (button?.isConnected) { button.disabled = false; button.removeAttribute('aria-busy'); }
+  }
+}
+
 async function refreshCloudDevices() {
   const workspace = await api('/api/cloud/me');
   state.cloudUser = workspace.user;
@@ -153,7 +198,7 @@ async function refreshCloudDevices() {
 }
 
 function resetCloudWorkspace() {
-  state.loggedOut = true; clearTimeout(reconnectTimer); clearTimeout(refreshTimer); refreshTimer = null;
+  state.loggedOut = true; clearTimeout(reconnectTimer); clearTimeout(refreshTimer); clearTimeout(controlRenewTimer); refreshTimer = null;
   state.selectionVersion++;
   state.socket?.close();
   state.socket = null;
@@ -173,11 +218,11 @@ function resetCloudWorkspace() {
 async function discoverCloudWorkspace() {
   const generation = workspaceGeneration;
   let response;
-  try { response = await fetch('/api/cloud/me', { cache:'no-store' }); }
+  try { response = await fetch('/api/cloud/me', { cache:'no-store', signal:AbortSignal.timeout(15000) }); }
   catch (error) { throw new Error('无法连接工作台服务，请检查网络。'); }
   if (generation !== workspaceGeneration) return 'stale';
   if (response.status === 404) return 'local';
-  captureCloudPairCode();
+  discardCloudPairCode();
   let configError = '';
   try { await loadCloudConfig(); }
   catch (error) { configError = error.message; }
@@ -193,7 +238,7 @@ async function discoverCloudWorkspace() {
   state.cloudUser = workspace.user; state.cloudDevices = workspace.devices || [];
   const saved = localStorage.getItem('orbit_cloud_device_id');
   if (saved && state.cloudDevices.some(device => device.id === saved && device.status === 'active')) state.cloudDeviceId = saved;
-  else if (state.cloudDevices.length === 1 && state.cloudDevices[0].status === 'active' && !state.cloudPairCode) {
+  else if (state.cloudDevices.length === 1 && state.cloudDevices[0].status === 'active') {
     state.cloudDeviceId = state.cloudDevices[0].id;
     localStorage.setItem('orbit_cloud_device_id',state.cloudDeviceId);
   } else {
@@ -217,6 +262,13 @@ async function boot() {
   try {
     const cloudState = await discoverCloudWorkspace();
     if (cloudState !== 'local' && cloudState !== 'ready') return;
+    if (cloudState === 'ready') {
+      try { await api('/api/cloud/connect',{}); }
+      catch (error) {
+        if (error.status === 404) throw new Error('云端尚未支持账号直接连接，请先更新云端 Orbit 服务到 0.1.2 或更高版本。');
+        throw error;
+      }
+    }
     state.status = await api('/api/status');
     if (generation !== workspaceGeneration) return;
     state.loggedOut = false;
@@ -227,7 +279,7 @@ async function boot() {
     state.enabled = new Map(Object.entries(state.status.execution.grants || {}));
     await refreshThreads(); connectSocket();
   } catch (error) {
-    if (error.code === 'STALE_WORKSPACE') return;
+    if (error.code === 'STALE_WORKSPACE' || error.handled) return;
     if (state.cloudMode) showCloudDevices(error.message);
     else if (!state.loggedOut) { showPairing(); select('#pair-error').textContent = error.message; }
   }
@@ -334,6 +386,7 @@ function scheduleReconnect() {
   clearTimeout(reconnectTimer);
   reconnectTimer = setTimeout(async () => {
     try {
+      if (state.cloudMode) await api('/api/cloud/connect',{});
       state.status = await api('/api/status');
       state.enabled = new Map(Object.entries(state.status.execution.grants || {}));
       connectSocket();
@@ -341,11 +394,20 @@ function scheduleReconnect() {
   }, Math.min(15000, 1000 * 2 ** Math.min(4, state.reconnect++)));
 }
 async function subscribeThread(id) {
+  clearTimeout(controlRenewTimer);
   const selectionVersion = state.selectionVersion;
   const attempt = ++desktopConnectionAttempt;
   desktopConnecting = true; updateMode();
   try {
-    const result = await rpc('thread.subscribe', { threadId: id });
+    const desktop = state.status?.execution.mode === 'desktop';
+    const eligible = desktop && state.selected?.id === id && !state.selected.archived && !String(state.selected.source).startsWith('{');
+    let result = await rpc('thread.subscribe', { threadId:id, autoControl:eligible });
+    if (id !== state.selected?.id || selectionVersion !== state.selectionVersion || attempt !== desktopConnectionAttempt) return;
+    if (eligible && result.runtime?.attached && !result.control) {
+      await rpc('thread.enable', {threadId:id,confirm:true});
+      if (id !== state.selected?.id || selectionVersion !== state.selectionVersion || attempt !== desktopConnectionAttempt) return;
+      result = await rpc('thread.subscribe', {threadId:id});
+    }
     if (id !== state.selected?.id || selectionVersion !== state.selectionVersion || attempt !== desktopConnectionAttempt) return;
     if (result.control) state.enabled.set(id, result.control); else state.enabled.delete(id);
     state.desktopRuntime = result.runtime || null;
@@ -354,6 +416,13 @@ async function subscribeThread(id) {
     state.turnId = result.turnId;
     state.busy = Boolean(result.turnId);
     state.approvals = new Map((result.approvals || []).map(approval => [approval.requestId, approval]));
+    if (desktop && result.control) {
+      controlRenewTimer = setTimeout(() => {
+        if (state.selected?.id === id && state.socket?.readyState === WebSocket.OPEN && state.desktopRuntime?.attached) {
+          subscribeThread(id).catch(error => toast(error.message));
+        }
+      },Math.max(1000,result.control.expires - Date.now() - 120000));
+    }
     renderMessages(); renderApprovals();
   } catch (error) {
     if (id === state.selected?.id && selectionVersion === state.selectionVersion && attempt === desktopConnectionAttempt) {
@@ -650,14 +719,14 @@ function updateMode() {
   const attached = desktopConnected && state.desktopRuntime?.attached === true;
   const blocked = thread.archived || (desktop ? !attached || desktopConnecting : thread.locked && !control && state.status?.execution.mode !== 'endpoint');
   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 ? desktop ? '热接管中' : '接续已授权' : thread.archived ? '归档只读' : desktopConnecting && desktop ? '连接中…' : desktop && !desktopConnected ? '桌面未连接' : desktop && !attached ? '原会话未连接' : blocked ? '原客户端占用' : desktop ? '重新接管' : '接续会话';
   select('#mode-banner').classList.toggle('controlled', Boolean(control));
   const banner = desktop
     ? desktopConnecting ? '正在连接这条原会话；历史仍可查看。'
       : !desktopConnected ? 'Codex 桌面连接已断开。请保持桌面应用运行，再点击“重新连接”。'
       : !attached ? state.desktopRuntime?.reason || '这条原会话尚未连接。请先在 Codex 桌面打开它，再点击“重新连接”。'
-      : control ? '热接管已授权 · 与电脑共用同一 Codex 执行实例；消息、运行状态和审批实时同步。'
-      : '这条原会话已连接 · 授权后可发送、停止任务和处理审批。'
+      : control ? '热接管中 · 与电脑共用同一 Codex 执行实例；消息、运行状态和审批实时同步。'
+      : '这条原会话已连接 · 点击“重新接管”恢复控制。'
     : control ? `原 ID 接续 · ${control.writable ? '工作区可写 / 操作需审批' : '只读执行沙箱'} · ${control.sharedExecution ? '目标服务已加载此会话' : '独立执行实例'}`
       : thread.locked ? '原客户端持有此会话：独立接续不会抢占桌面执行。' : '只读镜像：查看原生历史不会启动执行实例。';
   const modeBanner = select('#mode-banner');
@@ -672,7 +741,7 @@ function updateMode() {
   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('#stop-turn').hidden = !state.busy || !state.turnId || !control;
-  select('#message-input').placeholder = state.busy && desktop ? '追加指令给电脑上正在运行的任务…' : control ? '沿着原来的上下文继续…' : '先确认接续方式，再沿着这条会话继续…';
+  select('#message-input').placeholder = state.busy && desktop ? '追加指令给电脑上正在运行的任务…' : control ? '沿着原来的上下文继续…' : desktop ? '连接原桌面会话后继续…' : '先确认接续方式，再沿着这条会话继续…';
   select('#composer-note').textContent = control ? desktop ? '消息进入原 Codex 桌面会话；任务不会迁移或重启。断线不会自动重发。' : '原会话 ID 不变；断线不会自动重发消息。' : '只读查看不会唤醒或打断电脑上的执行。';
   renderModelStatus();
 }
@@ -693,12 +762,18 @@ function renderDevices() {
   cloudRow.querySelector('span:last-child').classList.toggle('pending', !state.cloudMode);
   select('#copy-url').onclick = async () => { try { await navigator.clipboard.writeText(url); toast('连接地址已复制。'); } catch { toast('浏览器不允许复制，请手动复制地址。'); } };
   select('#show-qr').onclick = async () => {
+    if (state.cloudMode) return;
     try {
       const data = await api('/api/pair/qr', { url });
       select('#qr-container').innerHTML = `<img src="${escapeHtml(data.image)}" alt="敏感的设备配对二维码"><p>${escapeHtml(data.warning)}</p>`;
       select('#qr-container').hidden = false;
     } catch (error) { toast(error.message); }
   };
+  if (state.cloudMode) {
+    const card = select('#show-qr').closest('section');
+    card.querySelector('p').textContent = '手机打开工作台，登录同一 Orbit 账号并选择这台电脑，即可继续原有会话，无需扫码或输入密钥。';
+    select('#show-qr').hidden = true;
+  }
 }
 
 function closeNav() { select('#workspace').classList.remove('nav-open'); select('#scrim').hidden = true; }
@@ -805,27 +880,13 @@ document.addEventListener('click', async event => {
     try {
       await api(`/api/cloud/devices/${encodeURIComponent(device.id)}/revoke`, {});
       await refreshCloudDevices();
-      toast('电脑已移除，其连接密钥已失效。');
+      toast('电脑已移除。原电脑运行 orbit rebind 可重新绑定。');
     } catch (error) { toast(error.message); revoke.disabled = false; }
     return;
   }
   const cloudDevice=event.target.closest('[data-cloud-device]');
   if(cloudDevice){
-    state.cloudDeviceId=cloudDevice.dataset.cloudDevice;
-    localStorage.setItem('orbit_cloud_device_id',state.cloudDeviceId);
-    if(state.cloudPairCode){
-      cloudDevice.disabled=true;
-      try{
-        await api('/api/pair',{code:state.cloudPairCode});
-        state.cloudPairCode=null;
-        showCloudDevices();
-        await boot();
-      }catch(error){
-        showCloudDevices(error.message);
-      }
-      return;
-    }
-    await boot();return;
+    await connectCloudDevice(cloudDevice.dataset.cloudDevice);return;
   }
   if(event.target.closest('#cloud-logout-picker')){
     try{await api('/api/cloud/logout',{});}catch{}
@@ -838,7 +899,7 @@ document.addEventListener('click', async event => {
     if (!id || select('#reconnect-desktop').disabled) return;
     try {
       await subscribeThread(id);
-      if (id === state.selected?.id) toast(state.desktopRuntime?.attached ? '这条原会话已连接，请授权后操作。' : state.desktopRuntime?.reason || '原会话尚未连接。');
+      if (id === state.selected?.id) toast(state.enabled.has(id) ? '已连接并接管这条原会话。' : state.desktopRuntime?.reason || '原会话尚未连接。');
     } catch (error) { toast(error.message); }
     return;
   }
@@ -901,8 +962,18 @@ select('#logout').onclick = async () => {
     }
   } catch(error){toast(error.message)}
 };
-select('#enable-control').onclick = () => {
+select('#enable-control').onclick = async () => {
   const desktop = state.status.execution.mode === 'desktop';
+  if (desktop) {
+    try {
+      await subscribeThread(state.selected.id);
+      if (state.reopenModelAfterGrant && state.enabled.has(state.selected?.id)) {
+        state.reopenModelAfterGrant = false;
+        await openModelSettings();
+      }
+    } catch (error) { toast(error.message); }
+    return;
+  }
   select('#control-form').reset(); select('#control-error').textContent = '';
   select('#control-title').textContent = desktop ? '授权热接管' : '沿用原会话';
   select('#control-description').textContent = desktop ? '不创建新会话、不迁移执行器。Orbit 将订阅并控制 Codex 桌面当前加载的原会话。' : '保持原会话 ID，使用独立执行通道继续。原客户端占用时不会强行抢锁。';

package/public/connect.html

@@ -25,8 +25,8 @@
         </form>
         <form id="connect-register-form" hidden>
           <label for="connect-register-username">用户名</label><input id="connect-register-username" autocomplete="username" minlength="3" maxlength="64" autocapitalize="none" spellcheck="false" required>
-          <label for="connect-register-password">设置密码</label><input id="connect-register-password" type="password" autocomplete="new-password" minlength="12" maxlength="256" required>
-          <label for="connect-register-confirm">确认密码</label><input id="connect-register-confirm" type="password" autocomplete="new-password" minlength="12" maxlength="256" required>
+          <label for="connect-register-password">设置密码</label><input id="connect-register-password" type="password" autocomplete="new-password" minlength="6" maxlength="256" placeholder="至少 6 个字符" required>
+          <label for="connect-register-confirm">确认密码</label><input id="connect-register-confirm" type="password" autocomplete="new-password" minlength="6" maxlength="256" required>
           <button class="primary full" type="submit">创建账号并确认 <span>↗</span></button>
           <p id="connect-register-error" class="error" role="alert"></p>
         </form>

package/public/index.html

@@ -7,15 +7,34 @@
 <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>手机登录同一账号，选择已上线的电脑即可使用，无需扫码或输入配对密钥。</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@latest 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>
-<div class="pair-form-wrap"><div class="pair-form"><span class="mini-badge">PRIVATE WORKSPACE</span><h2>连接你的工作台</h2><p>输入电脑上的配对密钥。会话内容仅向已配对的设备开放。</p><form id="pair-form"><label for="pair-code">设备配对密钥</label><input id="pair-code" type="password" placeholder="粘贴本机配对密钥" autocomplete="off" required><button class="primary full" type="submit">安全连接 <span>↗</span></button><p id="pair-error" class="error" role="alert"></p></form><div class="pair-help"><span data-icon="shield"></span><div><strong>你的会话，不必搬家</strong><p>首版默认只读。不会自动恢复、停止或改写原有对话。</p></div></div><details><summary>在哪里找到密钥？</summary><p>在 Orbit 目录运行 <code>Get-Content .runtime\pairing-key</code>。仅用于可信设备；它不是模型 API Key。</p></details></div><footer>ORBIT / 0.1 PREVIEW <span>原生记录 · 本地优先</span></footer></div>
+<div class="pair-form-wrap"><div class="pair-form"><span class="mini-badge">PRIVATE WORKSPACE</span><h2>连接你的工作台</h2><p>输入电脑上的配对密钥。会话内容仅向已配对的设备开放。</p><form id="pair-form"><label for="pair-code">设备配对密钥</label><input id="pair-code" type="password" placeholder="粘贴本机配对密钥" autocomplete="off" required><button class="primary full" type="submit">安全连接 <span>↗</span></button><p id="pair-error" class="error" role="alert"></p></form><div class="pair-help"><span data-icon="shield"></span><div><strong>原会话始终留在电脑</strong><p>选择原会话后，消息和操作会发送到这台电脑上正在运行的 Codex。</p></div></div><details><summary>在哪里找到密钥？</summary><p>在 Orbit 目录运行 <code>Get-Content .runtime\pairing-key</code>。仅用于可信设备；它不是模型 API Key。</p></details></div><footer>ORBIT <span>原生会话 · 电脑执行</span></footer></div>
 </section>
 <div id="workspace" class="workspace" hidden>
 <button id="scrim" class="scrim" aria-label="收起导航" hidden></button>