xuym-codex-collab 0.3.0 → 0.4.0

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

@@ -0,0 +1,284 @@
+{
+  "$schema": "https://json-schema.org/draft/2020-12/schema",
+  "$id": "urn:codex-collab:peer-inbox-event:v1",
+  "title": "Codex Collab Signed Natural Language Inbox Event v1",
+  "type": "object",
+  "additionalProperties": false,
+  "required": [
+    "schema_version",
+    "request_id",
+    "seq",
+    "event_id",
+    "actor_id",
+    "occurred_at",
+    "idempotency_key",
+    "team_hash",
+    "signature",
+    "type"
+  ],
+  "properties": {
+    "schema_version": {
+      "const": 1
+    },
+    "request_id": {
+      "type": "string",
+      "pattern": "^N-[A-F0-9]{32}$"
+    },
+    "seq": {
+      "type": "integer",
+      "minimum": 1
+    },
+    "event_id": {
+      "type": "string",
+      "pattern": "^[a-f0-9-]{36}$"
+    },
+    "actor_id": {
+      "type": "string",
+      "pattern": "^[a-zA-Z0-9_-]{1,64}$"
+    },
+    "occurred_at": {
+      "type": "string",
+      "format": "date-time",
+      "pattern": "Z$"
+    },
+    "idempotency_key": {
+      "type": "string",
+      "minLength": 1,
+      "maxLength": 300,
+      "pattern": "\\S"
+    },
+    "team_hash": {
+      "type": "string",
+      "pattern": "^[a-f0-9]{64}$"
+    },
+    "signature": {
+      "type": "string",
+      "minLength": 1
+    },
+    "type": {
+      "enum": [
+        "received",
+        "clarified",
+        "replied",
+        "task_created",
+        "answered"
+      ]
+    },
+    "spec_hash": {
+      "type": "string",
+      "pattern": "^[a-f0-9]{64}$"
+    },
+    "content": {
+      "type": "string",
+      "minLength": 1,
+      "maxLength": 4000,
+      "pattern": "\\S"
+    },
+    "message_key": {
+      "type": "string",
+      "minLength": 1,
+      "maxLength": 300,
+      "pattern": "\\S"
+    },
+    "response": {
+      "type": "string",
+      "minLength": 1,
+      "maxLength": 2000,
+      "pattern": "\\S"
+    },
+    "task_id": {
+      "type": "string",
+      "pattern": "^T-[A-F0-9]{32}$"
+    },
+    "task_hash": {
+      "type": "string",
+      "pattern": "^[a-f0-9]{64}$"
+    }
+  },
+  "oneOf": [
+    {
+      "properties": {
+        "type": {
+          "const": "received"
+        }
+      },
+      "required": [
+        "spec_hash"
+      ],
+      "not": {
+        "anyOf": [
+          {
+            "required": [
+              "content"
+            ]
+          },
+          {
+            "required": [
+              "message_key"
+            ]
+          },
+          {
+            "required": [
+              "response"
+            ]
+          },
+          {
+            "required": [
+              "task_hash"
+            ]
+          },
+          {
+            "required": [
+              "task_id"
+            ]
+          }
+        ]
+      }
+    },
+    {
+      "properties": {
+        "type": {
+          "const": "clarified"
+        }
+      },
+      "required": [
+        "response"
+      ],
+      "not": {
+        "anyOf": [
+          {
+            "required": [
+              "content"
+            ]
+          },
+          {
+            "required": [
+              "message_key"
+            ]
+          },
+          {
+            "required": [
+              "spec_hash"
+            ]
+          },
+          {
+            "required": [
+              "task_hash"
+            ]
+          },
+          {
+            "required": [
+              "task_id"
+            ]
+          }
+        ]
+      }
+    },
+    {
+      "properties": {
+        "type": {
+          "const": "replied"
+        }
+      },
+      "required": [
+        "content",
+        "message_key"
+      ],
+      "not": {
+        "anyOf": [
+          {
+            "required": [
+              "response"
+            ]
+          },
+          {
+            "required": [
+              "spec_hash"
+            ]
+          },
+          {
+            "required": [
+              "task_hash"
+            ]
+          },
+          {
+            "required": [
+              "task_id"
+            ]
+          }
+        ]
+      }
+    },
+    {
+      "properties": {
+        "type": {
+          "const": "task_created"
+        }
+      },
+      "required": [
+        "task_id",
+        "task_hash",
+        "response"
+      ],
+      "not": {
+        "anyOf": [
+          {
+            "required": [
+              "content"
+            ]
+          },
+          {
+            "required": [
+              "message_key"
+            ]
+          },
+          {
+            "required": [
+              "spec_hash"
+            ]
+          }
+        ]
+      }
+    },
+    {
+      "properties": {
+        "type": {
+          "const": "answered"
+        }
+      },
+      "required": [
+        "response"
+      ],
+      "not": {
+        "anyOf": [
+          {
+            "required": [
+              "content"
+            ]
+          },
+          {
+            "required": [
+              "message_key"
+            ]
+          },
+          {
+            "required": [
+              "spec_hash"
+            ]
+          },
+          {
+            "required": [
+              "task_hash"
+            ]
+          },
+          {
+            "required": [
+              "task_id"
+            ]
+          }
+        ]
+      }
+    }
+  ],
+  "$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."
+}

