diff --git a/docs/conventions.md b/docs/conventions.md
index c19fedfe..f434cc68 100644
--- a/docs/conventions.md
+++ b/docs/conventions.md
@@ -348,7 +348,7 @@ binary flavor.
 
 | Group | Tools |
 |---|---|
-| `messaging` | `send`, `recv`, `ack_until`, `ask`, `answer` |
+| `messaging` | `send`, `recv`, `ack_until` |
 | `meta` | `get_agent_meta` (`set_status` is always-on, see below) |
 | `inbox` | `get_loose_ends`, `cancel_loose_end`, `remind` |
 | `execution` | vestigial — `mcp__bash__run` / `mcp__bash__status` are always available unconditionally via `extraMcpServers`; this group's entries expand to non-existent `mcp__hyperhive__run` / `mcp__hyperhive__status` and have no effect. See `docs/tools/bash.md`. |
diff --git a/hive-agent-mcp/src/mcp/mod.rs b/hive-agent-mcp/src/mcp/mod.rs
index cd8a7c0d..c7a800c5 100644
--- a/hive-agent-mcp/src/mcp/mod.rs
+++ b/hive-agent-mcp/src/mcp/mod.rs
@@ -433,8 +433,8 @@ impl AgentServer {
                 // the c0re side, so a successful cancel here always means
                 // *this* agent's own `asked` mirror row for `id`. Known gap
                 // (documented on `Questions`): the target isn't notified,
-                // so their `answering` row lingers until they call
-                // `answer()` or it goes stale.
+                // so their `answering` row always lingers until it goes
+                // stale — `answer()` no longer exists as an option.
                 let _ = dial_agent_socket(&hive_agent_sock::Request::ClearQuestion { id }).await;
             }
             annotate_retries(
diff --git a/hive-sh4re/src/permissions.rs b/hive-sh4re/src/permissions.rs
index cde4906c..42a35878 100644
--- a/hive-sh4re/src/permissions.rs
+++ b/hive-sh4re/src/permissions.rs
@@ -15,7 +15,7 @@ use serde::{Deserialize, Serialize};
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Serialize, Deserialize)]
 #[serde(rename_all = "snake_case")]
 pub enum ToolGroup {
-    /// `send`, `recv`, `ask`, `answer`
+    /// `send`, `recv`, `ack_until`
     Messaging,
     /// `get_agent_meta` (`set_status` is always-on — see `ALWAYS_ON_TOOLS`)
     Meta,
@@ -51,7 +51,7 @@ impl ToolGroup {
     #[must_use]
     pub fn tools(self) -> &'static [&'static str] {
         match self {
-            Self::Messaging => &["send", "recv", "ack_until", "ask", "answer"],
+            Self::Messaging => &["send", "recv", "ack_until"],
             Self::Meta => &["get_agent_meta"],
             Self::Inbox => &["get_loose_ends", "cancel_loose_end", "remind"],
             Self::Lifecycle => &["kill", "start", "restart", "update", "list_containers"],
@@ -163,7 +163,7 @@ impl ToolGroup {
     #[must_use]
     pub fn description(self) -> &'static str {
         match self {
-            Self::Messaging => "send, recv, ask, answer — core agent communication",
+            Self::Messaging => "send, recv, ack_until — core agent communication",
             Self::Meta => {
                 "get_agent_meta — identity introspection (set_status is always available)"
             }