xuym-codex-collab 0.4.3 → 0.5.0

package/schemas/peer-inbox-event.schema.json

@@ -61,7 +61,8 @@
         "clarified",
         "replied",
         "task_created",
-        "answered"
+        "answered",
+        "reviewed"
       ]
     },
     "spec_hash": {
@@ -88,11 +89,31 @@
     },
     "task_id": {
       "type": "string",
-      "pattern": "^T-[A-F0-9]{32}$"
+      "pattern": "^T-[A-Z0-9-]{1,62}$"
     },
     "task_hash": {
       "type": "string",
       "pattern": "^[a-f0-9]{64}$"
+    },
+    "review_seq": {
+      "type": "integer",
+      "minimum": 2
+    },
+    "decision": {
+      "enum": [
+        "approved",
+        "changes_requested"
+      ]
+    },
+    "summary": {
+      "type": "string",
+      "minLength": 1,
+      "maxLength": 2000,
+      "pattern": "\\S"
+    },
+    "task_event_hash": {
+      "type": "string",
+      "pattern": "^[a-f0-9]{64}$"
     }
   },
   "oneOf": [
@@ -131,6 +152,26 @@
             "required": [
               "task_id"
             ]
+          },
+          {
+            "required": [
+              "review_seq"
+            ]
+          },
+          {
+            "required": [
+              "decision"
+            ]
+          },
+          {
+            "required": [
+              "summary"
+            ]
+          },
+          {
+            "required": [
+              "task_event_hash"
+            ]
           }
         ]
       }
@@ -170,6 +211,26 @@
             "required": [
               "task_id"
             ]
+          },
+          {
+            "required": [
+              "review_seq"
+            ]
+          },
+          {
+            "required": [
+              "decision"
+            ]
+          },
+          {
+            "required": [
+              "summary"
+            ]
+          },
+          {
+            "required": [
+              "task_event_hash"
+            ]
           }
         ]
       }
@@ -205,6 +266,26 @@
             "required": [
               "task_id"
             ]
+          },
+          {
+            "required": [
+              "review_seq"
+            ]
+          },
+          {
+            "required": [
+              "decision"
+            ]
+          },
+          {
+            "required": [
+              "summary"
+            ]
+          },
+          {
+            "required": [
+              "task_event_hash"
+            ]
           }
         ]
       }
@@ -213,6 +294,9 @@
       "properties": {
         "type": {
           "const": "task_created"
+        },
+        "task_id": {
+          "pattern": "^T-[A-F0-9]{32}$"
         }
       },
       "required": [
@@ -236,6 +320,26 @@
             "required": [
               "spec_hash"
             ]
+          },
+          {
+            "required": [
+              "review_seq"
+            ]
+          },
+          {
+            "required": [
+              "decision"
+            ]
+          },
+          {
+            "required": [
+              "summary"
+            ]
+          },
+          {
+            "required": [
+              "task_event_hash"
+            ]
           }
         ]
       }
@@ -275,10 +379,84 @@
             "required": [
               "task_id"
             ]
+          },
+          {
+            "required": [
+              "review_seq"
+            ]
+          },
+          {
+            "required": [
+              "decision"
+            ]
+          },
+          {
+            "required": [
+              "summary"
+            ]
+          },
+          {
+            "required": [
+              "task_event_hash"
+            ]
           }
         ]
       }
+    },
+    {
+      "properties": {
+        "type": {
+          "const": "reviewed"
+        }
+      },
+      "required": [
+        "task_id",
+        "review_seq",
+        "decision",
+        "task_event_hash",
+        "response"
+      ],
+      "not": {
+        "anyOf": [
+          {
+            "required": [
+              "content"
+            ]
+          },
+          {
+            "required": [
+              "message_key"
+            ]
+          },
+          {
+            "required": [
+              "spec_hash"
+            ]
+          },
+          {
+            "required": [
+              "task_hash"
+            ]
+          }
+        ]
+      },
+      "allOf": [
+        {
+          "if": {
+            "properties": {
+              "decision": {
+                "const": "changes_requested"
+              }
+            }
+          },
+          "then": {
+            "required": [
+              "summary"
+            ]
+          }
+        }
+      ]
     }
   ],