package/schemas/peer-inbox.schema.json

@@ -0,0 +1,63 @@
+{
+  "$schema": "https://json-schema.org/draft/2020-12/schema",
+  "$id": "urn:codex-collab:peer-inbox:v1",
+  "title": "Codex Collab Natural Language Inbox Request v1",
+  "type": "object",
+  "additionalProperties": false,
+  "required": [
+    "schema_version",
+    "id",
+    "repo",
+    "target_agent",
+    "chat_id",
+    "sender_id",
+    "content",
+    "message_key",
+    "admin_dispatch"
+  ],
+  "properties": {
+    "schema_version": {
+      "const": 1
+    },
+    "id": {
+      "type": "string",
+      "pattern": "^N-[A-F0-9]{32}$"
+    },
+    "repo": {
+      "type": "string",
+      "minLength": 1
+    },
+    "target_agent": {
+      "type": "string",
+      "pattern": "^[a-zA-Z0-9_-]{1,64}$"
+    },
+    "chat_id": {
+      "type": "string",
+      "minLength": 1,
+      "maxLength": 200,
+      "pattern": "\\S"
+    },
+    "sender_id": {
+      "type": "string",
+      "minLength": 1,
+      "maxLength": 200,
+      "pattern": "\\S"
+    },
+    "content": {
+      "type": "string",
+      "minLength": 1,
+      "maxLength": 4000,
+      "pattern": "\\S"
+    },
+    "message_key": {
+      "type": "string",
+      "minLength": 1,
+      "maxLength": 300,
+      "pattern": "\\S"
+    },
+    "admin_dispatch": {
+      "type": "boolean"
+    }
+  },
+  "$comment": "Runtime also verifies the repo and target against the pinned team, a deterministic request ID derived from target_agent and message_key, and bot-owner or allowed administrator authorization. The original group request is shared in Git; private Codex transcripts, bindings and credentials stay local."
+}

package/schemas/team-invitation.schema.json

@@ -80,7 +80,29 @@
     "signature": {
       "type": "string",
       "minLength": 1
+    },
+    "owner_userid": {
+      "type": "string",
+      "minLength": 1,
+      "maxLength": 200,
+      "description": "Optional owner pinned to the issuing administrator for adding their own independent agent."
     }
   },
