CLAUDE.md

@@ -22,10 +22,7 @@ hive-c0re/         host daemon + CLI (one binary, subcommand-dispatched)
   src/broker.rs         sqlite Message store + broadcast channel for SSE +
                          hourly vacuum of delivered>30d
   src/approvals.rs      sqlite Approval queue + kinds
-  src/operator_questions.rs  sqlite question queue backing `ask` /
+  src/operator_questions.rs  sqlite question queue backing `ask_operator`
-                         `answer` (both operator + agent-to-agent)
-  src/questions.rs      shared dispatch for `Ask` / `Answer` —
-                         used by both agent + manager surfaces
   src/reminder_scheduler.rs  5s poll loop: drains due reminders,
                          resolves file_path container→host, persists
                          payload + delivers pointer string
@@ -34,9 +31,8 @@ hive-c0re/         host daemon + CLI (one binary, subcommand-dispatched)
   src/crash_watch.rs    poll every 10s; fire HelperEvent::ContainerCrash
                          when a previously-running container disappears
                          without an operator-initiated transient
-  src/coordinator.rs    shared state (broker/approvals/operator_questions/
+  src/coordinator.rs    shared state (broker/approvals/questions/transient/
-                         transient/sockets) + tombstone enumeration +
+                         sockets) + tombstone enumeration + kick_agent
-                         kick_agent + notify_agent (helper-event push)
   src/actions.rs        approve/deny/destroy (transient-aware)
   src/auto_update.rs    startup rebuild scan + ensure_manager +
                          meta::lock_update_hyperhive bump
@@ -165,21 +161,11 @@ Prune freely.
   domain tooling — the agent flake's `inputs` block pulls
   the external flake, `agent.nix` references it via
   `flakeInputs.<name>.packages.${pkgs.system}.default`.
-- **Just landed:** `ask_operator` → `ask` rename + optional
+- **Just landed:** `mcp__hyperhive__ask_operator` is now on
-  `to: <agent>` param for agent-to-agent structured Q&A.
+  the sub-agent surface too (not just the manager). Answer
-  Recipient defaults to the operator (dashboard); peer
+  routes back to whichever agent asked via
-  questions land in the target's inbox as `QuestionAsked`
+  `coord.notify_agent`; the dashboard already shows the
-  events and the recipient replies via new `answer(id,
+  asker on each question row.
-  answer)` tool. Answer always flows back as
-  `QuestionAnswered { id, question, answer, answerer }`
-  (renamed from `OperatorAnswered`; `answerer` distinguishes
-  operator vs peer vs `ttl-watchdog`). Authorisation:
-  operator-targeted questions can only be answered by the
-  operator; agent-targeted by the named target (or the
-  operator as override). Self-ask rejected. Shared dispatch
-  lives in `hive-c0re/src/questions.rs`. Dashboard's
-  `pending()` filters on `target IS NULL` so peer questions
-  never leak into the operator's queue.
 - **Just landed:** dashboard now has a terminal-style
   compose textbox under the message-flow stream — `@name`
   picks the recipient (sticky in localStorage, auto-

README.md

@@ -33,12 +33,12 @@ host (NixOS, runs hive-c0re.service)
    ├── hm1nd      hive-m1nd serve : claude turn loop +
    │              MCP (send / recv / request_spawn / kill / start /
    │                   restart / update / request_apply_commit /
-   │                   ask / answer / remind) + web UI on :8000
+   │                   ask_operator) + web UI on :8000
    │
    └── h-<name>   hive-ag3nt serve : claude turn loop +
