fix: align s16-s19 teaching tool consistency

Author: Gui-Yue

s16_team_protocols/README.en.md

@@ -25,7 +25,7 @@ Both scenarios share the same structure: one side sends a request, the other rep
 
 ![Team Protocols Overview](images/team-protocols-overview.svg)
 
-Teaching code carries forward S15's capabilities (MessageBus, spawn_teammate, inbox injection, background execution, cron scheduling). To stay focused on the protocol mechanism, it omits full error recovery, memory, and skill systems. Added: **ProtocolState** (request state tracking), **dispatch_message** (routes incoming messages by type to handlers), **match_response** (correlates response to request via request_id, with type validation).
+Teaching code continues the agent capability arc from earlier chapters and adds structured protocols on top of S15's team communication. To stay focused on the protocol mechanism, it omits full error recovery, memory, and skill systems. Added: **ProtocolState** (request state tracking), **dispatch_message** (routes incoming messages by type to handlers), **match_response** (correlates response to request via request_id, with type validation).
 
 Two protocols, one mechanism:
 
@@ -192,7 +192,7 @@ Shutdown handshake complete: request → confirm → shutdown. Every step tracke
 | New message types | message, result | + shutdown_request/response, plan_approval_request/response |
 | Teammate lifecycle | Max 10 rounds | Idle loop (waits for inbox messages) |
 | Lead inbox | check_inbox and main loop read separately | Unified consume_lead_inbox |
-| Lead tools | 14 (s15) | + request_shutdown, request_plan, review_plan (17) |
+| Lead tools | 14 (s15) | 14 (core tool set plus request_shutdown, request_plan, review_plan) |
 | Teammate tools | 4 (s15) | + submit_plan (5) |
 
 ---

s16_team_protocols/README.ja.md

@@ -25,7 +25,7 @@ s15 のチームメイトは仕事ができるが、連携は緩い：Lead が
 
 ![Team Protocols Overview](images/team-protocols-overview.svg)
 
-教学版は S15 の能力（MessageBus、spawn_teammate、inbox 注入、バックグラウンド実行、cron スケジューリング）を踏襲。プロトコル機構に集中するため、完全なエラーリカバリ、メモリ、スキルシステムは省略。追加：**ProtocolState**（リクエスト状態追跡）、**dispatch_message**（メッセージタイプ別ルーティング）、**match_response**（request_id でリクエストとレスポンスを関連付け、型検証付き）。
+教学版は前章までの Agent 能力の流れを受け継ぎ、S15 のチーム通信の上に構造化プロトコルを追加する。プロトコル機構に集中するため、完全なエラーリカバリ、メモリ、スキルシステムは省略。追加：**ProtocolState**（リクエスト状態追跡）、**dispatch_message**（メッセージタイプ別ルーティング）、**match_response**（request_id でリクエストとレスポンスを関連付け、型検証付き）。
 
 2 つのプロトコル、1 つの仕組み：
 
@@ -192,7 +192,7 @@ LLM が非 tool_use を返す
 | 新規メッセージ型 | message, result | + shutdown_request/response, plan_approval_request/response |
 | チームメイトライフサイクル | 最大 10 ラウンド | idle loop（inbox メッセージを待機） |
 | Lead inbox | check_inbox とメインループが別々に読み取り | 統一 consume_lead_inbox |
-| Lead ツール | 14 (s15) | + request_shutdown, request_plan, review_plan (17) |
+| Lead ツール | 14 (s15) | 14（コアツールセットに request_shutdown、request_plan、review_plan を追加） |
 | チームメイトツール | 4 (s15) | + submit_plan (5) |
 
 ---

s16_team_protocols/README.md

@@ -25,7 +25,7 @@ s15 的队友能干活了，但协调是松散的：Lead 发消息，队友回
 
 ![Team Protocols Overview](images/team-protocols-overview.svg)
 
-教学代码沿用 S15 的能力（MessageBus、spawn_teammate、inbox 注入、后台执行、cron 调度）。为了聚焦协议机制，省略了完整错误恢复、记忆和技能系统。新增三样：**ProtocolState**（请求状态追踪）、**dispatch_message**（按消息类型路由到处理器）、**match_response**（通过 request_id 关联回复与请求，含类型校验）。
+教学代码承接前面章节的 Agent 能力脉络，在 S15 团队通信基础上加入结构化协议。为了聚焦协议机制，省略了完整错误恢复、记忆和技能系统。新增三样：**ProtocolState**（请求状态追踪）、**dispatch_message**（按消息类型路由到处理器）、**match_response**（通过 request_id 关联回复与请求，含类型校验）。
 
 两种协议，一套机制：
 
@@ -194,7 +194,7 @@ LLM 返回非 tool_use
 | 新消息类型 | message, result | + shutdown_request/response, plan_approval_request/response |
 | 队友生命周期 | 最多 10 轮 | idle loop（等待 inbox 消息） |
 | Lead inbox | check_inbox 和主循环分别读 | 统一 consume_lead_inbox |