-  "$comment": "Runtime verifies administrator signature under team_hash, Ed25519 claim key, expiry, and conflicts with existing members or assignments. No bot Secret or private keys are allowed here."
+  "$comment": "Runtime verifies administrator signature under team_hash, Ed25519 claim key, expiry, and conflicts with existing members or assignments. No bot Secret or private keys are allowed here. A self-owned invitation pins owner_userid to the issuing administrator; enrollment must prove the same account. Existing invitations without this optional field remain valid.",
+  "allOf": [
+    {
+      "if": {
+        "required": [
+          "owner_userid"
+        ]
+      },
+      "then": {
+        "properties": {
+          "commands_enabled": {
+            "const": true
+          }
+        }
+      }
+    }
+  ]
 }

package/schemas/team-policy.schema.json

@@ -155,7 +155,7 @@
       }
     }
   },
-  "$comment": "Runtime verifies distinct Ed25519 keys and owner IDs, valid reviewer and route capabilities, and clock skew below half the lease. v3 requires a review rule for every route; specific members require a verified owner. v2 forbids review_rules so old clients cannot silently bypass gates.",
+  "$comment": "Runtime verifies distinct Ed25519 keys and valid owner IDs (several agents may share the same human owner), valid reviewer and route capabilities, and clock skew below half the lease. v3 requires a review rule for every route; specific members require a verified owner. v2 forbids review_rules so old clients cannot silently bypass gates.",
   "allOf": [
     {
       "if": {

package/scripts/peer/onboarding.mjs

@@ -187,7 +187,13 @@ export async function attachProject({ configPath, repoPath }) {
   const block = `[mcp_servers.${serverName}]\ncommand = ${JSON.stringify(process.execPath)}\nargs = [${JSON.stringify(join(root, 'apps/peer/mcp-main.mjs'))}, ${JSON.stringify(configPath)}]`;
   const next = mergeMcpToml(before, serverName, block);
   const excludePath = await git(repo, 'rev-parse', '--path-format=absolute', '--git-path', 'info/exclude');
-  const oldExclude = await readFile(excludePath, 'utf8');
+  let oldExclude = '';
+  let excludeExisted = true;
+  try { oldExclude = await readFile(excludePath, 'utf8'); }
+  catch (error) {
+    if (error.code !== 'ENOENT') throw error;
+    excludeExisted = false;
+  }
   const rules = [`/.codex/config.toml`, `/.agents/skills/${skillName}/`, '/.codex-collab-worktrees/'];
   const addedRules = rules.filter((rule) => !oldExclude.split(/\r?\n/).includes(rule));
   const template = await readFile(join(root, `packages/codex-kit/templates/.agents/skills/${skillName}/SKILL.md`), 'utf8');
@@ -197,12 +203,18 @@ export async function attachProject({ configPath, repoPath }) {
     await writeFile(configFile, next, { mode: 0o600 });
     await chmod(configFile, 0o600);
     await writeFile(skillFile, template, { mode: 0o600, flag: 'wx' });
-    if (addedRules.length) await writeFile(excludePath, `${oldExclude}${oldExclude.endsWith('\n') || !oldExclude ? '' : '\n'}${addedRules.join('\n')}\n`);
+    if (addedRules.length) {
+      await mkdir(dirname(excludePath), { recursive: true, mode: 0o700 });
+      await writeFile(excludePath, `${oldExclude}${oldExclude.endsWith('\n') || !oldExclude ? '' : '\n'}${addedRules.join('\n')}\n`);
+    }
   } catch (error) {
     if (before) await writeFile(configFile, before, { mode: 0o600 });
     else await rm(configFile, { force: true });
     await rm(skillDir, { recursive: true, force: true });
-    if (addedRules.length) await writeFile(excludePath, oldExclude);
+    if (addedRules.length) {
+      if (excludeExisted) await writeFile(excludePath, oldExclude);
+      else await rm(excludePath, { force: true });
+    }
     throw error;
   }
   return { repo, mcp_config: configFile, skill: skillFile };

package/scripts/peer/refresh-project.mjs

@@ -0,0 +1,76 @@
+import { createHash, randomUUID } from 'node:crypto';
+import { chmod, lstat, mkdir, readFile, realpath, rename, rm, writeFile } from 'node:fs/promises';
+import { dirname, isAbsolute, join, relative, resolve } from 'node:path';
+import { fileURLToPath } from 'node:url';
+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(['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) {
+  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 是符号链接，请先手动检查；未覆盖文件。');
+  }
+}
+async function privateWrite(path, contents) {
+  const temporary = `${path}.${randomUUID()}.tmp`;
+  try { await writeFile(temporary, contents, { mode: 0o600, flag: 'wx' }); await rename(temporary, path); await chmod(path, 0o600); }
+  finally { await rm(temporary, { force: true }); }
+}
+// Only recognize our generated MCP entry. Never replace another identity's entry.
+export async function installedProjectConfig({ repoPath, agentId }) {
+  const repo = await realpath(repoPath);
+  const path = join(repo, '.codex/config.toml'); await plainPath(repo, path);
+  const before = await readFile(path, 'utf8');
+  const server = `team-collab-${agentId}`;
+  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}`);
+  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);
+  const argsLine = section.match(/^args\s*=\s*(\[[^\n]+\])\s*$/m);
+  const commandLine = section.match(/^command\s*=\s*("[^\n]+")\s*$/m);
+  let args, command;
+  try { args = JSON.parse(argsLine?.[1]); command = JSON.parse(commandLine?.[1]); } catch { /* reject below */ }
+  if (!Array.isArray(args) || args.length !== 2 || typeof args[0] !== 'string' || !args[0].endsWith('/apps/peer/mcp-main.mjs') || !isAbsolute(args[1] || '') || typeof command !== 'string' || !command) throw new Error('协作 MCP 不是可识别的安装配置，请手动检查；未覆盖文件。');
+  const keys = section.split(/\r?\n/).filter((line) => line.trim() && !/^\s*(?:#|\[)/.test(line));
+  if (keys.length !== 2) throw new Error('协作 MCP 有自定义设置，请手动检查；未覆盖文件。');
+  return { repo, path, before, section, config_path: args[1], command, args };
+}
+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 { 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 实际使用的个人配置路径；未更换身份。');
+  const skillFile = join(repo, '.agents/skills/team-collab-desktop/SKILL.md');
+  await plainPath(repo, skillFile);
+  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 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 (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);
+  if (inside(repo, dataDir)) throw new Error('个人数据目录必须位于项目仓库之外。');
+  const prompt = join(dataDir, 'desktop-binding-prompt.txt');
+  const changed = next !== before || oldSkill !== template;
+  let backup = null;
+  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' });
+    try { await privateWrite(configFile, next); await privateWrite(skillFile, template); }
+    catch (error) { await privateWrite(configFile, before); 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,
+    next_step: '重新加载项目 MCP；把 binding_prompt 内容发送到原绑定对话，以更新原协作 heartbeat。', heartbeat_updated: false };
+}

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

@@ -8,7 +8,7 @@ const absent = async (path) => { try { await stat(path); return false; } catch (
 const readOptional = async (path) => { try { return await readFile(path, 'utf8'); } catch (error) { if (error.code === 'ENOENT') return null; throw error; } };
 
 export function bindingPrompt(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 时保持安静；有任务就只在本对话和返回的隔离 worktree 执行本阶段，主动续租、测试、明确提交，然后 finish_desktop_task；失败时按 skill 处理。禁止启动 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 开始工作。自然语言“通过／完成”不能代替人工审核命令。复用或更新当前对话已有的协作 heartbeat，避免重复创建。禁止启动 SDK/CLI 代替当前对话。仅新任务、结果、失败或需我操作时通知。\n5. 创建完成后立即调用一次 poll_desktop_task 验证，无任务应正常返回，不要创建测试任务。告诉我绑定身份、对话 ID 和 heartbeat 状态；若工具不可用明确说明未启用自动轮询。\n`;
 }
 
 // An explicit project attachment: preserve unrelated TOML settings, keep a local