@pennixrv/trellis 0.7.1-beta.9 → 0.7.2-beta.0

package/dist/migrations/manifests/0.7.1-beta.18.json

@@ -0,0 +1,9 @@
+{
+  "version": "0.7.1-beta.18",
+  "description": "统一 Teamwork 输入分层与结构化结果，修复单次调用终态与诊断",
+  "breaking": false,
+  "recommendMigrate": false,
+  "changelog": "Role initialization and mode-specific result contracts are separated from task/reference data. New content reports use schema 2; run, batch and wait provide a normalized machine result. Historical frozen reports remain readable. Tool permissions automatically allow; Codex defaults to no sandbox. Input preflight, supervisor failures, failed-attempt identity, report artifacts and diagnostics are verified.",
+  "migrations": [],
+  "notes": "Run trellis update to refresh Teamwork role cards and Skill references. Agents must request --json; default human/event views remain available. Content shape validation does not perform main-agent semantic acceptance. Existing frozen launches retain their report contract."
+}

package/dist/migrations/manifests/0.7.1-beta.19.json

@@ -0,0 +1,9 @@
+{
+  "version": "0.7.1-beta.19",
+  "description": "Centralize Teamwork capacity policy and enable multi-advisor consultations",
+  "breaking": false,
+  "recommendMigrate": false,
+  "changelog": "Mode capacity defaults 8/3/3, member defaults 1/3/3, shared budget 8; schema-2 policy with diagnosed legacy/environment compatibility; advisor supports 1–3 assignments.",
+  "migrations": [],
+  "notes": "Run trellis update for generated schema-2 policy and Skills. Review customized schema-1 policy before migrating; historical plans remain unchanged."
+}

package/dist/migrations/manifests/0.7.1-beta.6.json

@@ -5,6 +5,6 @@
   "recommendMigrate": true,
   "changelog": "任务保留 planning、in_progress、completed、cancelled 四个状态；目录随原生生命周期操作同步迁移。完成任务按月份保存，取消任务单独保存。任务发现、父子关系、上下文、状态栏、初始化和平台模板统一使用新布局；旧布局需要显式迁移。",
   "migrations": [],
-  "migrationGuide": "## 任务目录迁移\n\n先运行 trellis update --migrate 更新脚本与工作流，并审查自定义文件冲突。更新模板不会自动移动任务。随后运行 python3 .trellis/scripts/task.py migrate-layout 预览，确认后运行 python3 .trellis/scripts/task.py migrate-layout --apply。planning、in_progress、cancelled 任务进入同名子目录；completed 任务进入 completed/YYYY-MM，旧 archive 的月份保持不变。task.json.status 是唯一状态事实，迁移不授予历史任务实施权限，也不重写历史正文或交接包。\n\n无效 JSON、重名、未关闭的委派资源、待交接所有权或不安全路径会阻止整个迁移。先处理明确的输入问题，再重新预览。发生中断时运行 python3 .trellis/scripts/task.py migrate-layout --recover，核验后重新预览；不要手工移动目录或删除事务记录。迁移会同步改写机器引用和当前会话指针；若连续性摘要变化，按原生 phase 接纳和 transfer reconcile 流程重新收敛当前所有权，保留历史交接摘要。",
+  "migrationGuide": "## 任务目录迁移\n\n先运行 trellis update --migrate 更新脚本与工作流，并审查自定义文件冲突。更新模板不会自动移动任务。随后运行 python3 .trellis/scripts/task.py migrate-layout 预览，确认后运行 python3 .trellis/scripts/task.py migrate-layout --apply。planning、in_progress、cancelled 任务进入同名子目录；completed 任务进入 completed/YYYY-MM，旧 archive 的月份保持不变。task.json.status 是唯一状态事实，迁移不授予历史任务实施权限，也不重写历史正文或交接包。\n\n无效 JSON、重名、未关闭的委派资源、待交接所有权或不安全路径会阻止整个迁移。先处理明确的输入问题，再重新预览。发生中断时运行 python3 .trellis/scripts/task.py migrate-layout --recover，核验后重新预览；不要手工移动目录或删除事务记录。迁移会同步改写机器引用和当前会话指针；若连续性摘要变化，按原生 phase 接纳和 capture 重新核对当前事实。handoff ownership 在 consume 后完成转移，后续普通任务修改不更新交接代次；需要查看现场时使用只读 transfer status --include-current，保留历史交接摘要。",
   "aiInstructions": "完整检查迁移预览、四种状态及月份分布、任务数量、父子关系和当前会话路径。只修复有证据的历史输入错误，不把 archive 中未完成任务伪造为 completed。使用原生生命周期入口完成或取消任务，不手写运行状态。保护项目配置、历史正文、二进制附件和不可变交接包。迁移后再次预览应为空，并运行 task.py list、current、phase show 和项目检查验证现场。"
 }

package/dist/migrations/manifests/0.7.2-beta.0.json

@@ -0,0 +1,11 @@
+{
+  "version": "0.7.2-beta.0",
+  "description": "收敛 fork 全面审查：Teamwork 恢复、证据、容量、委派与多宿主资产",
+  "breaking": true,
+  "recommendMigrate": true,
+  "changelog": "保留全部尝试证据并提供显式清理；修复实际容量和冻结配置核验；增加证据驱动 reconcile 与失败子集 retry；增加 Codex 等待护栏；补齐委派合同绑定、退役和 ownership recover；修复多宿主阶段提示、受管文件备份及跨生命周期初始化；退休隐式 Marketplace spec 来源，保留显式 registry；修复 npm 异步重试。",
+  "migrationGuide": "使用 beta 渠道精确升级到 0.7.2-beta.0，并运行 trellis update。保持用户自定义 spec 和 config；schema-2 项目忽略退休 YAML 容量键，需按实际冲突合并。默认初始化仅提供规范索引、指南和基于源码的 bootstrap；预制规范必须明确指定 --registry。原计划和旧 schema 报告兼容读取；需要本轮冻结配置和重试合同的新批次请通过 plan 构造器生成。保留全部 attempt 报告和 worklog，清理须使用 cleanup-artifacts 的预览摘要。",
+  "aiInstructions": "不要覆盖自定义规范或重开旧终态批次。使用原生 reconcile/retry/cleanup-artifacts/delegate-bind/delegate-reconcile/transfer recover；未知进程保持围栏。CLI 控制 FIFO，主代理静默续接同一等待句柄；Hook 不保证阻止普通模型消息或宿主唤醒。",
+  "migrations": [],
+  "notes": "保持 beta 渠道，0.7.2-beta.0 高于 stable 0.7.1；latest 标签保持不变。"
+}

