orbit-codex-bridge 0.1.0 → 0.1.1

package/lib/connector-service.mjs

@@ -0,0 +1,259 @@
+import crypto from 'node:crypto';
+import fs from 'node:fs/promises';
+import http from 'node:http';
+import path from 'node:path';
+import {spawn} from 'node:child_process';
+import {createRequire} from 'node:module';
+
+const stateFile = home => path.join(home,'service.json');
+const pause = milliseconds => new Promise(resolve => setTimeout(resolve,milliseconds));
+
+async function serviceRequest(home, action = 'status') {
+  let saved;
+  try { saved = JSON.parse(await fs.readFile(stateFile(home),'utf8')); }
+  catch (error) { if (error.code === 'ENOENT') return null; throw error; }
+  if (!Number.isInteger(saved.port) || saved.port < 1 || saved.port > 65535 || !/^[a-f0-9]{64}$/.test(saved.token)) return null;
+  try {
+    const response = await fetch(`http://127.0.0.1:${saved.port}/${action}`,{
+      method:action === 'stop' ? 'POST' : 'GET',
+      headers:{Authorization:`Bearer ${saved.token}`},
+      signal:AbortSignal.timeout(1500)
+    });
+    if (!response.ok) return null;
+    const result = await response.json();
+    return result.product === 'Orbit connector' ? result : null;
+  } catch { return null; }
+}
+
+export const connectorStatus = home => serviceRequest(home);
+
+export async function stopConnector(home) {
+  if (!await serviceRequest(home,'stop')) return false;
+  for (let attempt = 0; attempt < 50; attempt++) {
+    const locked = await fs.access(path.join(home,'connector.lock')).then(() => true,() => false);
+    if (!await connectorStatus(home) && !locked) return true;
+    await pause(100);
+  }
+  throw new Error('后台连接器尚未停止，请稍后重试。');
+}
+
+async function packageRoot(resolver, name) {
+  let directory = path.dirname(resolver.resolve(name));
+  while (true) {
+    try {
+      const manifest = JSON.parse(await fs.readFile(path.join(directory,'package.json'),'utf8'));
+      if (manifest.name === name) return directory;
+    } catch (error) { if (error.code !== 'ENOENT') throw error; }
+    const parent = path.dirname(directory);
+    if (parent === directory) throw new Error(`找不到依赖：${name}`);
+    directory = parent;
+  }
+}
+
+export async function installConnectorRuntime(source, home) {
+  const manifest = JSON.parse(await fs.readFile(path.join(source,'package.json'),'utf8'));
+  const target = path.join(home,'runtime',manifest.version);
+  try { await fs.access(path.join(target,'ready')); return {cliPath:path.join(target,'cli.mjs'),version:manifest.version}; }
+  catch {}
+  const temporary = `${target}.${crypto.randomBytes(6).toString('hex')}.tmp`;
+  await fs.mkdir(temporary,{recursive:true,mode:0o700});
+  const copied = new Map();
+  async function copyDependency(name, resolver) {
+    const original = await packageRoot(resolver,name);
+    if (copied.has(name)) {
+      if (copied.get(name) !== original) throw new Error(`依赖 ${name} 存在多个版本，无法安装后台运行时。`);
+      return;
+    }
+    copied.set(name,original);
+    const destination = path.join(temporary,'node_modules',name);
+    await fs.cp(original,destination,{recursive:true,filter:entry => path.basename(entry) !== 'node_modules'});
+    const dependency = JSON.parse(await fs.readFile(path.join(original,'package.json'),'utf8'));
+    for (const child of Object.keys(dependency.dependencies || {})) {
+      await copyDependency(child,createRequire(path.join(original,'package.json')));
+    }
+  }
+  try {
+    for (const filename of ['package.json',...manifest.files]) {
+      await fs.cp(path.join(source,filename),path.join(temporary,filename),{recursive:true});
+    }
+    for (const name of Object.keys(manifest.dependencies || {})) await copyDependency(name,createRequire(path.join(source,'package.json')));
+    await fs.writeFile(path.join(temporary,'ready'),manifest.version,{mode:0o600});
+    try { await fs.rename(temporary,target); }
+    catch (error) {
+      if (!['EEXIST','ENOTEMPTY','EPERM'].includes(error.code)) throw error;
+      await fs.access(path.join(target,'ready'));
+    }
+  } finally {
+    const resolved = path.resolve(temporary);
+    if (path.dirname(resolved) !== path.join(path.resolve(home),'runtime') || !path.basename(resolved).endsWith('.tmp')) throw new Error('无效的临时运行时路径。');
+    await fs.rm(resolved,{recursive:true,force:true});
+  }
+  return {cliPath:path.join(target,'cli.mjs'),version:manifest.version};
+}
+
+export async function startConnector({home,cliPath,version}) {
+  const running = await connectorStatus(home);
+  if (running?.version === version && running.workerReady) return running;
+  if (running) await stopConnector(home);
+  await fs.mkdir(home,{recursive:true,mode:0o700});
+  const startupLog = path.join(home,'service-startup.log');
+  const diagnostic = await fs.open(startupLog,'w',0o600);
+  let child;
+  try {
+    child = spawn(process.execPath,[cliPath,'__service'],{
+      detached:true,windowsHide:true,stdio:['ignore',diagnostic.fd,diagnostic.fd],env:{...process.env,ORBIT_HOME:home}
+    });
+    await new Promise((resolve,reject) => {
+      child.once('spawn',resolve);
+      child.once('error',reject);
+    });
+  } finally {await diagnostic.close();}
+  let exited = false;
+  child.once('exit',() => {exited = true;});
+  child.unref();
+  for (let attempt = 0; attempt < 100; attempt++) {
+    const current = await connectorStatus(home);
+    if (current?.version === version && current.workerReady) return current;
+    if (exited) {
+      const diagnostic = (await fs.readFile(startupLog,'utf8').catch(() => '')).slice(-1500);
+      throw new Error(`后台连接器启动失败。${diagnostic}\n诊断日志：${startupLog}`);
+    }
+    await pause(150);
+  }
+  throw new Error(`后台连接器未就绪。诊断日志：${path.join(home,'connector.log')}`);
+}
+
+export async function superviseConnector(options) {
+  const {home} = options;
+  await fs.mkdir(home,{recursive:true,mode:0o700});
+  const lockfile = path.join(home,'connector.lock');
+  async function acquire() {
+    try {
+      const handle = await fs.open(lockfile,'wx',0o600);
+      try {await handle.writeFile(String(process.pid));}
+      finally {await handle.close();}
+    } catch (error) {
+      if (error.code !== 'EEXIST') throw error;
+      const owner = Number(await fs.readFile(lockfile,'utf8'));
+      if (!Number.isInteger(owner) || owner < 1) throw new Error('另一个后台连接器正在启动，请稍后重试。');
+      try {process.kill(owner,0);}
+      catch (check) {
+        if (check.code !== 'ESRCH') throw check;
+        await fs.unlink(lockfile);
+        await acquire();
+        return;
+      }
+      throw new Error('Orbit 后台连接器已经运行。');
+    }
+  }
+  await acquire();
+  try {await runSupervisor(options);}
+  finally {
+    if ((await fs.readFile(lockfile,'utf8').catch(() => '')) === String(process.pid)) await fs.unlink(lockfile);
+  }
+}
+
+async function runSupervisor({home,cliPath,version,restartDelay = 1000}) {
+  await fs.mkdir(home,{recursive:true,mode:0o700});
+  const token = crypto.randomBytes(32).toString('hex');
+  const logfile = path.join(home,'connector.log');
+  let logBytes = (await fs.stat(logfile).catch(() => ({size:0}))).size;
+  let writes = Promise.resolve();
+  function log(text) {
+    writes = writes.then(async () => {
+      const line = `${new Date().toISOString()} ${text.toString().trimEnd()}\n`;
+      if (logBytes > 2 * 1024 * 1024) {
+        await fs.rename(logfile,`${logfile}.1`);
+        logBytes = 0;
+      }
+      await fs.appendFile(logfile,line,{mode:0o600});
+      logBytes += Buffer.byteLength(line);
+    }).catch(() => {});
+  }
+  let worker = null;
+  let stopped = false;
+  let restartTimer;
+  let failures = 0;
+  let state = {product:'Orbit connector',version,pid:process.pid,workerReady:false,status:'starting',startedAt:Date.now()};
+  const finished = Promise.withResolvers();
+  async function stop() {
+    if (stopped) return;
+    stopped = true;
+    clearTimeout(restartTimer);
+    if (worker) {
+      const previous = worker;
+      const exited = new Promise(resolve => previous.once('exit',resolve));
+      const force = setTimeout(() => previous.kill(),3000);
+      if (previous.connected) previous.send({type:'stop'},() => {});
+      else previous.kill();
+      await exited;
+      clearTimeout(force);
+    }
+    await new Promise(resolve => control.close(resolve));
+    try {
+      const saved = JSON.parse(await fs.readFile(stateFile(home),'utf8'));
+      if (saved.token === token) await fs.unlink(stateFile(home));
+    } catch {}
+    log('连接器已停止。');
+    await writes;
+    finished.resolve();
+  }
+  const control = http.createServer((request,response) => {
+    response.setHeader('Content-Type','application/json');
+    response.setHeader('Cache-Control','no-store');
+    if (request.headers.origin || request.headers.authorization !== `Bearer ${token}`) {
+      response.writeHead(403);response.end('{}');return;
+    }
+    if (request.method === 'GET' && request.url === '/status') return response.end(JSON.stringify(state));
+    if (request.method === 'POST' && request.url === '/stop') {
+      response.end(JSON.stringify({...state,stopping:true}));
+      void stop();return;
+    }
+    response.writeHead(404);response.end('{}');
+  });
+  control.requestTimeout = 5000;
+  control.headersTimeout = 5000;
+  control.keepAliveTimeout = 1000;
+  await new Promise((resolve,reject) => {
+    control.once('error',reject);
+    control.listen(0,'127.0.0.1',resolve);
+  });
+  try {
+    const temporary = `${stateFile(home)}.${token}.tmp`;
+    await fs.writeFile(temporary,JSON.stringify({port:control.address().port,token}),{mode:0o600});
+    await fs.rename(temporary,stateFile(home));
+  } catch (error) {
+    await new Promise(resolve => control.close(resolve));throw error;
+  }
+  function launchWorker() {
+    if (stopped) return;
+    const started = Date.now();
+    state = {...state,workerReady:false,status:'starting'};
+    worker = spawn(process.execPath,[cliPath,'__worker'],{
+      windowsHide:true,stdio:['ignore','pipe','pipe','ipc'],env:{...process.env,ORBIT_HOME:home}
+    });
+    state.workerPid = worker.pid;
+    worker.stdout.on('data',log);
+    worker.stderr.on('data',log);
+    worker.on('error',error => log(error.message));
+    worker.on('message',message => {
+      if (message?.type === 'connector-state') state = {...state,...message.state};
+    });
+    worker.once('exit',(code,signal) => {
+      worker = null;
+      state = {...state,workerReady:false,status:'restarting'};
+      if (stopped) return;
+      failures = Date.now() - started > 60000 ? 0 : failures + 1;
+      const delay = Math.min(30000,restartDelay * 2 ** Math.min(failures - 1,5));
+      log(`工作进程退出 (${code ?? signal})，${delay}ms 后自动恢复。`);
+      restartTimer = setTimeout(launchWorker,delay);
+    });
+  }
+  process.once('SIGINT',stop);
+  process.once('SIGTERM',stop);
+  log(`Orbit ${version} 后台连接器启动。`);
+  launchWorker();
+  await finished.promise;
+  process.off('SIGINT',stop);
+  process.off('SIGTERM',stop);
+}