-                  MCP (send / recv / ask / answer / remind + agent-declared
+                  MCP (send / recv / ask_operator + agent-declared extras
-                       extras via hyperhive.extraMcpServers) + web UI
+                       via hyperhive.extraMcpServers) + web UI on a
-                  on a hashed :8100-8999
+                  hashed :8100-8999
 ```
 
 Each turn: harness pops one inbox message (Recv long-polls server-side and
@@ -89,13 +89,10 @@ inside the container — so `git fetch applied`,
 `cat /meta/flake.lock` all just work without constructing paths by
 hand. See [`docs/approvals.md`](docs/approvals.md) for the full state
 machine + lock-flow walkthrough.
-For decisions any agent (manager or sub) needs structured signal on,
+For decisions the manager needs human signal on, `ask_operator(question,
-`ask(question, options?, multi?, ttl_seconds?, to?)` queues a question:
+options?, multi?)` queues a free-text/checkbox/radio form on the
-default recipient is the operator (dashboard renders a free-text /
+dashboard; the answer arrives later as a `HelperEvent::OperatorAnswered`
-checkbox / radio form), or pass `to: "<agent>"` to route a structured
+in the manager's inbox.
-peer question into another agent's inbox. The answer arrives later as
-a `HelperEvent::QuestionAnswered { id, question, answer, answerer }`
-in the asker's inbox. Peer recipients respond via `answer(id, answer)`.
 
 ## Host config
 

TODO.md

@@ -8,7 +8,7 @@
 - **Broadcast messaging**: allow sending messages with recipient "*" to all agents; deliver with hint "this was a broadcast and may not need any action from you"
 - **Multi-agent restart coordination**: when rebuilding all agents, manager should start first so it can coordinate post-restart confusion (notify agents, suppress unnecessary retries, etc)
 - **Shared docs/skills repo (RO)**: a single repo on the hive forge that every agent has read-only access to — common references, prompts, runbooks, "skills" the operator wants every agent to inherit without baking into the system prompt or `/shared`. Implementation likely: seed an `org-shared/docs` repo on first hive-forge boot, grant every per-agent user a read membership in the org. Agents `git clone` it (or use the API) to read; only the manager + operator can push.
-- ~~**Rename `ask_operator` → `ask` with optional `to` param**~~ ✓ done — `Ask { question, options, multi, ttl_seconds, to: Option<String> }` on both `AgentRequest` + `ManagerRequest`. `to = None` (or `Some("operator")`) = dashboard path; `to = Some(<agent>)` pushes `HelperEvent::QuestionAsked` into the target's inbox. New `Answer { id, answer }` request on both surfaces — target answers via `mcp__hyperhive__answer`; answer flows back to the asker as `HelperEvent::QuestionAnswered { id, question, answer, answerer }` (renamed from `OperatorAnswered`; carries who answered so the asker can distinguish operator vs peer vs `ttl-watchdog`). Authorisation: only the question's `target` agent or the operator can answer; self-ask is rejected. DB gets a nullable `target` column (NULL = operator path, back-compat). Dashboard's `pending()` / `recent_answered()` filter on `target IS NULL` so peer questions never leak into the operator's queue. Shared dispatch lives in `hive-c0re/src/questions.rs` so both surfaces stay aligned.
+- **Rename `ask_operator` → `ask` with optional `to` param**: today `mcp__hyperhive__ask_operator` always targets the operator dashboard. Generalise: rename to `ask`, add optional `to: <agent_name>` argument that defaults to `"operator"`. When `to` is another agent, route the question to that agent's inbox as a structured "question event" (different from a plain send so the recipient can answer back with the same id and the answer threads back to the asker). Unblocks agent-to-agent structured Q&A without burning regular inbox slots.
 - **Loose-ends tracker + `get_open_threads` tool**: hive-c0re already knows about pending approvals + unanswered questions; soon will also know about open PRs on hive-forge. Aggregate these into a per-agent "open threads" view (e.g. `[{kind: "approval", id: 7, summary: "spawn alice"}, {kind: "question", id: 12, asker: "alice", summary: "deploy now?"}]`). New MCP tool `mcp__hyperhive__get_open_threads` returns the list so an agent can see what's still pending against it without rebuilding context from inbox history. Manager's version includes hive-wide threads. **Also surface this list on the per-agent web UI** so the operator can see at a glance what each agent has hanging open — same data source as the MCP tool, just rendered into the existing per-agent dashboard page (next to inbox view / model chip / etc).
 
 ## Reminder Tool
@@ -25,13 +25,11 @@
 
 ## Dashboard
 
-- **UI for agent-to-agent questions** (follow-up to the `ask` rename): now that agents can `ask(to: <agent>)` each other, surface those threads in the per-agent dashboard view. Replace the existing read/unread tabs with THREE filters: `unread`, `from: <agent>`, `to: <agent>`. The `to:` filter makes agent-targeted questions visible so the operator can see at a glance "alice has 3 questions outstanding from bob" and intervene if a thread is stuck. Same UI is useful for general inbox filtering too. Data lives in the existing `operator_questions` table (with the new `target` column) + the broker inbox; no new schema needed. Also expose a "respond" affordance so the operator can override-answer a peer question when an agent is offline / stuck (the answerer-auth check in `OperatorQuestions::answer` already permits the operator on any target).
-- **Clickable file paths in message bodies**: agents drop pointer strings like `/agents/<name>/state/foo.md` constantly (it's the whole 1 KiB-cap escape hatch). Right now they're plain text — operator has to copy-paste into a terminal to peek. Detect path-shaped tokens (start with `/agents/`, `/shared/`, `/state/`, or absolute `/var/lib/hyperhive/...`) in rendered message bodies + question text + answer text + helper-event payloads, render as clickable links that hit a new `/api/state-file?path=…` dashboard endpoint. Endpoint serves the file as text (with a strict allow-list — only paths under `/var/lib/hyperhive/agents/*/state/`, `/var/lib/hyperhive/shared/`, never anything else), syntax-highlighting where it makes sense, falling back to download for binaries. Reuses the existing `<details>` collapse pattern so inline preview doesn't blow up the message-flow stream.
 - **UI for pending reminders**: show pending/queued reminders in dashboard, allow operator to view/debug/cancel
 - Per-agent reminder status (pending, delivered)
 - Reminder query interface for debugging
 - Display reminder delivery errors (failed sends, mark failures)
-- ~~**Phase 5b: per-domain mutation event types + client derived state**~~ ✓ landed across 56d615b (approvals), 1879b2f (questions), 7956e1c (transients). `DashboardEvent` now carries `ApprovalAdded` / `ApprovalResolved`, `QuestionAdded` / `QuestionResolved`, `TransientSet` / `TransientCleared`; emit sites cover `actions::approve`/`deny`/`finish_approval`, dashboard's orphan-approval GC, manager-socket `request_spawn` + `request_apply_commit` (success + git_fetch failure), `questions::handle_ask`/`handle_answer` (operator-targeted only), dashboard's `/answer-question` + `/cancel-question`, ttl-watchdog, `Coordinator::set_transient`/`clear_transient`. `/api/state` still serves these arrays for cold-start; live updates flow through the events. Container-list events still deferred — `ContainerView` is sourced from external `nixos-container list`, so the 5s poll continues to drive `/containers-section`. Phase 6 remaining redirect conversions (`/approve`, `/deny`, `/restart`, `/destroy`, `/kill`, `/rebuild`, `/api/cancel`, `/api/compact`, `/api/model`, `/api/new-session`, `/request-spawn`, `/answer-question`, `/cancel-question`, `/meta-update`, `/purge-tombstone`) are now unblocked for the event-covered domains; container-lifecycle ones still need either container-list events or to live with the 5s poll-refresh delay.
+- **Phase 5b: per-domain mutation event types + client derived state.** Foundation already in place (`DashboardEvent` channel on Coordinator, broker→dashboard forwarder, `/dashboard/{stream,history}`, snapshot+SSE seq dedupe). Remaining work: add `ApprovalAdded` / `ApprovalResolved`, `QuestionAdded` / `QuestionAnswered`, `TransientChanged` variants to `DashboardEvent`; emit each at the corresponding mutation site (`actions::approve`/`deny`/`finish_approval`, `approvals.submit_kind`, `OperatorQuestions::{submit,answer,cancel}`, `Coordinator::{set_transient,clear_transient}`); have the client maintain derived `approvals` / `questions` / `transients` arrays applied from events and drop those fields from `/api/state`. Unblocks dropping the redirect-and-refetch on every remaining action endpoint (`/approve`, `/deny`, `/restart`, `/destroy`, `/kill`, `/rebuild`, `/api/cancel`, `/api/compact`, `/api/model`, `/api/new-session`, `/request-spawn`, `/answer-question`, `/cancel-question`, `/meta-update`, `/purge-tombstone`). Container-list events deferred until `ContainerView` becomes event-derivable (currently sourced from external `nixos-container list`).
 
 ## Bugs
 

docs/approvals.md

@@ -248,25 +248,16 @@ package legitimacy, cheaper alternative, blast radius) before
 committing and calling `request_apply_commit`.
 
 For ambiguous cases or anything that needs human signal, the
-manager calls `ask(question, options?, multi?, ttl_seconds?, to?)` —
+manager calls `ask_operator(question, options?, multi?,
-queues the question and returns the id immediately. When `to` is
+ttl_seconds?)` — queues the question on the dashboard and returns
-omitted (or `"operator"`) the question shows up on the dashboard;
+the id immediately. The operator's answer arrives later as
-when `to` is a sub-agent's name, the recipient receives a
+`HelperEvent::OperatorAnswered` in the manager inbox. Storage is
-`HelperEvent::QuestionAsked` and answers via their own `answer`
+`hive-c0re::operator_questions` (sqlite); the answer flow is:
-tool. Either way the answer arrives back as
-`HelperEvent::QuestionAnswered { id, question, answer, answerer }`
-in the asker's inbox. Storage is `hive-c0re::operator_questions`
-(sqlite) — same table, with a nullable `target` column
-(NULL = operator). Dispatch goes through
-`hive-c0re/src/questions.rs::{handle_ask, handle_answer}` so both
-the agent + manager surfaces stay aligned. The answer flow is:
 
 ```
-POST /answer-question/{id}                       agent: Answer { id, answer }
+POST /answer-question/{id}
-  → OperatorQuestions::answer(_, _, "operator")    → questions::handle_answer
+  → OperatorQuestions::answer
-  → notify_agent(asker, QuestionAnswered {         → OperatorQuestions::answer(_, _, agent)
+  → notify_manager(OperatorAnswered { id, question, answer })
-       answerer: "operator", ... })                → notify_agent(asker, QuestionAnswered {
-                                                       answerer: agent, ... })
 ```
 
 Two more paths resolve a pending question with a sentinel answer:
@@ -310,14 +301,9 @@ regular claude turn so the manager can react. Variants
 - `NeedsUpdate { agent }` — sub-agent's recorded flake rev is
   stale. Manager calls `update(name)` to rebuild — idempotent,
   no approval required.
-- `QuestionAnswered { id, question, answer, answerer }` —
+- `OperatorAnswered { id, question, answer }` — dashboard
-  dashboard `/answer-question/{id}` (answerer = `"operator"`),
+  `/answer-question/{id}` after the operator submits the answer
-  peer `Answer` request (answerer = agent name), or ttl watchdog
+  form.
-  expiry (answerer = `"ttl-watchdog"`, answer = `"[expired]"`).
-- `QuestionAsked { id, asker, question, options, multi }` —
-  fired when an agent calls `Ask { to: Some(<this-agent>), ... }`.
-  The recipient responds via `Answer { id, answer }` and the
-  asker sees the matching `QuestionAnswered`.
 
 To add a new event: new `HelperEvent` variant + call sites + update
 `prompts/manager.md` so the manager knows the new shape.

docs/persistence.md

@@ -12,15 +12,10 @@ Three tables, all in one file:
   `sender / recipient / body / sent_at / delivered_at`.
 - `approvals` — the queue. `agent / kind (apply_commit | spawn) /
   commit_ref / requested_at / status / resolved_at / note`.
-- `operator_questions` — `ask` / `answer` queue (despite the
+- `operator_questions` — `ask_operator` queue.
-  file name, stores both operator-targeted + agent-to-agent
-  questions since the `ask` rename).
   `asker / question / options_json / multi / asked_at /
-  deadline_at (ttl) / answered_at / answer / target`. `target IS
+  deadline_at (ttl) / answered_at / answer`. Migrated via
-  NULL` = operator path (dashboard); `target = '<agent>'` = peer
+  `ALTER TABLE ADD COLUMN` against `pragma_table_info`.
-  Q&A (`HelperEvent::QuestionAsked` pushed into target's inbox,
-  answered via `Answer` request). Migrated via `ALTER TABLE ADD
-  COLUMN` against `pragma_table_info`.
 
 Retention:
 

docs/turn-loop.md

@@ -107,18 +107,10 @@ it as a stdio child via `--mcp-config`. The hyperhive socket name is
   "anything pending?" peek. Positive value parks the turn up
   to that many seconds (cap 180) — incoming messages wake
   instantly, otherwise returns empty at the timeout.
-- `ask(question, options?, multi?, ttl_seconds?, to?)` —
+- `ask_operator(question, options?, multi?, ttl_seconds?)` —
-  surface a structured question. Same shape as the manager's;
+  surface a question on the dashboard. Same shape as the manager's;
-  recipient defaults to the operator (dashboard) but can be set
+  answer routes back to the asker's own inbox as
-  to a peer agent name via `to: "<agent>"`. Answer routes back
+  `HelperEvent::OperatorAnswered` via `coord.notify_agent`.
-  to the asker's own inbox as `HelperEvent::QuestionAnswered`
-  via `coord.notify_agent`. For peer questions the recipient
-  sees a `HelperEvent::QuestionAsked` event and replies with
-  `answer(id, answer)`.
-- `answer(id, answer)` — respond to a `question_asked` event
-  routed to this agent. Authorisation is strict: only the
-  declared target (or the operator via the dashboard) can
-  answer.
 
 ### Waking the agent from inside the container
 
@@ -175,22 +167,16 @@ meta's.
 - `request_apply_commit(agent, commit_ref)` — submit a config
   change for any agent (`hm1nd` for the manager's own config) for
   operator approval.
-- `ask(question, options?, multi?, ttl_seconds?, to?)` —
+- `ask_operator(question, options?, multi?, ttl_seconds?)` —
-  surface a structured question to the operator (default) or a
+  surface a question on the dashboard. Non-blocking — returns the
-  sub-agent (`to: "<agent>"`). Non-blocking — returns the
+  queued question id; the operator's answer arrives later as
-  queued question id; the answer arrives later as
+  `HelperEvent::OperatorAnswered` in the manager inbox. Options
-  `HelperEvent::QuestionAnswered { id, question, answer,
+  always render alongside a free-text fallback; `multi=true`
-  answerer }` in the asker's inbox. Options always render
+  renders options as checkboxes. `ttl_seconds` auto-cancels with
-  alongside a free-text fallback; `multi=true` renders options
+  answer `[expired]` after the deadline (useful for time-sensitive
-  as checkboxes. `ttl_seconds` auto-cancels with answer
+  decisions that become moot if the operator hasn't responded).
-  `[expired]` (and `answerer: "ttl-watchdog"`) after the
+  The operator can also manually cancel with `[cancelled]` via the
-  deadline (useful for time-sensitive decisions that become moot
+  dashboard.
-  if no one has responded). The operator can also manually
-  cancel with `[cancelled]` via the dashboard.
-- `answer(id, answer)` — respond to a `question_asked` event
-  that was routed to the manager (a sub-agent did
-  `ask(to: "manager", ...)`). Surfaces in the asker's inbox as
-  the same `question_answered` event.
 
 The boundary: lifecycle ops on *existing* sub-agents
 (`kill`/`start`/`restart`) are at the manager's discretion — no

docs/web-ui.md

@@ -61,9 +61,7 @@ the previous process's socket release resolves itself.
    age + claude-creds badge). Two actions: `⊕ R3V1V3` (queues a
    Spawn approval; existing state is reused), `PURG3` (wipes
    state + applied dirs; `POST /purge-tombstone/{name}`).
-4. **M1ND H4S QU3STI0NS** — pending operator-targeted `ask`
+4. **M1ND H4S QU3STI0NS** — pending `ask_operator` questions
-   questions, i.e. rows with `target IS NULL` (peer-to-peer
-   questions live in the same table but never surface here)
    (amber pulsing border). Free-text fallback always rendered
    alongside any option list; `multi=true` renders options as
    checkboxes; submit merges selections + free text comma-joined.

hive-ag3nt/prompts/agent.md

@@ -5,8 +5,7 @@ Tools (hyperhive surface):
 - `mcp__hyperhive__recv(wait_seconds?)` — drain one more message from your inbox (returns `(empty)` if nothing pending). Without `wait_seconds` (or with `0`) it returns immediately — a cheap "anything pending?" peek you can sprinkle between tool calls. To **wait** for work when you have nothing else useful to do this turn, call with a long wait (e.g. `wait_seconds: 180`, the max) — incoming messages wake you instantly, otherwise the call returns empty at the timeout. That's strictly better than a fixed `sleep` shell command: lower latency on new work, no busy-loop.
 - `mcp__hyperhive__send(to, body)` — message a peer (by their name) or the operator (recipient `operator`, surfaces in the dashboard). Use `to: "*"` to broadcast to all agents (they receive a hint that it's a broadcast and may not need action). Some agents have a per-agent allow-list (`hyperhive.allowedRecipients` in their `agent.nix`) — if so the tool refuses recipients outside the list with a clear error; route through the manager (`send(to: "manager", …)`) which is always reachable.
 - (some agents only) **extra MCP tools** surfaced as `mcp__<server>__<tool>` — these are agent-specific (matrix client, scraper, db connector, etc.) declared in your `agent.nix` under `hyperhive.extraMcpServers`. Treat them as first-class tools alongside the hyperhive surface; the operator already auto-approved them at deploy time.
-- `mcp__hyperhive__ask(question, options?, multi?, ttl_seconds?, to?)` — surface a structured question to the human operator (default, or `to: "operator"`) OR a peer agent (`to: "<agent-name>"`). Returns immediately with a question id — do NOT wait inline. When the recipient answers, a system message with event `question_answered { id, question, answer, answerer }` lands in your inbox; handle it on a future turn. Use this for clarifications, permission for risky actions, choice between options, or peer Q&A without burning regular inbox slots. `options` is advisory: a short fixed-choice list when applicable, otherwise leave empty for free text. `multi: true` lets the answerer pick multiple (checkboxes), answer comes back comma-joined. `ttl_seconds` auto-cancels with answer `[expired]` (and `answerer: "ttl-watchdog"`) when the decision becomes moot.
+- `mcp__hyperhive__ask_operator(question, options?, multi?, ttl_seconds?)` — surface a question to the human operator on the dashboard. Returns immediately with a question id — do NOT wait inline. When the operator answers, a system message with event `operator_answered { id, question, answer }` lands in your inbox; handle it on a future turn. Use this for clarifications, permission for risky actions, or choice between options. `options` is advisory: a short fixed-choice list when applicable, otherwise leave empty for free text. `multi: true` lets the operator pick multiple (checkboxes), answer comes back comma-joined. `ttl_seconds` auto-cancels with answer `[expired]` when the decision becomes moot.
-- `mcp__hyperhive__answer(id, answer)` — answer a question that was routed to YOU. You'll see one in your inbox as a `question_asked { id, asker, question, options, multi }` system event when a peer or the manager calls `ask(to: "<your-name>", ...)`. The answer surfaces in the asker's inbox as a `question_answered` event. Strict authorisation: you can only answer questions where you are the declared target.
 
 Need new packages, env vars, or other NixOS config for yourself? You can't edit your own config directly — message the manager (recipient `manager`) describing what you need + why. The manager evaluates the request (it doesn't rubber-stamp), edits `/agents/{label}/config/agent.nix` on your behalf, commits, and submits an approval that the operator can accept on the dashboard; on approve hive-c0re rebuilds your container with the new config.
 

hive-ag3nt/prompts/manager.md

@@ -10,8 +10,7 @@ Tools (hyperhive surface):
 - `mcp__hyperhive__restart(name)` — stop + start a sub-agent. No approval required.
 - `mcp__hyperhive__update(name)` — rebuild a sub-agent (re-applies the current hyperhive flake + agent.nix, restarts the container). No approval required — idempotent. Use when you receive a `needs_update` system event.
 - `mcp__hyperhive__request_apply_commit(agent, commit_ref, description?)` — submit a config change for any agent (`hm1nd` for self) for operator approval. Pass an optional `description` and it appears on the dashboard approval card so the operator knows what changed without opening the diff. At submit time hive-c0re fetches your commit into the agent's applied repo and pins it as `proposal/<id>`; from that moment your proposed-side commit can be amended or force-pushed freely without changing what the operator will build.
-- `mcp__hyperhive__ask(question, options?, multi?, ttl_seconds?, to?)` — surface a structured question to the operator (default, or `to: "operator"`) OR a sub-agent (`to: "<agent-name>"`). Returns immediately with a question id; the answer arrives later as a system `question_answered { id, question, answer, answerer }` event in your inbox. Options are advisory: the dashboard always lets the operator type a free-text answer in addition. Set `multi: true` to render options as checkboxes (operator can pick multiple); the answer comes back as `, `-separated. Set `ttl_seconds` to auto-cancel after a deadline (capped at 6h server-side) — on expiry the answer is `[expired]` and `answerer` is `"ttl-watchdog"`. Do not poll inside the same turn — finish the current work and react when the event lands.
+- `mcp__hyperhive__ask_operator(question, options?, multi?, ttl_seconds?)` — surface a question on the dashboard. Returns immediately with a question id; the operator's answer arrives later as a system `operator_answered` event in your inbox. Options are advisory: the dashboard always lets the operator type a free-text answer in addition. Set `multi: true` to render options as checkboxes (operator can pick multiple); the answer comes back as `, `-separated. Set `ttl_seconds` to auto-cancel after a deadline — useful when the decision becomes moot if the operator hasn't responded in time; on expiry the answer is `[expired]`. Do not poll inside the same turn — finish the current work and react when the event lands.
-- `mcp__hyperhive__answer(id, answer)` — answer a question that was routed to YOU (a sub-agent did `ask(to: "manager", ...)`). The triggering event in your inbox is `question_asked { id, asker, question, options, multi }`. The answer surfaces in the asker's inbox as a `question_answered` event.
 
 Approval boundary: lifecycle ops on *existing* sub-agents (`kill`, `start`, `restart`) are at your discretion — no operator approval. *Creating* a new agent (`request_spawn`) and *changing* any agent's config (`request_apply_commit`) still go through the approval queue. The operator only signs off on changes; you run the day-to-day.
 
@@ -63,9 +62,9 @@ Sub-agents are NOT trusted by default. When one asks for a config change (new pa
 
 You're the policy gate between sub-agents and the operator's approval queue — the operator clicks ◆ APPR0VE on your commits, so don't submit changes you wouldn't defend.
 
-Two ways to talk to the operator: `send(to: "operator", ...)` for fire-and-forget status / pointers (surfaces in the operator inbox), or `ask(question, options?)` when you need a decision (omit `to`, or pass `to: "operator"`). `ask` is non-blocking — it queues the question and returns an id immediately; the answer arrives on a future turn as a `question_answered` system event. Prefer `ask` over an open-ended `send` for anything you actually need to wait on. Same primitive can target a sub-agent (`to: "<agent>"`) when you need a structured answer from a peer rather than free-form chat.
+Two ways to talk to the operator: `send(to: "operator", ...)` for fire-and-forget status / pointers (surfaces in the operator inbox), or `ask_operator(question, options?)` when you need a decision. `ask_operator` is non-blocking — it queues the question and returns an id immediately; the answer arrives on a future turn as an `operator_answered` system event. Prefer `ask_operator` over an open-ended `send` for anything you actually need to wait on.
 
-Messages from sender `system` are hyperhive helper events (JSON body, `event` field discriminates): `approval_resolved`, `spawned`, `rebuilt`, `killed`, `destroyed`, `container_crash`, `needs_login`, `logged_in`, `needs_update`, `question_asked`, `question_answered`. Use these to react to lifecycle changes:
+Messages from sender `system` are hyperhive helper events (JSON body, `event` field discriminates): `approval_resolved`, `spawned`, `rebuilt`, `killed`, `destroyed`, `container_crash`, `needs_login`, `logged_in`, `needs_update`, `operator_answered`. Use these to react to lifecycle changes:
 
 - `needs_login` — agent has no claude session yet. You can't help directly (login is interactive OAuth on the operator side); flag the operator if it's been long.
 - `logged_in` — agent just completed login; first useful turn is imminent. Good time to brief them on what to do.

hive-ag3nt/src/bin/hive-m1nd.rs

@@ -36,7 +36,7 @@ enum Cmd {
     /// Run the manager MCP server on stdio. Spawned by claude via
     /// `--mcp-config`; same shape as `hive-ag3nt mcp` but with the
     /// manager tool surface (`request_spawn`, `kill`, `start`, `restart`,
-    /// `request_apply_commit`, `ask`, `answer`, `remind`).
+    /// `request_apply_commit`, `ask_operator`).
     Mcp,
 }
 

hive-ag3nt/src/mcp.rs

@@ -226,74 +226,42 @@ impl AgentServer {
     }
 
     #[tool(
-        description = "Surface a structured question to either the operator OR a peer agent. \
+        description = "Surface a question to the operator on the dashboard. Returns immediately \
-        Returns immediately with a question id — do NOT wait inline. When the recipient \
+        with a question id — do NOT wait inline. When the operator answers, a system message \
-        answers, a system message with event `question_answered { id, question, answer, \
+        with event `operator_answered { id, question, answer }` lands in your inbox; handle it \
-        answerer }` lands in your inbox; handle it on a future turn. \n\n\
+        on a future turn. Use this when a decision needs human signal (ambiguous scope, \
-        Recipient: omit `to` (or set `to: \"operator\"`) for the human operator on the \
+        permission to do something risky, choosing between options). `options` is advisory: \
-        dashboard. Set `to: \"<agent-name>\"` to ask a peer agent — they receive a \
+        pass a short fixed-choice list when applicable, otherwise leave empty for free text. \
-        `question_asked { id, asker, question, options, multi }` event in their inbox \
+        Set `multi: true` to let the operator pick multiple options (checkboxes); the answer \
-        and answer via `mcp__hyperhive__answer`. \n\n\
+        comes back as a comma-separated string. Set `ttl_seconds` to auto-cancel a \
-        `options` is advisory: pass a short fixed-choice list when applicable, otherwise \
+        no-longer-relevant question — on expiry the answer is `[expired]` and the same \
-        leave empty for free text. Set `multi: true` to let the answerer pick multiple \
+        `operator_answered` event fires."
-        options (checkboxes on the dashboard, hint to the agent otherwise) — answer comes \
-        back as a comma-separated string. Set `ttl_seconds` to auto-cancel a \
-        no-longer-relevant question — on expiry the answer is `[expired]` (with \
-        `answerer: \"ttl-watchdog\"`) and the same `question_answered` event fires."
     )]
-    async fn ask(&self, Parameters(args): Parameters<AskArgs>) -> String {
+    async fn ask_operator(&self, Parameters(args): Parameters<AskOperatorArgs>) -> String {
         let log = format!("{args:?}");
-        run_tool_envelope("ask", log, async move {
+        run_tool_envelope("ask_operator", log, async move {
             let (resp, retries) = self
-                .dispatch(hive_sh4re::AgentRequest::Ask {
+                .dispatch(hive_sh4re::AgentRequest::AskOperator {
                     question: args.question,
                     options: args.options,
                     multi: args.multi,
                     ttl_seconds: args.ttl_seconds,
-                    to: args.to,
                 })
                 .await;
             let s = match resp {
                 Ok(SocketReply::QuestionQueued(id)) => format!(
-                    "question queued (id={id}); answer will arrive as a system \
+                    "question queued (id={id}); operator's answer will arrive as a system \
-                     `question_answered` event in your inbox"
+                     `operator_answered` event in your inbox"
                 ),
-                Ok(SocketReply::Err(m)) => format!("ask failed: {m}"),
+                Ok(SocketReply::Err(m)) => format!("ask_operator failed: {m}"),
-                Ok(other) => format!("ask unexpected response: {other:?}"),
+                Ok(other) => format!("ask_operator unexpected response: {other:?}"),
-                Err(e) => format!("ask transport error: {e:#}"),
+                Err(e) => format!("ask_operator transport error: {e:#}"),
             };
             annotate_retries(s, retries)
         })
         .await
     }
 
-    #[tool(
-        description = "Answer a question that was routed to YOU via a `question_asked` system \
-        event in your inbox. Pass the `id` from that event and your `answer` string. The \
-        answer will surface in the asker's inbox as a `question_answered { id, question, \
-        answer, answerer: <your-name> }` event. \n\n\
-        Authorisation is strict — you can only answer questions where you are the declared \
-        target (i.e. the asker did `ask(to: \"<your-name>\", ...)`). Trying to answer an \
-        operator-targeted question or a question addressed to a different agent will fail."
-    )]
-    async fn answer(&self, Parameters(args): Parameters<AnswerArgs>) -> String {
-        let log = format!("{args:?}");
-        let id = args.id;
-        run_tool_envelope("answer", log, async move {
-            let (resp, retries) = self
-                .dispatch(hive_sh4re::AgentRequest::Answer {
-                    id,
-                    answer: args.answer,
-                })
-                .await;
-            annotate_retries(
-                format_ack(resp, "answer", format!("answered question {id}")),
-                retries,
-            )
-        })
-        .await
-    }
-
     #[tool(
         description = "Pop one message from this agent's inbox. Returns the sender and body, \
             or an empty marker if nothing is waiting. Without `wait_seconds` (or with 0) the \
@@ -421,44 +389,25 @@ pub struct UpdateArgs {
 }
 
 #[derive(Debug, serde::Deserialize, schemars::JsonSchema)]
-pub struct AskArgs {
+pub struct AskOperatorArgs {
-    /// The question to surface.
+    /// The question to surface on the dashboard.
     pub question: String,
-    /// Optional fixed-choice answers. The dashboard renders these as
+    /// Optional fixed-choice answers. The dashboard always renders a
-    /// chips alongside a free-text fallback ("Other…") so the operator
+    /// free-text fallback ("Other…") so the operator is never trapped
-    /// is never trapped by an incomplete list; peer-agent recipients
+    /// by an incomplete list.
-    /// see the list in their inbox event and can return any string.
     #[serde(default)]
     pub options: Vec<String>,
-    /// When true, options are rendered as checkboxes — the answerer
+    /// When true, options are rendered as checkboxes — operator can pick
-    /// can pick any subset. The answer comes back as a single string
+    /// any subset. The answer comes back as a single string with
-    /// with selections joined by ", ". Ignored when `options` is empty.
+    /// selections joined by ", ". Ignored when `options` is empty.
     #[serde(default)]
     pub multi: bool,
-    /// Optional auto-cancel after `ttl_seconds` (capped server-side at
+    /// Optional auto-cancel after `ttl_seconds`. On expiry the question
-    /// 6 hours). On expiry the question resolves with answer
+    /// resolves with answer `[expired]` and the manager receives the
-    /// `[expired]` and the asker receives the usual
+    /// usual `operator_answered` system event. `None` (default) =
-    /// `question_answered` system event (with `answerer:
+    /// wait indefinitely.
-    /// "ttl-watchdog"`). `None` (default) = wait indefinitely.
     #[serde(default)]
     pub ttl_seconds: Option<u64>,
-    /// Recipient. Omit (or pass `"operator"`) to ask the human
-    /// operator via the dashboard. Pass another agent's logical name
-    /// to ask that peer — they receive a `question_asked` event in
-    /// their inbox and answer via `mcp__hyperhive__answer`.
-    #[serde(default)]
-    pub to: Option<String>,
-}
-
-#[derive(Debug, serde::Deserialize, schemars::JsonSchema)]
-pub struct AnswerArgs {
-    /// Id of the question being answered — comes from the
-    /// `question_asked` event in your inbox.
-    pub id: i64,
-    /// Free-text answer body. Soft-capped at 1 KiB by the same
-    /// `MESSAGE_MAX_BYTES` limit as `send`; keep it short or write the
-    /// detail to a file and pass a path.
-    pub answer: String,
 }
 
 #[derive(Debug, serde::Deserialize, schemars::JsonSchema)]
@@ -648,71 +597,42 @@ impl ManagerServer {
     }
 
     #[tool(
-        description = "Surface a structured question to either the operator OR a sub-agent. \
+        description = "Surface a question to the operator on the dashboard. Returns immediately \
-        Returns immediately with a question id — do NOT wait inline. When the recipient \
+        with a question id — do NOT wait inline. When the operator answers, a system message \
-        answers, a system message with event `question_answered { id, question, answer, \
+        with event `operator_answered { id, question, answer }` lands in your inbox; handle it \
-        answerer }` lands in your inbox; handle it on a future turn. \n\n\
+        on a future turn. Use this when a decision needs human signal (ambiguous sub-agent \
-        Recipient: omit `to` (or set `to: \"operator\"`) for the human operator on the \
+        request, policy call, scope clarification). `options` is advisory: pass a short \
-        dashboard. Set `to: \"<agent-name>\"` to ask a sub-agent — they receive a \
+        fixed-choice list when applicable, otherwise leave empty for free text. Set \
-        `question_asked` event in their inbox and answer via their `mcp__hyperhive__answer` \
+        `multi: true` to let the operator pick multiple options (checkboxes); the answer \
-        tool. Useful for delegating decisions / clarifications without losing the \
+        comes back as a comma-separated string. Set `ttl_seconds` to auto-cancel a \
-        question id correlation. \n\n\
+        no-longer-relevant question instead of blocking forever — on expiry the answer \
-        `options` is advisory: pass a short fixed-choice list when applicable, otherwise \
+        is `[expired]` and the same `operator_answered` event fires."
-        leave empty for free text. Set `multi: true` to render checkboxes; the answer \
-        comes back as a comma-separated string. Set `ttl_seconds` to auto-cancel — on \
-        expiry the answer is `[expired]` (with `answerer: \"ttl-watchdog\"`) and the same \
-        `question_answered` event fires."
     )]
-    async fn ask(&self, Parameters(args): Parameters<AskArgs>) -> String {
+    async fn ask_operator(&self, Parameters(args): Parameters<AskOperatorArgs>) -> String {
         let log = format!("{args:?}");
-        run_tool_envelope("ask", log, async move {
+        run_tool_envelope("ask_operator", log, async move {
             let (resp, retries) = self
-                .dispatch(hive_sh4re::ManagerRequest::Ask {
+                .dispatch(hive_sh4re::ManagerRequest::AskOperator {
                     question: args.question,
                     options: args.options,
                     multi: args.multi,
                     ttl_seconds: args.ttl_seconds,
-                    to: args.to,
                 })
                 .await;
             let s = match resp {
                 Ok(SocketReply::QuestionQueued(id)) => format!(
-                    "question queued (id={id}); answer will arrive as a system \
+                    "question queued (id={id}); operator's answer will arrive as a system \
-                     `question_answered` event in your inbox"
+                     `operator_answered` event in your inbox"
                 ),
-                Ok(SocketReply::Err(m)) => format!("ask failed: {m}"),
+                Ok(SocketReply::Err(m)) => format!("ask_operator failed: {m}"),
-                Ok(other) => format!("ask unexpected response: {other:?}"),
+                Ok(other) => format!("ask_operator unexpected response: {other:?}"),
-                Err(e) => format!("ask transport error: {e:#}"),
+                Err(e) => format!("ask_operator transport error: {e:#}"),
             };
             annotate_retries(s, retries)
         })
         .await
     }
 
-    #[tool(
-        description = "Answer a question that was routed to the manager via a `question_asked` \
-        system event in the manager's inbox (i.e. a sub-agent did `ask(to: \"manager\", \
-        ...)`). Pass the `id` from the event and your `answer`. The answer surfaces in the \
-        asker's inbox as a `question_answered` event."
-    )]
-    async fn answer(&self, Parameters(args): Parameters<AnswerArgs>) -> String {
-        let log = format!("{args:?}");
-        let id = args.id;
-        run_tool_envelope("answer", log, async move {
-            let (resp, retries) = self
-                .dispatch(hive_sh4re::ManagerRequest::Answer {
-                    id,
-                    answer: args.answer,
-                })
-                .await;
-            annotate_retries(
-                format_ack(resp, "answer", format!("answered question {id}")),
-                retries,
-            )
-        })
-        .await
-    }
-
     #[tool(
         description = "Submit a config change for operator approval. Pass the agent name \
         (e.g. `alice` or `hm1nd` for the manager's own config) and a commit sha in that \
@@ -824,10 +744,9 @@ impl ManagerServer {
         relay between them and the operator. Use `send` to talk to agents/operator, `recv` \
         to drain your inbox. Privileged: `request_spawn` (new agent, gated on operator \
         approval), `kill` (graceful stop), `request_apply_commit` (config change for \
-        any agent including yourself), `ask` (structured question to the operator or a \
+        any agent including yourself), `ask_operator` (block on a human answer via the \
-        sub-agent — non-blocking, answer arrives later as a `question_answered` event), \
+        dashboard). The manager's own config lives at \
-        `answer` (respond to a `question_asked` event directed at you). The manager's own \
+        `/agents/hm1nd/config/agent.nix`."
-        config lives at `/agents/hm1nd/config/agent.nix`."
 )]
 impl ServerHandler for ManagerServer {}
 
@@ -861,7 +780,7 @@ pub enum Flavor {
 #[must_use]
 pub fn allowed_mcp_tools(flavor: Flavor) -> Vec<String> {
     let names: &[&str] = match flavor {
-        Flavor::Agent => &["send", "recv", "ask", "answer", "remind"],
+        Flavor::Agent => &["send", "recv", "ask_operator", "remind"],
         Flavor::Manager => &[
             "send",
             "recv",
@@ -871,8 +790,7 @@ pub fn allowed_mcp_tools(flavor: Flavor) -> Vec<String> {
             "restart",
             "update",
             "request_apply_commit",
-            "ask",
+            "ask_operator",
-            "answer",
             "get_logs",
             "remind",
         ],

hive-c0re/assets/app.js

@@ -37,7 +37,7 @@
   // ─── browser notifications ──────────────────────────────────────────────
   // Fires OS notifications on three operator-bound signals:
   //   - new approval landed in the queue
-  //   - new operator question queued (ask, target IS NULL)
+  //   - new operator question queued (ask_operator)
   //   - broker message sent `to: "operator"`
   // permission grant is per-browser; a localStorage "muted" toggle lets
   // the operator silence without revoking. Secure-context only (HTTPS /
@@ -202,43 +202,6 @@
     }
   });
 
-  // Derived transient state — cold-loaded from /api/state.transients,
-  // then mutated live by `transient_set` / `transient_cleared`. Keyed
-  // by agent name so add/remove are O(1). `since_unix` is wall-clock so
-  // the elapsed-seconds badge ticks without polling.
-  const transientsState = new Map();
-  function syncTransientsFromSnapshot(s) {
-    transientsState.clear();
-    for (const t of s.transients || []) {
-      // Snapshot ships `secs` (server-computed); reconstruct an
-      // approximate since_unix so the live ticker keeps progressing
-      // without surprising jumps when the next snapshot lands.
-      const nowUnix = Math.floor(Date.now() / 1000);
-      transientsState.set(t.name, {
-        kind: t.kind,
-        since_unix: t.since_unix ?? (nowUnix - (t.secs || 0)),
-      });
-    }
-  }
-  function applyTransientSet(ev) {
-    transientsState.set(ev.name, {
-      kind: ev.transient_kind,
-      since_unix: ev.since_unix,
-    });
-    renderContainersFromState();
-  }
-  function applyTransientCleared(ev) {
-    if (transientsState.delete(ev.name)) renderContainersFromState();
-  }
-  // Re-render using the last cached snapshot (containers come from
-  // /api/state, transients overlay from the derived map). The snapshot
-  // is stashed on window.__hyperhive_state by refreshState; on cold
-  // load before the first snapshot we just skip.
-  function renderContainersFromState() {
-    const s = window.__hyperhive_state;
-    if (s) renderContainers(s);
-  }
-
   // ─── state rendering ────────────────────────────────────────────────────
   function renderContainers(s) {
     const root = $('containers-section');
@@ -263,22 +226,20 @@
       ));
     }
 
-    if (transientsState.size) {
+    if (s.transients.length) {
       const ul = el('ul');
-      const nowUnix = Math.floor(Date.now() / 1000);
+      for (const t of s.transients) {
-      for (const [name, t] of transientsState) {
-        const secs = Math.max(0, nowUnix - t.since_unix);
         ul.append(el('li', {},
           el('span', { class: 'glyph spinner' }, '◐'), ' ',
-          el('span', { class: 'agent' }, name), ' ',
+          el('span', { class: 'agent' }, t.name), ' ',
           el('span', { class: 'role role-pending' }, t.kind + '…'), ' ',
-          el('span', { class: 'meta' }, `nixos-container create + start (${secs}s)`),
+          el('span', { class: 'meta' }, `nixos-container create + start (${t.secs}s)`),
         ));
       }
       root.append(ul);
     }
 
-    if (!s.containers.length && !transientsState.size) {
+    if (!s.containers.length && !s.transients.length) {
       root.append(el('p', { class: 'empty' }, 'no managed containers'));
       return;
     }
@@ -516,57 +477,15 @@
     root.append(ul);
   }
 
-  // Derived question state — cold-loaded from /api/state, then mutated
+  function renderQuestions(s) {
-  // live by `question_added` / `question_resolved` dashboard events.
-  const QUESTION_HISTORY_LIMIT = 20;
-  const questionsState = { pending: [], history: [] };
-  function syncQuestionsFromSnapshot(s) {
-    questionsState.pending = (s.questions || []).slice();
-    questionsState.history = (s.question_history || []).slice();
-  }
-  function applyQuestionAdded(ev) {
-    if (questionsState.pending.some((q) => q.id === ev.id)) return;
-    questionsState.pending.push({
-      id: ev.id,
-      asker: ev.asker,
-      question: ev.question,
-      options: ev.options || [],
-      multi: !!ev.multi,
-      asked_at: ev.asked_at,
-      deadline_at: ev.deadline_at ?? null,
-    });
-    renderQuestions();
-  }
-  function applyQuestionResolved(ev) {
-    const idx = questionsState.pending.findIndex((q) => q.id === ev.id);
-    const existing = idx >= 0 ? questionsState.pending[idx] : null;
-    if (idx >= 0) questionsState.pending.splice(idx, 1);
-    questionsState.history.unshift({
-      id: ev.id,
-      asker: existing?.asker || '?',
-      question: existing?.question || '',
-      options: existing?.options || [],
-      multi: existing?.multi || false,
-      asked_at: existing?.asked_at || ev.answered_at,
-      answered_at: ev.answered_at,
-      answer: ev.answer,
-      answerer: ev.answerer,
-    });
-    if (questionsState.history.length > QUESTION_HISTORY_LIMIT) {
-      questionsState.history.length = QUESTION_HISTORY_LIMIT;
-    }
-    renderQuestions();
-  }
-  function renderQuestions() {
     const root = $('questions-section');
     root.innerHTML = '';
     const fmt = (n) => new Date(n * 1000).toISOString().replace('T', ' ').slice(0, 19);
-    const pending = questionsState.pending;
+    if (!s.questions || !s.questions.length) {
-    if (!pending.length) {
       root.append(el('p', { class: 'empty' }, 'no pending questions'));
     }
     const ul = el('ul', { class: 'questions' });
-    for (const q of pending) {
+    for (const q of s.questions) {
       const li = el('li', { class: 'question' });
       const head = el('div', { class: 'q-head' },
         el('span', { class: 'msg-ts' }, fmt(q.asked_at)), ' ',
@@ -648,10 +567,10 @@
       li.append(cancelForm);
       ul.append(li);
     }
-    if (pending.length) root.append(ul);
+    if (s.questions && s.questions.length) root.append(ul);
 
     // Answered question history
-    const hist = questionsState.history;
+    const hist = s.question_history || [];
     if (hist.length) {
       const details = el('details', { class: 'q-history', 'data-restore-key': 'q-history' });
       details.append(el('summary', {}, '◆ answ3red (' + hist.length + ')'));
@@ -715,51 +634,7 @@
   }
 
   const APPROVAL_TAB_KEY = 'hyperhive:approvals:tab';
-  // Derived approval state — cold-loaded from /api/state, then mutated
+  function renderApprovals(s) {
-  // live by `approval_added` / `approval_resolved` dashboard events.
-  // `pending` is the open queue (newest-first); `history` is the last
-  // 30 resolved rows.
-  const APPROVAL_HISTORY_LIMIT = 30;
-  const approvalsState = { pending: [], history: [] };
-  function syncApprovalsFromSnapshot(s) {
-    approvalsState.pending = (s.approvals || []).slice();
-    approvalsState.history = (s.approval_history || []).slice();
-  }
-  function applyApprovalAdded(ev) {
-    // Upsert by id so a snapshot that already included the row (cold
-    // load + event lands at the same tick) doesn't double it.
-    const existing = approvalsState.pending.findIndex((a) => a.id === ev.id);
-    const row = {
-      id: ev.id,
-      agent: ev.agent,
-      kind: ev.approval_kind,
-      sha_short: ev.sha_short || null,
-      diff: ev.diff || null,
-      description: ev.description || null,
-    };
-    if (existing >= 0) approvalsState.pending[existing] = row;
-    else approvalsState.pending.push(row);
-    renderApprovals();
-  }
-  function applyApprovalResolved(ev) {
-    // Drop from pending; prepend to history (newest-first), cap at 30.
-    approvalsState.pending = approvalsState.pending.filter((a) => a.id !== ev.id);
-    approvalsState.history.unshift({
-      id: ev.id,
-      agent: ev.agent,
-      kind: ev.approval_kind,
-      sha_short: ev.sha_short || null,
-      status: ev.status,
-      resolved_at: ev.resolved_at,
-      note: ev.note || null,
-      description: ev.description || null,
-    });
-    if (approvalsState.history.length > APPROVAL_HISTORY_LIMIT) {
-      approvalsState.history.length = APPROVAL_HISTORY_LIMIT;
-    }
-    renderApprovals();
-  }
-  function renderApprovals() {
     const root = $('approvals-section');
     root.innerHTML = '';
 
@@ -780,8 +655,7 @@
     );
     root.append(spawn);
 
-    const pending = approvalsState.pending;
+    const history = s.approval_history || [];
-    const history = approvalsState.history;
     const active = localStorage.getItem(APPROVAL_TAB_KEY) || 'pending';
     const tabs = el('div', { class: 'approval-tabs' });
     const pendingTab = el(
@@ -790,7 +664,7 @@
         type: 'button',
         class: 'approval-tab' + (active === 'pending' ? ' active' : ''),
       },
-      `pending · ${pending.length}`,
+      `pending · ${s.approvals.length}`,
     );
     const historyTab = el(
       'button',
@@ -802,11 +676,11 @@
     );
     pendingTab.addEventListener('click', () => {
       localStorage.setItem(APPROVAL_TAB_KEY, 'pending');
-      renderApprovals();
+      renderApprovals(s);
     });
     historyTab.addEventListener('click', () => {
       localStorage.setItem(APPROVAL_TAB_KEY, 'history');
-      renderApprovals();
+      renderApprovals(s);
     });
     tabs.append(pendingTab, historyTab);
     root.append(tabs);
@@ -816,12 +690,12 @@
       return;
     }
 
-    if (!pending.length) {
+    if (!s.approvals.length) {
       root.append(el('p', { class: 'empty' }, 'queue empty'));
       return;
     }
     const ul = el('ul', { class: 'approvals' });
-    for (const a of pending) {
+    for (const a of s.approvals) {
       const li = el('li');
       const row = el('div', { class: 'row' });
       if (a.kind === 'apply_commit') {
@@ -1076,21 +950,11 @@
       // names from here instead of refetching on every keystroke).
       window.__hyperhive_state = s;
       const openDetails = snapshotOpenDetails();
-      // Sync transients first so renderContainers below sees the
-      // current derived map (it reads from `transientsState`, not
-      // from `s.transients`).
-      syncTransientsFromSnapshot(s);
       renderContainers(s);
       renderTombstones(s);
-      // Sync the derived approvals + questions stores from the
+      renderQuestions(s);
-      // snapshot, then render. Live `*_added` / `*_resolved` events
-      // mutate the stores directly and re-render without a snapshot
-      // refetch.
-      syncQuestionsFromSnapshot(s);
-      renderQuestions();
       renderInbox();
-      syncApprovalsFromSnapshot(s);
+      renderApprovals(s);
-      renderApprovals();
       renderMetaInputs(s);
       restoreOpenDetails(openDetails);
       notifyDeltas(s);
@@ -1101,7 +965,7 @@
       // refresh on operator-bound messages; this catches the rest
       // (approvals, tombstones, questions).
       const anyPending = s.containers.some((c) => c.pending);
-      const next = (transientsState.size || anyPending) ? 2000 : 5000;
+      const next = (s.transients.length || anyPending) ? 2000 : 5000;
       if (pollTimer) { clearTimeout(pollTimer); pollTimer = null; }
       if (next) pollTimer = setTimeout(refreshState, next);
     } catch (err) {
@@ -1150,15 +1014,6 @@
       renderers: {
         sent:      (ev, api) => renderMsg(ev, api, '→'),
         delivered: (ev, api) => renderMsg(ev, api, '✓'),
-        // Mutation events update derived state and trigger a
-        // section re-render — no terminal log row (the terminal is
-        // for broker traffic, not state-change chatter).
-        approval_added:    (ev) => { applyApprovalAdded(ev); },
-        approval_resolved: (ev) => { applyApprovalResolved(ev); },
-        question_added:    (ev) => { applyQuestionAdded(ev); },
-        question_resolved: (ev) => { applyQuestionResolved(ev); },
-        transient_set:     (ev) => { applyTransientSet(ev); },
-        transient_cleared: (ev) => { applyTransientCleared(ev); },
       },
       // Both history backfill and live frames flow through here, so the
       // inbox section ends up populated correctly on first paint and

hive-c0re/src/actions.rs

@@ -114,29 +114,6 @@ fn finish_approval(
         sha: approval.fetched_sha.clone(),
         tag: terminal_tag.clone(),
     });
-    // Phase 5b: also fire on the dashboard event channel so the
-    // browser moves the row out of pending into history without a
-    // snapshot refetch. `approved` rows that succeed get the
-    // approval's logged resolved_at indirectly via `now_unix()`;
-    // failures already wrote it via mark_failed above.
-    let approval_kind = match approval.kind {
-        ApprovalKind::Spawn => "spawn",
-        ApprovalKind::ApplyCommit => "apply_commit",
-    };
-    let sha_short = approval
-        .fetched_sha
-        .as_deref()
-        .map(|s| s[..s.len().min(12)].to_owned());
-    let status_str = if ok { "approved" } else { "failed" };
-    coord.emit_approval_resolved(
-        approval.id,
-        &approval.agent,
-        approval_kind,
-        sha_short,
-        status_str,
-        note.clone(),
-        approval.description.clone(),
-    );
     // For spawn/rebuild approvals, also surface the underlying action so
     // the manager knows whether the container actually came up. The
     // ApprovalResolved event already carries the same `ok` signal but
@@ -404,13 +381,6 @@ pub async fn deny(coord: &Coordinator, id: i64, note: Option<&str>) -> Result<()
                 }
             }
         }
-        let approval_kind = match a.kind {
-            ApprovalKind::Spawn => "spawn",
-            ApprovalKind::ApplyCommit => "apply_commit",
-        };
-        let sha_short = sha.as_deref().map(|s| s[..s.len().min(12)].to_owned());
-        let description = a.description.clone();
-        let agent_owned = a.agent.clone();
         coord.notify_manager(&HelperEvent::ApprovalResolved {
             id: a.id,
             agent: a.agent,
@@ -420,15 +390,6 @@ pub async fn deny(coord: &Coordinator, id: i64, note: Option<&str>) -> Result<()
             sha,
             tag,
         });
-        coord.emit_approval_resolved(
-            id,
-            &agent_owned,
-            approval_kind,
-            sha_short,
-            "denied",
-            note.map(String::from),
-            description,
-        );
     }
     Ok(())
 }

hive-c0re/src/agent_server.rs

@@ -97,7 +97,34 @@ fn recv_timeout(wait_seconds: Option<u64>) -> std::time::Duration {
 async fn dispatch(req: &AgentRequest, agent: &str, coord: &Arc<Coordinator>) -> AgentResponse {
     let broker = &coord.broker;
     match req {
-        AgentRequest::Send { to, body } => handle_send(coord, agent, to, body),
+        AgentRequest::Send { to, body } => {
+            if let Err(message) = crate::limits::check_size("send", body) {
+                return AgentResponse::Err { message };
+            }
+            // Handle broadcast sends (recipient = "*")
+            if to == "*" {
+                let errors = coord.broadcast_send(agent, body);
+                if errors.is_empty() {
+                    AgentResponse::Ok
+                } else {
+                    AgentResponse::Err {
+                        message: format!("broadcast failed for agents: {}", errors.join(", ")),
+                    }
+                }
+            } else {
+                // Normal unicast send
+                match broker.send(&Message {
+                    from: agent.to_owned(),
+                    to: to.clone(),
+                    body: body.clone(),
+                }) {
+                    Ok(()) => AgentResponse::Ok,
+                    Err(e) => AgentResponse::Err {
+                        message: format!("{e:#}"),
+                    },
+                }
+            }
+        }
         AgentRequest::Recv { wait_seconds } => match broker
             .recv_blocking(agent, recv_timeout(*wait_seconds))
             .await
@@ -143,32 +170,12 @@ async fn dispatch(req: &AgentRequest, agent: &str, coord: &Arc<Coordinator>) ->
                 message: format!("{e:#}"),
             },
         },
-        AgentRequest::Ask {
+        AgentRequest::AskOperator {
             question,
             options,
             multi,
             ttl_seconds,
-            to,
+        } => handle_ask_operator(coord, agent, question, options, *multi, *ttl_seconds),
-        } => crate::questions::handle_ask(
-            coord,
-            agent,
-            question,
-            options,
-            *multi,
-            *ttl_seconds,
-            to.as_deref(),
-        )
-        .map_or_else(
-            |message| AgentResponse::Err { message },
-            |id| AgentResponse::QuestionQueued { id },
-        ),
-        AgentRequest::Answer { id, answer } => crate::questions::handle_answer(
-            coord, agent, *id, answer,
-        )
-        .map_or_else(
-            |message| AgentResponse::Err { message },
-            |()| AgentResponse::Ok,
-        ),
         AgentRequest::Remind {
             message,
             timing,
@@ -177,31 +184,36 @@ async fn dispatch(req: &AgentRequest, agent: &str, coord: &Arc<Coordinator>) ->
     }
 }
 
-/// Common Send handler shared between dispatch arms. Applies the
+fn handle_ask_operator(
-/// 1 KiB body cap, then routes broadcast (`to == "*"`) vs unicast
+    coord: &Arc<Coordinator>,
-/// through their respective broker calls. Pulled out of `dispatch`
+    agent: &str,
-/// to keep that function under the clippy too-many-lines limit; the
+    question: &str,
-/// behaviour is identical to inlining.
+    options: &[String],
-fn handle_send(coord: &Arc<Coordinator>, agent: &str, to: &str, body: &str) -> AgentResponse {
+    multi: bool,
-    if let Err(message) = crate::limits::check_size("send", body) {
+    ttl_seconds: Option<u64>,
+) -> AgentResponse {
+    if let Err(message) = crate::limits::check_size("question", question) {
         return AgentResponse::Err { message };
     }
-    if to == "*" {
+    let deadline_at = ttl_seconds.and_then(|s| {
-        let errors = coord.broadcast_send(agent, body);
+        let now = std::time::SystemTime::now()
-        return if errors.is_empty() {
+            .duration_since(std::time::UNIX_EPOCH)
-            AgentResponse::Ok
+            .ok()
-        } else {
+            .and_then(|d| i64::try_from(d.as_secs()).ok())
-            AgentResponse::Err {
+            .unwrap_or(0);
-                message: format!("broadcast failed for agents: {}", errors.join(", ")),
+        i64::try_from(s).ok().map(|s| now + s)
+    });
+    match coord
+        .questions
+        .submit(agent, question, options, multi, deadline_at)
+    {
+        Ok(id) => {
+            tracing::info!(%id, %agent, ?deadline_at, "agent question queued");
+            if let Some(ttl) = ttl_seconds {
+                crate::manager_server::spawn_question_watchdog(coord, id, ttl);
             }
-        };
+            AgentResponse::QuestionQueued { id }
-    }
+        }
-    match coord.broker.send(&Message {
-        from: agent.to_owned(),
-        to: to.to_owned(),
-        body: body.to_owned(),
-    }) {
-        Ok(()) => AgentResponse::Ok,
         Err(e) => AgentResponse::Err {
             message: format!("{e:#}"),
         },

hive-c0re/src/coordinator.rs

@@ -105,21 +105,6 @@ pub enum TransientKind {
     Destroying,
 }
 
-impl TransientKind {
-    /// Wire/UI label. Matches the strings the dashboard already
-    /// renders in the transient spinner.
-    pub fn as_str(self) -> &'static str {
-        match self {
-            TransientKind::Spawning => "spawning",
-            TransientKind::Starting => "starting",
-            TransientKind::Stopping => "stopping",
-            TransientKind::Restarting => "restarting",
-            TransientKind::Rebuilding => "rebuilding",
-            TransientKind::Destroying => "destroying",
-        }
-    }
-}
-
 impl Coordinator {
     pub fn open(
         db_path: &Path,
@@ -176,121 +161,6 @@ impl Coordinator {
         let _ = self.dashboard_events.send(event);
     }
 
-    /// Emit `ApprovalAdded` immediately after the row is inserted in
-    /// sqlite. Caller passes the diff text it already computed (or
-    /// `None` for spawn approvals which carry no diff).
-    pub fn emit_approval_added(
-        &self,
-        id: i64,
-        agent: &str,
-        approval_kind: &'static str,
-        sha_short: Option<String>,
-        diff: Option<String>,
-        description: Option<String>,
-    ) {
-        self.emit_dashboard_event(DashboardEvent::ApprovalAdded {
-            seq: self.next_seq(),
-            id,
-            agent: agent.to_owned(),
-            approval_kind,
-            sha_short,
-            diff,
-            description,
-        });
-    }
-
-    /// Emit `ApprovalResolved` after `mark_approved` / `mark_denied` /
-    /// `mark_failed` lands. `resolved_at` is stamped from the system
-    /// clock here so call sites don't repeat the conversion; if you
-    /// already have an authoritative timestamp from the db update,
-    /// the tiny skew between "row updated" and "event emitted" is
-    /// presentation-only and doesn't matter to clients.
-    pub fn emit_approval_resolved(
-        &self,
-        id: i64,
-        agent: &str,
-        approval_kind: &'static str,
-        sha_short: Option<String>,
-        status: &'static str,
-        note: Option<String>,
-        description: Option<String>,
-    ) {
-        let resolved_at = std::time::SystemTime::now()
-            .duration_since(std::time::UNIX_EPOCH)
-            .ok()
-            .and_then(|d| i64::try_from(d.as_secs()).ok())
-            .unwrap_or(0);
-        self.emit_dashboard_event(DashboardEvent::ApprovalResolved {
-            seq: self.next_seq(),
-            id,
-            agent: agent.to_owned(),
-            approval_kind,
-            sha_short,
-            status,
-            resolved_at,
-            note,
-            description,
-        });
-    }
-
-    /// Emit `QuestionAdded` after an operator-targeted question is
-    /// inserted. Peer-to-peer questions (those with a non-null
-    /// `target` agent) never fire this — they don't surface on the
-    /// dashboard at all. Caller is responsible for the
-    /// `target.is_none()` guard.
-    pub fn emit_question_added(
-        &self,
-        id: i64,
-        asker: &str,
-        question: &str,
-        options: &[String],
-        multi: bool,
-        deadline_at: Option<i64>,
-    ) {
-        let asked_at = std::time::SystemTime::now()
-            .duration_since(std::time::UNIX_EPOCH)
-            .ok()
-            .and_then(|d| i64::try_from(d.as_secs()).ok())
-            .unwrap_or(0);
-        self.emit_dashboard_event(DashboardEvent::QuestionAdded {
-            seq: self.next_seq(),
-            id,
-            asker: asker.to_owned(),
-            question: question.to_owned(),
-            options: options.to_vec(),
-            multi,
-            asked_at,
-            deadline_at,
-        });
-    }
-
-    /// Emit `QuestionResolved` when an operator-targeted question
-    /// transitions to answered (operator answer, peer override,
-    /// cancel, or ttl watchdog). Caller filters on the original
-    /// question's `target.is_none()` — peer questions are dashboard-
-    /// invisible.
-    pub fn emit_question_resolved(
-        &self,
-        id: i64,
-        answer: &str,
-        answerer: &str,
-        cancelled: bool,
-    ) {
-        let answered_at = std::time::SystemTime::now()
-            .duration_since(std::time::UNIX_EPOCH)
-            .ok()
-            .and_then(|d| i64::try_from(d.as_secs()).ok())
-            .unwrap_or(0);
-        self.emit_dashboard_event(DashboardEvent::QuestionResolved {
-            seq: self.next_seq(),
-            id,
-            answer: answer.to_owned(),
-            answerer: answerer.to_owned(),
-            answered_at,
-            cancelled,
-        });
-    }
-
     pub fn register_agent(self: &Arc<Self>, name: &str) -> Result<PathBuf> {
         // Idempotent: drop any existing listener so re-registration (e.g. on rebuild,
         // or after a hive-c0re restart cleared /run/hyperhive) gets a fresh socket.
@@ -301,7 +171,7 @@ impl Coordinator {
         let socket_path = Self::socket_path(name);
         // Hand the full Coordinator to the per-agent socket — it
         // needs broker + operator_questions to handle the agent-side
-        // `ask` / `answer` tools, not just the broker.
+        // `ask_operator` tool, not just the broker.
         let socket = agent_server::start(name, &socket_path, self.clone())?;
         self.agents.lock().unwrap().insert(name.to_owned(), socket);
         Ok(agent_dir)
@@ -333,30 +203,10 @@ impl Coordinator {
                 since: std::time::Instant::now(),
             },
         );
-        // Live-update dashboards. `since_unix` is wall-clock so the
-        // browser can tick "Ns spawning…" without polling. The
-        // intra-process map keeps using `Instant` for monotonicity.
-        let since_unix = std::time::SystemTime::now()
-            .duration_since(std::time::UNIX_EPOCH)
-            .ok()
-            .and_then(|d| i64::try_from(d.as_secs()).ok())
-            .unwrap_or(0);
-        self.emit_dashboard_event(DashboardEvent::TransientSet {
-            seq: self.next_seq(),
-            name: name.to_owned(),
-            transient_kind: kind.as_str(),
-            since_unix,
-        });
     }
 
     pub fn clear_transient(&self, name: &str) {
-        let removed = self.transient.lock().unwrap().remove(name).is_some();
+        self.transient.lock().unwrap().remove(name);
-        if removed {
-            self.emit_dashboard_event(DashboardEvent::TransientCleared {
-                seq: self.next_seq(),
-                name: name.to_owned(),
-            });
-        }
     }
 
     /// Set a transient state and return a guard that clears it on drop.
@@ -414,9 +264,9 @@ impl Coordinator {
 
     /// Push a `HelperEvent` into an arbitrary agent's inbox. Encoded
     /// the same way as `notify_manager` (sender = `SYSTEM_SENDER`,
-    /// body = JSON-encoded event). Used to route `QuestionAnswered`
+    /// body = JSON-encoded event). Used to route `OperatorAnswered`
-    /// events back to the agent that called `ask`, `QuestionAsked`
+    /// events back to the agent that called `ask_operator`, not just
-    /// events to the target of a peer question, etc.
+    /// the manager.
     pub fn notify_agent(&self, agent: &str, event: &hive_sh4re::HelperEvent) {
         let body = match serde_json::to_string(event) {
             Ok(s) => s,

hive-c0re/src/dashboard.rs

@@ -160,12 +160,10 @@ struct StateSnapshot {
     /// Last 30 resolved approvals (approved / denied / failed), newest-
     /// first. Drives the "history" tab on the approvals section.
     approval_history: Vec<ApprovalHistoryView>,
-    /// Pending operator-targeted questions (`target IS NULL`). Any
+    /// Pending operator questions (currently only from the manager).
-    /// agent can `ask` the operator and `ask` returns immediately with
+    /// `ask_operator` returns immediately with the id; on `/answer-question`
-    /// the id; on `/answer-question` we mark the row answered and
+    /// we mark the row answered and fire `HelperEvent::OperatorAnswered`
-    /// fire `HelperEvent::QuestionAnswered` back into the asker's
+    /// into the manager's inbox.
-    /// inbox. Peer-to-peer questions live in the same table but never
-    /// surface here (see `OperatorQuestions::pending`).
     questions: Vec<crate::operator_questions::OpQuestion>,
     /// Last 20 answered questions, newest-first.
     question_history: Vec<crate::operator_questions::OpQuestion>,
@@ -829,30 +827,17 @@ async fn post_answer_question(
     if answer.is_empty() {
         return error_response("answer: required");
     }
-    match state
+    match state.coord.questions.answer(id, answer) {
-        .coord
+        Ok((question, asker)) => {
-        .questions
-        .answer(id, answer, hive_sh4re::OPERATOR_RECIPIENT)
-    {
-        Ok((question, asker, target)) => {
             tracing::info!(%id, %asker, "operator answered question");
             state.coord.notify_agent(
                 &asker,
-                &hive_sh4re::HelperEvent::QuestionAnswered {
+                &hive_sh4re::HelperEvent::OperatorAnswered {
                     id,
                     question,
                     answer: answer.to_owned(),
-                    answerer: hive_sh4re::OPERATOR_RECIPIENT.to_owned(),
                 },
             );
-            if target.is_none() {
-                state.coord.emit_question_resolved(
-                    id,
-                    answer,
-                    hive_sh4re::OPERATOR_RECIPIENT,
-                    false,
-                );
-            }
             Redirect::to("/").into_response()
         }
         Err(e) => error_response(&format!("answer {id} failed: {e:#}")),
@@ -860,8 +845,8 @@ async fn post_answer_question(
 }
 
 /// Resolve a pending operator question with a sentinel answer when
-/// the operator decides not to / can't answer. The asker harness
+/// the operator decides not to / can't answer. The manager harness
-/// receives a `QuestionAnswered` event with `answer = "[cancelled]"`
+/// receives an `OperatorAnswered` event with `answer = "[cancelled]"`
 /// so it can fall back on whatever default it had. Same code path as
 /// a real answer — just lets the operator close the loop instead of
 /// letting the question dangle forever.
@@ -870,28 +855,15 @@ async fn post_cancel_question(
     AxumPath(id): AxumPath<i64>,
 ) -> Response {
     const SENTINEL: &str = "[cancelled]";
-    match state
+    match state.coord.questions.answer(id, SENTINEL) {
-        .coord
+        Ok((question, asker)) => {
-        .questions
-        .answer(id, SENTINEL, hive_sh4re::OPERATOR_RECIPIENT)
-    {
-        Ok((question, asker, target)) => {
             tracing::info!(%id, %asker, "operator cancelled question");
-            if target.is_none() {
-                state.coord.emit_question_resolved(
-                    id,
-                    SENTINEL,
-                    hive_sh4re::OPERATOR_RECIPIENT,
-                    true,
-                );
-            }
             state.coord.notify_agent(
                 &asker,
-                &hive_sh4re::HelperEvent::QuestionAnswered {
+                &hive_sh4re::HelperEvent::OperatorAnswered {
                     id,
                     question,
                     answer: SENTINEL.to_owned(),
-                    answerer: hive_sh4re::OPERATOR_RECIPIENT.to_owned(),
                 },
             );
             Redirect::to("/").into_response()
@@ -1193,12 +1165,6 @@ async fn post_request_spawn(
     {
         Ok(id) => {
             tracing::info!(%id, %name, "operator: spawn approval queued via dashboard");
-            // Phase 5b: notify the dashboard event channel so live
-            // subscribers can append the row without a snapshot
-            // refetch. Spawn approvals carry no diff/sha.
-            state
-                .coord
-                .emit_approval_added(id, &name, "spawn", None, None, None);
             Redirect::to("/").into_response()
         }
         Err(e) => error_response(&format!("request-spawn {name} failed: {e:#}")),
@@ -1403,22 +1369,8 @@ fn gc_orphans(coord: &Coordinator, approvals: Vec<Approval>) -> Vec<Approval> {
             if Coordinator::agent_proposed_dir(&a.agent).exists() {
                 true
             } else {
-                let note = "agent state dir missing";
+                let _ = coord.approvals.mark_failed(a.id, "agent state dir missing");
-                let _ = coord.approvals.mark_failed(a.id, note);
                 tracing::info!(id = a.id, agent = %a.agent, "auto-failed orphan approval");
-                let sha_short = a
-                    .fetched_sha
-                    .as_deref()
-                    .map(|s| s[..s.len().min(12)].to_owned());
-                coord.emit_approval_resolved(
-                    a.id,
-                    &a.agent,
-                    "apply_commit",
-                    sha_short,
-                    "failed",
-                    Some(note.to_owned()),
-                    a.description.clone(),
-                );
                 false
             }
         })
@@ -1443,12 +1395,7 @@ fn claude_has_session(dir: &Path) -> bool {
 /// since the canonical proposal commit lives there (manager-side
 /// amendments don't move it). Empty output means proposal == main —
 /// a no-op approval.
-///
+async fn approval_diff(agent: &str, approval_id: i64) -> String {
-/// `pub(crate)` so the manager-socket handler can pre-compute the
-/// diff once at submission time and embed it in the `ApprovalAdded`
-/// dashboard event (instead of forcing the dashboard to wait a
-/// `/api/state` cycle to see the diff for newly-queued approvals).
-pub(crate) async fn approval_diff(agent: &str, approval_id: i64) -> String {
     let applied = Coordinator::agent_applied_dir(agent);
     if !applied.join(".git").exists() {
         return format!("(no applied git repo at {})", applied.display());

hive-c0re/src/dashboard_events.rs

@@ -44,81 +44,4 @@ pub enum DashboardEvent {
         body: String,
         at: i64,
     },
-    /// A new approval landed in the pending queue. Payload carries
-    /// enough to render the dashboard row without a `/api/state`
-    /// refetch (`diff` is the raw unified diff text, same shape the
-    /// snapshot ships).
-    ///
-    /// The approval's own kind (`"apply_commit"` / `"spawn"`) lives on
-    /// `approval_kind` rather than `kind` because the latter is taken
-    /// by the serde tag identifying which `DashboardEvent` variant
-    /// this is.
-    ApprovalAdded {
-        seq: u64,
-        id: i64,
-        agent: String,
-        approval_kind: &'static str,
-        sha_short: Option<String>,
-        diff: Option<String>,
-        description: Option<String>,
-    },
-    /// A pending approval transitioned to a terminal state
-    /// (approved / denied / failed). Clients move the row out of the
-    /// pending list and into history.
-    ApprovalResolved {
-        seq: u64,
-        id: i64,
-        agent: String,
-        approval_kind: &'static str,
-        sha_short: Option<String>,
-        /// `"approved"` / `"denied"` / `"failed"`.
-        status: &'static str,
-        resolved_at: i64,
-        note: Option<String>,
-        description: Option<String>,
-    },
-    /// An operator-targeted question landed in the queue
-    /// (`Ask { to: None | Some("operator") }`). Peer-to-peer
-    /// questions (target = Some(<agent>)) never fire this event —
-    /// the dashboard only ever shows operator-bound questions, so
-    /// the emit site filters on `target.is_none()`.
-    QuestionAdded {
-        seq: u64,
-        id: i64,
-        asker: String,
-        question: String,
-        options: Vec<String>,
-        multi: bool,
-        asked_at: i64,
-        deadline_at: Option<i64>,
-    },
-    /// An operator-targeted question was answered (operator answer,
-    /// peer override, or ttl watchdog `[expired]`). Clients move the
-    /// row from pending to history. `cancelled = true` when the
-    /// operator dismissed via the cancel button — same code path on
-    /// the server but useful to surface differently in the UI.
-    QuestionResolved {
-        seq: u64,
-        id: i64,
-        answer: String,
-        answerer: String,
-        answered_at: i64,
-        cancelled: bool,
-    },
-    /// A lifecycle action started for an agent (spawn / start / stop
-    /// / restart / rebuild / destroy). Clients render a spinner next
-    /// to the row; the client computes "seconds in this state"
-    /// locally from `since_unix` so a slow rebuild's elapsed time
-    /// ticks without polling.
-    TransientSet {
-        seq: u64,
-        name: String,
-        /// Lifecycle kind: `"spawning"` / `"starting"` / `"stopping"` /
-        /// `"restarting"` / `"rebuilding"` / `"destroying"`.
-        transient_kind: &'static str,
-        since_unix: i64,
-    },
-    /// The matching lifecycle action resolved (success or failure).
-    /// Clients drop the spinner row.
-    TransientCleared { seq: u64, name: String },
 }

hive-c0re/src/limits.rs

@@ -10,10 +10,10 @@
 //! about it — oversized reminder bodies get persisted to disk
 //! transparently and the inbox sees a pointer.
 
-/// Per-message body cap. Applies to `send`, `ask` question text,
+/// Per-message body cap. Applies to `send`, `ask_operator` question
-/// `answer` body, and the stored inline form of a reminder. 1 KiB
+/// text, and the stored inline form of a reminder. 1 KiB is small
-/// is small enough that 100 unread messages don't dominate a wake
+/// enough that 100 unread messages don't dominate a wake prompt,
-/// prompt, large enough for routine cross-agent chatter.
+/// large enough for routine cross-agent chatter.
 pub const MESSAGE_MAX_BYTES: usize = 1024;
 
 /// Validate that `body` fits under [`MESSAGE_MAX_BYTES`]. Returns a

hive-c0re/src/main.rs

@@ -23,7 +23,6 @@ mod manager_server;
 mod meta;
 mod migrate;
 mod operator_questions;
-mod questions;
 mod reminder_scheduler;
 mod server;
 

hive-c0re/src/manager_server.rs

@@ -157,7 +157,6 @@ async fn dispatch(req: &ManagerRequest, coord: &Arc<Coordinator>) -> ManagerResp
             ) {
                 Ok(id) => {
                     tracing::info!(%id, %name, "spawn approval queued");
-                    coord.emit_approval_added(id, name, "spawn", None, None, description.clone());
                     ManagerResponse::Ok
                 }
                 Err(e) => ManagerResponse::Err {
@@ -245,30 +244,39 @@ async fn dispatch(req: &ManagerRequest, coord: &Arc<Coordinator>) -> ManagerResp
                 },
             }
         }
-        ManagerRequest::Ask {
+        ManagerRequest::AskOperator {
             question,
             options,
             multi,
             ttl_seconds,
-            to,
+        } => {
-        } => crate::questions::handle_ask(
+            if let Err(message) = crate::limits::check_size("question", question) {
-            coord,
+                return ManagerResponse::Err { message };
-            MANAGER_AGENT,
+            }
-            question,
+            tracing::info!(%question, ?options, multi, ?ttl_seconds, "manager: ask_operator");
-            options,
+            let deadline_at = ttl_seconds.and_then(|s| {
-            *multi,
+                let now = std::time::SystemTime::now()
-            *ttl_seconds,
+                    .duration_since(std::time::UNIX_EPOCH)
-            to.as_deref(),
+                    .ok()
-        )
+                    .and_then(|d| i64::try_from(d.as_secs()).ok())
-        .map_or_else(
+                    .unwrap_or(0);
-            |message| ManagerResponse::Err { message },
+                i64::try_from(s).ok().map(|s| now + s)
-            |id| ManagerResponse::QuestionQueued { id },
+            });
-        ),
+            match coord
-        ManagerRequest::Answer { id, answer } => {
+                .questions
-            crate::questions::handle_answer(coord, MANAGER_AGENT, *id, answer).map_or_else(
+                .submit(MANAGER_AGENT, question, options, *multi, deadline_at)
-                |message| ManagerResponse::Err { message },
+            {
-                |()| ManagerResponse::Ok,
+                Ok(id) => {
-            )
+                    tracing::info!(%id, ?deadline_at, "operator question queued");
+                    if let Some(ttl) = *ttl_seconds {
+                        spawn_question_watchdog(coord, id, ttl);
+                    }
+                    ManagerResponse::QuestionQueued { id }
+                }
+                Err(e) => ManagerResponse::Err {
+                    message: format!("{e:#}"),
+                },
+            }
         }
         ManagerRequest::GetLogs { agent, lines } => {
             let n = lines.unwrap_or(50);
@@ -383,17 +391,7 @@ async fn submit_apply_commit(
                 // dashboard reflects it instead of leaving a phantom
                 // pending entry. The note doubles as the operator-visible
                 // explanation of why the approval can't be approved.
-                let note = format!("{e:#}");
+                let _ = coord.approvals.mark_failed(id, &format!("{e:#}"));
-                let _ = coord.approvals.mark_failed(id, &note);
-                coord.emit_approval_resolved(
-                    id,
-                    agent,
-                    "apply_commit",
-                    None,
-                    "failed",
-                    Some(note),
-                    description.map(str::to_owned),
-                );
                 return Err(anyhow::anyhow!("git_fetch_to_tag: {e:#}"));
             }
         };
@@ -401,62 +399,33 @@ async fn submit_apply_commit(
         .approvals
         .set_fetched_sha(id, &sha)
         .map_err(|e| anyhow::anyhow!("persist fetched_sha: {e:#}"))?;
-    // Phase 5b: surface the new pending approval on the dashboard
-    // event channel. Compute the diff once here so live subscribers
-    // get a fully-formed row without a snapshot refetch.
-    let sha_short = sha[..sha.len().min(12)].to_owned();
-    let diff = crate::dashboard::approval_diff(agent, id).await;
-    coord.emit_approval_added(
-        id,
-        agent,
-        "apply_commit",
-        Some(sha_short),
-        Some(diff),
-        description.map(str::to_owned),
-    );
     Ok((id, sha))
 }
 
-/// On `Ask { ttl_seconds: Some(n) }`, sleep n seconds and then try to
+/// On `AskOperator { ttl_seconds: Some(n) }`, sleep n seconds and then
-/// resolve the question with `[expired]`. If the operator (or any
+/// try to resolve the question with `[expired]`. If the operator (or
-/// other path) already answered it, `answer()` returns Err and we
+/// any other path) already answered it, `answer()` returns Err and
-/// no-op silently. Otherwise fire a `QuestionAnswered` helper event
+/// we no-op silently. Otherwise fire the usual `OperatorAnswered`
-/// with `answerer = "ttl-watchdog"` so the asker can distinguish a
+/// helper event so the manager sees a terminal state.
-/// real answer from a deadline trip without parsing the answer text.
 const TTL_SENTINEL: &str = "[expired]";
-/// Synthetic `answerer` label used when the ttl watchdog resolves a
-/// question instead of a real human / agent. Lives in a distinct
-/// namespace from agent names + the operator so the asker can pattern
-/// match `event.answerer == "ttl-watchdog"`.
-const TTL_ANSWERER: &str = "ttl-watchdog";
 
 pub fn spawn_question_watchdog(coord: &Arc<Coordinator>, id: i64, ttl_secs: u64) {
     let coord = coord.clone();
     tokio::spawn(async move {
         tokio::time::sleep(std::time::Duration::from_secs(ttl_secs)).await;
-        // Watchdog has its own answerer label so the authorisation
+        // `answer` returns Err if already resolved — that's the
-        // check in `answer()` permits it for any target. We bypass
+        // normal path when the operator responded before the ttl
-        // the public `answer()` path by calling it with the operator
+        // fired, so no-op silently.
-        // identity, since the operator is always permitted; the
+        if let Ok((question, asker)) = coord.questions.answer(id, TTL_SENTINEL) {
-        // event we fire carries the real watchdog label for observers.
+            tracing::info!(%id, %asker, "operator question expired (ttl)");
-        if let Ok((question, asker, target)) =
-            coord
-                .questions
-                .answer(id, TTL_SENTINEL, hive_sh4re::OPERATOR_RECIPIENT)
-        {
-            tracing::info!(%id, %asker, "question expired (ttl)");
             coord.notify_agent(
                 &asker,
-                &hive_sh4re::HelperEvent::QuestionAnswered {
+                &hive_sh4re::HelperEvent::OperatorAnswered {
                     id,
                     question,
                     answer: TTL_SENTINEL.to_owned(),
-                    answerer: TTL_ANSWERER.to_owned(),
                 },
             );
-            if target.is_none() {
-                coord.emit_question_resolved(id, TTL_SENTINEL, TTL_ANSWERER, false);
-            }
         }
     });
 }

hive-c0re/src/operator_questions.rs

@@ -1,13 +1,7 @@
-//! Question queue. Agents submit via `Ask`; the answer comes from
+//! Operator question queue. Manager submits via `AskOperator`; the
-//! either the operator (via the dashboard, for `target IS NULL`) or
+//! operator answers via the dashboard. The manager-socket handler long-polls
-//! a peer agent (via `Answer`, for agent-to-agent questions).
+//! the store until the answer lands, so claude's `ask_operator` tool call
-//!
+//! returns the answer directly as its result.
-//! Despite the file name (kept for git history sanity), this table
-//! now stores *all* asynchronous questions in the hive — both the
-//! operator-targeted ones and the peer-to-peer ones. `target IS
-//! NULL` is the operator path (back-compat with rows written before
-//! the column existed); `target = '<agent-name>'` is the
-//! agent-to-agent path.
 
 use std::path::Path;
 use std::sync::Mutex;
@@ -44,15 +38,6 @@ fn ensure_columns(conn: &Connection) -> Result<()> {
             "deadline_at",
             "ALTER TABLE operator_questions ADD COLUMN deadline_at INTEGER;",
         ),
-        // `target` = recipient of the question. NULL = operator
-        // (back-compat default for rows written before agent-to-agent
-        // questions existed); a non-null agent name = peer-to-peer
-        // question. Dashboard's `pending()` filters on `target IS NULL`
-        // so peer questions never leak into the operator's queue.
-        (
-            "target",
-            "ALTER TABLE operator_questions ADD COLUMN target TEXT;",
-        ),
     ] {
         let has: bool = conn
             .prepare(&format!(
@@ -82,12 +67,6 @@ pub struct OpQuestion {
     pub deadline_at: Option<i64>,
     pub answered_at: Option<i64>,
     pub answer: Option<String>,
-    /// Recipient of the question. `None` = the operator (dashboard
-    /// path); `Some(<agent>)` = a peer agent asked via
-    /// `Ask { to: Some(<agent>), ... }`. Agent-to-agent questions
-    /// never appear in `pending()` so the operator's queue stays clean.
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub target: Option<String>,
 }
 
 pub struct OperatorQuestions {
@@ -118,89 +97,57 @@ impl OperatorQuestions {
         options: &[String],
         multi: bool,
         deadline_at: Option<i64>,
-        target: Option<&str>,
     ) -> Result<i64> {
         let conn = self.conn.lock().unwrap();
         let options_json = serde_json::to_string(options).unwrap_or_else(|_| "[]".into());
         conn.execute(
             "INSERT INTO operator_questions
-               (asker, question, options_json, multi, deadline_at, target, asked_at)
+               (asker, question, options_json, multi, deadline_at, asked_at)
-             VALUES (?1, ?2, ?3, ?4, ?5, ?6, ?7)",
+             VALUES (?1, ?2, ?3, ?4, ?5, ?6)",
             params![
                 asker,
                 question,
                 options_json,
                 i64::from(multi),
                 deadline_at,
-                target,
                 now_unix(),
             ],
         )?;
         Ok(conn.last_insert_rowid())
     }
 
-    /// Mark a pending question answered. `answerer` is who's actually
+    /// Mark the question answered. Returns the original question text so the
-    /// answering: `"operator"` for the dashboard path, or an agent's
+    /// Mark a pending question answered. Returns `(question, asker)`
-    /// own name when responding via `Answer`. Authorisation:
+    /// so the caller can both echo the question back in a helper
-    ///
+    /// event AND route that event to whichever agent originally
-    /// - Operator-targeted questions (`target IS NULL`) can only be
+    /// asked it.
-    ///   answered by `"operator"`. (Agents must not be able to spoof
+    pub fn answer(&self, id: i64, answer: &str) -> Result<(String, String)> {
-    ///   answers to operator questions — the dashboard is the
-    ///   privileged path.)
-    /// - Agent-targeted questions can only be answered by the
-    ///   declared target agent, OR by `"operator"` (operator override
-    ///   for stuck threads — useful when an agent is offline/down
-    ///   and someone has to close the loop).
-    ///
-    /// Returns `(question, asker, target)` so the caller can fire the
-    /// `QuestionAnswered` event with the right answerer label and route
-    /// it back to the original asker.
-    pub fn answer(
-        &self,
-        id: i64,
-        answer: &str,
-        answerer: &str,
-    ) -> Result<(String, String, Option<String>)> {
         let conn = self.conn.lock().unwrap();
-        let row: Option<(String, String, Option<String>, Option<i64>)> = conn
+        let row: Option<(String, String, Option<i64>)> = conn
             .query_row(
-                "SELECT question, asker, target, answered_at FROM operator_questions WHERE id = ?1",
+                "SELECT question, asker, answered_at FROM operator_questions WHERE id = ?1",
                 params![id],
-                |row| Ok((row.get(0)?, row.get(1)?, row.get(2)?, row.get(3)?)),
+                |row| Ok((row.get(0)?, row.get(1)?, row.get(2)?)),
             )
             .optional()?;
-        let Some((question, asker, target, answered_at)) = row else {
+        let Some((question, asker, answered_at)) = row else {
             bail!("question {id} not found");
         };
         if answered_at.is_some() {
             bail!("question {id} already answered");
         }
-        // Authorisation check: must match the target, or be the operator
-        // (operator-targeted questions are operator-only; the operator
-        // can additionally override agent-to-agent questions to close
-        // stuck threads).
-        let authorised = match target.as_deref() {
-            None => answerer == hive_sh4re::OPERATOR_RECIPIENT,
-            Some(t) => answerer == t || answerer == hive_sh4re::OPERATOR_RECIPIENT,
-        };
-        if !authorised {
-            bail!(
-                "question {id} not addressed to '{answerer}' (target = {:?})",
-                target.as_deref().unwrap_or(hive_sh4re::OPERATOR_RECIPIENT)
-            );
-        }
         conn.execute(
             "UPDATE operator_questions SET answer = ?1, answered_at = ?2 WHERE id = ?3",
             params![answer, now_unix(), id],
         )?;
-        Ok((question, asker, target))
+        Ok((question, asker))
     }
 
     #[allow(dead_code)]
     pub fn get(&self, id: i64) -> Result<Option<OpQuestion>> {
         let conn = self.conn.lock().unwrap();
         conn.query_row(
-            "SELECT id, asker, question, options_json, multi, asked_at, answered_at, answer, deadline_at, target
+            "SELECT id, asker, question, options_json, multi, asked_at, answered_at, answer, deadline_at
                FROM operator_questions WHERE id = ?1",
             params![id],
             row_to_question,
@@ -209,15 +156,12 @@ impl OperatorQuestions {
         .map_err(Into::into)
     }
 
-    /// Pending operator-targeted questions only (`target IS NULL`).
-    /// Drives the dashboard's pending-question pane — agent-to-agent
-    /// questions never appear here so the operator's queue stays clean.
     pub fn pending(&self) -> Result<Vec<OpQuestion>> {
         let conn = self.conn.lock().unwrap();
         let mut stmt = conn.prepare(
-            "SELECT id, asker, question, options_json, multi, asked_at, answered_at, answer, deadline_at, target
+            "SELECT id, asker, question, options_json, multi, asked_at, answered_at, answer, deadline_at
                FROM operator_questions
-              WHERE answered_at IS NULL AND target IS NULL
+              WHERE answered_at IS NULL
               ORDER BY id ASC",
         )?;
         let rows = stmt.query_map([], row_to_question)?;
@@ -225,15 +169,13 @@ impl OperatorQuestions {
             .map_err(Into::into)
     }
 
-    /// Last `limit` answered operator-targeted questions, newest-first.
+    /// Last `limit` answered questions, newest-first.
-    /// Same `target IS NULL` filter as `pending()` so the dashboard's
-    /// history view only shows operator-relevant rows.
     pub fn recent_answered(&self, limit: u64) -> Result<Vec<OpQuestion>> {
         let conn = self.conn.lock().unwrap();
         let mut stmt = conn.prepare(
-            "SELECT id, asker, question, options_json, multi, asked_at, answered_at, answer, deadline_at, target
+            "SELECT id, asker, question, options_json, multi, asked_at, answered_at, answer, deadline_at
                FROM operator_questions
-              WHERE answered_at IS NOT NULL AND target IS NULL
+              WHERE answered_at IS NOT NULL
               ORDER BY answered_at DESC
               LIMIT ?1",
         )?;
@@ -257,7 +199,6 @@ fn row_to_question(row: &rusqlite::Row<'_>) -> rusqlite::Result<OpQuestion> {
         answered_at: row.get(6)?,
         answer: row.get(7)?,
         deadline_at: row.get(8)?,
-        target: row.get(9)?,
     })
 }
 

hive-c0re/src/questions.rs

@@ -1,138 +0,0 @@
-//! Shared dispatch helpers for the `Ask` / `Answer` flow. Both the
-//! agent socket and the manager socket call into here so the routing
-//! semantics — recipient = operator vs. peer agent, answerer
-//! authorisation, asker-notification — only live in one place.
-//!
-//! Routing rules at a glance:
-//!
-//! - `Ask { to: None | Some("operator") }` → stored with `target = NULL`;
-//!   the dashboard's `pending()` query surfaces it; operator answers
-//!   via the dashboard.
-//! - `Ask { to: Some(<agent>) }` → stored with `target = <agent>`;
-//!   a `HelperEvent::QuestionAsked` is pushed into `<agent>`'s
-//!   inbox so they can `Answer { id, answer }` on their own socket.
-//! - `Answer { id, answer }` → permission-checked in
-//!   `OperatorQuestions::answer` (only the target agent or the
-//!   operator can answer; both paths fire the same
-//!   `QuestionAnswered` event to the asker).
-
-use std::sync::Arc;
-
-use crate::coordinator::Coordinator;
-use crate::limits;
-use crate::manager_server::spawn_question_watchdog;
-
-/// Cap on how long an asker can demand an answer before the watchdog
-/// auto-resolves with `[expired]`. Six hours mirrors typical agent
-/// session lifetimes — beyond that an unanswered question is
-/// effectively a dead thread and should be re-asked, not blocked on.
-const MAX_TTL_SECONDS: u64 = 6 * 60 * 60;
-
-/// Handle either surface's `Ask` request. Returns the queued
-/// question id on success or a caller-ready error string. Caller is
-/// responsible for wrapping in the matching `*Response::Err` /
-/// `QuestionQueued` variant.
-pub fn handle_ask(
-    coord: &Arc<Coordinator>,
-    asker: &str,
-    question: &str,
-    options: &[String],
-    multi: bool,
-    ttl_seconds: Option<u64>,
-    to: Option<&str>,
-) -> Result<i64, String> {
-    limits::check_size("question", question)?;
-    // Normalise `Some("operator")` → None so the storage layer
-    // only has to think about NULL vs. non-NULL targets, not
-    // "is this string the operator?".
-    let target = match to {
-        None => None,
-        Some(t) if t == hive_sh4re::OPERATOR_RECIPIENT => None,
-        Some("") => {
-            return Err("ask: `to` cannot be empty (omit it for the operator path)".to_owned());
-        }
-        Some(t) if t == asker => {
-            return Err("ask: cannot ask yourself a question (would loop forever)".to_owned());
-        }
-        Some(t) => Some(t),
-    };
-    let ttl = ttl_seconds.map(|s| s.min(MAX_TTL_SECONDS));
-    let deadline_at = ttl.and_then(|s| {
-        let now = std::time::SystemTime::now()
-            .duration_since(std::time::UNIX_EPOCH)
-            .ok()
-            .and_then(|d| i64::try_from(d.as_secs()).ok())
-            .unwrap_or(0);
-        i64::try_from(s).ok().map(|s| now + s)
-    });
-    let id = coord
-        .questions
-        .submit(asker, question, options, multi, deadline_at, target)
-        .map_err(|e| format!("{e:#}"))?;
-    tracing::info!(%id, %asker, ?target, ?deadline_at, "question queued");
-    // Agent-targeted questions need to wake the recipient — drop a
-    // QuestionAsked event into their inbox so the answerer doesn't
-    // have to poll. Operator-targeted questions show up on the
-    // dashboard's pending pane via `pending()` instead, plus a
-    // `QuestionAdded` dashboard event so the browser updates live.
-    if let Some(target_agent) = target {
-        coord.notify_agent(
-            target_agent,
-            &hive_sh4re::HelperEvent::QuestionAsked {
-                id,
-                asker: asker.to_owned(),
-                question: question.to_owned(),
-                options: options.to_vec(),
-                multi,
-            },
-        );
-    } else {
-        coord.emit_question_added(id, asker, question, options, multi, deadline_at);
-    }
-    if let Some(t) = ttl {
-        spawn_question_watchdog(coord, id, t);
-    }
-    Ok(id)
-}
-
-/// Handle either surface's `Answer` request. Returns `Ok(())` on
-/// success or a caller-ready error string. Authorisation lives in
-/// `OperatorQuestions::answer` — we only have to wire the result
-/// back to the asker as a `QuestionAnswered` event.
-pub fn handle_answer(
-    coord: &Arc<Coordinator>,
-    answerer: &str,
-    id: i64,
-    answer: &str,
-) -> Result<(), String> {
-    limits::check_size("answer", answer)?;
-    let (question, asker, target) = coord
-        .questions
-        .answer(id, answer, answerer)
-        .map_err(|e| format!("{e:#}"))?;
-    tracing::info!(%id, %answerer, %asker, "question answered");
-    coord.notify_agent(
-        &asker,
-        &hive_sh4re::HelperEvent::QuestionAnswered {
-            id,
-            question,
-            answer: answer.to_owned(),
-            answerer: answerer.to_owned(),
-        },
-    );
-    // Only operator-targeted questions surface on the dashboard;
-    // peer-to-peer answers are invisible to it. `cancelled = false`
-    // because this path is a real answer (operator cancel goes
-    // through `post_cancel_question` directly).
-    if target.is_none() {
-        coord.emit_question_resolved(id, answer, answerer, false);
-    }
-    Ok(())
-}
-
-// Real coverage needs a `Coordinator` fixture (broker + sqlite +
-// in-memory questions). Skipped for now — the normalisation branches
-// in `handle_ask` are short enough to read line-by-line; once we add
-// a coord test harness, drop integration tests here for: self-target
-// rejection, operator-string passthrough, agent-to-agent QuestionAsked
-// emission, and `Answer` authorisation.

hive-sh4re/src/lib.rs

@@ -221,17 +221,11 @@ pub enum AgentRequest {
     /// Non-mutating — pulls from the broker without delivering. The
     /// per-agent web UI uses this to render its own inbox section.
     Recent { limit: u64 },
-    /// Surface a question to either the operator or another agent.
+    /// Surface a question to the operator on the dashboard. Same
-    /// `to = None` (or `Some("operator")`) routes the question to the
+    /// shape as `ManagerRequest::AskOperator` — any agent can ask;
-    /// dashboard's operator-question queue (legacy `AskOperator`
+    /// the answer routes back to the asker's inbox as a
-    /// behaviour). `to = Some(<agent>)` routes it to that agent's
+    /// `HelperEvent::OperatorAnswered`.
-    /// inbox as a `HelperEvent::QuestionAsked` so the recipient can
+    AskOperator {
-    /// answer back via `AgentRequest::Answer` (or
-    /// `ManagerRequest::Answer`); the answer threads back to the asker
-    /// as a `HelperEvent::QuestionAnswered` event. Either way the
-    /// response shape is `QuestionQueued { id }` — the asker uses the
-    /// id to correlate the asynchronous answer event.
-    Ask {
         question: String,
         #[serde(default)]
         options: Vec<String>,
@@ -239,18 +233,7 @@ pub enum AgentRequest {
         multi: bool,
         #[serde(default)]
         ttl_seconds: Option<u64>,
-        /// Recipient of the question. `None` or `Some("operator")` =
-        /// the human operator (dashboard); `Some(<agent_name>)` = a
-        /// peer agent (their inbox).
-        #[serde(default)]
-        to: Option<String>,
     },
-    /// Answer a question previously routed to this agent via
-    /// `HelperEvent::QuestionAsked`. The caller is implicitly the
-    /// answerer; only the question's `target` agent (or the operator,
-    /// via the dashboard) is authorised. Wires through to
-    /// `HelperEvent::QuestionAnswered` in the asker's inbox.
-    Answer { id: i64, answer: String },
     /// Schedule a reminder message to be delivered to this agent at a
     /// future time. The reminder lands in the agent's inbox as an auto-sent
     /// message from `"reminder"`. Use for agent follow-ups (e.g. check task
@@ -281,8 +264,8 @@ pub enum AgentResponse {
     Status { unread: u64 },
     /// `Recent` result: newest-first inbox rows.
     Recent { rows: Vec<InboxRow> },
-    /// `Ask` result: the queued question id. The answer lands later
+    /// `AskOperator` result: the queued question id. The answer lands
-    /// as `HelperEvent::QuestionAnswered` in this agent's inbox.
+    /// later as `HelperEvent::OperatorAnswered` in this agent's inbox.
     QuestionQueued { id: i64 },
 }
 
@@ -392,32 +375,14 @@ pub enum HelperEvent {
         #[serde(default, skip_serializing_if = "Option::is_none")]
         note: Option<String>,
     },
-    /// A question queued via `Ask` was answered (by the operator via
+    /// The operator answered a question that was queued via
-    /// the dashboard, or by another agent via `Answer`). `id` matches
+    /// `AskOperator`. `id` matches the `QuestionQueued.id` returned to the
-    /// the `QuestionQueued.id` returned to the asker; `question`
+    /// asker; `question` echoes the original prompt so the manager can
-    /// echoes the original prompt so the asker can stitch the answer
+    /// stitch the answer back to context across compactions.
-    /// back to context across compactions; `answerer` is who answered
+    OperatorAnswered {
-    /// (`"operator"` or a peer agent name).
-    QuestionAnswered {
         id: i64,
         question: String,
         answer: String,
-        answerer: String,
-    },
-    /// A peer (or the manager) asked this agent a question via
-    /// `Ask { to: Some(<this-agent>), ... }`. The recipient should
-    /// answer via `Answer { id, answer }` on their socket; the answer
-    /// will route back to the asker as a `QuestionAnswered` event.
-    /// `options` + `multi` mirror the original `Ask` args so the
-    /// answerer knows what shape of reply is expected.
-    QuestionAsked {
-        id: i64,
-        asker: String,
-        question: String,
-        #[serde(default)]
-        options: Vec<String>,
-        #[serde(default)]
-        multi: bool,
     },
 }
 
@@ -487,10 +452,9 @@ pub enum ManagerRequest {
         #[serde(default, skip_serializing_if = "Option::is_none")]
         description: Option<String>,
     },
-    /// Surface a question to either the operator or another agent.
+    /// Ask the operator a question. Returns immediately with the queued
-    /// Mirrors `AgentRequest::Ask` exactly — see that doc for the
+    /// question id; the operator's answer arrives later as a
-    /// routing semantics (operator = dashboard queue; agent = the
+    /// `HelperEvent::OperatorAnswered` in the manager inbox.
-    /// peer's inbox via `HelperEvent::QuestionAsked`).
     ///
     /// - `options` is advisory: empty = free-text only; non-empty = the
     ///   dashboard renders the choices alongside a free-text fallback
@@ -500,11 +464,9 @@ pub enum ManagerRequest {
     ///   selections joined by ", ".
     /// - `ttl_seconds`: optional auto-cancel after that many seconds. On
     ///   expiry the question is resolved with answer `[expired]` and the
-    ///   asker gets the usual `QuestionAnswered` event. None = wait
+    ///   manager gets the usual `OperatorAnswered` event. None = wait
-    ///   forever for an answer (or manual cancel).
+    ///   forever for an operator answer (or manual cancel).
-    /// - `to`: recipient (None / `Some("operator")` = operator;
+    AskOperator {
-    ///   `Some(<agent>)` = peer agent).
-    Ask {
         question: String,
         #[serde(default)]
         options: Vec<String>,
@@ -512,13 +474,7 @@ pub enum ManagerRequest {
         multi: bool,
         #[serde(default)]
         ttl_seconds: Option<u64>,
-        #[serde(default)]
-        to: Option<String>,
     },
-    /// Answer a question previously routed to the manager via
-    /// `HelperEvent::QuestionAsked` (i.e. an agent asked the manager
-    /// for input). Mirror of `AgentRequest::Answer`.
-    Answer { id: i64, answer: String },
     /// Fetch recent journal lines for a sub-agent container. hive-c0re
     /// runs `journalctl -M <agent> -n <lines> --no-pager` and returns
     /// the output as a string. Useful for diagnosing MCP registration
@@ -558,10 +514,9 @@ pub enum ManagerResponse {
     Status {
         unread: u64,
     },
-    /// Result of `Ask`: the queued question id. The actual answer
+    /// Result of `AskOperator`: the queued question id. The actual answer
-    /// arrives later as a `HelperEvent::QuestionAnswered` in the
+    /// arrives later as a `HelperEvent::OperatorAnswered` in the manager
-    /// asker's inbox, so this returns immediately rather than blocking
+    /// inbox, so this returns immediately rather than blocking the turn.
-    /// the turn.
     QuestionQueued {
         id: i64,
     },