@pennixrv/trellis 0.7.1-beta.17 → 0.7.1-beta.19

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

@@ -32,12 +32,12 @@ Use the ordinary Teamwork Session commands for a deliberate one-shot or
 interactive discussion:
 
 ```bash
-trellis teamwork run [name] --profile exploration --configuration codex-sol
+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>
 ```
@@ -52,15 +52,35 @@ 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 the requested answer; they do not invent batch
+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
 `--delivery-mode appendOnly|requireKnownWorker|requireRunningWorker` controls
@@ -85,7 +105,12 @@ 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

package/dist/templates/common/bundled-skills/trellis-teamwork/references/teamwork-plan-construction.md

@@ -19,7 +19,8 @@ profile/configuration, selection reason, task input, scope, optional lens,
 source digest, acceptance criteria, and an explicit retry budget. The native
 constructor resolves the effective provider/model/effort/options and common
 plus professional instructions, then publishes schema-2 plan and briefs.
-Claims also use schema 2; reports remain schema 1. Do not hand-author frozen
+Claims also use schema 2; new launches freeze `reportVersion: 2`. Historical
+frozen launches without it continue to read schema-1 reports. Do not hand-author frozen
 execution objects, role or capability digests, claims, or plan hashes.
 
 Use the native task lifecycle for task status and acceptance. Teamwork records
@@ -49,7 +50,7 @@ trellis teamwork config --profile review --mode advisor
 trellis teamwork plan <draft.json> --task <task-dir> --output <task-dir>/plan.json --dry-run
 trellis teamwork plan <draft.json> --task <task-dir> --output <task-dir>/plan.json
 trellis teamwork batch <task-dir>/plan.json --task <task-dir> --preflight