-  "$comment": "Runtime also verifies Ed25519 signatures and historical team hash, receiving-agent authorship, exact sequence, unique IDs and idempotency keys, nondecreasing UTC timestamps, signed spec digest and allowed transitions. received opens pending; clarified waits for a reply; replied returns to pending; task_created and answered resolve pending. A task_created event and its desktop_poll task commit atomically; runtime validates the exact task digest, deterministic task ID, original group, creator and creation key. Replies are scoped to the same bot, group and sender."
+  "$comment": "Runtime also verifies Ed25519 signatures and historical team hash, receiving-agent authorship, exact sequence, unique IDs and idempotency keys, nondecreasing UTC timestamps, signed spec digest and allowed transitions. received opens pending; clarified waits for a reply; replied returns to pending; task_created and answered resolve pending. A task_created event and its desktop_poll task commit atomically; runtime validates the exact task digest, deterministic task ID, original group, creator and creation key. Replies are scoped to the same bot, group and sender. reviewed resolves a pending request and atomically appends the matching task reviewed event. Runtime verifies frozen context, explicit owner consent, pinned reviewer, unchanged code revision and the signed task-event digest; task_created keeps the deterministic inbox-derived task ID constraint."
 }

package/schemas/peer-inbox.schema.json

@@ -57,7 +57,46 @@
     },
     "admin_dispatch": {
       "type": "boolean"
+    },
+    "review_context": {
+      "type": "array",
+      "maxItems": 100,
+      "items": {
+        "type": "object",
+        "additionalProperties": false,
+        "required": [
+          "task_id",
+          "expected_seq",
+          "title",
+          "commit",
+          "stage"
+        ],
+        "properties": {
+          "task_id": {
+            "type": "string",
+            "pattern": "^T-[A-Z0-9-]{1,62}$"
+          },
+          "expected_seq": {
+            "type": "integer",
+            "minimum": 1
+          },
+          "title": {
+            "type": "string",
+            "minLength": 1,
+            "maxLength": 200,
+            "pattern": "\\S"
+          },
+          "commit": {
+            "type": "string",
+            "pattern": "^[a-f0-9]{40}$"
+          },
+          "stage": {
+            "type": "integer",
+            "minimum": 0
+          }
+        }
+      }
     }
   },
-  "$comment": "Runtime also verifies the repo and target against the pinned team, a deterministic request ID derived from target_agent and message_key, and authorization by the bot owner, an enrolled team member, or an explicitly allowed administrator. The original group request is shared in Git; private Codex transcripts, bindings and credentials stay local."
+  "$comment": "Runtime also verifies the repo and target against the pinned team, a deterministic request ID derived from target_agent and message_key, and authorization by the bot owner, an enrolled team member, or an explicitly allowed administrator. The original group request is shared in Git; private Codex transcripts, bindings and credentials stay local. Optional review_context freezes pending tasks, sequences and code commits when the authenticated owner message arrives. Natural review interpretation cannot replace this context with a newer version. All peers must support these records before enabling natural reviews."
 }

package/scripts/peer/cli.mjs

@@ -6,9 +6,11 @@ import { join, resolve } from 'node:path';
 import { fileURLToPath } from 'node:url';
 import { setTimeout as delay } from 'node:timers/promises';
 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 +22,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 {
@@ -58,7 +62,9 @@ switch (command) {
     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));
     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 +87,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 +121,5 @@ switch (command) {
   }
   default: throw new Error('unknown peer command');
 }
