xuym-codex-collab 0.4.4 → 0.6.0

package/scripts/peer/cli.mjs

@@ -5,10 +5,13 @@ import { homedir } from 'node:os';
 import { join, resolve } from 'node:path';
 import { fileURLToPath } from 'node:url';
 import { setTimeout as delay } from 'node:timers/promises';
+import { diagnosePeer } from './onboarding.mjs';
 import { loadRuntime, readPeerConfig } from '../../apps/peer/runtime.mjs';
-import { alive, readRunnerLock } from '../../apps/peer/process.mjs';
+import { alive, readRunnerLock, acquireRunnerControl } from '../../apps/peer/process.mjs';
 import { git } from '../../packages/peer/store.mjs';
 
+import { readRunnerIntent, writeRunnerIntent } from '../../apps/peer/intent.mjs';
+
 const root = fileURLToPath(new URL('../../', import.meta.url));
 const [command, configArg, ...args] = process.argv.slice(2);
 if (!command || !configArg) throw new Error('usage: node scripts/peer/cli.mjs install|doctor|probe|start|stop|status|list|read|review|complete|reopen|desktop-status|desktop-unbind /abs/peer.json [task-id] [decision/reason]');
@@ -20,6 +23,8 @@ async function running() {
   return state && alive(state.pid) ? state : null;
 }
 