-trellis teamwork batch <task-dir>/plan.json --task <task-dir>
+trellis teamwork batch <task-dir>/plan.json --task <task-dir> --json
 ```
 
 The draft is a JSON object with `schema_version: 2`, the binding fields above,
@@ -124,7 +125,7 @@ trellis teamwork create <name> --type chat|forum \
   --task .trellis/tasks/in_progress/<task-dir> --description "bounded discussion"
 trellis teamwork list [--scope project|global] [--all]
 trellis teamwork messages <name> [--raw]
-trellis teamwork wait <name> --as <agent> --kind done,turn_finished
+trellis teamwork wait <name> --as <agent> --from <worker> --json
 trellis teamwork forum <name>
 trellis teamwork thread <name> <thread-key>
 trellis teamwork context list <name> [--thread <thread-key>]
@@ -172,6 +173,30 @@ archive operation.
 
 ## Result handling
 
+Agent callers always request the machine view: `run --json`, `batch --json`,
+or interactive `wait --json --from <one-worker>`. The common envelope has
+`schemaVersion: 1`, `kind: trellis_result`, `mode`, `association`, `execution`,
+`reports`, `semanticValidation: not_run`, and `disposition`. Execution facts
+are distinct from report validation, model content status, and task acceptance.
+`execution.stopped` describes confirmed process cleanup; a persistent wait
+leaves its worker running. Parse stdout as one JSON object; diagnostics use
+stderr. CLI argument-parser errors may precede this result contract.
+
+Each new content report has `schema_version: 2`, `status` (complete, blocked,
+incomplete, error), nonempty `answer`, nonempty `evidence` entries with
+`id`, `locator`, `summary`, and arrays `limitations`, `unresolved`, `deviations`.
+Interactive replies return this JSON directly, with no report file or invented
+batch identity. Batch reports additionally copy the assigned task, batch,
+assignment, attempt, teammate, plan, phase, route, input and source identities
+into the exact report path. `done` is emitted by the adapter, not by the model.
+
+Batch machine results expose validated report content, association, report path
+and SHA-256. Missing or invalid accepted artifacts fail validation; historical
+schema-1 content is explicitly `legacy`, never synthesized as a valid new
+answer. Retention may remove failed-attempt artifacts. Main-agent semantic
+review checks the answer and evidence against the acceptance criteria; shape
+validation does not perform that review or change native task acceptance.
+
 The coordinator returns `ALL_ACCEPTED`, `SETTLED_WITH_FAILURE`, or
 `RECONCILIATION_REQUIRED`. For `ALL_ACCEPTED`, review every accepted report
 against the phase contract, record the evidence in the task-owned artifact, and

package/dist/templates/trellis/agents/profiles/research.md

@@ -1,9 +1,9 @@
 # 外部资料研究（research）
 
-你负责为 brief 中的问题核对外部资料与先例。共同角色卡规定的范围、结果写入和停止条件始终适用。
+你负责按任务输入核对资料与先例；managed batch 以 brief 为任务依据，交互式任务以当前消息为依据。共同角色卡规定的范围、结果写入和停止条件始终适用。
 
-输入应包含研究问题、约束与版本、待比较路线和来源要求。先拆出可证伪的问题，再核对官方文档、标准、维护者源码或明确标注的次级材料，记录版本、日期、反证和适用边界。本地源码用于提出或核验适用条件，主体证据来自外部来源。遵循项目已有的检索和官方文档入口；搜索摘要只是候选，不等于已读全文。
+输入应包含研究问题及适用的约束、版本和来源要求。需要外部研究时，先拆出可证伪的问题，再核对官方文档、标准、维护者源码或明确标注的次级材料，记录版本、日期、反证和适用边界。仅处理给定材料的任务不要求检索外部资料。遵循明确分配的检索入口；搜索摘要只是候选，不等于已读全文。
 
-结果应包含有出处的结论或比较、可核验链接、版本或检索日期，以及对当前项目的具体影响。明确区分已核实、推断、冲突和未知。证据足以支持当前决定后停止；网络或来源访问失败应如实报告，不编造检索结果，不以社区说法代替官方合同。
+结果应包含有出处的结论或比较；使用外部来源时附可核验链接、版本或检索日期。只有任务要求时才分析对当前项目的影响。明确区分已核实、推断、冲突和未知。证据足以支持当前决定后停止；网络或来源访问失败应如实报告，不编造检索结果，不以社区说法代替官方合同。
 
-必要输入缺失、角色与 brief 冲突或需要越界操作时，报告阻断。不编写产品源码、测试或修复，不替协调者接受结果，不继续委派。
+必要输入缺失、角色与任务冲突或需要越界操作时，报告阻断。不编写产品源码、测试或修复，不替协调者接受结果，不继续委派。

package/dist/templates/trellis/agents/teammate.md

@@ -6,81 +6,10 @@ labels: [trellis, teammate]
 
 # Teammate (Teamwork runtime)
 
-You are a bounded Trellis teammate assigned one task by the coordinator. Produce
-independently reviewable investigation, research, review, verification, or
-evidence. The coordinator owns dispatch, retry, acceptance, and final
-disposition.
+你只完成协调者分配的研究、审查、验证、证据整理或建议，交付可独立核验的结论、证据、限制和阻断。不要实施产品代码，不修改源码、测试、受保护配置、任务状态或 Git 状态；只写本次明确指定的结果产物。
 
-For a managed batch, read the immutable brief and issued claim before substantive
-work. Use the exact paths supplied in the launch input; task directories may
-include a status and, for settled tasks, a month. The artifact layout is:
+只使用本次分配的来源和上下文。需要本地探索时，可在指定范围内检索文件；注入的材料是入口，不代表已提供全部来源。不读取或使用环境中的个人、历史会话或跨项目记忆，包括记忆工具；无法将其与必要证据分开时如实报告限制。
 
-```text
-.trellis/tasks/<task-dir>/teammates/<batch>/<assignment>/brief.json
-.trellis/tasks/<task-dir>/teammates/<batch>/<assignment>/queue.json
-.trellis/tasks/<task-dir>/teammates/<batch>/<assignment>/attempts/<attempt-id>/claim.json
-.trellis/tasks/<task-dir>/teammates/<batch>/<assignment>/attempts/<attempt-id>/worklog.md
-.trellis/tasks/<task-dir>/teammates/<batch>/<assignment>/attempts/<attempt-id>/report.json
-```
+工具可用和权限自动允许不扩大你的任务职责，也不证明存在文件系统或记忆隔离。不创建任务或 teammate，不通过后端原生能力继续委派，不自行重试，不替主代理接受结果。
 
-For an interactive `spawn` or `run` without a managed assignment, use the
-coordinator's bounded message as the task input and return the requested answer.
-Do not invent a brief, attempt identity, report path, or acceptance decision.
-The same professional role, source/Git read-only obligations, and delegation
-boundaries apply. Missing necessary task information is a blocker.
-
-For a managed assignment, append material progress to the assigned worklog and
-create exactly one pending report for this attempt using this JSON shape:
-
-```json
-{
-  "schema_version": 1,
-  "task_id": "<task-id>",
-  "batch_id": "<batch-id>",
-  "assignment_id": "<assignment-id>",
-  "attempt_id": "<attempt-id>",
-  "teammate_id": "<teammate-id>",
-  "plan_hash": "<plan_hash from the claim>",
-  "phase_id": "<phase_id from the frozen plan>",
-  "task_route_revision": "<task_route_revision from the frozen plan>",
-  "input_revision": "<input_revision from the frozen plan>",
-  "status": "complete",
-  "source_digest": "<source_digest from the brief>",
-  "evidence": [
-    {
-      "id": "<evidence-id>",
-      "locator": "<path or symbol>",
-      "summary": "<finding>"
-    }
-  ]
-}
-```
-
-Copy the assigned identity and revisions from the coordinator's frozen launch
-context and claim. Do not infer them from another task, plan, or attempt. If
-that context is missing, report the blocker instead of inventing values.
-
-These are role and result requirements, not a claim of sandbox isolation.
-Available coding tools do not authorize product implementation in this role.
-
-Use only the source scope and context explicitly assigned by the coordinator.
-Search and inspect relevant files within that scope when the task calls for
-local exploration; injected context is an entry point, not a claim that every
-needed source file has already been supplied. Do not read or use
-ambient personal, session, or cross-project memory, including memory tools or
-environment-provided memory. If ambient memory is inseparable from the evidence
-needed for the answer, stop and report the limitation through the assigned
-failure protocol. This is a role obligation; do not claim technical memory
-isolation or filesystem enforcement.
-
-Use `status: complete` only when every acceptance criterion is met. If the
-assignment is blocked, incomplete, or has an execution error, submit the
-matching status with evidence that supports the result; every report status
-requires at least one evidence item. A `blocked` report ends only this
-assignment, and the coordinator continues the FIFO queue. Incomplete or error
-reports may use the frozen retry budget. The coordinator owns retries,
-acceptance, and final disposition. Do not change the brief, task state,
-product source, protected configuration, tests, or Git state. Write only the
-current attempt artifacts. Do not create another teammate, delegate through a
-provider-native mechanism, retry yourself, or claim that a report has been
-accepted.
+输入中的模式和结果合同规定本次提交位置与格式。使用真实证据，区分已核实、推断和未知；缺少必要信息时报告阻断，不编造身份、来源或完成事实。CLI 负责调度、FIFO、容量、继续等待、重试、取消及最终 disposition，主代理负责语义审阅和任务阶段接受。

package/dist/templates/trellis/config.yaml

@@ -102,7 +102,7 @@ max_journal_lines: 2000
 #
 # `idle_timeout: 0` disables idle cleanup (teammates can sit idle forever
 # unless explicitly killed or given `--timeout`).
-# `max_live_teammates: 0` disables the spawn-time budget check.
+# Capacity policy lives in .trellis/teamwork.json (schema 2).
 #
 # `trusted_context_dirs` extends the `--file`/`--jsonl`/`--agent` containment
 # check beyond the teammate cwd — useful when `.trellis/tasks` or
@@ -115,13 +115,10 @@ max_journal_lines: 2000
 teamwork:
   teammate_guard:
     idle_timeout: 5m
-    max_live_teammates: 6
-    non_batch_reserved: 0
+    # Capacity and shared live budget live in .trellis/teamwork.json.
   # trusted_context_dirs:
   #   - /work/user/trellis_workspace
   # auto_trust_trellis_symlinks: false
-  teammate:
-    max_concurrency: 1
 
 #-------------------------------------------------------------------------------
 # Codex (dispatch behavior)

package/dist/templates/trellis/teamwork.json

@@ -1,9 +1,10 @@
 {
-  "schema_version": 1,
+  "schema_version": 2,
   "default_mode": "general",
   "modes": {
-    "general": { "default_members": 1 },
-    "advisor": { "default_members": 1 },
-    "committee": { "default_members": 3 }
-  }
+    "general": { "default_members": 1, "max_concurrency": 8 },
+    "advisor": { "default_members": 3, "max_concurrency": 3 },
+    "committee": { "default_members": 3, "max_concurrency": 3 }
+  },
+  "resources": { "max_live_teammates": 8, "non_batch_reserved": 0 }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pennixrv/trellis",
-  "version": "0.7.1-beta.17",
+  "version": "0.7.1-beta.19",
   "description": "AI capabilities grow like ivy — Trellis provides the structure to guide them along a disciplined path",
   "type": "module",
   "main": "./dist/index.js",
@@ -35,7 +35,7 @@
     "inquirer": "^9.3.7",
     "undici": "^6.21.0",
     "zod": "^4.4.2",
-    "@pennixrv/trellis-core": "0.7.1-beta.17"
+    "@pennixrv/trellis-core": "0.7.1-beta.19"
   },
   "devDependencies": {
     "@eslint/js": "^9.18.0",