Merge remote-tracking branch 'origin/worktree-hooks-e-protocol' into worktree-hooks-f-bridges

examples/acp-agent/cordis.yml

@@ -1,9 +1,8 @@
 # The acp-agent plugin tree: the ACP server. Also the snapshot RECORD config
 # (the dsh-acp-agent bin selects it for DSH_SNAPSHOT=record): a real llm-deepseek
-# run whose persisted log the snapshot harness harvests. Just the two swappable
-# backends — the DeepSeek adapter and the local bash executor — plus the ACP
-# server app (@deepseek-ai/dsh-acp-agent), which bundles the agent-core spine,
-# JSONL persistence, and the ACP bridge.
+# run whose persisted log the snapshot harness harvests. The swappable DeepSeek
+# adapter and local bash executor, the ACP server app (@deepseek-ai/dsh-acp-agent),
+# and the optional model-facing subagent/todo tools loaded below.
 #
 # CRITICAL: this tree loads NO stdout logger and NO hmr — stdout is reserved for
 # the ACP JSON-RPC protocol (see packages/ui/acp). That guarantee is now a
@@ -51,7 +50,9 @@
 
       Use the subagent tool to delegate a focused, self-contained subtask to
       a fresh child agent (it works in its own context and returns only its
-      final result) — give it a complete, standalone instruction.
+      final result) — give it a complete, standalone instruction. Use
+      subagent_fork instead when the subtask needs THIS conversation's
+      context: the child inherits the log so far.
 
       For multi-step work, use the todo_write tool to track a task list:
       send the WHOLE list each call (it replaces the previous one), keep at