xuym-codex-collab 0.4.4 → 0.6.0

package/apps/onboarding/web/app.js

@@ -1,5 +1,6 @@
 const $ = (id) => document.getElementById(id);
 let currentId, pending, discovery, timer, busy = false, reviewVersion = null, reviewId, ownAdminId, resetPlan, resetDiscovery;
+let repositoryPolicy;
 let viewEpoch = 0, currentView = 'home', completing = false, deliveryTarget;
 const storageKey = 'codex-collab-onboarding';
 function remember(value) { try { if (value) sessionStorage.setItem(storageKey, JSON.stringify(value)); else sessionStorage.removeItem(storageKey); } catch {} }
@@ -18,7 +19,13 @@ const values = (form) => Object.fromEntries(new FormData(form));
 function text(tag, value) { const node = document.createElement(tag); node.textContent = value; return node; }
 function button(label, fn) { const node = text('button', label); node.onclick = () => action(fn); return node; }
 async function overview() {
-  const value = await api('overview'); $('profiles').replaceChildren(); $('removed-profiles').replaceChildren();
+  const value = await api('overview');
+  if (value.defaults) {
+    if (!$('admin-form').elements.repo.value) $('admin-form').elements.repo.value = value.defaults.repo || '';
+    if (!$('admin-form').elements.display_name.value) $('admin-form').elements.display_name.value = value.defaults.display_name || '';
+  }
+  $('startup-status').textContent = value.startup?.enabled ? '后台服务已运行，登录时自动恢复已开启的连接。可关闭终端和浏览器。' : value.startup?.error || '后台工作台会保持连接；登录自启状态可用 codex-collab autostart status 查看。';
+  $('profiles').replaceChildren(); $('removed-profiles').replaceChildren();
   $('removed-projects').hidden = !(value.removed_profiles || []).length;
   for (const profile of value.removed_profiles || []) {
     const card = document.createElement('div'); card.className = 'card'; const info = document.createElement('div');
@@ -29,7 +36,7 @@ async function overview() {
     const card = document.createElement('div'); card.className = 'card';
     card.append(text('span', `${draft.display_name || draft.agent_id} · 待完成群验证`), button('继续创建团队', () => openDraft(draft.id))); $('profiles').append(card);
   }
-  if (!value.profiles.length && !(value.drafts || []).length) $('profiles').append(text('p', '还没有接入项目。管理员选择“初始化团队”，成员选择“加入团队”。'));
+  if (!value.profiles.length && !(value.drafts || []).length) $('profiles').append(text('p', '还没有接入项目。选择“连接我的机器人”，或导入同事提供的接入包。'));
   for (const profile of value.profiles) {
     const card = document.createElement('div'); card.className = 'card'; const info = document.createElement('div');
     info.append(text('strong', `${profile.display_name || profile.agent_id} · ${profile.role === 'admin' ? '管理员' : '成员'}`), text('p', profile.repo));
@@ -108,6 +115,7 @@ function watchProfile(id, epoch) {
   timer = setTimeout(tick, 5000);
 }
 async function loadProfile(id) {
+  repositoryPolicy = null; $('repository-policy-form').hidden = true;
   currentId = id; remember({ profile_id: id }); show('profile'); const epoch = viewEpoch; let value;
   try { value = await api(`profile?id=${id}`); } catch (error) { value = await api(`profile?id=${id}&local=1`); notice(`团队同步暂未成功，本机状态仍可查看。${error.message}`); }
   if (epoch !== viewEpoch) return;
@@ -117,9 +125,9 @@ async function loadProfile(id) {
 function renderProfile(value, automatic = false) {
   const id = value.id; renderSteps(value);
   $('reset-conversation').hidden = value.phase !== 'ready'; $('reset-robot').hidden = value.phase !== 'ready';
-  $('profile-title').textContent = `${value.display_name && value.display_name !== value.agent_id ? `${value.display_name}（${value.agent_id}）` : value.agent_id} · ${value.role === 'admin' ? '管理员' : '成员'}`; $('profile-repo').textContent = value.repo;
+  $('profile-title').textContent = `${value.display_name && value.display_name !== value.agent_id ? `${value.display_name}（${value.agent_id}）` : value.agent_id} · ${value.role === 'admin' ? '管理员' : '成员'}`; $('profile-repo').textContent = `${value.repo}${value.base_branch ? ` · 基准：${value.remote_name || '远程'}/${value.base_branch}` : ''}`;
   $('profile-diagnostics').hidden = !value.config_path; $('config-path').textContent = value.config_path || '';
-  $('checks').replaceChildren(); $('progress').replaceChildren(); $('binding').hidden = value.phase !== 'ready'; $('runner-actions').hidden = value.phase !== 'ready'; $('admin-tools').hidden = value.role !== 'admin' || value.phase !== 'ready';
+  $('checks').replaceChildren(); $('progress').replaceChildren(); $('binding').hidden = value.phase !== 'ready'; $('runner-actions').hidden = value.phase !== 'ready'; $('diagnostic-actions').hidden = value.phase !== 'ready'; $('admin-tools').hidden = value.role !== 'admin' || value.phase !== 'ready';
   if (value.phase === 'ready') {
     $('binding-text').textContent = value.binding_prompt; $('binding-details').textContent = value.detailed_binding_prompt || value.binding_prompt;
     for (const [label, ok, wait] of [['项目 MCP', value.project_setup?.mcp_configured, '待配置'], ['项目 Skill', value.project_setup?.skill_installed, '待配置'], ['企业微信机器人', value.runner?.wecom === 'authenticated', value.runner?.online ? '连接中' : '已停止'], ['目标 Codex 对话', !!value.desktop?.binding, '待绑定'], ['对话实际轮询', value.poll_recent, value.poll_observed ? '最近未观察到轮询' : '待观察'], ['可接收任务', value.can_receive_tasks, '尚未满足条件']]) {
@@ -191,30 +199,79 @@ $('review-form').onsubmit = (event) => { event.preventDefault(); action(async ()
   await api('review-rules', { id: currentId, expected_version: reviewVersion, review_rules });
   await loadProfile(currentId); notice('审核规则已保存，新任务将使用此规则。');
 }); };
-for (const button of document.querySelectorAll('[data-view]')) button.onclick = () => action(async () => { clearInterval(timer); if (resetPlan) { await api('reset-cancel', { id: resetPlan.id, preview_token: resetPlan.preview_token }); resetPlan = null; resetDiscovery = null; $('reset-secret').value = ''; } remember(null); show(button.dataset.view); if (button.dataset.view === 'home') await overview(); });
+for (const button of document.querySelectorAll('[data-view]')) button.onclick = () => action(async () => { clearInterval(timer); if (resetPlan) { await api('reset-cancel', { id: resetPlan.id, preview_token: resetPlan.preview_token }); resetPlan = null; resetDiscovery = null; $('reset-secret').value = ''; } remember(null); show(button.dataset.view); if (button.dataset.view === 'home') await overview(); if (button.dataset.view === 'admin' && $('admin-form').elements.repo.value) await checkProject(); });
 function repoMode(prefix) {
   const clone = $(`${prefix}-repo-mode`).value === 'clone'; $(`${prefix}-existing-repo`).hidden = clone; $(`${prefix}-clone-repo`).hidden = !clone;
 }
-for (const prefix of ['admin', 'join']) $(`${prefix}-repo-mode`).onchange = () => repoMode(prefix);
-$('check-project').onclick = () => action(async () => {
-  const selected = await api('project-check', values($('admin-form')));
+for (const prefix of ['admin', 'join', 'own']) $(`${prefix}-repo-mode`).onchange = () => {
+  repoMode(prefix);
+  if (prefix === 'admin') clearProjectSelection();
+};
+function clearProjectSelection() {
+  $('admin-remote-name').value = ''; $('admin-base-branch').value = ''; $('repository-options').hidden = true;
+  $('project-recommendation').textContent = '';
+}
+async function checkProject() {
+  const snapshot = values($('admin-form'));
+  const selected = await api('project-check', snapshot);
+  const current = values($('admin-form'));
+  if (['repo_mode', 'repo', 'remote', 'destination', 'remote_name', 'base_branch'].some((key) => current[key] !== snapshot[key])) return;
   const form = $('admin-form'); form.elements.repo.value = selected.repo; $('admin-repo-mode').value = 'existing'; repoMode('admin');
-  $('project-recommendation').textContent = `项目已检查：${selected.repo}。${selected.tests.length ? '推荐：' + selected.tests.map((test) => test.command).join(' / ') + '，请确认或修改。' : '未找到常见测试入口，请填写适合项目的验证命令。'}`;
+  $('repository-options').hidden = false;
+  for (const [id, options, chosen, placeholder] of [
+    ['admin-remote-name', selected.remotes || [], selected.remote_name, '请选择协作远程'],
+    ['admin-base-branch', selected.branches || [], selected.base_branch, '请选择业务基准分支'],
+  ]) {
+    const select = $(id); select.replaceChildren();
+    const empty = text('option', placeholder); empty.value = ''; select.append(empty);
+    for (const value of options) { const option = text('option', value); option.value = value; select.append(option); }
+    select.value = chosen || '';
+  }
+  $('project-recommendation').textContent = selected.selection_required ? '请在下方选择协作远程或业务基准分支，再继续。' : `项目已检查：${selected.repo}。基准：${selected.remote_name}/${selected.base_branch}。${selected.tests.length ? '推荐：' + selected.tests.map((test) => test.command).join(' / ') + '，请确认或修改。' : '未找到常见测试入口，请填写适合项目的验证命令。'}`;
   if (!$('test-command').value && selected.tests.length) $('test-command').value = selected.tests[0].command;
+}
+$('load-repository-settings').onclick = () => action(async () => {
+  const id = currentId, value = await api('repository-settings', { id });
+  if (id !== currentId || currentView !== 'profile') return;
+  const select = $('team-base-branch'); select.replaceChildren();
+  for (const branch of value.branches) { const option = text('option', branch); option.value = branch; select.append(option); }
+  select.value = value.branches.includes(value.base_branch) ? value.base_branch : value.default_branch || '';
+  repositoryPolicy = { id, expected_version: value.version }; $('repository-policy-form').hidden = false;
 });
+$('repository-policy-form').onsubmit = (event) => { event.preventDefault(); action(async () => {
+  if (!repositoryPolicy || repositoryPolicy.id !== currentId) throw new Error('请重新读取团队基准分支。');
+  await api('repository-policy', { ...repositoryPolicy, base_branch: $('team-base-branch').value });
+  await loadProfile(currentId); notice('团队基准分支已保存，同事和新增机器人会自动继承；已有任务保留原起始提交。');
+}); };
+$('check-project').onclick = () => action(checkProject);
+for (const id of ['admin-repo', 'admin-remote', 'admin-destination']) $(id).onchange = () => {
+  const form = $('admin-form');
+  clearProjectSelection();
+  if ($('admin-repo-mode').value === 'clone' ? form.elements.remote.value && form.elements.destination.value : form.elements.repo.value) action(checkProject);
+};
+$('admin-remote-name').onchange = () => { $('admin-base-branch').value = ''; action(checkProject); };
+$('admin-base-branch').onchange = () => action(checkProject);
 $('admin-form').onsubmit = (event) => { event.preventDefault(); action(async () => {
   const input = values(event.target);
   const session = await api('admin-prepare', input); event.target.elements.secret.value = '';
   pending = { type: 'admin', draft_id: session.draft_id }; remember({ draft_id: session.draft_id }); await verifyView(session);
 }); };
 async function invitationInput(form) { const input = values(form); input.content = await input.file.text(); delete input.file; return input; }
-$('inspect-invite').onclick = () => action(async () => {
+async function inspectInvite() {
   $('invite-info').hidden = true; $('invite-summary').textContent = ''; $('invite-remote').textContent = '';
-  const value = await api('inspect-invite', await invitationInput($('join-form')));
+  const file = $('join-form').elements.file.files?.[0];
+  const input = await invitationInput($('join-form'));
+  const value = await api('inspect-invite', input);
+  if ($('join-form').elements.password.value !== input.password || $('join-form').elements.file.files?.[0] !== file) return;
   $('invite-info').hidden = false; $('invite-summary').textContent = `${value.display_name || value.agent_id}（${value.agent_id}）· 职责：${value.capabilities.join('、')}${value.team_name ? ' · ' + value.team_name : ''}`;
-  $('invite-remote').textContent = value.remote;
+  $('invite-remote').textContent = `${value.remote}${value.base_branch ? ` · 基准分支：${value.base_branch}（自动继承）` : ''}`;
   if (!$('join-form').elements.destination.value) $('join-form').elements.destination.value = value.suggested_repo;
-});
+}
+$('inspect-invite').onclick = () => action(inspectInvite);
+for (const id of ['invite-file', 'invite-password']) $(id).onchange = () => {
+  $('invite-info').hidden = true;
+  if ($('invite-file').files?.length && $('invite-password').value) action(inspectInvite);
+};
 $('join-form').onsubmit = (event) => { event.preventDefault(); action(async () => {
   const profile = await api('import', await invitationInput(event.target)); event.target.elements.password.value = ''; await connectMember(profile);
 }); };
@@ -242,6 +299,14 @@ $('retry-code').onclick = () => action(async () => {
 $('confirm-code').onclick = () => action(completeVerification);
 $('existing-form').onsubmit = (event) => { event.preventDefault(); action(async () => { const profile = await api('existing', values(event.target)); await loadProfile(profile.id); }); };
 $('issue-form').onsubmit = (event) => { event.preventDefault(); action(async () => { const input = values(event.target); input.id = currentId; input.prefer = event.target.elements.prefer.checked; input.commands_enabled = event.target.elements.commands_enabled.checked; const result = await api('issue', input); event.target.reset(); await loadProfile(currentId); await showDelivery(currentId, result.invite_id); notice('接入包已生成。下载文件交给指定成员，密码请单独发送。'); }); };
+$('run-diagnostics').onclick = () => action(async () => {
+  const value = await api('diagnostics', { id: currentId }); $('diagnostic-result').replaceChildren();
+  for (const check of value.checks) $('diagnostic-result').append(text('p', `${check.ok ? '✓' : '待处理'} ${check.label}${check.action ? '：' + check.action : ''}`));
+  $('diagnostic-result').append(text('p', value.note));
+});
+$('repair-project').onclick = () => action(async () => {
+  const value = await api('repair', { id: currentId }); await loadProfile(currentId); notice(value.next_step);
+});
 $('refresh').onclick = () => action(() => loadProfile(currentId));
 $('start').onclick = () => action(async () => { await api('runner', { id: currentId, command: 'start' }); await loadProfile(currentId); });
 $('stop').onclick = () => action(async () => { await api('runner', { id: currentId, command: 'stop' }); await loadProfile(currentId); });

package/apps/onboarding/web/index.html

@@ -1,34 +1,34 @@
 <!doctype html><html lang="zh-CN"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1"><title>Codex Collab · 团队接入</title><link rel="stylesheet" href="/style.css"></head><body>
 <header><span class="brand">Codex Collab</span><span>本机团队工作台</span></header>
-<main><h1>把群里的任务，交给你的 Codex 对话</h1><p class="intro">管理员分配机器人，成员导入接入包。项目配置与连接检查集中在这里。</p><div id="notice" role="status" hidden></div>
-<nav><button data-view="home">我的项目</button><button data-view="admin">初始化团队</button><button data-view="join">加入团队</button><button data-view="existing">导入已有配置</button></nav>
-<section id="home"><h2>我的项目</h2><div id="profiles"></div><details id="removed-projects" hidden><summary>已移除的接入</summary><p class="muted">本机身份与恢复记录保留。恢复前请确保原 clone 未绑定其他身份。</p><div id="removed-profiles"></div></details></section>
-<section id="admin" hidden><h2>管理员初始化</h2><p>先在企业微信创建智能机器人并加入协作群。这里会通过群验证码自动获取群和你的 userid。</p>
+<main><h1>把群里的任务，交给你的 Codex 对话</h1><p class="intro">选一种接入方式，按提示完成群验证，再把启用指令发给你的 Codex 对话。</p><div id="notice" role="status" hidden></div>
+<nav><button data-view="home">我的项目</button><button data-view="admin">连接我的机器人</button><button data-view="join">接受同事邀请</button><button data-view="existing">导入已有配置</button></nav>
+<section id="home"><div class="entry-options"><button data-view="admin">连接我的机器人<small>首次接入，或为团队建立协作项目</small></button><button data-view="join">接受同事邀请<small>已有接入包，自动带入机器人和项目信息</small></button></div><p id="startup-status" class="muted"></p><h2>我的项目</h2><div id="profiles"></div><details id="removed-projects" hidden><summary>已移除的接入</summary><p class="muted">本机身份与恢复记录保留。恢复前请确保原 clone 未绑定其他身份。</p><div id="removed-profiles"></div></details></section>
+<section id="admin" hidden><h2>连接我的机器人</h2><p>先在企业微信创建智能机器人并加入协作群。这里会通过群验证码自动获取群和你的 userid。</p>
 <form id="admin-form">
-<label>团队名称<input name="team_name" placeholder="例如：产品研发团队" maxlength="80"></label>
 <fieldset><legend>选择业务项目</legend><label>项目来源<select id="admin-repo-mode" name="repo_mode"><option value="existing">使用本机已有项目</option><option value="clone">从 Git 地址拉取新项目</option></select></label>
-<label id="admin-existing-repo">项目目录<input name="repo" placeholder="Git 仓库根目录的完整路径"></label>
-<div id="admin-clone-repo" hidden><label>Git 仓库地址<input name="remote" placeholder="HTTPS 或 SSH 地址，不含 Token"></label><label>保存到新目录<input name="destination" placeholder="新目录的完整路径"></label></div>
-<button id="check-project" type="button" class="secondary">检查项目并推荐验证命令</button><p id="project-recommendation" class="muted">自动拉取使用你本机已有的 Git 登录。仓库需要已有 main 分支。</p>
+<label id="admin-existing-repo">项目目录<input name="repo" id="admin-repo" placeholder="Git 仓库根目录的完整路径"></label>
+<div id="admin-clone-repo" hidden><label>Git 仓库地址<input name="remote" id="admin-remote" placeholder="HTTPS 或 SSH 地址，不含 Token"></label><label>保存到新目录（可选）<input name="destination" id="admin-destination" placeholder="留空按项目与名称生成独立目录"></label></div>
+<button id="check-project" type="button" class="secondary">检查项目并推荐验证命令</button><p id="project-recommendation" class="muted">使用本机已有的 Git 登录，自动识别远程仓库和默认分支；无法确定时只需选择一次。</p>
+<div id="repository-options" hidden><label>协作远程<select name="remote_name" id="admin-remote-name"><option value="">自动识别</option></select></label><label>业务基准分支<select name="base_branch" id="admin-base-branch"><option value="">使用远程默认分支</option></select></label><p class="muted">同事和新增机器人会继承这个基准分支。每个新任务固定起始提交，后续分支更新不会改变已有任务。</p></div>
 <label>验证命令<input id="test-command" name="test_command" required placeholder="例如 npm test、go test ./...、sh test.sh"></label><p class="muted">请确认这个命令适合项目。工具使用固定程序和参数执行，不运行管道或拼接命令。</p></fieldset>
 <div class="row"><label>你的显示名称<input name="display_name" required placeholder="例如 Alice 或张三" maxlength="80"></label><label>主要职责<select name="responsibility"><option value="fullstack">全栈开发</option><option value="frontend">前端开发</option><option value="backend">后端开发</option><option value="testing">测试</option><option value="docs">文档</option><option value="general">通用开发</option></select></label></div>
-<details><summary>自定义内部身份与职责</summary><label>内部 Agent ID（可选）<input name="agent_id" pattern="[a-zA-Z0-9_-]{1,64}" placeholder="留空自动生成"></label><label>自定义职责标签（可选）<input name="capabilities" placeholder="英文标签，以逗号分隔"></label></details>
+<details><summary>更多设置：团队名称、内部身份与职责</summary><label>团队名称（可选）<input name="team_name" placeholder="留空使用项目名称" maxlength="80"></label><label>内部 Agent ID（可选）<input name="agent_id" pattern="[a-zA-Z0-9_-]{1,64}" placeholder="留空自动生成"></label><label>自定义职责标签（可选）<input name="capabilities" placeholder="英文标签，以逗号分隔"></label></details>
 <div class="row"><label>你的机器人 Bot ID<input name="bot_id" required autocomplete="off"></label><label>机器人 Secret<input name="secret" type="password" required autocomplete="off"></label></div>
-<button type="submit">创建团队并连接机器人</button></form></section>
+<button type="submit">连接并进入群验证</button></form></section>
 <section id="own" hidden><h2>给自己增加机器人</h2><p>同一个企业微信账号可以拥有多个 Agent。每个 Agent 使用独立机器人、独立 clone 和独立 Codex 对话。验证后自动完成本机接入，无需下载接入包。</p>
-<form id="own-form"><label>另一个 clone 的本机目录<input name="repo" required placeholder="同一业务仓库的另一个独立 clone"></label><div class="row"><label>新的 Agent 名称<input name="agent_id" required pattern="[a-zA-Z0-9_-]{1,64}" placeholder="bob"></label><label>职责标签<input name="capabilities" required placeholder="backend"></label></div><div class="row"><label>新机器人 Bot ID<input name="bot_id" required autocomplete="off"></label><label>新机器人 Secret<input name="secret" type="password" required autocomplete="off"></label></div><label class="checkbox"><input name="prefer" type="checkbox" checked>该 Agent 为这些职责的首选执行者</label><button type="submit">连接我的新机器人</button><button id="own-cancel" type="button" class="secondary">返回原项目</button></form></section>
-<section id="join" hidden><h2>加入团队</h2><p>导入管理员提供的加密接入包。机器人、职责和仓库信息会自动带入，密码请向管理员单独获取。</p>
-<form id="join-form"><label>接入包文件<input name="file" type="file" accept=".json" required></label><label>接入包密码<input name="password" type="password" required autocomplete="off"></label>
-<button id="inspect-invite" type="button" class="secondary">读取接入信息</button><div id="invite-info" hidden><p id="invite-summary"></p><p id="invite-remote" class="muted"></p></div>
+<form id="own-form"><label>准备项目<select id="own-repo-mode" name="repo_mode"><option value="clone">自动拉取独立项目</option><option value="existing">使用已有的独立 clone</option></select></label><label id="own-clone-repo">新项目目录（可选）<input name="destination" placeholder="留空按项目和 Agent 名称创建"></label><label id="own-existing-repo" hidden>另一个 clone 的本机目录<input name="repo" placeholder="同一业务仓库的另一个独立 clone"></label><div class="row"><label>新的 Agent 名称<input name="agent_id" required pattern="[a-zA-Z0-9_-]{1,64}" placeholder="bob"></label><label>职责标签<input name="capabilities" required placeholder="backend"></label></div><div class="row"><label>新机器人 Bot ID<input name="bot_id" required autocomplete="off"></label><label>新机器人 Secret<input name="secret" type="password" required autocomplete="off"></label></div><label class="checkbox"><input name="prefer" type="checkbox" checked>该 Agent 为这些职责的首选执行者</label><button type="submit">连接我的新机器人</button><button id="own-cancel" type="button" class="secondary">返回原项目</button></form></section>
+<section id="join" hidden><h2>接受同事邀请</h2><p>导入管理员提供的加密接入包。机器人、职责和仓库信息会自动带入，密码请向管理员单独获取。</p>
+<form id="join-form"><label>接入包文件<input name="file" id="invite-file" type="file" accept=".json" required></label><label>接入包密码<input name="password" id="invite-password" type="password" required autocomplete="off"></label>
+<button id="inspect-invite" type="button" class="secondary">重新读取接入信息</button><div id="invite-info" hidden><p id="invite-summary"></p><p id="invite-remote" class="muted"></p></div>
 <label>准备项目<select id="join-repo-mode" name="repo_mode"><option value="clone">帮我拉取到新目录</option><option value="existing">使用本机已有项目</option></select></label>
-<label id="join-clone-repo">新项目目录<input name="destination" placeholder="读取接入包后自动建议，亦可填写完整路径"></label>
+<label id="join-clone-repo">新项目目录<input name="destination" placeholder="留空使用推荐目录，亦可填写完整路径"></label>
 <label id="join-existing-repo" hidden>已有项目目录<input name="repo" placeholder="Git 仓库根目录的完整路径"></label>
 <button type="submit">接入我的机器人</button><p class="muted">工具使用本机 Git 登录拉取代码，不会改写已有目录。导入后请按提示在群里确认一次身份，审批和配置会自动继续。</p></form></section>
 <section id="existing" hidden><h2>导入已有协作项目</h2><p>先停止原 Runner。导入会保留原成员身份、任务和对话绑定，并重新启动机器人。旧团队由管理员先导入。</p><form id="existing-form"><label>已有私有 peer.json 路径<input name="config_path" required placeholder="完整路径"></label><button type="submit">导入已有项目</button></form></section>
 <section id="verification" hidden><h2>在群里确认身份</h2><p id="connection" role="status"></p><p class="muted">发送消息后页面会自动继续，无需回来确认。刷新页面可恢复当前接入进度。</p><p>请用自己的企业微信账号，<strong>@ 刚刚分配的机器人</strong>，发送下面这条消息：</p><pre id="code"></pre><button id="copy-code">复制消息</button><button id="confirm-code">立即检查</button><button id="retry-code" class="secondary" hidden>重新连接</button></section>
-<section id="profile" hidden><div class="row"><h2 id="profile-title"></h2><button id="refresh">刷新项目状态</button></div><p id="profile-repo"></p><details id="profile-diagnostics" hidden><summary>查看本机配置路径</summary><pre id="config-path"></pre><button id="copy-config-path">复制配置路径</button></details><p id="next-step" class="next-step" role="status"></p><ol id="setup-steps" class="setup-steps"></ol><details><summary>连接检查详情</summary><div id="checks"></div></details><div id="progress"></div><div id="binding" hidden><h3>最后一步：在你选定的 Codex 对话启用</h3><p>在 Codex 打开上面的项目，信任项目并加载 MCP，将下面的指令发到要绑定的对话。Skill 会完成身份检查、对话绑定和轮询启用。完成后本页自动更新实际连接状态。</p><pre id="binding-text"></pre><button id="copy-binding">复制启用指令</button><details><summary>无法识别 Skill 时使用详细指令</summary><pre id="binding-details"></pre><button id="copy-binding-details">复制详细指令</button></details></div><div id="runner-actions" hidden><button id="start">启动机器人连接</button><button id="stop" class="secondary">停止机器人连接</button><p class="muted">停止连接仅断开群机器人。对话中的轮询自动化需要在 Codex 中单独暂停。</p></div>
+<section id="profile" hidden><div class="row"><h2 id="profile-title"></h2><button id="refresh">刷新项目状态</button></div><p id="profile-repo"></p><details id="profile-diagnostics" hidden><summary>查看本机配置路径</summary><pre id="config-path"></pre><button id="copy-config-path">复制配置路径</button></details><p id="next-step" class="next-step" role="status"></p><ol id="setup-steps" class="setup-steps"></ol><details><summary>连接检查详情</summary><div id="checks"></div></details><div id="progress"></div><div id="binding" hidden><h3>最后一步：在你选定的 Codex 对话启用</h3><p>在 Codex 打开上面的项目，信任项目并加载 MCP（已打开的项目请重新加载 MCP），将下面的指令发到要绑定的对话。Skill 会完成身份检查、对话绑定和轮询启用。完成后本页自动更新实际连接状态。</p><pre id="binding-text"></pre><button id="copy-binding">复制启用指令</button><details><summary>无法识别 Skill 时使用详细指令</summary><pre id="binding-details"></pre><button id="copy-binding-details">复制详细指令</button></details></div><div id="diagnostic-actions" hidden><button id="run-diagnostics" class="secondary">检查整条连接</button><button id="repair-project" class="secondary">修复本机配置</button><div id="diagnostic-result" role="status"></div></div><div id="runner-actions" hidden><button id="start">启动机器人连接</button><button id="stop" class="secondary">停止机器人连接</button><p class="muted">停止连接仅断开群机器人。对话中的轮询自动化需要在 Codex 中单独暂停。</p></div>
 <details id="manage-project"><summary>管理与重置</summary><p>选择要调整的配置，先查看影响，再确认。每次只操作当前 Agent 和 clone。</p><div class="manage-actions"><button id="reset-conversation" class="secondary">重新绑定对话</button><button id="reset-robot" class="secondary">更新机器人凭据</button><button id="reset-project" class="danger">移除本机接入</button></div></details>
-<div id="admin-tools" hidden><details><summary>团队分工、审核与通知设置</summary><h3>团队 Agent 与分工</h3><div id="members"></div><div id="owners"></div><button id="add-own-agent" class="secondary">给自己增加机器人</button><div id="routes"></div><h3>真人审核与通知</h3><p>按职责设置：阶段结果提交后由谁审核、通知谁。关闭中间审核可直接接力；最终提交仍需真人审核，并由管理员完成任务。关闭审核的职责作为最后阶段时由管理员审核。</p><p id="review-policy-note" class="muted"></p><form id="review-form" hidden><div id="review-rules"></div><button type="submit">保存审核规则</button></form><p class="muted">规则保存后用于新任务。现有任务继续使用创建时的规则。审核通知附带分支、提交、测试和可复制的群命令；企业微信原生 @ 的显示效果需要在实际群中确认。</p></details><h3>批量分配机器人给同事</h3><p>每行分配一个独立机器人。同一个同事可以领取多行，分别绑定独立项目和对话。接入包密码自动生成。</p>
+<div id="admin-tools" hidden><details><summary>团队分工、审核与通知设置</summary><h3>团队 Agent 与分工</h3><div id="members"></div><div id="owners"></div><button id="add-own-agent" class="secondary">给自己增加机器人</button><div id="routes"></div><h3>任务基准分支</h3><button type="button" id="load-repository-settings" class="secondary">读取并调整基准分支</button><form id="repository-policy-form" hidden><label>业务基准分支<select id="team-base-branch" required></select></label><p class="muted">保存后所有成员的新任务使用此分支。已创建任务保留原来的分支、起始提交和审核规则。</p><button type="submit">保存团队基准分支</button></form><h3>真人审核与通知</h3><p>按职责设置：阶段结果提交后由谁审核、通知谁。关闭中间审核可直接接力；最终提交仍需真人审核，并由管理员完成任务。关闭审核的职责作为最后阶段时由管理员审核。</p><p id="review-policy-note" class="muted"></p><form id="review-form" hidden><div id="review-rules"></div><button type="submit">保存审核规则</button></form><p class="muted">规则保存后用于新任务。现有任务继续使用创建时的规则。审核通知附带分支、提交、测试和可复制的群命令；企业微信原生 @ 的显示效果需要在实际群中确认。</p></details><h3>批量分配机器人给同事</h3><p>每行分配一个独立机器人。同一个同事可以领取多行，分别绑定独立项目和对话。接入包密码自动生成。</p>
 <form id="batch-form"><div id="assignment-rows"></div><div class="row"><button id="add-assignment" type="button" class="secondary">增加一位成员／机器人</button><button type="submit">生成全部接入包</button></div></form>
 <div id="delivery-panel" hidden><h3 id="delivery-title"></h3><p>接入包与密码请分开传递。下面的接入说明不包含密码或 Secret。</p><pre id="delivery-instructions"></pre><button id="copy-delivery">复制接入说明</button><label id="delivery-password-label">接入包密码<input id="delivery-password" type="password" readonly></label><button id="copy-password" type="button" class="secondary">复制密码</button><p id="delivery-password-note" class="muted" hidden></p><a id="delivery-download" class="secondary">下载这份接入包</a><button id="reissue-invite" type="button" class="secondary" hidden>重新生成接入包与密码</button><form id="reissue-form" hidden><p>旧包和未批准的旧入队申请将失效。保持原机器人和职责；请输入这个机器人的 Secret，自动生成新的密码。</p><label>机器人 Bot ID<input id="reissue-bot-id" readonly></label><label>机器人 Secret<input id="reissue-secret" name="secret" type="password" required autocomplete="off"></label><button type="submit">生成新的接入包与密码</button><button id="reissue-cancel" type="button" class="secondary">取消</button></form><button id="hide-delivery" type="button" class="secondary">收起</button></div>
 <details><summary>单独分配（兼容入口）</summary><form id="issue-form"><div class="row"><label>Agent ID<input name="agent_id" required pattern="[a-zA-Z0-9_-]{1,64}" placeholder="bob"></label><label>职责标签<input name="capabilities" required placeholder="backend"></label></div><div class="row"><label>机器人 Bot ID<input name="bot_id" required autocomplete="off"></label><label>机器人 Secret<input name="secret" type="password" required autocomplete="off"></label></div><label>自定义密码（可选，留空自动生成）<input name="password" type="password" minlength="12" autocomplete="off"></label><label class="checkbox"><input name="prefer" type="checkbox" checked>设为这些职责的首选执行者</label><label class="checkbox"><input name="commands_enabled" type="checkbox" checked>允许所有者通过此机器人发送群命令</label><button type="submit">生成接入包</button></form></details>

package/apps/onboarding/web/style.css

@@ -5,3 +5,6 @@ form[hidden]{display:none}fieldset{border:1px solid #dbe6df;border-radius:9px;pa
 button[hidden],details[hidden],label[hidden]{display:none}details{margin:24px 0}summary{cursor:pointer;font-weight:600;line-height:1.7}.manage-actions{display:flex;gap:12px;flex-wrap:wrap}.danger{background:#fff;border:1px solid #d9aca4;color:#943c30}#reset-effects{line-height:1.9;padding-left:24px}#reset-target{overflow-wrap:anywhere}#reset-verification{padding:16px;background:#f0f5f2;border-radius:8px}
 
 #setup-steps{display:flex;flex-wrap:wrap;gap:10px;list-style:none;padding:0;margin:22px 0}#setup-steps li{font-size:13px;border:1px solid #e0e7e2;border-radius:7px;padding:9px 12px;color:#738379}#setup-steps .done{color:#176b4a;background:#eaf5ed;border-color:#cbe4d3}#setup-steps .active{color:#845d26;background:#fff5e2;border-color:#ebd29f}#next-step{padding:14px 16px;background:#edf6f0;border-radius:8px}#delivery-panel{padding:18px;background:#f6f9f7;border:1px solid #dbe6df;border-radius:9px;margin-top:20px}#delivery-panel h3{margin-top:0}#delivery-panel button{margin:6px 6px 6px 0}.assignment details{margin:0}.assignment>button{justify-self:start;background:#fff;color:#657970;border-color:#c9dacf}#assignment-rows{display:grid;gap:14px}#assignment-rows fieldset{margin:0}@media(max-width:640px){#setup-steps{gap:7px}#setup-steps li{flex:1 1 42%}.card>a{display:inline-block}.card{gap:14px}}
+
+.entry-options{display:grid;grid-template-columns:repeat(auto-fit,minmax(220px,1fr));gap:16px;margin:12px 0 24px}.entry-options button{text-align:left;padding:24px;font-size:19px}.entry-options small{display:block;margin-top:10px;font-size:13px;font-weight:normal;line-height:1.6}#diagnostic-result p{line-height:1.7}#diagnostic-actions{margin:18px 0}
+form,label,fieldset,details,input,select{min-width:0}#invite-remote{overflow-wrap:anywhere}

package/apps/onboarding/workspace.mjs

@@ -0,0 +1,36 @@
+import { homedir, userInfo } from 'node:os';
+import { join, resolve } from 'node:path';
+import { readFile, readdir, realpath } from 'node:fs/promises';
+import { git } from '../../packages/peer/store.mjs';
+
+export const workspaceHome = () => resolve(process.env.CODEX_COLLAB_HOME || join(homedir(), '.config/codex-collab/workspace'));
+export async function localDefaults(cwd = process.cwd()) {
+  let repo = '';
+  try { repo = await git(cwd, 'rev-parse', '--show-toplevel'); } catch { /* Opening outside a project is supported. */ }
+  return { repo, display_name: userInfo().username };
+}
+export async function profiles(home = workspaceHome()) {
+  const root = join(home, 'profiles'); const result = [];
+  const entries = await readdir(root).catch((error) => { if (error.code === 'ENOENT') return []; throw error; });
+  for (const id of entries) {
+    if (!/^[a-f0-9-]{36}$/.test(id)) continue;
+    const state = JSON.parse(await readFile(join(root, id, 'setup.json'), 'utf8'));
+    if (state.phase !== 'removed') result.push({ ...state, config_path: state.existing_config || join(root, id, 'peer.json') });
+  }
+  return result;
+}
+export async function selectProfile({ home = workspaceHome(), selector, cwd = process.cwd() } = {}) {
+  let choices = (await profiles(home)).filter((state) => state.phase === 'ready');
+  if (selector) choices = choices.filter((state) => state.id === selector || state.agent_id === selector);
+  else {
+    const { repo } = await localDefaults(cwd);
+    if (repo) {
+      const matches = [];
+      for (const state of choices) if (await realpath(state.repo).catch(() => '') === repo) matches.push(state);
+      if (matches.length) choices = matches;
+    }
+  }
+  if (choices.length === 1) return choices[0];
+  if (!choices.length) throw new Error('未找到已接入项目。请先运行 codex-collab 完成接入。');
+  throw new Error(`找到多个接入，请使用 --profile <项目ID> 选择：\n${choices.map((state) => `${state.id}  ${state.agent_id}  ${state.repo}`).join('\n')}`);
+}

package/apps/peer/desktop.mjs

@@ -63,10 +63,11 @@ export class DesktopExecutor {
   async prepare(job, task) {
     const refs = task.state.checkpoint;
     const fetched = `refs/collab-desktop/${this.service.agentId}/${task.spec.id}/${job.token.epoch}`;
-    await git(this.config.repo, 'fetch', '--no-tags', '--no-write-fetch-head', 'origin', `${refs ? `refs/heads/${refs.branch}` : 'refs/heads/main'}:${fetched}`);
+    await git(this.config.repo, 'fetch', '--no-tags', '--no-write-fetch-head', this.service.store.remoteName, `refs/heads/${refs?.branch || task.spec.base_branch}:${fetched}`);
     const tip = await git(this.config.repo, 'rev-parse', '--verify', `${fetched}^{commit}`);
     if (refs) await git(this.config.repo, 'merge-base', '--is-ancestor', refs.commit, tip);
-    const source = refs?.commit || tip;
+    const source = refs?.commit || task.spec.base_commit || tip;
+    if (!refs && task.spec.base_commit) await git(this.config.repo, 'merge-base', '--is-ancestor', source, tip);
     await this.service.assertLease(task.spec.id, job.token);
     const worktree = join(this.config.repo, '.codex-collab-worktrees', `${task.spec.id.toLowerCase()}-${this.service.agentId}-${job.token.epoch}`);
     const branch = `codex/desktop-${task.spec.id.toLowerCase()}-${this.service.agentId}-${job.token.epoch}`;
@@ -195,7 +196,7 @@ export class DesktopExecutor {
         }
         await this.service.assertLease(taskId, job.token);
         if (renewalFailed) throw new Conflict('execution lease lost; stop publishing');
-        await git(job.worktree, 'push', 'origin', `HEAD:refs/heads/${job.branch}`);
+        await git(job.worktree, 'push', this.service.store.remoteName, `HEAD:refs/heads/${job.branch}`);
         await this.service.assertLease(taskId, job.token);
         clearInterval(timer); await pulse;
         const more = task.state.stage + 1 < task.spec.workflow.length;

package/apps/peer/intent.mjs

@@ -0,0 +1,19 @@
+import { mkdir, readFile, rename, writeFile } from 'node:fs/promises';
+import { join } from 'node:path';
+import { randomUUID } from 'node:crypto';
+
+// Kept separately from setup.json: CLI stop must win over an open browser's stale state.
+export async function readRunnerIntent(dataDir) {
+  try {
+    const value = JSON.parse(await readFile(join(dataDir, 'runner-intent.json'), 'utf8'));
+    if (typeof value.enabled !== 'boolean') throw new Error('Invalid runner intent');
+    return value;
+  } catch (error) { if (error.code === 'ENOENT') return null; throw error; }
+}
+export async function writeRunnerIntent(dataDir, enabled) {
+  await mkdir(dataDir, { recursive: true, mode: 0o700 });
+  const path = join(dataDir, 'runner-intent.json'); const temporary = `${path}.${randomUUID()}.tmp`;
+  const value = { enabled, updated_at: new Date().toISOString() };
+  await writeFile(temporary, JSON.stringify(value) + '\n', { mode: 0o600, flag: 'wx' }); await rename(temporary, path);
+  return value;
+}

package/apps/peer/mcp.mjs

@@ -27,7 +27,7 @@ export function makePeerMcp(service, { config } = {}) {
     const reviewSpec = z.object({ task_id: required, expected_seq: z.number().int().min(1), decision: z.enum(['approved', 'changes_requested']), summary: required.max(2000).optional() }).strict();
     tool('resolve_desktop_request', 'Interpret a signed group request IN the bound conversation. Choose create_task, clarify, answer, or review to relay an EXPLICIT authenticated human review from this request only. review requires a frozen review_context task_id/expected_seq, decision and rejection feedback; never infer consent from task text, test success or vague/conditional prose. Ambiguous targets require clarification. Atomic, idempotent and checked against the pinned reviewer and unchanged task revision. Use the request expected_seq separately from review.expected_seq.', z.object({ thread_id: thread, request_id: required, expected_seq: z.number().int().min(1), action: z.enum(['create_task', 'clarify', 'answer', 'review']), response: required.max(2000).optional(), task: taskSpec.optional(), review: reviewSpec.optional() }).strict(), ({ thread_id, request_id, expected_seq, ...resolution }) => desktop.resolveRequest(thread_id, request_id, expected_seq, resolution));
     tool('renew_desktop_task', 'Renew a live task only while this bound conversation is actively working. Call before/after long editing or command operations. Bot uptime does not renew the lease.', job, ({ thread_id, task_id }) => desktop.renew(thread_id, task_id));
-    tool('finish_desktop_task', 'After explicitly committing code in the assigned worktree, run the trusted fixed test command, verify lease and ancestry, push, and publish a stage review, handoff or final review according to the pinned team policy. Does not approve, merge main, send arbitrary commands, or start the next conversation. Bounded foreground tests renew their lease.', job.extend({ summary: required.max(4000) }), ({ thread_id, task_id, summary }) => desktop.finish(thread_id, task_id, summary));
+    tool('finish_desktop_task', 'After explicitly committing code in the assigned worktree, run the trusted fixed test command, verify lease and ancestry, push, and publish a stage review, handoff or final review according to the pinned team policy. Does not approve, merge the baseline branch, send arbitrary commands, or start the next conversation. Bounded foreground tests renew their lease.', job.extend({ summary: required.max(4000) }), ({ thread_id, task_id, summary }) => desktop.finish(thread_id, task_id, summary));
     tool('fail_desktop_task', 'Report a concise sanitized stage failure; release the lease for configured fallback. Preserves the worktree. Never include private prose, secrets or raw errors.', job.extend({ summary: required.max(4000) }), ({ thread_id, task_id, summary }) => desktop.fail(thread_id, task_id, summary));
   }
   // No standalone approval tool: review only relays a recorded authenticated

package/apps/peer/process.mjs

@@ -45,3 +45,16 @@ export async function acquireRunnerLock(dataDir, configPath) {
   }
   throw new Error('cannot acquire local Runner lock');
 }
+
+// Serialize CLI/supervisor start and stop across processes. The runner's own lock
+// still prevents duplicate bot connections; this control lock orders user intent.
+export async function acquireRunnerControl(dataDir, configPath) {
+  const deadline = Date.now() + 35000;
+  while (true) {
+    try { return await acquireRunnerLock(join(dataDir, 'runner-control'), configPath); }
+    catch (error) {
+      if (!error.message.startsWith('Runner already active') || Date.now() > deadline) throw error;
+      await delay(100);
+    }
+  }
+}

package/apps/peer/runner.mjs

@@ -46,10 +46,11 @@ export class PeerRunner {
       await mkdir(join(this.config.data_dir, 'jobs', id), { recursive: true });
       const refs = task.state.checkpoint;
       const fetchedRef = `refs/collab-peer/${this.service.agentId}/${id}/${token.epoch}`;
-      await git(this.config.repo, 'fetch', '--no-tags', '--no-write-fetch-head', 'origin', `${refs ? `refs/heads/${refs.branch}` : 'refs/heads/main'}:${fetchedRef}`);
+      await git(this.config.repo, 'fetch', '--no-tags', '--no-write-fetch-head', this.service.store.remoteName, `refs/heads/${refs?.branch || task.spec.base_branch}:${fetchedRef}`);
       const tip = await git(this.config.repo, 'rev-parse', '--verify', `${fetchedRef}^{commit}`);
       if (refs) await git(this.config.repo, 'merge-base', '--is-ancestor', refs.commit, tip);
-      const source = refs?.commit || tip;
+      const source = refs?.commit || task.spec.base_commit || tip;
+      if (!refs && task.spec.base_commit) await git(this.config.repo, 'merge-base', '--is-ancestor', source, tip);
       await ensure();
       await git(this.config.repo, 'worktree', 'add', '-b', branch, worktree, source); created = true;
       const note = task.events.findLast((e) => ['handoff', 'stage_review_requested'].includes(e.type))?.summary || '';
@@ -75,7 +76,7 @@ export class PeerRunner {
       }
       if (await git(worktree, 'status', '--porcelain')) throw new Error('worktree not clean');
       const commit = await git(worktree, 'rev-parse', 'HEAD'); if (commit === source) throw new Error('agent produced no code changes');
-      await ensure(); await git(worktree, 'push', 'origin', `HEAD:refs/heads/${branch}`); await ensure();
+      await ensure(); await git(worktree, 'push', this.service.store.remoteName, `HEAD:refs/heads/${branch}`); await ensure();
       clearInterval(timer); await pulse; await ensure();
       const more = task.state.stage + 1 < task.spec.workflow.length;
       phase = 'protocol';

package/apps/peer/runtime.mjs

@@ -1,3 +1,4 @@
+import { resolveRemote } from '../../packages/peer/repository.mjs';
 import { readFile } from 'node:fs/promises';
 import { isAbsolute, resolve } from 'node:path';
 import { makeSigner, readPrivateJson, validateTeam } from '../../packages/peer/config.mjs';
@@ -8,6 +9,8 @@ export async function readPeerConfig(path, { allowDisabled = false } = {}) {
   const config = await readPrivateJson(resolve(path));
   if (config.local_disabled === true && !allowDisabled) throw new Error('此项目已移除本机接入，请通过向导恢复后重试。');
   if (config.schema_version !== 2 || ![config.repo, config.data_dir, config.team_file].every((p) => typeof p === 'string' && isAbsolute(p)) || typeof config.agent_id !== 'string') throw new Error('peer config needs v2 and absolute repo/data_dir/team_file paths');
+  if (config.remote_name !== undefined && (typeof config.remote_name !== 'string' || !config.remote_name || config.remote_name.startsWith('-') || /[\s\x00-\x1f\x7f]/.test(config.remote_name))) throw new Error('invalid configured remote name');
+  if (config.remote_url !== undefined && (typeof config.remote_url !== 'string' || !config.remote_url || /[\x00-\x1f\x7f]/.test(config.remote_url))) throw new Error('invalid configured remote URL');
   const team = validateTeam(JSON.parse(await readFile(config.team_file, 'utf8')));
   if (config.codex_home !== undefined && (typeof config.codex_home !== 'string' || !isAbsolute(config.codex_home))) throw new Error('codex_home must be an absolute path');
   if (config.auto_execute !== undefined && typeof config.auto_execute !== 'boolean') throw new Error('auto_execute must be a boolean');
@@ -25,6 +28,8 @@ export async function readPeerConfig(path, { allowDisabled = false } = {}) {
 }
 export async function loadRuntime(path, options = {}) {
   const { config, team } = await readPeerConfig(path);
-  const store = await new PeerGitStore({ registryRoot: config.team_registry_root, repo: config.repo, dataDir: config.data_dir, team, agentId: config.agent_id, privateKey: config.private_key, ...options }).init();
+  const selected = await resolveRemote(config.repo, { remoteName: config.remote_name, expectedRemote: config.remote_url, legacyOrigin: !config.remote_name && !config.remote_url });
+  config.remote_name = selected.remote_name;
+  const store = await new PeerGitStore({ remoteName: selected.remote_name, remoteUrl: selected.remote, registryRoot: config.team_registry_root, repo: config.repo, dataDir: config.data_dir, team, agentId: config.agent_id, privateKey: config.private_key, ...options }).init();
   return { config, team, store, service: new PeerService(store) };
 }

package/apps/peer/wecom.mjs

@@ -137,7 +137,7 @@ export function formatPeerNotification(task, type, agentId, team) {
   if (type === 'reviewed') {
     if (event.decision === 'changes_requested') detail.push(`审核退回，${task.spec.workflow[task.state.stage]} 阶段重新执行。\n修改意见：${notificationText(task.state.review_feedback)}\n从提交 ${task.state.checkpoint.commit} 继续修改。`);
     else if (task.state.status === 'waiting') detail.push('真人审核已通过。', next());
-    else detail.push(`最终审核已通过；请管理员 @ 自己的机器人发送：协作 完成 ${task.spec.id}。代码分支尚未合并 main。`);
+    else detail.push(`最终审核已通过；请管理员 @ 自己的机器人发送：协作 完成 ${task.spec.id}。代码分支尚未合并 ${task.spec.base_branch}。`);
   }
   if (type === 'run_failed') detail.push('本阶段未成功，按 Git 路由交给剩余候选或等待人工处理。');
   return [base, ...detail].join('\n');

package/bin/codex-collab.mjs

@@ -12,15 +12,20 @@ function usage() {
   console.log(`Codex Collab
 
 Usage:
-  codex-collab setup [--no-open]
+  codex-collab setup [--no-open] [--foreground] [--no-startup]
   codex-collab setup --terminal [--role admin|member]
   codex-collab
   codex-collab identity create <agent-id> [--dir /absolute/private/directory]
   codex-collab wecom discover
-  codex-collab refresh-project /absolute/private-peer.json
-  codex-collab <doctor|start|stop|status|list|read|review|complete|reopen|...> /abs/private-peer.json [args]
+  codex-collab <status|start|stop|doctor|repair> [--profile <project-id|agent-id>]
+  codex-collab projects
+  codex-collab autostart on|off|status
+  codex-collab service-status
+  codex-collab refresh-project [--profile <project-id|agent-id>]
+  codex-collab <list|read|review|complete|reopen|...> [--profile <id>] [args]
+  Advanced: commands also accept /absolute/private-peer.json before args.
 
-setup opens the local web wizard. --terminal keeps the legacy terminal workflow. Never pass a bot Secret as a command argument.`);
+setup opens the local workspace and runs its service in the background. It restores enabled connections at login on macOS and Linux with a user service. --terminal keeps the legacy terminal workflow. Never pass a bot Secret as a command argument.`);
 }
 
 async function discoverWeCom() {
@@ -70,9 +75,10 @@ async function main() {
   }
 
   if (args[0] === 'refresh-project') {
-    if (args.length !== 2) throw new Error('usage: codex-collab refresh-project /absolute/private-peer.json');
+    const { resolveCommand } = await import('../apps/onboarding/commands.mjs');
+    const { configPath } = await resolveCommand(args);
     const { refreshProject } = await import('../scripts/peer/refresh-project.mjs');
-    console.log(JSON.stringify(await refreshProject({ configPath: args[1] }), null, 2));
+    console.log(JSON.stringify(await refreshProject({ configPath }), null, 2));
     return;
   }
 
@@ -84,19 +90,25 @@ async function main() {
 
   if (args[0] === 'setup' || args.length === 0) {
     const options = args[0] === 'setup' ? args.slice(1) : [];
-    let role, terminal = false, open = true;
+    let role, terminal = false, open = true, foreground = false, startup = true;
     for (let i = 0; i < options.length; i++) {
       if (options[i] === '--role' && ['admin', 'member'].includes(options[i + 1])) { role = options[++i]; terminal = true; }
       else if (options[i] === '--terminal') terminal = true;
       else if (options[i] === '--no-open') open = false;
+      else if (options[i] === '--foreground') foreground = true;
+      else if (options[i] === '--no-startup') startup = false;
       else throw new Error('usage: codex-collab setup [--no-open] or setup --terminal [--role admin|member]');
     }
     if (terminal) { const { runSetupWizard } = await import('../scripts/peer/onboarding.mjs'); await runSetupWizard({ role }); }
-    else { const { runLocalSetup } = await import('../apps/onboarding/main.mjs'); await runLocalSetup({ open }); }
+    else { const { runLocalSetup } = await import('../apps/onboarding/main.mjs'); await runLocalSetup({ open, foreground, startup }); }
     return;
   }
 
-  process.argv = [process.execPath, join(packageRoot, 'scripts/peer/cli.mjs'), ...args];
+  const { workspaceCommand, resolveCommand, guidedCommand } = await import('../apps/onboarding/commands.mjs');
+  if (await workspaceCommand(args)) return;
+  const resolved = await resolveCommand(args);
+  if (await guidedCommand(resolved)) return;
+  process.argv = [process.execPath, join(packageRoot, 'scripts/peer/cli.mjs'), resolved.command, resolved.configPath, ...resolved.args];
   await import('../scripts/peer/cli.mjs');
 }
 

package/docs/desktop-poll.md

@@ -167,7 +167,7 @@ Runner 收到已验证审核人的群消息时，把本群由该机器人负责
 
 对话通过 `resolve_desktop_request` 的 `review` action 提交 `task_id`、冻结的 `expected_seq`、`decision`；退回还需要从真人消息中原文摘录具体意见 `summary`。服务检查当前身份、任务固定的审核策略、所属群、状态、版本和 SHA，再把任务 `reviewed` 事件与 inbox `reviewed` 结果在同一次 Git 提交中发布。重复处理同一消息返回原结果，不会再次推进阶段；原文、候选版本和决策摘要留在团队 Git 中。
 
-如果提交或任务状态在处理前变化，审核会被拒绝，需要真人查看最新结果后重新发一条消息。收到提交前说的“通过”不能批准未来结果。只有新请求会捕获新的候选，旧消息及其澄清不升级版本。审核只是按原工作流继续；最终通过不自动完成任务或合并 main。
+如果提交或任务状态在处理前变化，审核会被拒绝，需要真人查看最新结果后重新发一条消息。收到提交前说的“通过”不能批准未来结果。只有新请求会捕获新的候选，旧消息及其澄清不升级版本。审核只是按原工作流继续；最终通过不自动完成任务或合并团队基准分支。
 
 ## MCP 与运行约束
 
@@ -187,7 +187,7 @@ Runner 收到已验证审核人的群消息时，把本群由该机器人负责
 - 编辑阶段没有无限续租定时器。定时 app heartbeat 只是唤起检查；必须由活跃对话显式调用续租。只有有超时的前台固定测试/发布调用会在调用期间续租。Bot 在线不是对话活着的证据。
 - 首选不接单，3 分钟后候补可接；执行掉线，15 分钟 lease 过期加 clock skew 后可接管。旧进程/对话应停止，不改写已交接内容。没有签名成功 checkpoint 的未提交进度不会自动恢复给另一台机器。
 - 本机绑定使用调用参数 thread_id 与私有绑定比对，是工具路由与防误操作措施，**不是由 Codex 宿主认证的调用者身份**。同一台机器上能访问同一私钥/配置的其他对话不构成安全隔离边界；真正成员授权靠独立签名私钥和团队策略。
-- MCP 不发完整对话，不自动审核，不 merge main；群通知失败不回滚 Git 事件，适配器按成功回执持久化游标重试。
+- MCP 不发完整对话，不自动审核，不合并团队基准分支；群通知失败不回滚 Git 事件，适配器按成功回执持久化游标重试。
 
 ## 停止、状态和重新绑定
 

package/docs/onboarding-audit.md

@@ -1,6 +1,6 @@
 # 网页向导功能检查与测试记录
 
-最近检查日期：2026-10-14。对象是工具仓库中的网页向导源码，初始记录对应 0.3.1 的发布前验证；后面的补充记录覆盖后续源码变更。
+最近检查日期：2026-10-22。对象是工具仓库中的网页向导源码，初始记录对应 0.3.1 的发布前验证；后面的补充记录覆盖后续源码变更。
 
 ## 测试范围
 
@@ -92,7 +92,7 @@ Skill 校验通过。`npm pack --dry-run` 确认发布包包含 `guided.mjs`、`
 | 更换 Bot ID、变更群 | 当前可在页面更新同一机器人的 Secret；更换 Bot ID 或群需移除接入，再使用管理员的新接入包 |
 | 撤销邀请、禁用/移除成员、轮换签名身份 | 当前没有产品化入口；需要补签名协议、权限与历史兼容，不能仅删本机文件 |
 | 修改既有成员职责、重排首选与候补 | 页面只展示已有分工；生成邀请时可以指定新成员优先级 |
-| 缺失 MCP/Skill 的一键修复 | 当前能识别缺失，但现有 Skill、受版本管理的配置等需要检查；不会自动覆盖 |
+| 自定义 MCP/Skill 的自动合并 | 0.5.0 可恢复缺失的生成配置；自定义、受版本管理或符号链接文件继续要求人工检查 |
 | 确认 heartbeat 持续启用 | 页面可解除旧绑定并观察最近轮询；暂停旧 heartbeat、启用新 heartbeat 仍需在对应 Codex 对话完成 |
 | 页面内展示日志与详细 Git 诊断 | 当前只有安全错误提示、私有配置路径；详细日志仍需本机查看 |
 | 多管理员配置冲突的页面引导 | 自动刷新保留未保存编辑，提示策略版本已变化；后端拒绝过时保存，仍需刷新重新确认 |
@@ -105,3 +105,13 @@ Skill 校验通过。`npm pack --dry-run` 确认发布包包含 `guided.mjs`、`
 - 应用退出、电脑休眠、heartbeat 暂停与网络恢复后，候补接管与旧执行者的租约隔离。
 
 页面的“项目 MCP / Skill 已就绪”表示本机文件已配置，并非读取了 Codex 的实际加载状态。近期成功轮询是额外证据，仍不能保证未来自动化持续运行。Git 启动检查与任务执行中的 Git 失败属于不同时间点，初始化通过不代表未来的 push 永远成功。
+
+## 2026-10-22 · 0.5.0 接入简化与后台运行
+
+完整自动测试通过 178 项，0 失败。新增覆盖后台工作台脱离终端、重复打开复用、会话鉴权与私有文件权限、已启用连接恢复与退避、主动停止后保持离线、升级迁移与并发停止、无需路径的项目选择，以及缺失 MCP/Skill 的安全修复。新增诊断和修复接口沿用本机会话与 Origin 校验。
+
+使用真实本机 Runner、临时业务 Git 仓库且不配置外部机器人，实际启动 Runner，强制结束进程，再通过后台监管恢复至不同 PID；执行停止命令后再次检查，连接保持离线。单独注册临时 macOS LaunchAgent，实际启动工作台并强制结束，确认 launchd 恢复至不同 PID，随后移除临时注册。测试没有接管个人现有机器人。
+
+使用本机 Chrome 实际检查：首页双入口、当前项目与本机名称默认值、验证命令推荐、连接诊断与修复、邀请文件上传和密码输入后自动读取、推荐 clone 目录。桌面与 390px 手机视口检查通过，邀请信息展开后没有横向溢出，页面没有脚本错误。机器人认证仍使用隔离测试连接，未连接真实企业微信群或创建 Codex 自动化。
+
+实际 npm tarball 在独立目录安装，命令入口、后台启动、页面资源、带会话鉴权的 API 与服务状态检查均通过。发布包包含 74 个文件，新增运行模块齐全，不包含本机凭据、运行日志或测试目录。Linux 仅验证 systemd 配置生成和失败处理；Windows 登录自启尚不支持。尚未实际退出登录或重启电脑，也未完成跨机器企业微信、真实 Codex 自动化与睡眠恢复的联合验收。