-| Lead 工具 | 14 (s15) | + request_shutdown, request_plan, review_plan (17) |
+| Lead 工具 | 14 (s15) | 14（核心工具集加入 request_shutdown, request_plan, review_plan） |
 | 队友工具 | 4 (s15) | + submit_plan (5) |
 
 ---

s16_team_protocols/images/team-protocols-overview.en.svg

@@ -201,7 +201,7 @@ Two teammates claim and work in parallel. Lead only creates tasks and spawns tea
 | Lead inbox | Prints only, not in context | consume_lead_inbox injects into history |
 | New functions | — | idle_poll, scan_unclaimed_tasks, consume_lead_inbox |
 | Identity persistence | System prompt only | Auto re-inject after compression |
-| Lead tools | 13 | 14 (+ get_task) |
+| Lead tools | 14 (s16) | 14 (unchanged) |
 | Teammate tools | 5 | 8 (+ list_tasks, claim_task, complete_task) |
 | Teammate exit | Exit after task done | Exit only after 60s idle timeout |
 

s16_team_protocols/images/team-protocols-overview.ja.svg

@@ -201,7 +201,7 @@ if len(messages) <= 3:
 | Lead inbox | 印刷のみ、コンテキストに入らない | consume_lead_inbox で history に注入 |
 | 新規関数 | — | idle_poll, scan_unclaimed_tasks, consume_lead_inbox |
 | 身份保持 | system prompt のみ | 圧縮後に自動再注入 |
-| Lead ツール | 13 | 14（+ get_task） |
+| Lead ツール | 14 (s16) | 14（変更なし） |
 | チームメイトツール | 5 | 8（+ list_tasks, claim_task, complete_task） |
 | チームメイト終了条件 | タスク完了後即終了 | 60s アイドルタイムアウト後のみ終了 |
 

s16_team_protocols/images/team-protocols-overview.svg

@@ -201,7 +201,7 @@ if len(messages) <= 3:
 | Lead inbox | 只打印，不进上下文 | consume_lead_inbox 统一注入 history |
 | 新函数 | — | idle_poll, scan_unclaimed_tasks, consume_lead_inbox |
 | 身份保持 | 仅 system prompt | 压缩后自动重注入 |
-| Lead 工具 | 13 | 14（+ get_task） |
+| Lead 工具 | 14 (s16) | 14（不变） |
 | 队友工具 | 5 | 8（+ list_tasks, claim_task, complete_task） |
 | 队友退出条件 | 完成任务即退出 | 60s 无新任务才退出 |
 

s17_autonomous_agents/README.en.md

@@ -115,7 +115,6 @@ def claim_task(task_id: str, owner: str = "agent") -> str:
         if deps: parts.append(f"blocked by: {deps}")
         if missing: parts.append(f"missing deps: {missing}")
         return "Cannot start — " + ", ".join(parts)
-        return f"Blocked by: {deps}"
     task.owner = owner
     task.status = "in_progress"
     save_task(task)
@@ -145,7 +144,7 @@ def complete_task(task_id: str) -> str:
     "tools": "Available tools: bash, read_file, write_file, "
              "create_task, list_tasks, get_task, claim_task, complete_task, "
              "spawn_teammate, send_message, check_inbox, "
-             "request_shutdown, submit_plan, review_plan.",
+             "request_shutdown, request_plan, review_plan.",
     "workspace": f"Working directory: {WORKDIR}",
     "memory": "Relevant memories are injected below when available.",
 }
@@ -555,9 +554,9 @@ def run_request_shutdown(teammate: str) -> str:
     return f"Shutdown request sent to {teammate} (req: {req_id})"
 
 
-def run_submit_plan(teammate: str, plan: str) -> str:
+def run_request_plan(teammate: str, task: str) -> str:
     """Lead asks a teammate to submit a plan."""
-    BUS.send("lead", teammate, f"Please submit a plan for: {plan}",
+    BUS.send("lead", teammate, f"Please submit a plan for: {task}",
              "message")
     return f"Asked {teammate} to submit a plan"
 
@@ -709,12 +708,12 @@ def run_check_inbox() -> str:
      "input_schema": {"type": "object",
                       "properties": {"teammate": {"type": "string"}},
                       "required": ["teammate"]}},
-    {"name": "submit_plan",
+    {"name": "request_plan",
      "description": "Ask a teammate to submit a plan for review.",
      "input_schema": {"type": "object",
                       "properties": {"teammate": {"type": "string"},
-                                     "plan": {"type": "string"}},
-                      "required": ["teammate", "plan"]}},
+                                     "task": {"type": "string"}},
+                      "required": ["teammate", "task"]}},
     {"name": "review_plan",
      "description": "Approve or reject a submitted plan.",
      "input_schema": {"type": "object",
@@ -733,7 +732,7 @@ def run_check_inbox() -> str:
     "spawn_teammate": run_spawn_teammate,
     "send_message": run_send_message, "check_inbox": run_check_inbox,
     "request_shutdown": run_request_shutdown,
-    "submit_plan": run_submit_plan, "review_plan": run_review_plan,
+    "request_plan": run_request_plan, "review_plan": run_review_plan,
 }