package/dist/templates/codex/hooks/session-start.py

@@ -232,8 +232,7 @@ def _get_task_status(trellis_dir: Path, hook_input: dict) -> str:
     if not active.task_path:
         return (
             "Status: NO ACTIVE TASK\n"
-            "Next: Classify the current turn and ask for task-creation consent "
-            "before creating any Trellis task."
+            "Next: Route through trellis-request-intake using the existing authorization and taskless contract."
         )
 
     task_ref = active.task_path
@@ -245,12 +244,10 @@ def _get_task_status(trellis_dir: Path, hook_input: dict) -> str:
         )
 
     task_json_path = task_dir / "task.json"
-    task_data: dict = {}
-    if task_json_path.is_file():
-        try:
-            task_data = json.loads(task_json_path.read_text(encoding="utf-8"))
-        except (json.JSONDecodeError, PermissionError):
-            pass  # Optional task metadata; fall back to generic status.
+    from common.io import read_json_checked  # type: ignore[import-not-found]
+    task_data, _reason = read_json_checked(task_json_path)
+    if task_data is None or task_data.get("status") not in ("planning", "in_progress", "completed", "cancelled"):
+        return f"Status: TASK_ERROR\nTask: {task_ref}\nNext: Repair the existing task record through its owner before continuing; do not create a replacement task."
 
     task_title = task_data.get("title", task_ref)
     task_status = task_data.get("status", "unknown")