+
+} finally { await releaseControl?.(); }

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(['6e4d1ea6a644fb3078c541e40bcc9e8bf5069462994152f3ec2fc3aa5fedd5fa', 'f98ad425e2ea3c8ab6fb86febef7d9cb288029ef55bea6937dda6de8b467fece']);
+const legacyHashes = new Set(['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,

package/scripts/peer/setup-desktop-project.mjs

@@ -11,7 +11,7 @@ export function bindingPrompt(agentId, repo) {
   return `使用 $team-collab-desktop，启用当前项目的团队协作，将 ${agentId} 机器人绑定到当前对话。项目：${repo}`;
 }
 export function detailedBindingPrompt(agentId, repo) {
-  return `请把当前已有 Codex 对话设为 ${agentId} 的企微协作执行对话，不要新建独立执行线程。\n项目：${repo}\n读取 ${join(repo, '.agents/skills/team-collab-desktop/SKILL.md')}。\n1. 用本项目 MCP 的 get_identity 确认身份是 ${agentId}，execution_mode 是 desktop_poll；若不匹配，停止并提示重新加载 MCP。\n2. 获取当前真实对话 ID：优先使用已提供的应用上下文，或当前终端 CODEX_THREAD_ID（如果存在）；不可猜 ID 或读取/修改应用数据库。没有可用 ID 时请让我复制当前对话 ID/链接。\n3. 调用 bind_desktop_thread 绑定当前真实对话，然后用应用 automation_update 工具在当前已有对话创建一个 heartbeat：每分钟检查（仅当工具接受该周期；否则说明限制），不要创建 cron、新对话或后台 SDK。先查现有 automation，避免重复；不要修改无关 automation 或 CC Switch。\n4. heartbeat 的保存提示词必须包含 ${agentId}、当前真实 thread_id 和该 skill 路径；每次 get_identity → poll_desktop_task。job=null 且 requests 为空 时保持安静；有任务就只在本对话和返回的隔离 worktree 执行本阶段，主动续租、测试、明确提交，然后 finish_desktop_task；失败时按 skill 处理。requests 非空时按 Skill 理解群消息，调用 resolve_desktop_request 创建任务、追问或回答；使用 team_context 的现有路由、能力与默认分工，不能猜测不存在的同事。解决后再次 poll 开始工作。自然语言“通过／完成”不能代替人工审核命令。复用或更新当前对话已有的协作 heartbeat，避免重复创建。禁止启动 SDK/CLI 代替当前对话。仅新任务、结果、失败或需我操作时通知。\n5. 创建完成后立即调用一次 poll_desktop_task 验证，无任务应正常返回，不要创建测试任务。告诉我绑定身份、对话 ID 和 heartbeat 状态；若工具不可用明确说明未启用自动轮询。\n`;
+  return `请把当前已有 Codex 对话设为 ${agentId} 的企微协作执行对话，不要新建独立执行线程。\n项目：${repo}\n读取 ${join(repo, '.agents/skills/team-collab-desktop/SKILL.md')}。\n1. 用本项目 MCP 的 get_identity 确认身份是 ${agentId}，execution_mode 是 desktop_poll；若不匹配，停止并提示重新加载 MCP。\n2. 获取当前真实对话 ID：优先使用已提供的应用上下文，或当前终端 CODEX_THREAD_ID（如果存在）；不可猜 ID 或读取/修改应用数据库。没有可用 ID 时请让我复制当前对话 ID/链接。\n3. 调用 bind_desktop_thread 绑定当前真实对话，然后用应用 automation_update 工具在当前已有对话创建一个 heartbeat：每分钟检查（仅当工具接受该周期；否则说明限制），不要创建 cron、新对话或后台 SDK。先查现有 automation，避免重复；不要修改无关 automation 或 CC Switch。\n4. heartbeat 的保存提示词必须包含 ${agentId}、当前真实 thread_id 和该 skill 路径；每次 get_identity → poll_desktop_task。job=null 且 requests 为空 时保持安静；有任务就只在本对话和返回的隔离 worktree 执行本阶段，主动续租、测试、明确提交，然后 finish_desktop_task；失败时按 skill 处理。requests 非空时按 Skill 理解群消息，调用 resolve_desktop_request 创建任务、转达明确的真人审核、追问或回答；使用 team_context 的现有路由、能力与默认分工，不能猜测不存在的同事。解决后再次 poll 开始工作。真人自然语言审核仅能通过 request.review_context 中的固定版本转达；多任务、语义不清或版本变化时先追问，不得自行批准、完成或合并。复用或更新当前对话已有的协作 heartbeat，避免重复创建。禁止启动 SDK/CLI 代替当前对话。仅新任务、结果、失败或需我操作时通知。\n5. 创建完成后立即调用一次 poll_desktop_task 验证，无任务应正常返回，不要创建测试任务。告诉我绑定身份、对话 ID 和 heartbeat 状态；若工具不可用明确说明未启用自动轮询。\n`;
 }
 
 // An explicit project attachment: preserve unrelated TOML settings, keep a local