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

package/dist/commands/teamwork/teammate-config.js

@@ -2,9 +2,15 @@ import crypto from "node:crypto";
 import fs from "node:fs";
 import path from "node:path";
 import { DIR_NAMES } from "../../constants/paths.js";
+import { DEFAULT_TEAMWORK_CONFIG, readCoordinationConfig, } from "./coordination.js";
 const DEFAULT_CONFIG = {
-    teammate: { maxConcurrency: 1 },
-    guard: { maxLiveTeammates: 6, nonBatchReserved: 0 },
+    teammate: {
+        maxConcurrency: DEFAULT_TEAMWORK_CONFIG.modes.general.max_concurrency,
+    },
+    guard: {
+        maxLiveTeammates: DEFAULT_TEAMWORK_CONFIG.resources.max_live_teammates,
+        nonBatchReserved: DEFAULT_TEAMWORK_CONFIG.resources.non_batch_reserved,
+    },
 };
 function integer(value, field, positive = false) {
     if (value === undefined)
@@ -44,35 +50,61 @@ function yamlInteger(content, section, key) {
     }
     return undefined;
 }
-export function resolveTeammateRuntimeConfig(cwd = process.cwd(), env = process.env) {
+export function resolveTeammateRuntimeConfig(cwd = process.cwd(), env = process.env, mode) {
     const configPath = path.join(cwd, DIR_NAMES.WORKFLOW, "config.yaml");
     let content = "";
     try {
         content = fs.readFileSync(configPath, "utf8");
     }
-    catch {
-        // Built-in defaults are intentionally conservative.
+    catch (error) {
+        if (error.code !== "ENOENT")
+            throw error;
     }
+    const resolved = readCoordinationConfig(cwd);
+    const selected = mode ?? resolved.config.default_mode;
+    const legacyConcurrency = yamlInteger(content, "teammate", "max_concurrency");
+    const legacyLive = yamlInteger(content, "teammate_guard", "max_live_teammates");
+    const legacyReserved = yamlInteger(content, "teammate_guard", "non_batch_reserved");
+    const diagnostics = [];
+    if (legacyConcurrency !== undefined ||
+        legacyLive !== undefined ||
+        legacyReserved !== undefined)
+        diagnostics.push(resolved.legacy
+            ? "Legacy YAML capacity is active; migrate to .trellis/teamwork.json schema 2."
+            : "Legacy YAML capacity keys are ignored by teamwork.json schema 2; remove them with trellis update.");
+    if (resolved.legacy && resolved.source !== "built-in")
+        diagnostics.push("Legacy teamwork.json schema 1; update to schema 2 for mode-specific capacity.");
+    for (const key of [
+        "TRELLIS_TEAMWORK_TEAMMATE_MAX_CONCURRENCY",
+        "TRELLIS_TEAMWORK_MAX_LIVE_TEAMMATES",
+        "TRELLIS_TEAMWORK_TEAMMATE_RESERVED",
+    ])
+        if (env[key])
+            diagnostics.push(`${key} explicitly overrides the project capacity policy.`);
     const maxConcurrency = integer(env.TRELLIS_TEAMWORK_TEAMMATE_MAX_CONCURRENCY
         ? Number(env.TRELLIS_TEAMWORK_TEAMMATE_MAX_CONCURRENCY)
-        : yamlInteger(content, "teammate", "max_concurrency"), "teamwork.teammate.max_concurrency", true) ?? DEFAULT_CONFIG.teammate.maxConcurrency;
+        : resolved.legacy && legacyConcurrency !== undefined
+            ? legacyConcurrency
+            : resolved.config.modes[selected].max_concurrency, "teamwork.teammate.max_concurrency", true) ?? DEFAULT_CONFIG.teammate.maxConcurrency;
     const maxLiveTeammates = integer(env.TRELLIS_TEAMWORK_MAX_LIVE_TEAMMATES
         ? Number(env.TRELLIS_TEAMWORK_MAX_LIVE_TEAMMATES)
-        : yamlInteger(content, "teammate_guard", "max_live_teammates"), "teamwork.teammate_guard.max_live_teammates", true) ?? DEFAULT_CONFIG.guard.maxLiveTeammates;
+        : resolved.legacy && legacyLive !== undefined
+            ? legacyLive
+            : resolved.config.resources.max_live_teammates, "teamwork.teammate_guard.max_live_teammates", true) ?? DEFAULT_CONFIG.guard.maxLiveTeammates;
     const nonBatchReserved = integer(env.TRELLIS_TEAMWORK_TEAMMATE_RESERVED
         ? Number(env.TRELLIS_TEAMWORK_TEAMMATE_RESERVED)
-        : yamlInteger(content, "teammate_guard", "non_batch_reserved"), "teamwork.teammate_guard.non_batch_reserved") ?? DEFAULT_CONFIG.guard.nonBatchReserved;
+        : resolved.legacy && legacyReserved !== undefined
+            ? legacyReserved
+            : resolved.config.resources.non_batch_reserved, "teamwork.teammate_guard.non_batch_reserved") ?? DEFAULT_CONFIG.guard.nonBatchReserved;
     return {
         teammate: { maxConcurrency },
         guard: { maxLiveTeammates, nonBatchReserved },
-        ...(content
-            ? {
-                sourceDigest: crypto
-                    .createHash("sha256")
-                    .update(content)
-                    .digest("hex"),
-            }
-            : {}),
+        source: resolved.source,
+        diagnostics,
+        sourceDigest: crypto
+            .createHash("sha256")
+            .update(content + resolved.configDigest)
+            .digest("hex"),
     };
 }
 export function effectiveTeammateCapacity(input) {

package/dist/commands/teamwork/teammate-config.js.map

@@ -1 +1 @@
-{"version":3,"file":"teammate-config.js","sourceRoot":"","sources":["../../../src/commands/teamwork/teammate-config.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"teammate-config.js","sourceRoot":"","sources":["../../../src/commands/teamwork/teammate-config.ts"],"names":[],"mappings":"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"}

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/templates/common/bundled-skills/trellis-meta/references/local-architecture/multi-agent-teamwork.md

@@ -27,12 +27,12 @@ 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 are schema 2, reports schema 1.
+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

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

@@ -39,7 +39,7 @@ 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`, then `references/teamwork-plan-construction.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` |

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

@@ -8,12 +8,23 @@ 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 one, and committee to three. Read them with
+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
-member, committee two or three, and general one or more within capacity.
+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`
 
@@ -24,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.
 

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

@@ -7,8 +7,10 @@
 | `.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 1 | `default_mode` 及三种模式的 `default_members` |
-| `.trellis/config.yaml` 的 `teamwork.*` | 并发和进程容量限制 |
+| `.trellis/teamwork.json`，schema 2 | `default_mode`；各模式的 `default_members`、`max_concurrency`；`resources` 中的共享进程预算与非 batch 预留 |
+| `.trellis/config.yaml` 的 `teamwork.teammate_guard.idle_timeout` | 空闲清理；旧容量键仅在未迁移到 schema 2 时兼容读取 |
+
+默认成员数为 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` 只表示成员的“本次关注点”。
 

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.18",
+  "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.18"
+    "@pennixrv/trellis-core": "0.7.1-beta.19"
   },
   "devDependencies": {
     "@eslint/js": "^9.18.0",