@@ -380,13 +377,15 @@ def _build_compact_current_state(
     active = _resolve_active_task(trellis_dir, hook_input)
     if active.task_path:
         task_dir = _resolve_task_dir(trellis_dir, active.task_path)
-        status = "unknown"
+        status = "task_error"
         task_json = task_dir / "task.json"
         if task_json.is_file():
             try:
                 data = json.loads(task_json.read_text(encoding="utf-8"))
                 if isinstance(data, dict):
-                    status = str(data.get("status") or "unknown")
+                    value = data.get("status")
+                    if value in ("planning", "in_progress", "completed", "cancelled"):
+                        status = value
             except (json.JSONDecodeError, OSError):
                 pass  # Optional task metadata; fall back to generic status.
         lines.append(f"Current task: {_repo_relative(repo_root, task_dir)}; status={status}.")
@@ -504,11 +503,15 @@ def main() -> None:
         hook_input = json.loads(sys.stdin.read())
         if not isinstance(hook_input, dict):
             hook_input = {}
-        project_dir = Path(_normalize_windows_shell_path(hook_input.get("cwd", "."))).resolve()
+        raw_cwd = hook_input.get("cwd")
+        project_dir = Path(_normalize_windows_shell_path(raw_cwd if isinstance(raw_cwd, str) and raw_cwd else ".")).resolve()
     except (json.JSONDecodeError, KeyError):
         hook_input = {}
         project_dir = Path(".").resolve()
 
+    project_dir = next((candidate for candidate in (project_dir, *project_dir.parents) if (candidate / ".trellis").is_dir()), None)
+    if project_dir is None or not (project_dir / ".trellis" / "scripts" / "common" / "active_task.py").is_file():
+        return
     configure_project_encoding(project_dir)
 
     trellis_dir = project_dir / ".trellis"

package/dist/templates/codex/hooks.json

@@ -36,6 +36,16 @@
       }
     ],
     "PreToolUse": [
+      {
+        "matcher": ".*",
+        "hooks": [
+          {
+            "type": "command",
+            "command": "{{PYTHON_CMD}} -X utf8 .codex/hooks/guard-teamwork-wait.py",
+            "timeout": 15
+          }
+        ]
+      },
       {
         "matcher": "Edit|Write",
         "hooks": [

package/dist/templates/common/bundled-skills/trellis-meta/references/local-architecture/multi-agent-teamwork.md

@@ -8,7 +8,9 @@
 | --- | --- |
 | `~/.trellis/teamwork/<project>/<session>/events.jsonl` | Durable Teamwork Session event log. |
 | `.trellis/agents/teammate.md` | Generic behavior card loaded for a teammate. |
-| `.trellis/agents/teammate-profiles.json` | Provider and execution profiles. |
+| `.trellis/agents/teammate-profiles.json` | Schema-2 professional profiles and named execution candidates. |
+| `.trellis/agents/profiles/*.md` | Six professional role cards combined with the common card. |
+| `.trellis/teamwork.json` | Coordination mode and member-count defaults. |
 | `.trellis/config.yaml` (`teamwork.*`) | Teammate concurrency and process guard settings. |
 | `packages/core/src/teamwork/` | Reusable Teamwork Session event and storage APIs. |
 | `packages/cli/src/commands/teamwork/` | CLI commands, provider adapters, and process supervision. |
@@ -25,7 +27,17 @@ The storage root defaults to `~/.trellis/teamwork`; `TRELLIS_TEAMWORK_ROOT` over
 
 ## Configuration
 
-The project configuration supports `teamwork.teammate.max_concurrency` and `teamwork.teammate_guard.idle_timeout`, `max_live_teammates`, and `non_batch_reserved`. Defaults and CLI overrides are defined by the current Trellis CLI; read `packages/cli/src/commands/teamwork/teammate-config.ts` before changing them.
+The schema-2 `.trellis/teamwork.json` owns mode member defaults, mode concurrency limits, and the shared live-process budget and reservation. Defaults are members 1/3/3, concurrency 8/3/3, live budget 8, and reservation 0. YAML retains `teamwork.teammate_guard.idle_timeout`; legacy YAML capacity applies only before schema-2 migration and is otherwise ignored with diagnostics. Runtime `maxConcurrency` is a resolved value, not an independent configuration. Read `coordination.ts` and `teammate-config.ts` before changing this policy.
+
+`teamwork config` resolves project defaults. `teamwork plan` freezes profile,
+configuration, instructions and evidence into schema-2 plan/brief artifacts;
+`teamwork batch --task` connects the foreground coordinator to Codex app-server,
+Claude CLI, Copilot ACP or DSH ACP. Claims and content reports are schema 2.
+An unresolved batch keeps a durable project capacity reservation, including
+after coordinator exit. The guard and session cleanup preserve that evidence.
+Role read-only and history-use requirements are behavioral contracts; runtime
+capabilities do not claim filesystem or memory isolation. Teamwork is independent
+of Paseo workspaces, Git worktrees and source-writing delegated agents.
 
 ## Related entry points
 

package/dist/templates/common/bundled-skills/trellis-meta/references/local-architecture/task-system.md

@@ -33,7 +33,7 @@ The read-only trellis task progress command summarizes planning, in_progress, co
 
 旧平铺目录和 `archive/YYYY-MM` 只能作为显式迁移输入。先运行 `task.py migrate-layout` 预览，再使用 `--apply`；已完成 archive 任务保留原月份，非终态任务按真实状态归位，不伪造完成。`--recover` 恢复未完成事务。重复名称、无效 JSON、符号链接、未知执行资源或交接所有权冲突会阻止迁移；不跳过记录。
 
-移动同步 JSON/JSONL 机器引用、会话指针及 runtime 哈希索引；终态操作在同一事务中清除本任务 runtime。历史正文和正式交接包保留。内容绑定的接受证据或 continuity digest 失效后，通过原生重新接受、capture、目标会话 reconcile 核对，不静默重授历史授权。文档中的 `<task-dir>` 指包含状态及必要月份的真实任务相对路径。
+移动同步 JSON/JSONL 机器引用、会话指针及 runtime 哈希索引；终态操作在同一事务中清除本任务 runtime。历史正文和正式交接包保留。内容绑定的接受证据或 continuity digest 失效后，通过原生重新接受和 capture 核对，不静默重授历史授权。handoff ownership 在 `consume` 后完成转移；后续普通任务修改不更新交接代次，需要查看现场时使用只读 `transfer status --include-current`。文档中的 `<task-dir>` 指包含状态及必要月份的真实任务相对路径。
 
 ## Context manifests
 

package/dist/templates/common/bundled-skills/trellis-solution-design-and-convergence/workflow.md

@@ -6,6 +6,10 @@
 
 判断当前结果：分析交付形成 `analysis_conclusion`；不继续形成 `no_go`；延期形成带责任方、触发条件和恢复位置的 `deferred`，留在解决方案设计与收敛阶段；实施路线形成 `implementation_contract`，明确目标、范围和接受条件，并按路线需要补足实施与核验信息。只有交付物具有独立实施或集成边界时才拆分工作包，并说明推进和协作所需的依赖、顺序、责任或集成信息；单一交付不人为拆分工作包。解决方案设计与收敛阶段的结果接受与实施授权分开记录；只有合同及明确批准均有效时，Trellis CLI 才允许进入任务实施与测试验证阶段。
 
+合同结果已接受、实施尚未授权时，发现需要返修，应通过 `task.py phase return` 回到本阶段或更早受影响阶段，记录理由和证据。受影响的接受与授权随之失效；修订后重新接受当前产物，再核验实施授权。
+
+接受 `implementation_contract` 前，在合同中建立 `## 验收覆盖` 表，表头为 `接受条件 | 工作包 | Owner | 验证入口 | 交付证据 | 停止条件`。逐条映射已接受条件，核对实际源码 owner、可运行验证、证据落点和停止条件；单一工作包可以覆盖多条条件。CLI 仅检查表结构及非空内容，不能代替语义审查。目标、合同、决策与执行记录分别使用明确的文件引用，执行细节追加到 execution 或 research，避免修改已接受的上游合同。
+
 逐项决定回答后，将已决目标、候选依据、接口与数据流、owner、依赖顺序、实施和验证，以及适用的迁移、发布、资源和失败恢复安排组织为一个完整方案。核对需求覆盖、跨产物一致性、可实施性和可验收性；有净收益时使用有界反例或压力测试，先修复可查缺口。向用户展示可识别的整体方案和实质剩余取舍后，再记录当前 revision 的接受及实施授权。逐项答复不自动等于整体批准；用户已充分明确批准整体方案时不重复索取。目标或候选问题回最早受影响阶段，局部方案问题在本阶段解决，不增设外部封口状态。
 
 研究、原型和协作证据写回现有阶段产物、research 或 execution 自然落点，注明来源与版本、事实和假设、适用性、限制及决定影响。证据足够即停止扩搜；工具、报告或模板不能替代用户决定和 Trellis 原生接受事实。

package/dist/templates/common/bundled-skills/trellis-task-implementation/workflow.md

@@ -2,6 +2,10 @@
 
 开始前核验当前 `implementation_contract`、实施授权、路线 revision、必要依赖和执行基线。使用 `trellis-before-dev` 读取目标仓库实际适用的规范；按组件 owner 合同选择主工作树或已批准的独立写入路线。调用项目任务 `start` 只在实施授权有效时将任务置为 `in_progress`。
 
+实施阶段为 `blocked` 或 `waiting_user` 时，先解决阻塞并经原生 `phase resume` 恢复，再重新核验准入。`delegate-start` 核验父任务已有的 ownership 围栏和子任务状态；存在未消费交接、当前会话不符合已有 ownership 记录，或子任务已完成、取消时，不启动或复用委派执行。没有 ownership 记录的任务不具备默认会话独占保护。
+
+父授权有效后，用 `task.py delegate-bind <child>` 绑定子 PRD、角色、Git base、分支和结果路径，再用 `delegate-start` 启动。输入漂移须先核对是否仍在父授权范围内，再重新绑定。失联现场先用 `delegate-reconcile` 预览，证据充分时才显式 `--execute --reason ... --approval-ref ...` 核销，不能直接覆盖旧映射。
+
 按合同的依赖和优先级选取当前工作包，实施满足目标的最小变更，并运行与风险和影响相称的局部验证。主工作树主代理核对来源、revision、Git 基线、差异和结果后接受工作包。多包任务按合同集成；单一交付不人为拆分。Trellis Teamwork 仅用于冻结计划下的只读比较或评议，不能改写任务状态或接受实施结果。实际写入委派依父任务规定使用 Trellis 受控入口与 Paseo；各组件源码仍在 owner 仓库内修改。
 
 局部失败、暂时不可用或当前状态已满足接受条件时，先在任务实施与测试验证阶段中处理。依赖或资源暂不可用且现场安全时记录恢复条件；未授权不产生外部副作用；未知现场先停止并核验。合同允许未运行验证且风险可接受时，记录原因、影响和替代证据。替代路线若改变授权、成本、隐私或接受条件，回到解决方案设计与收敛阶段；目标、范围变化按影响回到目标探索与需求核对阶段或决策空间构造与归并阶段。只有合同范围内工作包均已接受、适用必需验证完成或有有效未运行处置、按范围和风险需要的集成验证通过，才将交付候选交由交付审查与现场收尾阶段；仅当路线实际创建或委派资源时，才核验其处置事实。
@@ -26,4 +30,6 @@ flowchart TD
 
 ### 委派、回退与收敛
 
+合同不变的局部修复在当前活动阶段处理；需要撤销实施或交付接受事实时，使用 `phase return --return-kind execution_rework` 并提供原因、证据及目标阶段。仅在需求、合同摘要、路线和依赖仍有效时保留实施授权；CLI 拒绝时核对真实失效原因，不重复索取已有效的用户决定。合同实质变化使用默认 `contract_change` 回到最早受影响阶段并重新接受、授权。终态任务先经独立的 `reopen` 恢复到 `planning`，再操作工作流阶段；重开不复用旧授权。
+
 回退使用当前 owner 的 Git 和资源合同，不覆盖无关改动，也不删除仍需核验的现场。只有当前合同无法安全覆盖目标、授权、依赖、基线、接受条件或停止条件的变化时，才回退到最早受影响阶段。结束任务实施与测试验证阶段前，记录适用验证结果、未运行处置、合同差异和未结发现；仅当路线实际创建或委派资源时，记录其处置状态。

package/dist/templates/common/bundled-skills/trellis-teamwork/SKILL.md

@@ -22,6 +22,7 @@ trellis --version
 trellis teamwork --help
 trellis teamwork list --all
 trellis teamwork list --scope global --all
+trellis teamwork config
 ```
 
 If the user names a Teamwork Session or thread, inspect it before asking for
@@ -38,8 +39,9 @@ trellis teamwork context list <session> --scope global --thread <thread>
 | User intent | Read |
 |---|---|
 | `general`: bounded research, review, or verification assignments | `references/teamwork-plan-construction.md`, then `references/coordination-modes.md` |
-| Advisor: one bounded consultation | `references/coordination-modes.md` |
-| `committee`: parallel assessment by two or three distinct lenses | `references/coordination-modes.md` |
+| Advisor: one to three bounded consultations | `references/coordination-modes.md`, then `references/teamwork-plan-construction.md` |
+| `committee`: parallel assessment by two or three distinct lenses | `references/coordination-modes.md`, then `references/teamwork-plan-construction.md` |
+| Profile, model, provider, reasoning effort, or role-card configuration | `references/teammate-configuration-matrix.md` |
 | “和 codex/claude 讨论一下”, “brainstorm with another agent” | `references/teamwork-plan-construction.md`, then `references/coordination-modes.md` |
 | “派 teammate 做研究或验证”, “让 agent review”, “spawn a worker” | `references/teamwork-plan-construction.md`, then `references/teammate-processes.md` |
 | “开 issue 区 / topic 群 / changelog / board”, “make a forum” | `references/teamwork-plan-construction.md` |
@@ -50,7 +52,15 @@ trellis teamwork context list <session> --scope global --thread <thread>
 ## Core Rules
 
 - Teammates provide research, review, verification, evidence, and advice under a role contract; they do not implement product code. Coding tools or provider permission modes do not grant that role authority. Return results in the assigned format and let the coordinator review them.
-- `general`, `advisor`, and `committee` are coordination modes, independent from `run`, batch execution, and forum sessions. The current `batch` CLI is reserved and refuses dispatch; see the plan reference for the current boundary.
+- `general`, `advisor`, and `committee` are coordination modes, independent from profiles, providers, `run`, batch execution, and forum sessions. Read project defaults with `teamwork config`; construct a frozen plan with `teamwork plan` and execute it with `teamwork batch --task <task-dir>`.
+- For a managed batch, invoke one foreground `teamwork batch --json` command and wait for its receipt. The CLI owns FIFO admission, capacity, provider waits, retries, cancellation, report validation, and settlement; the main agent must not schedule per-assignment waits or retries.
+- If the host yields that call, silently continue its original handle. Do not emit repetitive progress, query status, start unrelated work, or create another batch. Host continuation is not CLI scheduling. Codex ships a native wait projection and PreToolUse guard for supported tool events; neither prevents model wake-ups or ordinary model messages. After a lost coordinator, use native `teamwork reconcile` and retain reservations until process exit is proven.
+- Agent/program callers must use `run --json`, `batch --json`, or `wait --json --from <worker>` for final results. Default run text and default wait events are compatibility/operator views. Read `execution`, every `reports[].validation` and content status, then perform semantic review; `done`, exit zero, `complete`, and `ALL_ACCEPTED` alone do not accept a task result. `semanticValidation: not_run` explicitly leaves that decision to the main agent.
+- Tool permissions are automatically allowed; the default Codex launch has no sandbox. Source/Git, memory, and delegation boundaries are prompt obligations. Do not add tool/path permission gates or describe the role as technical isolation.
+- Initialization carries common/professional rules and the mode-specific result contract. Task messages carry task data, acceptance and exact identity/path references. Context manifests may choose inline, required full reading, or on-demand references; reference text never becomes system instructions. ACP has user content only and cannot claim system priority.
+- A batch runtime continuation waits on the same provider process under the same frozen deadline. It does not send another provider prompt or consume a full-attempt retry. A live `teamwork wait` host-tool continuation is a separate interactive-session workflow.
+- Select one of the six professional profiles and one of its named configurations. For multiple teammates, consider the second and third candidates and record the selection reason; using the same configuration is allowed. See the configuration matrix reference before constructing a new plan.
+- Teamwork does not create or operate Paseo workspaces, Git worktrees, or source-writing implementation agents. Those mechanisms remain independent.
 - New forum Teamwork Sessions use `--type forum`. A `thread` is one item inside a forum Teamwork Session.
 - Use `--context-file` / `--context-raw` and `trellis teamwork context add/delete/list`.
 - Use `--stdin` or `--text-file` for long messages. Do not put long mixed Chinese/English text in the positional shell argument.
@@ -58,7 +68,7 @@ trellis teamwork context list <session> --scope global --thread <thread>
 - `--as` is the speaker or worker handle, depending on the command. Use explicit, stable names when multiple agents or sessions are involved.
 - `--scope project` (default) operates on the current cwd's project bucket; `--scope global` operates on the shared `__global__` bucket. Pick scope deliberately — a global board is invisible from project listings unless `--scope global` is passed.
 - For exploratory discussion, choose distinct questions and pressure-test unresolved assumptions. Continue only while another exchange can change the decision or its evidence; do not require a fixed number of rounds or relabel a confirmation as new evidence.
-- **Dispatcher wait pattern**: use `--kind done` / `--kind turn_finished` (Trellis-emitted system events), not a user `--tag` as the completion signal. Tags are labels, not runtime completion events.
+- **Dispatcher wait pattern**: use `wait --json --from <worker>` for a final content report. Operator event waits may use `--kind done` / `--kind turn_finished`; tags are labels, not runtime completion events. Resume an outstanding host continuation before any other host action.
 - Teamwork Sessions are event-sourced. Do not parse `events.jsonl` first; use `forum`, `thread`, `messages --thread`, and `context list`.
 - `@pennixrv/trellis-core` owns reusable Teamwork Session/thread state, event append, sequence allocation, context/title projection, reducers, and task helpers. The CLI owns flags, terminal rendering, prompts, teammate lifecycle, and process exits.
 - Teamwork plan construction belongs to the current phase coordinator. Teamwork validates and executes a frozen plan; it does not select the task phase, change task status, or create a second task state machine.

package/dist/templates/common/bundled-skills/trellis-teamwork/references/coordination-modes.md

@@ -3,6 +3,29 @@
 The plan's `coordination_mode` selects the call shape. It is independent from
 the teammate role, execution profile, and Teamwork Session type.
 
+All modes use the same schema-2 content report and common `--json` result
+envelope. Mode selection does not waive result validation or main-agent
+semantic review. It also does not transfer FIFO or process control to a model.
+
+Project defaults live in `.trellis/teamwork.json`: general defaults to one
+member, advisor to three, and committee to three. Schema 2 also owns the mode
+concurrency limits (general 8, advisor 3, committee 3) and the shared live-process
+budget (8, with 0 reserved for non-batch work). Read them with
+`trellis teamwork config --mode <mode>`. The coordinator uses `defaultMembers`
+when composing assignments; it must write each member explicitly. The runtime
+does not invent assignments or silently duplicate one to reach the default.
+Changing defaults affects only newly constructed plans. Advisor must have one to
+three members, committee two or three, and general one or more within capacity.
+
+Member count guides plan composition; concurrency limits simultaneous work.
+Effective capacity is bounded by the selected mode, requested capacity, shared
+live budget after reservations, and verified host capability. Existing live
+workers and batch reservations share admission control. Environment overrides
+are explicit and reported in `capacityPolicy.diagnostics`. Legacy schema 1 and
+YAML capacity remain readable for compatibility. Schema 2 ignores legacy YAML
+capacity keys with a diagnostic, so a stale YAML limit of 1 cannot silently
+override the new policy. YAML retains idle-cleanup settings.
+
 ## `general`
 
 Use general coordination for one or more independent assignments. Each
@@ -12,8 +35,8 @@ each assignment independently.
 
 ## `advisor`
 
-Use advisor coordination for one bounded consultation. The plan contains
-exactly one assignment and its result is advice for the current coordinator.
+Use advisor coordination for one to three bounded consultations. Each advisor
+returns independent advice for the current coordinator; the default is three.
 The result still carries a source digest and acceptance evidence and does not
 change the task or phase by itself.
 
@@ -26,6 +49,12 @@ independently authored reports; the coordinator compares them after they finish.
 Members may cite the same authoritative sources. Distinct lenses do not
 guarantee independent evidence or require different providers, models, or profiles.
 
+`lens` is the member's “本次关注点”, not another role directory. It is optional
+in general and advisor mode. Committee members receive the same task, evidence
+and acceptance contract; they must not read peer reports before submitting
+their own. Profiles and configurations may differ, with a recorded selection
+reason. Paseo workspace and Git worktree collaboration are independent.
+
 Committee members do not debate with one another, run a consensus loop, or use
 a directional counter relationship. If a question does not need independent
 lenses, use general coordination or advisor coordination instead.

package/dist/templates/common/bundled-skills/trellis-teamwork/references/teammate-configuration-matrix.md

@@ -1,36 +1,42 @@
-# Teammate configuration matrix
+# Teammate 配置矩阵
 
-The candidate source for teammate execution settings is the teammate
-configuration matrix. It is a selection input, not a new role system. A
-profile may provide a default provider and model plus provider-specific
-options. The frozen plan stores the selected execution values in the
-`Teammate Execution Configuration` snapshot so a running batch is unaffected
-by later matrix changes.
+配置由项目文件持有，运行时读取；下表解释默认选择，不替代实际文件。
 
-The tuple is:
+| 文件 | 职责 |
+| --- | --- |
+| `.trellis/agents/teammate-profiles.json`，schema 2 | `default_profile`；每个 profile 的 `role`、`default_configuration` 和 2–3 套命名 `configurations` |
+| `.trellis/agents/teammate.md` | 通用角色、只读职责和结果合同 |
+| `.trellis/agents/profiles/<profile>.md` | 精确专业角色卡；普通 Markdown，通过 Trellis 注入，不注册宿主原生角色 |
+| `.trellis/teamwork.json`，schema 2 | `default_mode`；各模式的 `default_members`、`max_concurrency`；`resources` 中的共享进程预算与非 batch 预留 |
+| `.trellis/config.yaml` 的 `teamwork.teammate_guard.idle_timeout` | 空闲清理；旧容量键仅在未迁移到 schema 2 时兼容读取 |
 
-```text
-role + provider + optional profile + model + reasoning effort + options
+默认成员数为 general 1、advisor 3、committee 3；默认并发上限分别为 8、3、3，共享存活进程预算为 8，非 batch 预留为 0。成员数用于构造计划，不要求同时运行；有效并发还受显式请求、共享预算和宿主能力约束。schema 2 不再叠加旧 YAML 容量上限，兼容读取和环境覆盖均在 `capacityPolicy.diagnostics` 中说明。`capacityPolicy` 是解析结果，不是另一套配置。
+
+每套执行配置包含 `provider`、`model`，可选 `reasoning_effort` 和适配器支持的 `options`。上下文长度沿用 provider 默认，不配置 token 或预算机制。`teammate` 是内部执行者类型，公开计划不填写 `role_id`；`lens` 只表示成员的“本次关注点”。
+
+| Profile | 工作职责 | 默认配置 | 第二候选 | 第三候选 |
+| --- | --- | --- | --- | --- |
+| `architecture` | 架构、接口、依赖与取舍 | codex / gpt-6.1-sol / xhigh | copilot / gpt-6.1-sol / xhigh | copilot / claude-opus-5.5 / xhigh |
+| `review` | 基于当前差异的正确性审查 | codex / gpt-6.1-sol / high | copilot / gpt-6.1-sol / high | copilot / claude-opus-5.5 / high |
+| `research` | 外部资料、先例与时效核验 | codex / gpt-6.1-sol / high | copilot / gpt-6.1-sol / high | copilot / claude-sonnet-5.5 / high |
+| `verification` | 独立验收、验证和证据核对 | codex / gpt-6.1-sol / high | copilot / gpt-6.1-sol / high | copilot / claude-sonnet-5.5 / high |
+| `exploration` | 围绕主题探索本地源码、调用和边界 | codex / gpt-6.1-sol / high | copilot / gpt-6.1-sol / high | copilot / claude-sonnet-5.5 / high |
+| `diagnosis` | 针对已知故障验证根因假设 | codex / gpt-6.1-sol / high | copilot / gpt-6.1-sol / high | copilot / claude-opus-5.5 / high |
+
+候选名为 `codex-sol`、`copilot-sol`，以及 `copilot-opus` 或 `copilot-sonnet`。默认 profile 为 `exploration`。先查实际设置：
+
+```bash
+trellis teamwork config --profile architecture --configuration copilot-opus --mode committee
 ```
 
-The role remains `teammate`. Coordination mode is separate from role and
-profile. Supported provider adapters are Codex app-server, DSH ACP, Copilot
-ACP, and Claude Code CLI when their host contracts are available. A provider
-name alone does not prove that its host is installed or verified.
-
-The coordinator's host capability proof covers foreground waiting, protected
-artifact writes, attempt artifact output, disabled native delegation, isolated
-context, supported transport, and a positive capacity. Source and Git write
-boundaries are role obligations recorded in `writePolicy`; they do not require
-filesystem or Git permission isolation. Available tools do not authorize a
-teammate to implement product code. The coordinator rejects an incomplete
-runtime proof without silently changing the frozen execution values.
-
-The public `trellis teamwork batch` entry currently refuses dispatch before
-coordination state is written. It does not discover or connect a host adapter;
-interactive `spawn` and `run` do not establish a verified batch adapter.
-
-The bundled role card is `.trellis/agents/teammate.md`. It is provider-neutral
-and limits a teammate to the frozen context and current attempt artifacts. A
-Teamwork teammate is not the native host-created `subagent`; the two have
-different creation paths and contracts.
+成员显式覆盖执行值只作用于该成员，不改项目默认。多成员应考虑同 provider 不同模型、跨 provider 同模型或不同专业的收益，填写 `selection_reason`；不强制异构、不自动轮换、不静默 fallback。`architecture + committee` 可以让 2–3 位架构成员分别使用不同配置。
+
+构造器冻结有效执行值、通用加专业角色指令、模式结果合同、上下文、模式配置摘要和能力摘要。能力的 `evidence: adapter-contract` 说明它来自静态适配器合同，不是已安装后端的成功探测。后续改配置只影响新计划，已有计划执行时不重新解析角色文件；新计划的参考文件在派发前后核对冻结摘要。模型不可用、推理强度未被后端声明或选项不支持时明确失败，并保留实际配置协商阶段及后端声明信息。
+
+四种 transport 为 Codex app-server、Claude Code stream-json、Copilot ACP 和 DSH ACP。Copilot 原生 CLI 支持非交互调用；这里选择 ACP 是为了统一会话、配置与取消回执。DSH 使用 `dsh --profile acp`，恢复使用其声明的 `session/resume`；Copilot 使用 `session/load`。安装、账号和真实调用结果须单独核验，fixture 通过不证明某个后端已可用。
+
+Codex 使用 `developerInstructions`，Claude 使用独立的 append-system-prompt；ACP v1 只有用户内容块，Trellis 将角色与任务放在两个明确区分的纯文本块，但不宣称具有独立 system 优先级。完整角色在同一会话成功完成一轮后不重复发送，恢复或首次失败后重新建立。参考资料通过任务数据通道发送。不会动态改写 `AGENTS.md` 或注册 provider 原生 persona。
+
+源码、Git、递归委派和隐式历史使用限制是角色义务。宿主能力检查只声明实际运行能力：前台等待、受控产物、transport 和容量；不声称完成文件系统只读或记忆隔离。可用工具与宽权限模式不授予 teammate 编写产品代码的职责。
+
+工具权限自动允许，不设置默认沙箱或工具/路径准入限制。Codex 默认 `danger-full-access`、`approvalPolicy: never`；ACP 自动选择后端提供的允许选项。宿主仍可能附加 AGENTS、Skills 和环境记忆，角色摘要不代表整个有效上下文摘要。

package/dist/templates/common/bundled-skills/trellis-teamwork/references/teammate-processes.md

@@ -7,29 +7,37 @@ evidence, path, secret, and symlink rules. The teammate writes only its
 current attempt artifacts. It does not modify product source, Git state, task
 status, or another teammate's artifacts.
 
-After a timeout, the same attempt may receive a continuation. A confirmed
-execution or acceptance failure may consume that assignment's explicit retry
-budget and create a new attempt identity. An uncertain command, changed host
-identity, or unconfirmed cancellation enters reconciliation and is not
-automatically duplicated. Reconciliation is a runtime outcome; the task
-coordinator decides whether a later task phase needs a return.
-
-When a live Teamwork wait returns a host continuation, resume only that
-continuation until it resolves, times out, or errors. Do not run another
-host action meanwhile, including another wait, shell command, or status/message
-query. An empty transport slice does not mean the wait has completed. Run
-diagnostics only after the continuation returns and diagnosis is needed.
+When a managed batch runtime wait yields before the frozen deadline, the CLI
+may continue waiting on the same provider process and attempt identity. This
+continuation does not send another provider prompt, extend the deadline, or
+consume the full-attempt retry budget. The CLI keeps other active slots moving
+while that wait is pending. At the deadline it closes FIFO admission and
+cancels active attempts. A confirmed execution or acceptance failure may
+consume the assignment's explicit retry budget and create a new attempt
+identity. A `blocked` report with evidence ends only that assignment and does
+not stop later FIFO work. An uncertain command, changed host identity,
+incomplete report write, or unconfirmed cancellation enters reconciliation and
+is not automatically duplicated. Reconciliation is a runtime outcome; the
+task coordinator decides whether a later task phase needs a return.
+
+For an interactive Teamwork Session `wait` invoked as a host tool, resume only
+that host continuation until it resolves, times out, or errors. Do not run
+another host action meanwhile, including another wait, shell command, or
+status/message query. An empty transport slice does not mean the wait has
+completed. Run diagnostics only after the continuation returns and diagnosis
+is needed. This host-tool rule does not control a managed `teamwork batch`:
+that foreground CLI call owns the batch lifecycle and returns one receipt.
 
 Use the ordinary Teamwork Session commands for a deliberate one-shot or
 interactive discussion:
 
 ```bash
-trellis teamwork run [name]
-trellis teamwork spawn <name> --agent teammate --provider <provider> \
-  --as reviewer --file .trellis/tasks/<task-dir>/prd.md \
-  --jsonl .trellis/tasks/<task-dir>/research.jsonl
+trellis teamwork run [name] --profile exploration --configuration codex-sol --stdin --json
+trellis teamwork spawn <name> --profile review --configuration copilot-opus \
+  --as reviewer --file .trellis/tasks/in_progress/<task-dir>/prd.md \
+  --jsonl .trellis/tasks/in_progress/<task-dir>/research.jsonl
 trellis teamwork send <name> --as <agent> --stdin
-trellis teamwork wait <name> --as <agent> --kind done,turn_finished
+trellis teamwork wait <name> --as <agent> --from reviewer --json
 trellis teamwork interrupt <name> --as <agent> --to <teammate> --stdin
 trellis teamwork kill <name> --as <teammate>
 ```
@@ -39,13 +47,39 @@ create a second scheduler. Do not use them to bypass a rejected batch or to
 steer an active managed assignment manually.
 
 `spawn` registers an idle teammate; the first targeted `send` starts its turn.
-The agent card can set provider defaults, while `--provider`, `--model`,
+The project profile supplies the common and professional role cards plus
+execution defaults. `--profile` and `--configuration` select them;
+`--reasoning-effort`, `--provider`, `--model`,
 `--cwd`, `--resume`, `--sandbox`, `--timeout`, and `--warn-before` refine one
 launch. `--file` accepts repeatable paths or globs. `--jsonl` accepts a
-repeatable Trellis JSONL manifest whose entries have `{ "file", "reason" }`.
+repeatable Trellis JSONL manifest whose entries have `{ "file", "reason", "delivery" }`.
 Both forms are resolved relative to the spawn cwd, reject paths outside the
 cwd or configured trusted roots, skip missing entries with a warning, and
-enforce per-file and total-context limits before building the system prompt.
+enforce per-file and total-context limits before building reference data.
+`delivery` defaults to `inline`; `required` supplies a path, digest and an
+instruction to read the complete file before work; `on-demand` supplies a
+path, digest and retrieval condition. Required/on-demand missing files fail
+explicitly. New frozen batches recheck reference bytes before dispatch and
+after completion; changed references require a new plan. This check binds
+source versions, but does not prove the model actually read every byte.
+Legacy generic `--agent <card>` remains available for deliberately custom
+agent cards, but it cannot be combined with professional profile selection.
+Interactive roles return a schema-2 JSON content report; they do not invent batch
+claims, report paths or attempt identities.
+
+Common/professional role rules and the mode-specific result contract are
+initialization instructions. Codex uses `developerInstructions`; Claude uses
+append-system-prompt. Reference material travels with the first task as data.
+ACP has user blocks only: the role is sent once after a confirmed turn, retained
+for follow-ups, and injected again after recovery or an unsuccessful first
+turn. No JSON transport envelope is serialized into the role/task prose.
+The host may add AGENTS, Skills and memory; `TRELLIS_HOOKS=0` disables Trellis
+hooks, not all host context. No environment or memory isolation is claimed.
+
+All providers automatically allow tool permissions. Codex defaults to
+`danger-full-access` with `approvalPolicy: never`; an explicit user sandbox
+override is still supported. ACP selects the offered allow option and reports
+an error if none exists. Role boundaries remain prompt obligations.
 
 Use `--inbox-policy explicitOnly|broadcastAndExplicit` to control which
 messages are delivered to a teammate. `send --to` selects recipients and
@@ -53,8 +87,10 @@ messages are delivered to a teammate. `send --to` selects recipients and
 target validation. The runtime records the injected files, manifest paths,
 provider identity, and terminal event in the session log.
 
-The guard resolves CLI flags, then environment variables, then
-`teamwork.teammate_guard` in `.trellis/config.yaml`, then built-in defaults.
+The live budget and mode capacity come from schema-2 `.trellis/teamwork.json`;
+explicit CLI flags and environment overrides may tighten the frozen policy.
+Legacy `.trellis/config.yaml` teammate keys are ignored with diagnostics;
+the separate idle timeout remains a process-lifecycle setting.
 `--idle-timeout` cleans a continuously idle teammate; `--max-live-teammates`
 limits live processes. A value of `0` disables the corresponding guard. An
 idle teammate is not cleaned while it is in a turn. `interrupt` requests a
@@ -62,14 +98,48 @@ replacement instruction, `kill` attempts graceful shutdown, and `kill --force`
 uses the hard termination path. `--resume` supplies the provider session or
 thread identifier for a later attempt.
 
+Codex interrupts use `turn/interrupt` and await the old terminal turn before
+submitting the replacement. ACP sends `session/cancel` and awaits the terminal
+prompt response; sending a notification alone is not cancellation proof.
+Batch cancellation additionally confirms provider process exit. Unconfirmed
+termination preserves reconciliation and its capacity reservation. Session
+removal and prune preserve sessions with unresolved batch reservations.
+
 For short independent work, `teamwork run` creates an ephemeral session,
 injects the selected context, sends one prompt, waits for `done`, prints the
-answer, and removes the session. For a managed plan, the coordinator owns
+answer, and removes the session only after a valid complete content report.
+`run --json` returns the common machine envelope and keeps failure diagnostics;
+early supervisor errors/kills terminate the wait without hiding the cause.
+`wait --json --from <one-worker>` binds the final report to `inputSeq` and
+`turnId`; it does not stop the persistent worker. Default event waits retain
+their existing behavior. For a managed plan, the coordinator owns
 claim, dispatch, retry budget, terminal receipt, and reconciliation. An
 uncertain provider action is reconciled instead of being duplicated. Settled
-attempt artifacts may be cleaned according to the plan retention rule; the
+attempt reports and worklogs, including rejected attempts, remain until explicit
+native cleanup; the result includes every attempt index. The
 Teamwork Session event log follows its own lifecycle.
 
+`teamwork cleanup-artifacts <plan> --task <task-dir>` previews the exact retained
+report/worklog/stderr files of a durably settled batch. Only an explicit repeat
+with `--confirm <preview-digest>` deletes those files; a changed preview or an
+unresolved reservation is rejected. Read and accept needed evidence before
+cleanup. Session removal alone does not delete task-owned attempt evidence.
+
+Use `teamwork reconcile <original-plan> --task <task-dir>` to preview recovery
+after coordinator loss. `--execute --reason <disposition>` only settles when
+native process-exit facts or process birth identity prove termination. A missing
+PID, absent report, or dead coordinator alone is insufficient. This command
+preserves accepted assignments and releases only the original batch's leases.
+It does not restart providers or accept task results.
+
+After a durable failed settlement and explicit bounded retry approval, construct
+`teamwork retry <original-plan> --task <task-dir> --output <new-plan> --batch <new-id>
+--assignments <failed-id,...> --deadline <ISO-time> --approval-ref <approval>`.
+Only failed assignments enter the new plan; frozen inputs and parent lineage
+are retained. Repeating the same output is idempotent. Execute the new plan
+normally; the original terminal result remains unchanged. A recovered subset
+does not retroactively accept the original committee evaluation.
+
 For a stalled process, inspect `teamwork list`,
 `teamwork messages <session> --raw --no-progress`, the provider log, and the
 host process state in that order. Use `messages --follow` for live output and