agentclientprotocol
diff --git a/docs/quickstart.md b/docs/quickstart.md
@@ -71,7 +71,7 @@ Or, if using `uv`:
       "args": [
         "run",
         "/abs/path/to/agentclientprotocol/python-sdk/examples/echo_agent.py"
-      ],
+      ]
     }
   }
 }
@@ -92,7 +92,6 @@ import asyncio
 import sys
 from pathlib import Path
 from typing import Any
-from uuid import uuid4
 
 from acp import PROTOCOL_VERSION, spawn_agent_process, text_block
 from acp.interfaces import Client
@@ -116,7 +115,6 @@ async def main() -> None:
         await conn.prompt(
             session_id=session.session_id,
             prompt=[text_block("Hello from spawn!")],
-            message_id=str(uuid4()),
         )
 
 asyncio.run(main())
@@ -135,9 +133,9 @@ from acp import Agent, PromptResponse
 
 
 class MyAgent(Agent):
-    async def prompt(self, prompt, session_id, message_id=None, **kwargs) -> PromptResponse:
+    async def prompt(self, prompt, session_id, **kwargs) -> PromptResponse:
         # inspect prompt, stream updates, then finish the turn
-        return PromptResponse(stop_reason="end_turn", user_message_id=message_id)
+        return PromptResponse(stop_reason="end_turn")
 ```
 
 Run it with `run_agent()` inside an async entrypoint and wire it to your client. Refer to:

diff --git a/examples/agent.py b/examples/agent.py
@@ -103,7 +103,6 @@ async def prompt(
             | EmbeddedResourceContentBlock
         ],
         session_id: str,
-        message_id: str | None = None,
         **kwargs: Any,
     ) -> PromptResponse:
         logging.info("Received prompt request for session %s", session_id)
@@ -113,7 +112,7 @@ async def prompt(
         await self._send_agent_message(session_id, text_block("Client sent:"))
         for block in prompt:
             await self._send_agent_message(session_id, block)
-        return PromptResponse(stop_reason="end_turn", user_message_id=message_id)
+        return PromptResponse(stop_reason="end_turn")
 
     async def cancel(self, session_id: str, **kwargs: Any) -> None:
         logging.info("Received cancel notification for session %s", session_id)

diff --git a/examples/client.py b/examples/client.py
@@ -6,7 +6,6 @@
 import sys
 from pathlib import Path
 from typing import Any
-from uuid import uuid4
 
 from acp import (
     PROTOCOL_VERSION,
@@ -18,6 +17,8 @@
 from acp.core import ClientSideConnection
 from acp.schema import (
     AgentMessageChunk,
+    AgentPlanContentUpdate,
+    AgentPlanRemovedUpdate,
     AgentPlanUpdate,
     AgentThoughtChunk,
     AudioContentBlock,
@@ -102,6 +103,8 @@ async def session_update(
         | ToolCallStart
         | ToolCallProgress
         | AgentPlanUpdate
+        | AgentPlanContentUpdate
+        | AgentPlanRemovedUpdate
         | AvailableCommandsUpdate
         | CurrentModeUpdate
         | ConfigOptionUpdate
@@ -158,7 +161,6 @@ async def interactive_loop(conn: ClientSideConnection, session_id: str) -> None:
             await conn.prompt(
                 session_id=session_id,
                 prompt=[text_block(line)],
-                message_id=str(uuid4()),
             )
         except Exception as exc:
             logging.error("Prompt failed: %s", exc)  # noqa: TRY400

diff --git a/examples/echo_agent.py b/examples/echo_agent.py
@@ -66,7 +66,6 @@ async def prompt(
             | EmbeddedResourceContentBlock
         ],
         session_id: str,
-        message_id: str | None = None,
         **kwargs: Any,
     ) -> PromptResponse:
         for block in prompt:
@@ -76,7 +75,7 @@ async def prompt(
             chunk.content.field_meta = {"echo": True}
 
             await self._conn.session_update(session_id=session_id, update=chunk, source="echo_agent")
-        return PromptResponse(stop_reason="end_turn", user_message_id=message_id)
+        return PromptResponse(stop_reason="end_turn")
 
 
 async def main() -> None:

diff --git a/examples/gemini.py b/examples/gemini.py
@@ -22,6 +22,8 @@
 from acp.core import ClientSideConnection
 from acp.schema import (
     AgentMessageChunk,
+    AgentPlanContentUpdate,
+    AgentPlanRemovedUpdate,
     AgentPlanUpdate,
     AgentThoughtChunk,
     AllowedOutcome,
@@ -124,6 +126,8 @@ async def session_update(  # noqa: C901
         | ToolCallStart
         | ToolCallProgress
         | AgentPlanUpdate
+        | AgentPlanContentUpdate
+        | AgentPlanRemovedUpdate
         | AvailableCommandsUpdate
         | CurrentModeUpdate
         | ConfigOptionUpdate
@@ -143,6 +147,10 @@ async def session_update(  # noqa: C901
             print("\n[plan]")
             for entry in update.entries:
                 print(f" - {entry.status.upper():<10} {entry.content}")
+        elif isinstance(update, AgentPlanContentUpdate):
+            print(f"\n[plan update] {update.plan.id}")
+        elif isinstance(update, AgentPlanRemovedUpdate):
+            print(f"\n[plan removed] {update.id}")
         elif isinstance(update, ToolCallStart):
             print(f"\n🔧 {update.title} ({update.status or 'pending'})")
         elif isinstance(update, ToolCallProgress):

diff --git a/schema/VERSION b/schema/VERSION
@@ -1 +1 @@
-refs/tags/v0.13.3
+refs/tags/v0.13.6
diff --git a/schema/meta.json b/schema/meta.json
@@ -27,8 +27,7 @@
     "session_prompt": "session/prompt",
     "session_resume": "session/resume",
     "session_set_config_option": "session/set_config_option",
-    "session_set_mode": "session/set_mode",
-    "session_set_model": "session/set_model"
+    "session_set_mode": "session/set_mode"
   },
   "clientMethods": {
     "elicitation_complete": "elicitation/complete",