The backend never sent a JSON-RPC request; when it needed an answer from the
renderer it hand-correlated a `*.request` notification with a later `*.respond`
method through four module-level dicts, a timeout thread and 13 derived
`*.expire` names, plus a separate reconnect snapshot per prompt kind. That is a
second request/response layer built on a protocol that already has one.
`tui_gateway/server_requests.py` sends `{id: "srq-…", method, params}` and
blocks on the response frame with that id (string ids never collide with the
clients' integer ids). One `request.cancel {id, method, reason}` notification
withdraws a request on timeout / interrupt / session close. `open_requests` on
`session.resume` / `session.activate` / `session.events.since` re-delivers
unanswered requests after a reconnect; the shared TypeScript channel does that
itself before the caller sees the result. Batch clarify keeps its per-question
locks as a normal `clarify.lock` RPC (the last lock resolves the request).
Approvals stay queue-backed (`tools.approval` owns the timeout, `/approve all`,
coalescing): the request resolves the queue entry and the entry's own
resolution withdraws the request through `register_gateway_settle`.
Deleted: `_block`, `_respond`, `_pending`, `_answers`,
`_pending_prompt_payloads`, `_batch_clarify`, `_EXPIRING_REQUESTS`, the
`*.respond` methods, every `*.request` / `*.expire` event, `pending_clarify`.
Compute-host (turn isolation) mirrors the child's open request and relays the
response frame / lock to it. Desktop, TUI and shared clients register
`onRequest` handlers where they used to switch on `*.request` events; answers
are response frames over the socket the request arrived on, so #91684's
owner-routing class cannot recur for prompts.
177 lines
8.7 KiB
Python
177 lines
8.7 KiB
Python
"""Blocking gateway approval wait for :mod:`tools.approval`.
|
|
|
|
Mirrors the CLI's synchronous ``input()`` flow: the agent thread enqueues a
|
|
pending approval, the gateway notifies the user, and the thread blocks until
|
|
``/approve`` / ``/deny`` resolves it or the approval timeout elapses. Multiple
|
|
threads (parallel subagents, execute_code RPC handlers) can block concurrently
|
|
— each gets its own ``threading.Event``; ``/approve`` resolves the oldest,
|
|
``/approve all`` every pending entry. Queue state (``_gateway_queues``,
|
|
``_lock``) is owned by ``tools.approval`` and reached through that module at
|
|
call time.
|
|
"""
|
|
|
|
import logging
|
|
import threading
|
|
import time
|
|
import uuid
|
|
|
|
from tools.interrupt import is_interrupted
|
|
from tools import approval_context as _ctx
|
|
from tools.approval_human_wait import activity_heartbeat, human_wait_window
|
|
|
|
logger = logging.getLogger("tools.approval")
|
|
|
|
|
|
class _ApprovalEntry:
|
|
"""One pending dangerous-command approval inside a gateway session."""
|
|
__slots__ = ("event", "data", "result", "reason", "acknowledged", "settle")
|
|
|
|
def __init__(self, data: dict):
|
|
self.event = threading.Event()
|
|
self.data = dict(data)
|
|
self.data.setdefault("request_id", uuid.uuid4().hex)
|
|
self.acknowledged = False
|
|
# Surface hook run once when the wait ends by ANY path (answer, timeout, interrupt, /approve from
|
|
# another client): the tui_gateway withdraws its open server→client request through it.
|
|
self.settle = None
|
|
self.result: str | None = None # "once"|"session"|"always"|"deny"
|
|
# Free-text reason from ``/deny <reason>`` so the agent can adapt, not just hear "denied".
|
|
self.reason: str | None = None
|
|
|
|
|
|
def _poll_event(event: threading.Event, session_key: str, *, interrupt_log: str) -> str:
|
|
"""Wait on *event* until it fires, the turn is interrupted, or approvals.timeout
|
|
elapses; returns ``"set"`` | ``"interrupted"`` | ``"timeout"``. Polls in ~1s
|
|
slices so activity heartbeats reach the agent's inactivity tracker every ~10s —
|
|
otherwise the gateway watchdog kills the agent while the user is still
|
|
responding (mirrors ``_wait_for_process()`` cadence). The loop is recorded as
|
|
human-wait time so the concurrent batch deadline excludes it.
|
|
|
|
``is_interrupted()`` deliberately does NOT distinguish a deliberate /stop from
|
|
a gateway inactivity timeout — both resolve as 'deny' (not outcome='timeout').
|
|
The per-thread interrupt flag carries no stable machine-checkable cause, so a
|
|
fail-closed deny preserves the historical semantics; changing this needs a
|
|
dedicated interrupt-cause channel, not string matching."""
|
|
deadline = time.monotonic() + max(_ctx._get_approval_timeout(), 0)
|
|
heartbeat = activity_heartbeat("waiting for user approval")
|
|
with human_wait_window(session_key):
|
|
while True:
|
|
# The poll loop below is verifiably blocked on a human answer (the user tapping approve/deny on
|
|
# the gateway surface), bounded by the approval timeout. Record it as human-wait time so the
|
|
# concurrent batch deadline excludes it (#79719).
|
|
if is_interrupted():
|
|
logger.info(interrupt_log, session_key)
|
|
return "interrupted"
|
|
remaining = deadline - time.monotonic()
|
|
if remaining <= 0:
|
|
return "timeout"
|
|
if event.wait(timeout=min(1.0, remaining)):
|
|
return "set"
|
|
heartbeat()
|
|
|
|
|
|
def _finish(payload: dict, resolved: bool, choice: str | None, reason, **extra) -> dict:
|
|
"""Fire the post hook and build the decision dict. Unresolved (timeout) and
|
|
a None choice both mean the user never answered."""
|
|
_ctx._fire_approval_hook("post_approval_response", **payload,
|
|
choice="timeout" if not resolved else (choice or "timeout"), **extra)
|
|
return {"resolved": resolved, "choice": choice, "reason": reason, **extra}
|
|
|
|
|
|
def _await_coalesced_leader(session_key: str, leader, payload: dict):
|
|
"""Wait on an already-pending identical approval instead of re-prompting.
|
|
Adopts the leader's decision: ``session``/``always`` → approval (same dict
|
|
shape as a direct resolution; persistence stays the caller's and is
|
|
idempotent across leader and followers); ``deny`` → denial carrying the
|
|
leader's reason; leader timeout / our own deadline → unresolved. ``once``
|
|
returns ``None``: single-use consent covers only the leader's execution,
|
|
so the caller must issue a fresh prompt. Hooks fire with ``coalesced=True``
|
|
so observers see the follower's lifecycle without a duplicate prompt."""
|
|
_ctx._fire_approval_hook("pre_approval_request", **payload, coalesced=True)
|
|
state = _poll_event(leader.event, session_key,
|
|
interrupt_log="Coalesced approval wait interrupted by user signal — "
|
|
"returning deny for session %s")
|
|
if state == "interrupted":
|
|
# Deny only OUR follower; the leader thread handles its own signal.
|
|
choice, resolved = "deny", True
|
|
elif state == "timeout":
|
|
choice, resolved = None, False
|
|
else:
|
|
choice = leader.result
|
|
resolved = choice is not None
|
|
if choice == "once":
|
|
# The post hook fires for the fresh prompt's own lifecycle, not here.
|
|
return None
|
|
return _finish(payload, resolved, choice, getattr(leader, "reason", None), coalesced=True)
|
|
|
|
|
|
def _await_gateway_decision(session_key: str, notify_cb, approval_data: dict, *, surface: str = "gateway") -> dict:
|
|
"""Enqueue *approval_data*, notify the user, and block until resolved or timed
|
|
out. Shared by the terminal command guard, the execute_code guard, the plugin
|
|
escalation gate, and MCP elicitation. Returns ``{"resolved", "choice",
|
|
"reason"}`` or ``{"resolved": False, "choice": None, "notify_failed": True}``
|
|
when the notify callback raised. Persisting the choice and building the
|
|
tool-facing result stay with the caller.
|
|
|
|
Identical concurrent approvals (same command text + pattern-key set) are
|
|
coalesced: parallel tool calls would otherwise fire N identical prompts
|
|
the user must /approve N times while the agent sits wedged. Followers adopt
|
|
the leader's ``session``/``always``/``deny``/timeout; a ``once`` covers only
|
|
the leader, so the follower falls through to a fresh prompt."""
|
|
from tools import approval as _approval
|
|
|
|
primary_key = approval_data.get("pattern_key", "")
|
|
payload = {
|
|
"command": approval_data.get("command", ""),
|
|
"description": approval_data.get("description", ""),
|
|
"pattern_key": primary_key,
|
|
"pattern_keys": list(approval_data.get("pattern_keys", [primary_key])),
|
|
"session_key": session_key, "surface": surface,
|
|
}
|
|
keys = list(approval_data.get("pattern_keys") or [])
|
|
with _approval._lock:
|
|
leader = next((e for e in _approval._gateway_queues.get(session_key, [])
|
|
if e.data.get("command") == approval_data.get("command")
|
|
and list(e.data.get("pattern_keys") or []) == keys), None)
|
|
if leader is not None:
|
|
adopted = _await_coalesced_leader(session_key, leader, payload)
|
|
if adopted is not None:
|
|
return adopted
|
|
|
|
entry = _ApprovalEntry(approval_data)
|
|
with _approval._lock:
|
|
_approval._gateway_queues.setdefault(session_key, []).append(entry)
|
|
|
|
def _drop_entry(reason: str) -> None:
|
|
with _approval._lock:
|
|
queue = _approval._gateway_queues.get(session_key, [])
|
|
if entry in queue:
|
|
queue.remove(entry)
|
|
if not queue:
|
|
_approval._gateway_queues.pop(session_key, None)
|
|
settle, entry.settle = entry.settle, None
|
|
if settle is not None:
|
|
try:
|
|
settle(reason)
|
|
except Exception:
|
|
logger.debug("approval settle hook failed", exc_info=True)
|
|
|
|
# Plugins hear about the request before the gateway does (real-time observers).
|
|
_ctx._fire_approval_hook("pre_approval_request", **payload)
|
|
# Bridges sync agent thread → async gateway.
|
|
try:
|
|
notify_cb(dict(entry.data))
|
|
except Exception as exc:
|
|
logger.warning("Gateway approval notify failed: %s", exc)
|
|
_drop_entry("notify_failed")
|
|
_ctx._fire_approval_hook("post_approval_response", **payload, choice="notify_failed")
|
|
return {"resolved": False, "choice": None, "notify_failed": True}
|
|
|
|
state = _poll_event(entry.event, session_key,
|
|
interrupt_log="Approval wait interrupted by user signal — returning deny for session %s")
|
|
if state == "interrupted":
|
|
entry.result = "deny"
|
|
entry.event.set()
|
|
_drop_entry("answered" if state == "set" else state)
|
|
return _finish(payload, state != "timeout", entry.result, entry.reason)
|