+const releaseControl = ['start', 'recover', 'stop'].includes(command) ? await acquireRunnerControl(config.data_dir, configPath) : null;
+try {
 switch (command) {
   case 'probe': {
     try {
@@ -51,14 +56,12 @@ switch (command) {
     break;
   }
   case 'doctor': {
-    const origin = await git(config.repo, 'remote', 'get-url', 'origin');
-    const main = await git(config.repo, 'ls-remote', '--heads', 'origin', 'refs/heads/main');
-    if (!main) throw new Error('shared origin needs a main branch');
-    execFileSync('git', ['-C', config.repo, 'check-ref-format', 'refs/heads/agent-collab'], { stdio: 'ignore' });
-    console.log(JSON.stringify({ identity: config.agent_id, auto_execute: config.auto_execute !== false, execution_session: config.execution_mode === 'desktop_poll' ? 'bound desktop heartbeat; adapter never launches SDK (check desktop-status and app heartbeat separately)' : 'new Runner-owned SDK thread; not an existing desktop conversation', config: 'valid; private key matches policy', git: 'shared origin and main readable', origin_configured: !!origin, wecom: config.wecom ? 'configured; live authentication not checked' : 'disabled', codex_provider: config.execution_mode === 'desktop_poll' ? 'uses the existing desktop conversation model; no SDK provider is launched by this adapter' : 'not tested; uses selected CODEX_HOME/provider configuration', test_argv: config.test_argv || ['sh', 'test.sh'] }, null, 2));
+    console.log(JSON.stringify(await diagnosePeer(configPath), null, 2));
     break;
   }
-  case 'start': {
+  case 'start': case 'recover': {
+    if (command === 'recover') { if (!(await readRunnerIntent(config.data_dir))?.enabled) break; }
+    else await writeRunnerIntent(config.data_dir, true);
     const current = await running();
     if (current) { console.log(`Runner already online (PID ${current.pid})`); break; }
     await mkdir(config.data_dir, { recursive: true, mode: 0o700 });
@@ -81,10 +84,11 @@ switch (command) {
         if (health.pid === state.pid && new Date(health.updated_at).getTime() >= new Date(state.started_at).getTime() && ['connecting', 'authenticated', 'reconnecting', 'disconnected', 'failed'].includes(health.status)) wecom = health.status;
       } catch (error) { if (error.code !== 'ENOENT') throw error; }
     }
-    console.log(JSON.stringify({ identity: config.agent_id, execution_mode: config.execution_mode || 'legacy', auto_execute: config.auto_execute !== false, online: !!state, wecom, pid: state?.pid || null, log: join(config.data_dir, 'runner.log') }, null, 2));
+    console.log(JSON.stringify({ identity: config.agent_id, execution_mode: config.execution_mode || 'legacy', auto_execute: config.auto_execute !== false, online: !!state, connection_enabled: (await readRunnerIntent(config.data_dir))?.enabled ?? !!state, wecom, pid: state?.pid || null, log: join(config.data_dir, 'runner.log') }, null, 2));
     break;
   }
   case 'stop': {
+    await writeRunnerIntent(config.data_dir, false);
     const state = await running();
     if (!state) { console.log('Runner offline'); break; }
     if (state.config !== configPath) throw new Error('PID configuration mismatch; refusing to signal');
@@ -114,3 +118,5 @@ switch (command) {
   }
   default: throw new Error('unknown peer command');
 }
+
+} finally { await releaseControl?.(); }

package/scripts/peer/init-agent.mjs

@@ -1,15 +1,6 @@
-import { createPublicKey } from 'node:crypto';
-import { mkdir, readFile, writeFile, chmod } from 'node:fs/promises';
-import { dirname, isAbsolute, resolve } from 'node:path';
-import { readPrivateJson, validateTeam } from '../../packages/peer/config.mjs';
-const [teamPath, identityPath, repo, dataDir, out] = process.argv.slice(2);
-if (![teamPath, identityPath, repo, dataDir, out].every((v) => v && isAbsolute(v))) throw new Error('usage: node scripts/peer/init-agent.mjs /abs/team.json /abs/bob.private.json /abs/clone /abs/data /abs/bob-peer.json');
-const team = validateTeam(JSON.parse(await readFile(resolve(teamPath), 'utf8')));
-const identity = await readPrivateJson(resolve(identityPath));
-if (!team.agents[identity.agent_id]) throw new Error('identity is not in team policy');
-const publicKey = createPublicKey(identity.private_key).export({ type: 'spki', format: 'pem' });
-if (publicKey !== team.agents[identity.agent_id].public_key) throw new Error('private identity does not match the public key pinned in team policy');
-const config = { schema_version: 2, agent_id: identity.agent_id, repo: resolve(repo), data_dir: resolve(dataDir), team_file: resolve(teamPath), private_key: identity.private_key, test_argv: ['sh', 'test.sh'] };
-await mkdir(dirname(resolve(out)), { recursive: true, mode: 0o700 });
-await writeFile(resolve(out), JSON.stringify(config, null, 2) + '\n', { mode: 0o600, flag: 'wx' }); await chmod(resolve(out), 0o600);
-console.log(`private peer config written: ${resolve(out)} (keep it local)`);
+import { isAbsolute } from 'node:path';
+import { createMemberConfig } from './onboarding.mjs';
+const [teamPath, identityPath, repoPath, dataDir, configPath] = process.argv.slice(2);
+if (![teamPath, identityPath, repoPath, dataDir, configPath].every((v) => v && isAbsolute(v))) throw new Error('usage: node scripts/peer/init-agent.mjs /abs/team.json /abs/bob.private.json /abs/clone /abs/data /abs/bob-peer.json');
+await createMemberConfig({ teamPath, identityPath, repoPath, dataDir, configPath });
+console.log(`private peer config written: ${configPath} (keep it local)`);

package/scripts/peer/onboarding.mjs

@@ -1,3 +1,4 @@
+import { inspectRepository, resolveRemote, teamBaseBranch } from '../../packages/peer/repository.mjs';
 import { createPublicKey } from 'node:crypto';
 import { spawnSync } from 'node:child_process';
 import { emitKeypressEvents } from 'node:readline';
@@ -62,10 +63,11 @@ export async function getOrCreateIdentityFiles(agentId, directory) {
   return { agent_id: agentId, private_key_file: privatePath, public_key_file: publicPath };
 }
 
-export function buildTeamPolicy({ repo, reviewer, defaultRoute, agents, routes, policy = {} }) {
+export function buildTeamPolicy({ repo, reviewer, defaultRoute, agents, routes, policy = {}, baseBranch }) {
   const team = validateTeam({
     schema_version: 2,
     repo,
+    ...(baseBranch !== undefined ? { base_branch: baseBranch } : {}),
     reviewer,
     default_route: defaultRoute,
     agents: Object.fromEntries(agents.map((agent) => [agent.id, {
@@ -95,7 +97,7 @@ export async function writeTeamPolicy(path, team) {
   return path;
 }
 
-export async function createMemberConfig({ teamPath, identityPath, repoPath, dataDir, configPath, testArgv = ['sh', 'test.sh'] }) {
+export async function createMemberConfig({ teamPath, identityPath, repoPath, dataDir, configPath, testArgv = ['sh', 'test.sh'], remoteName, remoteUrl }) {
   for (const path of [teamPath, identityPath, repoPath, dataDir, configPath]) {
     if (!path || !isAbsolute(path)) throw new Error('team, identity, repository, data and config paths must be absolute');
   }
@@ -109,13 +111,13 @@ export async function createMemberConfig({ teamPath, identityPath, repoPath, dat
   if (await git(repo, 'rev-parse', '--show-toplevel') !== repo) throw new Error('select the root directory of a Git project');
   const privatePaths = [dataDir, configPath, identityPath];
   if (privatePaths.some((path) => isWithin(repoPath, path) || isWithin(repo, path))) throw new Error('private identity, data and config files must stay outside the code repository');
-  const origin = await git(repo, 'remote', 'get-url', 'origin');
-  const main = await git(repo, 'ls-remote', '--heads', 'origin', 'refs/heads/main');
-  if (!main) throw new Error('the shared origin must have a readable main branch');
+  const selected = await inspectRepository(repo, { remoteName, expectedRemote: remoteUrl, baseBranch: teamBaseBranch(team) });
   const config = {
     schema_version: 2,
     agent_id: identity.agent_id,
     repo,
+    remote_name: selected.remote_name,
+    remote_url: selected.remote,
     data_dir: dataDir,
     team_file: teamPath,
     private_key: identity.private_key,
@@ -133,29 +135,32 @@ export async function createMemberConfig({ teamPath, identityPath, repoPath, dat
     await rm(configPath, { force: true });
     throw error;
   }
-  return { config, team, origin };
+  return { config, team, origin: selected.remote };
 }
 
 export async function diagnosePeer(configPath, { testPush = false } = {}) {
-  const { config, team } = await readPeerConfig(configPath);
-  const origin = await git(config.repo, 'remote', 'get-url', 'origin');
-  const main = await git(config.repo, 'ls-remote', '--heads', 'origin', 'refs/heads/main');
-  if (!main) throw new Error('shared origin is missing refs/heads/main');
-  const ledger = await git(config.repo, 'ls-remote', '--heads', 'origin', 'refs/heads/agent-collab');
+  const { config, team: cachedTeam } = await readPeerConfig(configPath);
+  const remote = await resolveRemote(config.repo, { remoteName: config.remote_name, expectedRemote: config.remote_url, legacyOrigin: !config.remote_name && !config.remote_url });
+  const ledger = await git(config.repo, 'ls-remote', '--heads', remote.remote_name, 'refs/heads/agent-collab');
+  if (config.team_registry_root && !ledger) throw new Error('signed team ledger is missing; restore agent-collab before continuing');
+  const team = config.team_registry_root ? (await loadRuntime(configPath)).store.team : cachedTeam;
+  const selected = await inspectRepository(config.repo, { remoteName: remote.remote_name, expectedRemote: remote.remote, baseBranch: teamBaseBranch(team) });
   let writeAccess = 'not checked';
   if (testPush) {
     const probe = `refs/heads/codex-collab-doctor/${process.pid}-${Date.now()}`;
-    await git(config.repo, 'push', '--dry-run', 'origin', `HEAD:${probe}`);
+    await git(config.repo, 'push', '--dry-run', selected.remote_name, `HEAD:${probe}`);
     writeAccess = 'push dry-run passed; no remote ref was created';
   }
   return {
     agent_id: config.agent_id,
     mode: config.execution_mode,
-    origin,
+    origin: selected.remote,
+    remote_name: selected.remote_name,
+    base_branch: selected.base_branch,
     team_repo: team.repo,
     checks: {
       identity: 'valid; private key matches team public key',
-      repository: 'Git root with readable origin/main',
+      repository: `Git root with readable ${selected.remote_name}/${selected.base_branch}`,
       ledger: ledger ? 'agent-collab exists' : 'not initialized; first start may create it',
       push_access: writeAccess,
       wecom: config.wecom ? 'configured; authentication requires starting the adapter' : 'not configured',
@@ -305,8 +310,9 @@ async function createAdminTeam(prompts, output) {
   const reviewer = await prompts.ask('人工审核管理员 agent ID', id);
   const defaultRoute = await prompts.ask('默认任务能力标签', capabilities[0]);
   const repo = await prompts.required('共享代码仓库标识（例如 owner/repo）');
+  const baseBranch = await prompts.ask('业务基准分支（供所有成员继承；网页向导可自动识别）', 'main');
   const teamPath = resolve(await prompts.ask('团队策略文件路径', join(homedir(), 'codex-collab-team.json')));
-  const team = buildTeamPolicy({ repo, reviewer, defaultRoute, agents, routes });
+  const team = buildTeamPolicy({ repo, reviewer, defaultRoute, agents, routes, baseBranch });
   await writeTeamPolicy(teamPath, team);
   output.write(`\n团队策略已创建：${teamPath}\n只分发此 team.json；各成员仍须在自己的电脑运行 setup 并使用自己的私钥。\n`);
   return { teamPath, identityPath: identityPaths.private_key_file, agentId: id };
@@ -335,7 +341,7 @@ async function configureWeCom(prompts, configPath, config, team, output) {
 }
 
 async function joinTeam(prompts, output, initial = {}) {
-  output.write('\n成员接入：私钥留在本机；共享仓库必须允许读取 main，并具备推送协作分支的权限。\n\n');
+  output.write('\n成员接入：私钥留在本机；共享仓库必须允许读取团队基准分支，并具备推送协作分支的权限。\n\n');
   const teamPath = resolve(initial.teamPath || await prompts.required('管理员提供的 team.json 路径'));
   const identityPath = resolve(initial.identityPath || await prompts.required('本机私有身份文件路径'));
   const identity = await readPrivateJson(identityPath);
@@ -347,10 +353,10 @@ async function joinTeam(prompts, output, initial = {}) {
   let parsedArgv;
   try { parsedArgv = JSON.parse(rawArgv); }
   catch { throw new Error('固定验证命令必须是 JSON 字符串数组，例如 ["npm", "test"]'); }
-  const { config, team, origin } = await createMemberConfig({ teamPath, identityPath, repoPath, dataDir, configPath, testArgv: parsedArgv });
-  output.write(`\n身份 ${agentId} 已验证；共享 origin：${origin}\n执行模式：desktop_poll（不启动后台 Codex SDK）\n`);
+  const { config, team } = await createMemberConfig({ teamPath, identityPath, repoPath, dataDir, configPath, testArgv: parsedArgv });
+  output.write(`\n身份 ${agentId} 已验证；共享远程：${config.remote_name}；基准分支：${teamBaseBranch(team)}\n执行模式：desktop_poll（不启动后台 Codex SDK）\n`);
 
-  if (await prompts.confirm('把本项目接入 Codex MCP + Skill？（只写本机 project config，不改 origin）', true)) {
+  if (await prompts.confirm('把本项目接入 Codex MCP + Skill？（只写本机 project config）', true)) {
     const attached = await attachProject({ configPath, repoPath: config.repo });
     output.write(`MCP 配置：${attached.mcp_config}\nSkill：${attached.skill}\n`);
   }
@@ -361,7 +367,7 @@ async function joinTeam(prompts, output, initial = {}) {
   const diagnosis = await diagnosePeer(configPath, { testPush: true });
   output.write('\n连接检查：\n');
   for (const [name, result] of Object.entries(diagnosis.checks)) output.write(`- ${name}: ${result}\n`);
-  if (await prompts.confirm('现在初始化/同步共享 agent-collab 账本分支？首次初始化会向 origin 推送该分支。', true)) {
+  if (await prompts.confirm('现在初始化/同步共享 agent-collab 账本分支？首次初始化会向所选协作远程推送该分支。', true)) {
     await loadRuntime(configPath);
     output.write('共享账本分支已就绪。\n');
   }

package/scripts/peer/refresh-project.mjs

@@ -6,14 +6,15 @@ import { readPeerConfig } from '../../apps/peer/runtime.mjs';
 import { git } from '../../packages/peer/store.mjs';
 import { bindingPrompt } from './setup-desktop-project.mjs';
 const root = fileURLToPath(new URL('../../', import.meta.url));
-const legacyHashes = new Set(['46543ca4fe00836f0ae0d7d7c12ea2756c9ab0220f01d29c391d608c5e405c53', '6e4d1ea6a644fb3078c541e40bcc9e8bf5069462994152f3ec2fc3aa5fedd5fa', 'f98ad425e2ea3c8ab6fb86febef7d9cb288029ef55bea6937dda6de8b467fece']);
+const legacyHashes = new Set(['f0f5f51ec7f2e0952d15e079d37e9f00b958ac7fda0d819c0a20e4ed620abaff', '46543ca4fe00836f0ae0d7d7c12ea2756c9ab0220f01d29c391d608c5e405c53', '6e4d1ea6a644fb3078c541e40bcc9e8bf5069462994152f3ec2fc3aa5fedd5fa', 'f98ad425e2ea3c8ab6fb86febef7d9cb288029ef55bea6937dda6de8b467fece']);
 const hash = (value) => createHash('sha256').update(value).digest('hex');
 const inside = (parent, child) => { const path = relative(parent, child); return !path || path !== '..' && !path.startsWith('../') && !isAbsolute(path); };
-async function plainPath(base, path) {
+async function plainPath(base, path, { allowMissing = false } = {}) {
   let current = base;
   for (const part of relative(base, path).split('/').filter(Boolean)) {
     current = join(current, part);
-    if ((await lstat(current)).isSymbolicLink()) throw new Error('协作配置或 Skill 是符号链接，请先手动检查；未覆盖文件。');
+    let info; try { info = await lstat(current); } catch (error) { if (allowMissing && error.code === 'ENOENT') return; throw error; }
+    if (info.isSymbolicLink()) throw new Error('协作配置或 Skill 是符号链接，请先手动检查；未覆盖文件。');
   }
 }
 async function privateWrite(path, contents) {
@@ -22,14 +23,17 @@ async function privateWrite(path, contents) {
   finally { await rm(temporary, { force: true }); }
 }
 // Only recognize our generated MCP entry. Never replace another identity's entry.
-export async function installedProjectConfig({ repoPath, agentId }) {
+export async function installedProjectConfig({ repoPath, agentId, allowMissing = false }) {
   const repo = await realpath(repoPath);
-  const path = join(repo, '.codex/config.toml'); await plainPath(repo, path);
-  const before = await readFile(path, 'utf8');
+  const path = join(repo, '.codex/config.toml'); await plainPath(repo, path, { allowMissing });
+  const before = await readFile(path, 'utf8').catch((error) => { if (allowMissing && error.code === 'ENOENT') return null; throw error; });
   const server = `team-collab-${agentId}`;
-  const headers = [...before.matchAll(/^\s*\[([^\]\n]+)\][^\n]*$/gm)];
+  const headers = [...(before || '').matchAll(/^\s*\[([^\]\n]+)\][^\n]*$/gm)];
   if (headers.some((item) => item[1].startsWith(`mcp_servers.${server}.`))) throw new Error('协作 MCP 有自定义嵌套配置，请手动检查；未覆盖文件。');
   const matching = headers.filter((item) => item[1] === `mcp_servers.${server}`);
+  // A missing block can be rebuilt from the private profile, but ambiguous or
+  // other identities' collaboration settings always require manual inspection.
+  if (!matching.length && allowMissing && !(before || '').includes('team-collab-')) return { repo, path, before, missing: true };
   if (matching.length !== 1) throw new Error('未找到唯一的已安装协作 MCP，请先完成项目接入。');
   const header = matching[0]; const end = headers.find((item) => item.index > header.index)?.index ?? before.length;
   const section = before.slice(header.index, end);
@@ -46,17 +50,19 @@ export async function refreshProject({ configPath }) {
   if (!isAbsolute(configPath || '')) throw new Error('usage: codex-collab refresh-project /absolute/private-peer.json');
   const { config } = await readPeerConfig(configPath);
   if (config.execution_mode !== 'desktop_poll' || config.auto_execute !== false) throw new Error('refresh-project 需要 desktop_poll 配置且 SDK 已关闭。');
-  const installed = await installedProjectConfig({ repoPath: config.repo, agentId: config.agent_id });
+  const installed = await installedProjectConfig({ repoPath: config.repo, agentId: config.agent_id, allowMissing: true });
   const { repo, path: configFile, before, section } = installed;
-  if (await git(repo, 'rev-parse', '--show-toplevel') !== repo || await realpath(installed.config_path) !== await realpath(configPath)) throw new Error('项目 MCP 已绑定其他配置，请使用该 MCP 实际使用的个人配置路径；未更换身份。');
+  if (await git(repo, 'rev-parse', '--show-toplevel') !== repo || !installed.missing && await realpath(installed.config_path) !== await realpath(configPath)) throw new Error('项目 MCP 已绑定其他配置，请使用该 MCP 实际使用的个人配置路径；未更换身份。');
   const skillFile = join(repo, '.agents/skills/team-collab-desktop/SKILL.md');
-  await plainPath(repo, skillFile);
+  await plainPath(repo, skillFile, { allowMissing: true });
   if (await git(repo, 'ls-files', '--', '.codex/config.toml', '.agents/skills/team-collab-desktop')) throw new Error('协作配置或 Skill 已提交到项目 Git，请手动合并；未覆盖共享文件。');
-  const oldSkill = await readFile(skillFile, 'utf8');
+  const oldSkill = await readFile(skillFile, 'utf8').catch((error) => { if (error.code === 'ENOENT') return null; throw error; });
   const template = await readFile(join(root, 'packages/codex-kit/templates/.agents/skills/team-collab-desktop/SKILL.md'), 'utf8');
-  if (oldSkill !== template && !legacyHashes.has(hash(oldSkill))) throw new Error('协作 Skill 已自定义，请手动合并自然语言处理说明；未覆盖文件。');
-  const nextSection = section.replace(/^command\s*=.*$/m, `command = ${JSON.stringify(process.execPath)}`).replace(/^args\s*=.*$/m, `args = ${JSON.stringify([join(root, 'apps/peer/mcp-main.mjs'), installed.config_path])}`);
-  const next = before.replace(section, () => nextSection);
+  if (oldSkill !== null && oldSkill !== template && !legacyHashes.has(hash(oldSkill))) throw new Error('协作 Skill 已自定义，请手动合并自然语言处理说明；未覆盖文件。');
+  const command = `command = ${JSON.stringify(process.execPath)}`;
+  const args = `args = ${JSON.stringify([join(root, 'apps/peer/mcp-main.mjs'), installed.config_path || configPath])}`;
+  const nextSection = installed.missing ? `[mcp_servers.team-collab-${config.agent_id}]\n${command}\n${args}\n` : section.replace(/^command\s*=.*$/m, () => command).replace(/^args\s*=.*$/m, () => args);
+  const next = installed.missing ? `${before || ''}\n${nextSection}` : before.replace(section, () => nextSection);
   if (inside(repo, resolve(config.data_dir))) throw new Error('个人数据目录必须位于项目仓库之外。');
   await mkdir(config.data_dir, { recursive: true, mode: 0o700 });
   const dataDir = await realpath(config.data_dir);
@@ -67,8 +73,10 @@ export async function refreshProject({ configPath }) {
   if (changed) {
     backup = join(dataDir, `project-refresh-${randomUUID()}.json`);
     await writeFile(backup, JSON.stringify({ repo, config_toml: before, skill: oldSkill, created_at: new Date().toISOString() }, null, 2) + '\n', { mode: 0o600, flag: 'wx' });
+    await mkdir(dirname(skillFile), { recursive: true, mode: 0o700 });
+    await mkdir(dirname(configFile), { recursive: true, mode: 0o700 });
     try { await privateWrite(configFile, next); await privateWrite(skillFile, template); }
-    catch (error) { await privateWrite(configFile, before); await privateWrite(skillFile, oldSkill); throw error; }
+    catch (error) { if (before === null) await rm(configFile, { force: true }); else await privateWrite(configFile, before); if (oldSkill === null) await rm(skillFile, { force: true }); else await privateWrite(skillFile, oldSkill); throw error; }
   }
   await privateWrite(prompt, bindingPrompt(config.agent_id, repo));
   return { agent_id: config.agent_id, repo, changed, mcp_config: configFile, skill: skillFile, backup, binding_prompt: prompt,