@mindfoldhq/trellis 0.5.0-rc.4 → 0.5.0-rc.5

package/dist/migrations/manifests/0.5.0-rc.5.json

@@ -0,0 +1,9 @@
+{
+  "version": "0.5.0-rc.5",
+  "description": "Codex template enables multi_agent_v2 by default with an 8-minute wait floor. AGENTS.md adds wait tool rules. No new migrations.",
+  "breaking": false,
+  "recommendMigrate": false,
+  "changelog": "**Enhancements:**\n- feat(codex): `.codex/config.toml` template now writes `[features.multi_agent_v2] { enabled = true, max_concurrent_threads_per_session = 6, min_wait_timeout_ms = 480000 }`. `min_wait_timeout_ms = 480000` (8 min) is the `wait()` timeout floor, up from Codex's `10000` (10 s) default; forces the parent to wait through subagent runtime instead of cancelling. `enabled = true` is required inside the table — the table form alone does not enable the feature. Project-level `[features]` activates only when the project is trusted in `~/.codex/config.toml`.\n- fix(codex): drop the `[features].codex_hooks = true` line — `CodexHooks` is now `Stage::Stable` with `default_enabled: true` in Codex's feature registry, so hooks load automatically once the project is trusted. The legacy `codex_hooks` alias was redundant.\n- feat(agents): `AGENTS.md` Subagents section names Codex's `wait` tool and bans cancel/re-spawn before `wait` returns. Raise the timeout (default 30 s, max 1 h) before judging a subagent stuck.",
+  "migrations": [],
+  "notes": "RC install: `npm install -g @mindfoldhq/trellis@rc`. Codex users: trust this project (`[projects.\"<abs path>\"].trust_level = \"trusted\"` in `~/.codex/config.toml`) so hooks and the project-level [features] block activate."
+}

package/dist/templates/codex/config.toml

@@ -1,15 +1,32 @@
 # Project-scoped Codex defaults for Trellis workflows.
-# Codex loads this after ~/.codex/config.toml when you work in this project.
+# Codex merges this layer after the user-level config when the project
+# is marked as a trusted project. To trust this project, add it under
+# `[projects]` in ~/.codex/config.toml, e.g.:
+#
+#   [projects."/abs/path/to/this/repo"]
+#   trust_level = "trusted"
+#
+# Without trust, the [features] block below is loaded but disabled.
 
 # Keep AGENTS.md as the primary project instruction file.
 project_doc_fallback_filenames = ["AGENTS.md"]
 
-# NOTE: Trellis's SessionStart + UserPromptSubmit hooks require opt-in.
-# Add the following to your USER-level config at ~/.codex/config.toml
-# (not this project file — features.* must be enabled globally):
-#
-#   [features]
-#   codex_hooks = true
-#
-# Without this flag, hooks.json is ignored and Trellis context won't
-# be injected into Codex sessions.
+# Codex hooks (`hooks.json` in this directory) load automatically once
+# the project is trusted — no feature flag needed. CodexHooks is Stable
+# and default_enabled: true in codex's feature registry; the legacy
+# `[features].codex_hooks = true` flag is no longer required.
+
+# multi_agent_v2 forces structured subagent orchestration with the
+# `wait` tool — parent must block on terminal status before acting,
+# instead of cancelling / re-spawning. Incompatible with
+# [agents].max_threads (codex will reject the combination).
+# `enabled = true` is required inside the table — the table form does
+# NOT auto-enable the feature without it.
+# - max_concurrent_threads_per_session: bumps default 4 → 6.
+# - min_wait_timeout_ms: 480000 ms = 8 min. Codex default is 10 s, too
+#   short for Trellis subagents that routinely take 2-10 min. Hard
+#   ceiling is 3,600,000 (1 h).
+[features.multi_agent_v2]
+enabled = true
+max_concurrent_threads_per_session = 6
+min_wait_timeout_ms = 480000

package/dist/templates/markdown/agents.md

@@ -18,10 +18,13 @@ If you're using Codex or another agent-capable tool, additional project-scoped h
 
 ## Subagents
 
-- ALWAYS wait for all subagents to complete before yielding.
+- ALWAYS wait for every spawned subagent to reach a terminal status before yielding, acting on partial results, or spawning followups.
+  - On Codex, this means calling the `wait` tool with the subagent's thread id (requires `multi_agent_v2`). Do NOT infer completion from elapsed time.
+  - On Claude Code / OpenCode, this means awaiting the Task/agent tool result before continuing.
+- NEVER cancel or re-spawn a subagent that hasn't finished. If a subagent appears stuck, raise the wait timeout (Codex default 30s, max 1h) before judging it broken.
 - Spawn subagents automatically when:
   - Parallelizable work (e.g., install + verify, npm test + typecheck, multiple tasks from plan)
-  - Long-running or blocking tasks where a worker can run independently.
+  - Long-running or blocking tasks where a worker can run independently
   - Isolation for risky changes or checks
 
 Managed by Trellis. Edits outside this block are preserved; edits inside may be overwritten by a future `trellis update`.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mindfoldhq/trellis",
-  "version": "0.5.0-rc.4",
+  "version": "0.5.0-rc.5",
   "description": "AI capabilities grow like ivy — Trellis provides the structure to guide them along a disciplined path",
   "type": "module",
   "main": "./dist/index.js",