package/package.json

@@ -1,9 +1,11 @@
 {
   "name": "orbit-codex-bridge",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "type": "module",
   "description": "Connect your original Codex desktop conversations to Orbit on the web.",
-  "engines": { "node": ">=24" },
+  "engines": {
+    "node": ">=24"
+  },
   "bin": {
     "orbit": "orbit"
   },
@@ -23,8 +25,9 @@
     "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 public/app.js && node --check public/connect.js && node --check relay-server.mjs && node --check relay-store.mjs && node --check relay-agent.mjs && node --check public/admin.js"
+    "check": "node --check cli.mjs && node --check server.mjs && node --check lib/store.mjs && node --check lib/rpc.mjs && node --check lib/desktop.mjs && node --check lib/device-auth.mjs && node --check lib/connector-service.mjs && node --check public/app.js && node --check public/connect.js && node --check relay-server.mjs && node --check relay-store.mjs && node --check relay-agent.mjs && node --check public/admin.js"
   },
   "dependencies": {
     "dompurify": "^3.3.0",

package/public/admin.html

@@ -11,7 +11,7 @@
     <section class="overview"><div><span>用户总数</span><strong id="overview-users">0</strong></div><div><span>有效用户</span><strong id="overview-active-users">0</strong></div><div><span>已停用</span><strong id="overview-suspended-users">0</strong></div><div><span>已到期</span><strong id="overview-expired-users">0</strong></div><div><span>有效电脑</span><strong id="overview-devices">0</strong></div><div><span>在线电脑</span><strong id="overview-online">0</strong></div></section>
     <section class="content-section"><div class="section-heading"><div><span class="eyebrow">TENANTS</span><h2>用户与设备</h2></div><button id="refresh-admin" type="button">刷新</button></div>
       <div class="user-filters"><label for="user-search">搜索用户</label><input id="user-search" type="search" maxlength="100" placeholder="用户名或显示名称"><label for="user-status">账户状态</label><select id="user-status"><option value="all">全部状态</option><option value="active">有效</option><option value="suspended">已停用</option><option value="expired">已到期</option></select><span id="user-count" role="status"></span></div>
-      <form id="create-user-form" class="create-user-form"><label>登录名<input name="username" minlength="3" maxlength="64" autocomplete="off" required></label><label>显示名称<input name="displayName" maxlength="120"></label><label>初始密码<input name="password" type="password" minlength="12" autocomplete="new-password" placeholder="留空则自动生成"></label><label>套餐<input name="plan" value="standard" maxlength="40" required></label><label>设备上限<input name="maxDevices" type="number" min="1" max="50" value="2" required></label><label>账号到期<input name="expiresAt" type="datetime-local"></label><button class="primary" type="submit">创建账号</button></form>
+      <form id="create-user-form" class="create-user-form"><label>登录名<input name="username" minlength="3" maxlength="64" autocomplete="off" required></label><label>显示名称<input name="displayName" maxlength="120"></label><label>初始密码<input name="password" type="password" minlength="6" maxlength="256" autocomplete="new-password" placeholder="留空则自动生成"></label><label>套餐<input name="plan" value="standard" maxlength="40" required></label><label>设备上限<input name="maxDevices" type="number" min="1" max="50" value="2" required></label><label>账号到期<input name="expiresAt" type="datetime-local"></label><button class="primary" type="submit">创建账号</button></form>
       <div id="admin-message" role="status" hidden></div><div id="users-list" class="users-list"></div>
       <nav class="pagination" aria-label="用户列表分页"><button id="users-previous" type="button">上一页</button><span id="users-page">第 1 页</span><button id="users-next" type="button">下一页</button></nav>
     </section>

package/public/admin.js

@@ -148,7 +148,7 @@ document.addEventListener('click',async event=>{
       showSecret('电脑代理密钥',`只显示一次。把密钥写入电脑的 ORBIT_RELAY_AGENT_TOKEN。设备 ID：${result.device.id}`,result.agentToken);
       await refresh();
     }else if(reset){
-      const password=window.prompt('输入新密码（至少 12 个字符）；留空则自动生成');
+      const password=window.prompt('输入新密码（至少 6 个字符）；留空则自动生成');
       if(password===null)return;
       const result=await api(`/api/admin/users/${encodeURIComponent(reset.dataset.reset)}/reset-password`,password?{password}:{});
       showSecret('新密码已签发','旧用户会话已撤销，请通过安全渠道交付新密码。',result.initialPassword);

package/public/app.js

@@ -29,14 +29,16 @@ const state = { threads: [], status: null, selected: null, selectionVersion: 0,
 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;
@@ -95,20 +97,39 @@ async function api(url, body, signal) {
   if (state.cloudMode && state.cloudDeviceId && !url.startsWith('/api/cloud/')) 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 && url !== '/api/pair' && !url.startsWith('/api/cloud/') && !state.cloudPairCode) {
+      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 = state.cloudMode
+    ? `首次连接“${state.cloudDevices.find(device => device.id === state.cloudDeviceId)?.name || '这台电脑'}”，请扫描电脑终端中的配对二维码，或粘贴终端显示的本机配对密钥。`
+    : '输入电脑上的配对密钥。会话内容仅向已配对的设备开放。';
   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,6 +151,7 @@ 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}。`;
@@ -141,10 +163,51 @@ function showCloudDevices(message = '') {
   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);
+    if (state.cloudPairCode) {
+      try {
+        await api('/api/pair', {code:state.cloudPairCode});
+        state.cloudPairCode = null;
+      } catch (error) {
+        if (error.status === 401 && !error.handled) {
+          state.cloudPairCode = null;
+          showPairing(error.message);
+          return;
+        }
+        throw error;
+      }
+    }
+    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 +216,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,7 +236,7 @@ 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';
@@ -192,7 +255,7 @@ async function discoverCloudWorkspace() {
   state.cloudMode = true; state.loggedOut = false;
   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;
+  if (!state.cloudPairCode && 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) {
     state.cloudDeviceId = state.cloudDevices[0].id;
     localStorage.setItem('orbit_cloud_device_id',state.cloudDeviceId);
@@ -227,7 +290,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; }
   }
@@ -341,11 +404,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 +426,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 +729,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 +751,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();
 }
@@ -805,27 +884,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 +903,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 +966,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>