@pennixrv/trellis 0.7.0-beta.8 → 0.7.1

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

@@ -229,14 +229,6 @@ def _resolve_task_dir(trellis_dir: Path, task_ref: str) -> Path:
 
 def _get_task_status(trellis_dir: Path, hook_input: dict) -> str:
     active = _resolve_active_task(trellis_dir, hook_input)
-    if active.source_type == "unbound_ambiguous":
-        candidates = "\n".join(f"- {candidate}" for candidate in active.candidate_paths)
-        return (
-            "Status: TASK BINDING AMBIGUOUS\n"
-            f"Candidates:\n{candidates}\n"
-            "Next: Review the candidates and run `python3 ./.trellis/scripts/task.py start <task>` "
-            "with the intended task once a direct session identity is available."
-        )
     if not active.task_path:
         return (
             "Status: NO ACTIVE TASK\n"
@@ -266,13 +258,9 @@ def _get_task_status(trellis_dir: Path, hook_input: dict) -> str:
     if task_status == "completed":
         return (
             f"Status: COMPLETED\nTask: {task_title}\n"
-            f"Next: Archive with `python3 ./.trellis/scripts/task.py archive {task_dir.name}` "
-            "or start a new task."
+            "Next: Start another task or end the session; finish-work only records the session journal."
         )
 
-    has_prd = (task_dir / "prd.md").is_file()
-    has_design = (task_dir / "design.md").is_file()
-    has_implement = (task_dir / "implement.md").is_file()
     present = [
         name
         for name in ("prd.md", "design.md", "implement.md", "implement.jsonl", "check.jsonl")
@@ -280,20 +268,18 @@ def _get_task_status(trellis_dir: Path, hook_input: dict) -> str:
     ]
     present_line = ", ".join(present) if present else "none"
 
-    if not has_prd:
-        return (
-            f"Status: PLANNING\nTask: {task_title}\nPresent: {present_line}\n"
-            "Next: Load trellis-brainstorm and write prd.md. Stay in planning."
-        )
-
     if task_status == "planning":
-        if has_design and has_implement:
-            next_action = "Review planning artifacts with the user before `task.py start`."
-        else:
-            next_action = (
-                "Lightweight task can ask for start review with PRD-only; "
-                "complex task must add design.md and implement.md before `task.py start`."
-            )
+        next_action = (
+            "Follow the current per-turn workflow-state. Task lifecycle status and artifact presence "
+            "do not identify the business phase. If no phase route is initialized, load "
+            "`trellis-goal-exploration-and-requirements` and confirm the requirements baseline "
+            "before initializing the route."
+        )
+        if any(
+            path.is_file() and not _has_curated_jsonl_entry(path)
+            for path in (task_dir / "implement.jsonl", task_dir / "check.jsonl")
+        ):
+            next_action += " Curate task context manifests only when a dispatched agent needs them."
         return (
             f"Status: PLANNING\nTask: {task_title}\nPresent: {present_line}\n"
             f"Next: {next_action}"
@@ -301,8 +287,9 @@ def _get_task_status(trellis_dir: Path, hook_input: dict) -> str:
 
     return (
         f"Status: {task_status.upper()}\nTask: {task_title}\nPresent: {present_line}\n"
-        "Next: Follow the matching per-turn workflow-state. Context order is jsonl entries, "
-        "prd.md, design.md if present, implement.md if present."
+        "Next: Follow the matching per-turn workflow-state; task lifecycle status does not "
+        "identify the business phase. Context order is jsonl entries, `prd.md`, `design.md` "
+        "if present, `implement.md` if present."
     )
 
 
@@ -391,10 +378,7 @@ def _build_compact_current_state(
     lines.append(_format_git_state(repo_root))
 
     active = _resolve_active_task(trellis_dir, hook_input)
-    if active.source_type == "unbound_ambiguous":
-        candidates = ", ".join(active.candidate_paths)
-        lines.append(f"Current task: ambiguous; candidates={candidates}; bind explicitly.")
-    elif active.task_path:
+    if active.task_path:
         task_dir = _resolve_task_dir(trellis_dir, active.task_path)
         status = "unknown"
         task_json = task_dir / "task.json"
@@ -436,14 +420,23 @@ def _extract_range(content: str, start_header: str, end_header: str) -> str:
     lines = content.splitlines()
     start: "int | None" = None
     end: int = len(lines)
-    start_match = f"## {start_header}"
-    end_match = f"## {end_header}"
+    start_matches = {f"## {start_header}", "## 阶段索引", "## Phase Index"}
+    end_matches = {
+        f"## {end_header}",
+        f"### {end_header}",
+    }
+    phase_titles = ("目标探索与需求核对阶段", "Goal Exploration and Requirements Confirmation Phase")
     for i, line in enumerate(lines):
         stripped = line.strip()
-        if start is None and stripped == start_match:
+        if start is None and stripped in start_matches:
             start = i
             continue
-        if start is not None and stripped == end_match:
+        heading = stripped.lstrip("#").strip()
+        is_phase_heading = stripped.startswith(("## ", "### ")) and any(
+            heading == title or heading.endswith((f"：{title}", f": {title}"))
+            for title in phase_titles
+        )
+        if start is not None and (stripped in end_matches or is_phase_heading):
             end = i
             break
     if start is None:
@@ -491,11 +484,11 @@ def _build_workflow_toc(workflow_path: Path) -> str:
 
     out_lines = [
         "# Development Workflow - Session Summary",
-        "Full guide: .trellis/workflow.md. Step detail: `python3 ./.trellis/scripts/get_context.py --mode phase --step <X.Y>`.",
+        "Full guide: .trellis/workflow.md. Phase detail: load the Skill named in the active phase breadcrumb.",
         "",
     ]
 
-    phases = _extract_range(content, "Phase Index", "Phase 1: Plan")
+    phases = _extract_range(content, "阶段索引", "目标探索与需求核对阶段")
     if phases:
         out_lines.append(_strip_breadcrumb_tag_blocks(phases).rstrip())
 

package/dist/templates/common/bundled-skills/trellis-decision-space-construction-and-merging/SKILL.md

@@ -0,0 +1,10 @@
+---
+name: trellis-decision-space-construction-and-merging
+description: 当前任务进入决策空间构造与归并阶段时，整理实质决策、候选、证据、依赖与决策树。
+---
+
+# 决策空间构造与归并阶段
+
+当 `current_phase_id` 为 `decision_space_construction_and_merging` 时使用。阅读本 Skill 同目录的 `workflow.md`，并基于已确认且仍有效的需求基线工作。
+
+决策空间构造与归并阶段负责展示和归并决策空间，不代替用户锁定保留决定。简单问题使用清单或比较表；只有前置选择或条件会改变后续选项时才建立决策树。阶段结果由 Trellis CLI 接受；无实质候选差异时可按证据跳过本阶段。

package/dist/templates/common/bundled-skills/trellis-decision-space-construction-and-merging/workflow.md

@@ -0,0 +1,40 @@
+# 决策空间构造与归并阶段流程
+
+核对目标探索与需求核对阶段已确认的目标基线及当前 `artifact_revision`。判断候选差异、条件分支是否会影响交付、验收、风险或下游选择。若没有实质差异，可记录基线引用、跳过理由、解决方案设计与收敛阶段的最低输入和需要重新进入本阶段的变化条件，再由 Trellis CLI 核验跳过。
+
+需要构造时，梳理决策项及其权限、候选、重要排除项与理由；按需补齐证据、适用约束、标准、阈值、依赖、影响和优先级。证据足够时给出推荐；证据不足则保留未知或待决项，不伪造结论。仅当选择之间存在条件依赖时使用决策树，并标明分支条件、来源、未知路径及其下游影响。互斥、共享依赖或汇合关系可用依赖图；独立候选用比较表或清单即可。
+
+新颖机制、重大重构、跨组件边界变化或关键取舍缺少可信本地先例时，进行有界的 `prior-art review`，记录适用性与采纳或排除理由。只读 Teamwork 可按需补充证据；主代理核验报告后归并。将 `DecisionSpace` 或有据跳过记录交由 Trellis CLI 接受，待用户决定交由解决方案设计与收敛阶段处理。
+
+```mermaid
+flowchart TD
+  input["核对已确认且仍有效的需求基线"] --> material{"差异或条件分支会改变交付、验收、风险或下游选择？"}
+  material -->|"否"| skip["记录 revision、理由、解决方案设计与收敛阶段所需的最低输入和重入条件"]
+  skip --> accepted["Trellis CLI 核验并接受跳过记录"]
+  material -->|"是"| items["整理决策项、权限、候选和重要排除项"]
+  items --> evidence["补充适用证据、标准、依赖、优先级和影响"]
+  evidence --> prior{"触发 prior-art review 条件？"}
+  prior -->|"是"| review["有界核对相关开源实现或公开提案"]
+  prior -->|"否"| merge["汇总当前证据"]
+  review --> merge
+  evidence --> teamwork_gate{"只读 Teamwork 评议有净收益？"}
+  teamwork_gate -->|"是"| teamwork["获取并核验只读 Teamwork 报告"]
+  teamwork_gate -->|"否"| merge
+  teamwork --> merge
+  merge --> representation{"候选关系需要条件分支吗？"}
+  representation -->|"是"| tree["建立可追溯决策树并标明相关未知路径"]
+  representation -->|"否"| simple["使用清单、比较表或适用的依赖图"]
+  tree --> assess["核对证据、覆盖范围、关系与当前 revision"]
+  simple --> assess
+  assess -->|"目标或范围变化"| goal_exploration_and_requirements["回到目标探索与需求核对阶段，更新基线"]
+  assess -->|"证据或候选仍有缺口"| items
+  assess -->|"可供方案收敛"| output["Trellis CLI 接受 DecisionSpace"]
+  accepted --> solution_design_and_convergence["进入解决方案设计与收敛阶段"]
+  output --> solution_design_and_convergence
+```
+
+### 离开阶段的条件
+
+- 有实质决策空间时，候选、关键证据、关系、未知项和推荐均能支持下一阶段比较；不要求固定字段数量或同时使用多种图表。
+- 无实质差异时，跳过记录须能说明当前基线、判断依据和重新进入条件。
+- 保留用户决定不在本阶段锁定；外部参考不替代项目事实或用户选择。

package/dist/templates/common/bundled-skills/trellis-delivery-review-and-closeout/SKILL.md

@@ -0,0 +1,10 @@
+---
+name: trellis-delivery-review-and-closeout
+description: 当前任务进入交付审查与现场收尾阶段时，核对当前交付候选、未结事项、接受条件和资源处置。
+---
+
+# 交付审查与现场收尾阶段
+
+当 `current_phase_id` 为 `delivery_review_and_closeout` 时使用。阅读本 Skill 同目录的 `workflow.md`，只审查当前路线和 revision 下的交付，不在本阶段重新设计或实施。
+
+本阶段核验交付与合同、接受条件、工作包、集成、验证、未结发现和资源事实。当前合同内缺口按最早受影响阶段回流或暂停；合同外遗留应记录责任方、触发条件、影响和后续引用。满足交付条件后由 Trellis CLI 接受；只有明确撤回才进入取消处置。会话交接包是独立附加操作，不是阶段或任务收尾的前置条件。

package/dist/templates/common/bundled-skills/trellis-delivery-review-and-closeout/workflow.md

@@ -0,0 +1,55 @@
+# 交付审查与现场收尾阶段流程
+
+绑定当前 `task_route_revision`、输入和结果 revision，按解决方案设计与收敛阶段确认的优先级和依赖检查任务实施与测试验证阶段的工作包、适用的集成与验证、合同差异和未结发现；只有路线实际涉及必需子任务或受托资源时，才核对相应事实。分析型路线只核对实际分析产物，不制造实施工作包。验证按通过、失败、未运行或受限记录；合同允许且风险可接受时说明未运行原因、影响和替代证据，否则暂停或回到任务实施与测试验证阶段。
+
+实施、集成或必需验证缺陷回到任务实施与测试验证阶段；方案、合同、风险、依赖、回退或停止条件失效回到解决方案设计与收敛阶段；候选、标准或条件变化回到决策空间构造与归并阶段；目标、范围或接受目标变化回到目标探索与需求核对阶段。必要证据缺失时，暂停并停留在交付审查与现场收尾阶段；必要用户决定缺失时，通过 `pennix-decision-grill` 同步请求决定，答复前保持暂停，收到答复后重新核对当前输入和受影响阶段。当前合同内未完成工作不能改记为遗留后关闭。合同外、已明确延期或撤回后不继续的事项，可在现有收尾产物中记录范围、责任方、触发条件、影响和后续任务引用；没有遗留时不另造清单。
+
+满足当前合同且没有待处理缺口时，由 Trellis CLI 接受交付审查并形成 `delivery_ready`；`no_go` 也须经交付审查与现场收尾阶段后才能完成任务。只有合同、用户明确要求或不可由主代理替代的重要价值与风险取舍需要用户接受时，才等待用户确认。用户要求修改或拒绝时，使当前交付候选失效并按影响回流。调用 `complete` 前核验任务生命周期；只有路线实际创建、委派或依赖外部执行资源时，才核验其处置状态。相关资源仍可能写入、泄露、造成数据风险或状态无法确认时，保留现场并阻止完成。若用户明确撤回，Trellis CLI 将路线收敛为仅包含交付审查与现场收尾阶段并记录原因；存在关联子任务时，逐项记录继续、转为独立任务或取消的决定及依据，继续时保留父子关系，转为独立任务时记录子任务和依据后再解除关系，取消时另行执行子任务自身的取消流程。完成子任务处置后，再核验当前路线实际涉及的外部执行资源；资源仍可能写入、泄露、造成数据风险或状态无法确认时保留现场并阻止取消，风险解除后才调用 `cancel --reason`。
+
+```mermaid
+flowchart TD
+  candidate["绑定当前 revision 的分析产物或实施交付候选"] --> review["按当前合同核验工作包、适用的集成与验证、差异及相关子任务和资源"]
+  review --> gaps{"存在合同内缺口或失效事实？"}
+  gaps -->|"实施、集成或必需验证"| task_implementation["回到任务实施与测试验证阶段"]
+  gaps -->|"方案或合同"| solution_design_and_convergence["回到解决方案设计与收敛阶段"]
+  gaps -->|"候选、标准或条件"| decision_space_construction_and_merging["回到决策空间构造与归并阶段"]
+  gaps -->|"目标、范围或接受目标"| goal_exploration_and_requirements["回到目标探索与需求核对阶段"]
+  gaps -->|"必要证据缺失"| wait["暂停并留在交付审查与现场收尾阶段"]
+  gaps -->|"必要用户决定缺失"| decision_grill["pennix-decision-grill 同步请求必要决定；答复前暂停"]
+  decision_grill --> candidate
+  wait --> candidate
+  gaps -->|"无"| residual{"是否有可保留的合同外或已延期遗留？"}
+  residual -->|"是"| record["记录责任方、触发条件、影响和后续引用"]
+  residual -->|"否"| accept["Trellis CLI 接受 delivery_ready 或 no_go"]
+  record --> accept
+  accept --> user_gate{"交付合同、用户明确要求或不可由主代理替代的价值/风险取舍要求用户接受？"}
+  user_gate -->|"否"| ready["核验任务生命周期及适用资源后按条件 complete"]
+  user_gate -->|"是"| ask_accept["pennix-decision-grill 同步请求用户接受"]
+  ask_accept --> answer{"用户答复是否明确？"}
+  answer -->|"接受"| ready
+  answer -->|"未答复或答复不清"| user_wait["保持暂停并等待明确答复"]
+  user_wait --> candidate
+  answer -->|"要求修订或拒绝"| invalidate["使当前交付候选失效并判断最早受影响阶段"]
+  invalidate -->|"实施、集成或验证"| task_implementation
+  invalidate -->|"候选、标准或条件"| decision_space_construction_and_merging
+  invalidate -->|"方案或合同"| solution_design_and_convergence
+  invalidate -->|"目标、范围或接受目标"| goal_exploration_and_requirements
+  withdraw["用户明确撤回"] --> cancel_route["Trellis CLI 将路线收敛为仅‘交付审查与现场收尾阶段’并记录原因"]
+  cancel_route --> child_disposition{"关联子任务如何处置？"}
+  child_disposition -->|"继续"| child_continue["保留父子关系"]
+  child_disposition -->|"转为独立任务"| child_independent["记录子任务标识与依据后解除父子关系"]
+  child_disposition -->|"取消"| child_cancel["另行执行子任务自身的取消流程"]
+  child_disposition -->|"无关联子任务"| cancelReview
+  child_continue --> cancelReview
+  child_independent --> cancelReview
+  child_cancel --> cancelReview
+  cancelReview["核验当前路线涉及的子任务和资源处置"]
+  cancelReview --> safe{"是否仍有资源可能写入、泄露或造成数据风险？"}
+  safe -->|"是或状态未知"| preserve["保留现场并阻止取消"]
+  preserve --> cancelReview
+  safe -->|"否"| cancel["Trellis CLI cancel --reason"]
+```
+
+### 与会话交接的边界
+
+正式会话交接包仅在用户明确要求时按其独立 Skill 处理。它不改变阶段、路线或任务状态，也不是 `delivery_ready`、`complete` 或 `cancel` 的前置条件。

package/dist/templates/common/bundled-skills/trellis-goal-exploration-and-requirements/SKILL.md

@@ -0,0 +1,10 @@
+---
+name: trellis-goal-exploration-and-requirements
+description: 当前任务处于目标探索与需求核对阶段时，核对目标、范围、成功条件、约束、证据与用户确认。
+---
+
+# 目标探索与需求核对阶段
+
+当 Trellis 任务的 `current_phase_id` 为 `goal_exploration_and_requirements` 时使用。先阅读本 Skill 同目录的 `workflow.md`，再按当前项目事实选择必要的探索深度和证据来源。
+
+阶段产物和用户确认通过 Trellis CLI 记录。离开本阶段前，必须由用户明确确认绑定当前 `artifact_revision` 的目标与需求基线；只要求修订或尚未确认时，继续停留在本阶段。确认不等于最终方案批准或实施授权。

package/dist/templates/common/bundled-skills/trellis-goal-exploration-and-requirements/workflow.md

@@ -0,0 +1,33 @@
+# 目标探索与需求核对阶段流程
+
+先核对用户请求、目标对象和项目背景。新项目明确问题、用户、领域及系统边界；既有项目核对目标仓库、组件、当前版本、适用规则、现状和影响范围。按问题选择本地源码、历史记录、外部资料或用户维护知识等证据来源；只在独立取证有净收益时使用 Trellis Teamwork。
+
+整理目标、范围、成功条件、关键约束和责任方。区分已知事实、假设、证据冲突和未知事项；缺少会改变目标或路线的用户事实时，通过 `pennix-decision-grill` 同步询问。记录会阻断推进的问题及恢复条件；不影响当前路线的事项可明确责任方和后续处理。
+
+形成 `phase_output`，至少包含当前目标与需求基线、必要证据、不确定性、`phase_result` 和非约束性的 `route_advice`。`route_advice` 简要说明任务类型、复杂度画像和项目背景如何影响阶段选择，并记录复杂度判断的实际触发维度与理由；不机械计分或套用固定路由矩阵，也不要求固定字段或篇幅。路线发生变化时，使用 Trellis CLI 更新受影响的分类和阶段，并按影响范围重新核验。阶段可等待用户补充或因依赖阻塞；只有用户确认当前基线且阶段产物有效时，才以 `accepted` 离开本阶段。将阶段产物及引用提交 Trellis CLI 核验后，向用户展示简明基线并请求确认或修订。
+
+```mermaid
+flowchart TD
+  request["核对请求、项目背景和目标对象"] --> evidence["选择必要证据并核验现状"]
+  evidence --> baseline["整理目标、范围、成功条件与约束"]
+  baseline --> enough{"关键事实是否足以形成基线？"}
+  enough -->|"否，需用户补充"| ask["Trellis CLI 记录 needs_user_input；同步询问"]
+  ask --> wait["等待答复并留在目标探索与需求核对阶段"]
+  wait --> evidence
+  enough -->|"否，依赖阻断"| blocked["记录 blocked 与恢复条件"]
+  blocked -->|"依赖恢复后"| evidence
+  enough -->|"是"| output["形成 phase_output 并由 Trellis CLI 核验"]
+  output --> confirm["向用户展示当前基线并请求确认"]
+  confirm --> decision{"用户是否明确确认当前版本？"}
+  decision -->|"要求修订"| evidence
+  decision -->|"尚未确认"| wait
+  decision -->|"明确确认"| gate["以当前 artifact_revision 记录确认并接受阶段"]
+  gate --> route["按当前路线选择后续阶段；跳过决策空间构造与归并阶段也保留此确认"]
+```
+
+### 离开阶段的条件
+
+- `accepted` 及明确用户确认必须绑定当前 `artifact_revision`；产物改变后重新核验并取得确认。
+- `needs_user_input` 或 `blocked` 时不推进阶段游标。
+- `terminated` 不代表用户撤回任务；如用户明确撤回，按交付审查与现场收尾阶段中的取消审查处理。
+- 可从目标探索与需求核对阶段直接进入解决方案设计与收敛阶段，但不能绕过需求基线确认。

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

@@ -1,20 +1,20 @@
 ---
 name: trellis-meta
-description: "Understand and customize the local Trellis architecture inside a user project. Use when modifying .trellis plus platform hooks, settings, agents, skills, commands, prompts, workflows, the channel runtime (trellis channel), bundled runtime agents under .trellis/agents/, selectable workflow templates, registry-backed spec refresh, cross-session memory (trellis mem) generated by trellis init, or AI-facing bundled skills and their auto-dispatch flow."
+description: "Understand and customize the local Trellis architecture inside a user project. Use when modifying .trellis plus platform hooks, settings, agents, skills, commands, prompts, workflows, the Teamwork runtime (trellis teamwork), bundled runtime agents under .trellis/agents/, selectable workflow templates, registry-backed spec refresh, cross-session memory (trellis mem) generated by trellis init, or bundled skills and their auto-dispatch flow."
 ---
 
 # Trellis Meta
 
 This skill is for local Trellis users who have already run `trellis init` in a project. After reading it, an AI should understand the Trellis architecture, operating model, and customization entry points inside that user project, then modify the generated `.trellis/` and platform directory files according to the user's request.
 
-Trellis v0.6 adds three architectural surfaces on top of the pre-v0.6 workflow / persistence / platform model. First, a multi-agent collaboration runtime: `trellis channel` coordinates multiple AI worker processes through project-scoped JSONL event logs at `~/.trellis/channels/<project>/<channel>/events.jsonl`, with worker OOM guard, forum/thread channels, durable idempotency keys, and bundled `.trellis/agents/{check,implement,subnode}.md` runtime definitions. Second, cross-session memory: `trellis mem list | search | context | extract | projects` reads raw Claude Code, Codex, and Pi Agent JSONL already on disk, slices by `--phase brainstorm|implement|all`, and never uploads anything. Third, a dual-package npm release: `@pennixrv/trellis` (CLI) and `@pennixrv/trellis-core` (SDK with `/channel`, `/task`, `/mem`, `/testing` subpaths) ship in lockstep on one version. Treat these as first-class customization surfaces alongside the per-platform integration files.
+Trellis v0.6 adds three architectural surfaces on top of the pre-v0.6 workflow / persistence / platform model. First, the Teamwork runtime: `trellis teamwork` coordinates teammate processes through project-scoped JSONL event logs at `~/.trellis/teamwork/<project>/<session>/events.jsonl`, with a process guard, forum threads, durable idempotency keys, and a bundled `.trellis/agents/teammate.md` role card. Second, cross-session memory: `trellis mem list | search | context | extract | projects` reads raw Claude Code, Codex, and Pi Agent JSONL already on disk, slices by `--phase brainstorm|implement|all`, and never uploads anything. Third, a dual-package npm release: `@pennixrv/trellis` (CLI) and `@pennixrv/trellis-core` (SDK with `/teamwork`, `/task`, `/mem`, `/testing` subpaths) ship in lockstep on one version. Treat these as first-class customization surfaces alongside the per-platform integration files.
 
 The default operating scope is local files in the user project:
 
 - `.trellis/`: workflow, config, tasks, spec, workspace, scripts, bundled runtime agents, and runtime state.
 - Platform directories: `.claude/`, `.codex/`, `.cursor/`, `.opencode/`, `.kiro/`, `.gemini/`, `.qoder/`, `.codebuddy/`, `.github/`, `.factory/`, `.pi/`, `.reasonix/`, `.kilocode/`, `.agent/`, `.devin/`, `.kimi-code/`, `.dsh/`, and similar directories. Pi additionally exposes a native `trellis_subagent` tool with `single` / `parallel` / `chain` dispatch modes, throttled progress cards, and `isTrellisAgent()` validation on top of the file layout. Reasonix stores both workflow skills and subagent skills as `.reasonix/skills/<name>/SKILL.md`; subagent skills carry `runAs: subagent` frontmatter. Kimi Code keeps workflow skills in the shared `.agents/skills/` layer and delivers commands plus agent prompts as `.kimi-code/skills/<name>/SKILL.md`. DeepSeek Harness keeps shared workflow skills under `.agents/skills/` and DSH-private commands plus `trellis-agent-*` role skills under `.dsh/skills/`; with the optional `dsh-trellis` plugin its continuable subagents use event-driven settlement waits, otherwise required children are dispatched in the foreground from the start.
 - Shared skill layer: `.agents/skills/`.
-- User-owned channel store outside the project tree: `~/.trellis/channels/<project>/<channel>/events.jsonl`.
+- User-owned Teamwork Session store outside the project tree: `~/.trellis/teamwork/<project>/<session>/events.jsonl`.
 - Raw platform conversation logs queryable via `trellis mem`: `~/.claude/projects/`, `~/.codex/sessions/`, and `~/.pi/agent/sessions/` (OpenCode adapter degraded for the v0.6 line).
 
 Do not assume the user has the Trellis source repository. Do not default to modifying the global npm install directory or `node_modules` — both `@pennixrv/trellis` and `@pennixrv/trellis-core` ship as published packages sharing one version and one git tag per release.
@@ -23,7 +23,7 @@ Do not assume the user has the Trellis source repository. Do not default to modi
 
 1. Read `references/local-architecture/overview.md` first to establish the local Trellis system model.
 2. If the request involves a specific AI tool, read `references/platform-files/platform-map.md` and the relevant platform file notes.
-3. If the request involves multi-agent dispatch or channel workers, read `references/local-architecture/multi-agent-channel.md` and the bundled `.trellis/agents/` files.
+3. If the request involves Teamwork coordination or teammate sessions, read `references/local-architecture/multi-agent-teamwork.md` and the bundled `.trellis/agents/` files.
 4. If the user wants to change behavior, read `references/customize-local/overview.md`, then open the specific customization topic.
 5. Before editing, read the actual files in the user project and treat local content as authoritative.
 
@@ -31,46 +31,46 @@ Do not assume the user has the Trellis source repository. Do not default to modi
 
 ### Local Architecture
 
-- `references/local-architecture/overview.md`: The layered local Trellis architecture (workflow / persistence / platform / channel runtime) and customization principles.
+- `references/local-architecture/overview.md`: The layered local Trellis architecture (workflow / persistence / platform / Teamwork runtime) and customization principles.
 - `references/local-architecture/generated-files.md`: Files generated by `trellis init` and their customization boundaries, including `.trellis/agents/`.
-- `references/local-architecture/workflow.md`: Phases, routing, workflow-state blocks, and selectable workflow templates (`native`, `tdd`, `channel-driven-subagent-dispatch`, marketplace) in `.trellis/workflow.md`.
+- `references/local-architecture/workflow.md`: Phases, routing, workflow-state blocks, the bundled `native` workflow, and explicitly sourced custom workflows in `.trellis/workflow.md`.
 - `references/local-architecture/task-system.md`: Task directories, active task, JSONL context, parent/child task trees, and task runtime.
 - `references/local-architecture/spec-system.md`: How `.trellis/spec/` is organized, injected, and refreshed from a `registry.spec` source.
 - `references/local-architecture/workspace-memory.md`: `.trellis/workspace/` journals plus `trellis mem` cross-session recall and the `@pennixrv/trellis-core/mem` SDK.
-- `references/local-architecture/context-injection.md`: Hooks, sub-agent preludes, and channel-runtime worker inbox routing.
-- `references/local-architecture/multi-agent-channel.md`: `trellis channel` subcommands, project-scoped event store, forum/thread channels, worker OOM guard, durable idempotency, and bundled `.trellis/agents/` runtime agents.
-- `references/local-architecture/bundled-skills.md`: Auto-dispatched bundled skills (`trellis-channel`, `trellis-meta`, `trellis-research-record`, `trellis-session-insight`, `trellis-spec-bootstrap`) and how `getBundledSkillTemplates()` ships them to every platform skill root.
+- `references/local-architecture/context-injection.md`: Hooks, sub-agent preludes, and Teamwork message inbox routing.
+- `references/local-architecture/multi-agent-teamwork.md`: `trellis teamwork`, Teamwork Session storage, teammate process guard, task ownership boundary, and bundled `.trellis/agents/` runtime instructions.
+- `references/local-architecture/bundled-skills.md`: Bundled skills under `packages/cli/src/templates/common/bundled-skills/` and how `getBundledSkillTemplates()` ships them to platform skill roots.
 
 ### Platform Files
 
-- `references/platform-files/overview.md`: How shared `.trellis/` files relate to platform directories and the four platform integration modes (hook-driven, agent prelude, main-session workflow, channel runtime).
+- `references/platform-files/overview.md`: How shared `.trellis/` files relate to platform directories and the three platform integration modes (hook-driven, agent prelude, main-session workflow).
 - `references/platform-files/platform-map.md`: Platform directories and paths for skills, agents, hooks, and extensions across all supported platforms including DeepSeek Harness, Reasonix, and Pi's native `trellis_subagent` extension.
-- `references/platform-files/hooks-and-settings.md`: How settings/config files, hooks, plugins, and extensions connect to Trellis; covers `channel.worker_guard.*`, `channel.subnode.*`, and `codex.dispatch_mode`.
-- `references/platform-files/agents.md`: Per-platform `trellis-research` / `trellis-implement` / `trellis-check` sub-agent files plus bundled `.trellis/agents/{check,implement}.md` for the channel runtime.
+- `references/platform-files/hooks-and-settings.md`: How settings/config files, hooks, plugins, and extensions connect to Trellis; covers `teamwork.teammate_guard.*` and `codex.dispatch_mode`.
+- `references/platform-files/agents.md`: Per-platform `trellis-research` / `trellis-implement` / `trellis-check` sub-agent files plus the bundled `.trellis/agents/teammate.md` role card.
 - `references/platform-files/skills-and-commands.md`: Differences between skills, commands, prompts, and workflows, plus how to change them.
 
 ### Local Customization
 
 - `references/customize-local/overview.md`: Choose the right local customization entry point for the user's request.
 - `references/customize-local/change-workflow.md`: Change phases, routing, next actions, workflow-state, and the selected workflow template.
-- `references/customize-local/change-task-lifecycle.md`: Change task creation, status, archive behavior, parent/child links, archive slug collision handling, and lifecycle hooks.
-- `references/customize-local/change-context-loading.md`: Change how tasks, specs, journals, hook context, channel inbox messages, and `trellis mem` recall are loaded.
+- `references/customize-local/change-task-lifecycle.md`: Change task creation, lifecycle and phase state, parent/child links, and lifecycle hooks.
+- `references/customize-local/change-context-loading.md`: Change how tasks, specs, journals, hook context, Teamwork inbox messages, and `trellis mem` recall are loaded.
 - `references/customize-local/change-hooks.md`: Change platform hooks, settings, task lifecycle hooks (`hooks.after_*`), and shell session bridges.
-- `references/customize-local/change-agents.md`: Change research, implement, and check agent behavior across platform sub-agents, bundled channel runtime agents, and the Codex `dispatch_mode` toggle.
+- `references/customize-local/change-agents.md`: Change research, implement, and check agent behavior across platform sub-agents, the Teamwork teammate role card, and the Codex `dispatch_mode` toggle.
 - `references/customize-local/change-skills-or-commands.md`: Add or modify local skills, commands, prompts, and workflows; covers upstream bundled-skill auto-dispatch.
 - `references/customize-local/change-spec-structure.md`: Adjust the project spec structure under `.trellis/spec/`, including registry-backed sources.
 - `references/customize-local/add-project-local-conventions.md`: Put team rules into project-local specs or local skills.
 
 ## Current Rules
 
-- `.trellis/workflow.md` is the local workflow source of truth; its initial content was selected from a workflow template (built-in `native`, `tdd`, `channel-driven-subagent-dispatch`, or a marketplace template) at `trellis init` time and can be re-selected via `trellis workflow --template <id>`. Missing `.trellis/agents/<name>.md` files referenced by the active template trigger a non-blocking stderr warning pointing at `trellis update`.
-- `.trellis/config.yaml` is the project-level Trellis configuration entry point. It hosts task lifecycle hooks (`hooks.after_create` / `after_start` / `after_finish` / `after_archive`), journal shape (`session_commit_message` / `max_journal_lines` / `session_auto_commit`), generic channel worker guard (`channel.worker_guard.idle_timeout` / `max_live_workers`), bounded subnode defaults (`channel.subnode.max_live_workers` / `idle_timeout` / `timeout` / `warn_before`), Codex dispatch mode (`codex.dispatch_mode: inline | sub-agent`), and the spec registry block (`registry.spec.source` + `registry.spec.template`).
-- `.trellis/spec/` stores the user's project-specific coding conventions and design constraints. When `registry.spec` is set, files are refreshed by `trellis update`; local edits surface as "modified by user" conflicts in `.trellis/.template-hashes.json`.
-- `.trellis/tasks/` stores task PRDs, design notes, implement plans, research files, and JSONL context. Tasks form parent/child trees: `task.py create --parent <slug>`, `task.py add-subtask <parent> <child>`, `task.py remove-subtask <parent> <child>`, and `task.py list-context <task>`. `task.py create` rejects a slug already present in `.trellis/tasks/archive/**`.
+- `.trellis/workflow.md` is the local workflow source of truth. By default, `trellis init` writes the bundled `native` workflow; a custom workflow is available only when its source is explicitly supplied, and can be re-selected via `trellis workflow --template <id> --workflow-source <source>`. Missing `.trellis/agents/<name>.md` files referenced by the active template trigger a non-blocking stderr warning pointing at `trellis update`.
+- `.trellis/config.yaml` is the project-level Trellis configuration entry point. It hosts task lifecycle hooks (`hooks.after_create` / `after_start` / `after_finish`), journal shape (`session_commit_message` / `max_journal_lines` / `session_auto_commit`), Teamwork teammate guard (`teamwork.teammate_guard.idle_timeout` / `max_live_teammates`), Codex dispatch mode (`codex.dispatch_mode: inline | sub-agent`), and the spec registry block (`registry.spec.source` + `registry.spec.template`).
+- `.trellis/spec/` stores the user's project-specific coding conventions and design constraints. When `registry.spec` is set, files are refreshed by `trellis update`; local edits surface as `modified by user` conflicts in `.trellis/.template-hashes.json`.
+- `.trellis/tasks/` stores task records, planning artifacts, research, and JSONL context. Tasks remain in place after completion or cancellation. Tasks form parent/child trees through `task.py create --parent`, `add-subtask`, `remove-subtask`, and `list-context`.
 - `.trellis/workspace/` stores **deliberately written** developer journals. Raw cross-session dialogue is **not** stored here — it lives on disk under `~/.claude/projects/`, `~/.codex/sessions/`, and `~/.pi/agent/sessions/` and is recovered via `trellis mem search|extract|context`. The bundled `trellis-session-insight` skill teaches when to reach for `mem`.
-- `.trellis/agents/{check,implement,subnode}.md` are bundled, platform-agnostic channel runtime agent definitions loaded by `trellis channel spawn --agent <name>`. Editable; `trellis update` backfills missing ones. Editing the per-platform `trellis-implement.md` / `trellis-check.md` does **not** change channel-runtime worker behavior.
-- `~/.trellis/channels/<project>/<channel>/events.jsonl` is the channel runtime event log per project per channel. User-owned, file-locked sequence numbering, durable `idempotencyKey` support; never under `.trellis/`.
-- Bundled multi-file skills are auto-dispatched to every platform skill root by `getBundledSkillTemplates()` in `packages/cli/src/templates/common/index.ts`. Dropping a new directory under `packages/cli/src/templates/common/bundled-skills/` (upstream) ships it to every platform on the next `trellis update`.
+- `.trellis/agents/teammate.md` is the bundled, platform-agnostic instruction card loaded for a teammate by `trellis teamwork spawn --agent teammate`. Editable; `trellis update` backfills it if missing. Editing the per-platform `trellis-implement.md` / `trellis-check.md` does **not** change Teamwork teammate behavior.
+- `~/.trellis/teamwork/<project>/<session>/events.jsonl` is the Teamwork Session event log. User-owned, file-locked sequence numbering, durable `idempotencyKey` support; never under `.trellis/`.
+- Directories under `packages/cli/src/templates/common/bundled-skills/` are auto-dispatched to platform skill roots by `getBundledSkillTemplates()` in `packages/cli/src/templates/common/index.ts`. Adding a directory there is enough for the shared loader to include it on the next `trellis init` or `trellis update`.
 - Platform settings/config files decide which hooks, agents, skills, commands, prompts, and workflows actually run. Reasonix has no settings file — behavior is encoded inside skill frontmatter.
 - `.trellis/.template-hashes.json` and `.trellis/.runtime/` are management/runtime state files. Confirm necessity before editing them.
 
@@ -79,7 +79,7 @@ Do not assume the user has the Trellis source repository. Do not default to modi
 - Do not treat Trellis upstream source code as the default target for local customization.
 - Do not modify the global npm install directory or `node_modules/@pennixrv/trellis` or `node_modules/@pennixrv/trellis-core` to implement project needs; both packages ship in lockstep.
 - Do not overwrite user-modified local files with default templates; check `.trellis/.template-hashes.json` first and prefer `.new` sidecar files over destructive overwrites.
-- Do not put team-private project rules into any public bundled skill (`trellis-meta`, `trellis-spec-bootstrap`, `trellis-session-insight`, `trellis-channel`); put project rules in `.trellis/spec/`, a project-local skill, the current task, or the workspace journal — `trellis update` will overwrite anything inside a bundled skill directory.
-- Do not hand-edit `~/.trellis/channels/<project>/<channel>/events.jsonl`; sequence numbers are assigned under a file lock and replay-safe writes go through the `trellis channel` CLI or the `@pennixrv/trellis-core/channel` SDK.
-- Do not edit `.claude/agents/trellis-implement.md` (or any other per-platform sub-agent file) when the goal is to change channel runtime worker behavior — edit `.trellis/agents/<name>.md` instead.
+- Do not put team-private project rules into a public bundled skill; put project rules in `.trellis/spec/`, a project-local skill, the current task, or the workspace journal — `trellis update` will overwrite anything inside a bundled skill directory.
+- Do not hand-edit `~/.trellis/teamwork/<project>/<session>/events.jsonl`; sequence numbers are assigned under a file lock and replay-safe writes go through the `trellis teamwork` CLI or the `@pennixrv/trellis-core/teamwork` SDK.
+- Do not edit `.claude/agents/trellis-implement.md` (or any other per-platform sub-agent file) when the goal is to change Teamwork teammate behavior — edit `.trellis/agents/teammate.md` instead.
 - Do not describe removed or never-shipped mechanisms as current Trellis behavior; cross-check against the local `.trellis/config.yaml` and the installed CLI's `trellis --help` before claiming a knob exists.

package/dist/templates/common/bundled-skills/trellis-meta/references/customize-local/change-agents.md

@@ -5,7 +5,7 @@ When the user wants to change `trellis-research`, `trellis-implement`, or `trell
 ## Read These Files First
 
 1. Target platform agent directory
-2. `.trellis/workflow.md` Phase 2 / research routing
+2. `.trellis/workflow.md` Decision Space Construction and Consolidation Phase / research routing
 3. Current task `prd.md`
 4. Current task `implement.jsonl` / `check.jsonl`
 5. Relevant hook or agent prelude

package/dist/templates/common/bundled-skills/trellis-meta/references/customize-local/change-skills-or-commands.md

@@ -4,10 +4,11 @@ When the user wants to change AI entry points, auto-trigger rules, or explicit c
 
 Before editing, classify the skill you are about to touch:
 
-- **Bundled upstream skill** — `trellis-meta`, `trellis-spec-bootstrap`, `trellis-session-insight`, `trellis-channel`. Source of truth lives in the Trellis CLI repo under `packages/cli/src/templates/common/bundled-skills/<name>/`; auto-dispatched to every platform's skill root by `getBundledSkillTemplates()` on `trellis init` / `trellis update`. Local edits here are tracked by `.trellis/.template-hashes.json` and will be flagged on the next update.
-- **Project-local skill** — anything else under `.{platform}/skills/`. Owned by the user; not refreshed by `trellis update`.
+- **Bundled skill** — any directory under `packages/cli/src/templates/common/bundled-skills/` in the Trellis CLI repo. The shared loader dispatches these skills to platform skill roots on `trellis init` / `trellis update`; local edits are tracked by `.trellis/.template-hashes.json` and flagged on update.
+- **Other Trellis-generated skill** — a single-file workflow skill under `packages/cli/src/templates/common/skills/` or a platform-specific skill under `packages/cli/src/templates/<platform>/skills/`. Edit its source template; deployed files are managed by Trellis.
+- **Project-local or separately installed skill** — a skill not produced by a Trellis template. Trellis does not refresh it; follow the project owner's or installing tool's update process.
 
-The remainder of this file uses "skill" for the local file; the override and conflict rules differ between the two cases.
+For the source paths and generated layout of each Trellis skill type, see [Bundled Skills](../local-architecture/bundled-skills.md). The remainder of this file uses "skill" for the local file; ownership and update behavior depend on its source.
 
 ## Read These Files First
 
@@ -20,7 +21,7 @@ The remainder of this file uses "skill" for the local file; the override and con
 ## Which Entry Type To Choose
 
 | Goal | Recommendation |
-| --- | --- |
+| ------------------------------------------------------------------------ | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
 | AI should automatically know a capability | Add or modify a skill. |
 | User wants to trigger manually with a command | Add or modify a command/prompt/workflow. |
 | Team project conventions | Prefer `.trellis/spec/` or a project-local skill — never a bundled skill directory. |
@@ -50,15 +51,15 @@ Do not write vague descriptions such as "helpful project skill"; they can trigge
 
 ### Bundled vs. Project-Local
 
-The same directory shape is used by two very different ownership models:
+Bundled and project-local skills can share a similar on-disk layout but have different owners:
 
-| Aspect | Bundled (`trellis-meta`, `trellis-spec-bootstrap`, `trellis-session-insight`, `trellis-channel`) | Project-local |
-| --- | --- | --- |
+| Aspect                     | Bundled (any directory under `packages/cli/src/templates/common/bundled-skills/`)                                                                                | Project-local                                          |
+| -------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------ |
 | Source of truth | `packages/cli/src/templates/common/bundled-skills/<name>/` in Trellis CLI repo | Inside the user project itself |
 | Dispatch | Auto-dispatched to every platform skill root by `getBundledSkillTemplates()` (`packages/cli/src/templates/common/index.ts`) on `trellis init` / `trellis update` | Created by the user (or another skill) and never moved |
 | Hash tracking | Every file recorded in `.trellis/.template-hashes.json`; conflict prompt on update | Not tracked |
 | Editing locally | Allowed but will be marked "modified by user" on next update | Free editing |
-| The right way to customize | Add a *new* project-local skill with a *different* name that supplements (or supersedes) the bundled one | Edit the file directly |
+| The right way to customize | Add a _new_ project-local skill with a _different_ name that supplements (or supersedes) the bundled one                                                         | Edit the file directly                                 |
 
 If the goal is "make my project's AI behave differently when discussing release notes," the answer is almost always a project-local skill, not surgery on `trellis-meta/`.
 
@@ -76,7 +77,7 @@ If a command only repeats workflow rules, prefer making it reference/read `.trel
 ## Common Paths
 
 | Platform | Entry directories |
-| --- | --- |
+| -------------------------- | -------------------------------------------------------------------------------------- |
 | Claude Code | `.claude/skills/`, `.claude/commands/` |
 | Cursor | `.cursor/skills/`, `.cursor/commands/` |
 | OpenCode | `.opencode/skills/`, `.opencode/commands/` |
@@ -92,7 +93,7 @@ If a command only repeats workflow rules, prefer making it reference/read `.trel
 | ZCode | `.zcode/skills/`, `.zcode/commands/` |
 | Kilo / Antigravity / Devin | workflows + skills |
 
-Every directory above is a deploy target for the four bundled skills. Each platform receives a full copy on `trellis init` and refresh on `trellis update`; nothing has to be wired by hand.
+Platforms with a skill root receive the bundled skills discovered by the shared loader on `trellis init` and manage them through `trellis update`; no per-skill platform wiring is required.
 
 ## Add A Project-Local Skill
 
@@ -105,19 +106,12 @@ If the user wants to document team-private customizations, create a project-loca
 
 For multi-platform projects, add equivalent versions in each platform skill directory, or use `.agents/skills/` on platforms that support the shared layer (Codex, Gemini CLI).
 
-Pick a name that does **not** collide with the bundled set:
-
-- `trellis-meta`
-- `trellis-spec-bootstrap`
-- `trellis-session-insight`
-- `trellis-channel`
-
-A reused name causes `getBundledSkillTemplates()` to overwrite the project-local copy on the next update. A common convention is to prefix the project name: `acme-trellis-deploy`, `acme-trellis-onboarding`.
+Before choosing a project-local skill name, check `packages/cli/src/templates/common/bundled-skills/`, `packages/cli/src/templates/common/skills/`, and the target platform's `packages/cli/src/templates/<platform>/skills/`; a matching name can target the same path during `trellis init` or `trellis update`. A common convention is to prefix the project name: `acme-trellis-deploy`, `acme-trellis-onboarding`.
 
 ## Notes
 
 - Do not mix every platform's syntax into one file.
 - Do not change only one platform entry point while claiming all platforms are supported.
 - Do not hide long-term engineering conventions inside a command; write them to `.trellis/spec/`.
-- Do not hand-edit files inside `trellis-meta/`, `trellis-spec-bootstrap/`, `trellis-session-insight/`, or `trellis-channel/` under any `.{platform}/skills/` directory expecting the change to persist — they are bundled and refreshed by `trellis update`. Either contribute upstream or add a project-local skill that complements them.
+- Do not hand-edit files inside a bundled skill directory under any `.{platform}/skills/` directory expecting the change to persist — they are refreshed by `trellis update`. Either contribute upstream or add a project-local skill that complements them.
 - After `trellis update` reports a "modified by you" conflict on a bundled skill file, choose **keep** only if you accept maintaining the divergence by hand; otherwise accept the overwrite and re-apply the intent as a project-local skill.

package/dist/templates/common/bundled-skills/trellis-meta/references/customize-local/change-spec-structure.md

@@ -6,7 +6,7 @@ When the user wants to change the engineering conventions AI follows, add new sp
 
 1. `.trellis/config.yaml`
 2. `.trellis/spec/`
-3. `.trellis/workflow.md` planning artifact guidance and Phase 3.3
+3. `.trellis/workflow.md` planning artifact guidance in Solution Design and Convergence Phase
 4. Current task `implement.jsonl` / `check.jsonl`
 
 ## Common Needs