fix(gateway): honor approval scope capabilities

This commit is contained in:
loulanyue
2026-08-09 08:32:20 +08:00
committed by brooklyn!
parent e63786fc23
commit 4e8419dadb
4 changed files with 65 additions and 17 deletions
+11 -3
View File
@@ -117,10 +117,17 @@ _BROWSER_CONTROL_PROTOCOL_VERSION = 1
_BROWSER_CONTROL_WS_PROTOCOL = "hermes-browser-control-v1"
_BROWSER_CONTROL_TICKET_PROTOCOL_PREFIX = "hermes-browser-control-ticket."
def _approval_event_choices(*, smart_denied: bool, allow_permanent: bool) -> list[str]:
if smart_denied:
def _approval_event_choices(
*, smart_denied: bool, allow_session: bool, allow_permanent: bool
) -> list[str]:
if smart_denied or not allow_session:
return ["once", "deny"]
return ["once", "session", "always", "deny"] if allow_permanent else ["once", "session", "deny"]
return (
["once", "session", "always", "deny"]
if allow_permanent
else ["once", "session", "deny"]
)
try:
@@ -7750,6 +7757,7 @@ class APIServerAdapter(BasePlatformAdapter):
"timestamp": time.time(),
"choices": _approval_event_choices(
smart_denied=bool(event.get("smart_denied")),
allow_session=event.get("allow_session") is not False,
allow_permanent=event.get("allow_permanent") is not False,
),
})
+16 -10
View File
@@ -34,21 +34,27 @@ from tools import approval as approval_mod
@pytest.mark.parametrize(
("smart_denied", "allow_permanent", "expected"),
("smart_denied", "allow_session", "allow_permanent", "expected"),
[
(False, True, ["once", "session", "always", "deny"]),
(False, False, ["once", "session", "deny"]),
(True, True, ["once", "deny"]),
(True, False, ["once", "deny"]),
(False, True, True, ["once", "session", "always", "deny"]),
(False, True, False, ["once", "session", "deny"]),
(False, False, True, ["once", "deny"]),
(False, False, False, ["once", "deny"]),
(True, True, True, ["once", "deny"]),
(True, False, False, ["once", "deny"]),
],
)
def test_approval_event_choices_follow_backend_capabilities(
smart_denied, allow_permanent, expected
smart_denied, allow_session, allow_permanent, expected
):
assert _approval_event_choices(
smart_denied=smart_denied,
allow_permanent=allow_permanent,
) == expected
assert (
_approval_event_choices(
smart_denied=smart_denied,
allow_session=allow_session,
allow_permanent=allow_permanent,
)
== expected
)
def _make_adapter(api_key: str = "") -> APIServerAdapter:
@@ -34,4 +34,34 @@ class TestTuiApprovalEmitRedaction:
assert emitted["payload"]["description"] == "x"
assert "github.com" in emitted["payload"]["command"]
@pytest.mark.parametrize(
("allow_session", "allow_permanent", "expected"),
[
(True, True, ["once", "session", "always", "deny"]),
(True, False, ["once", "session", "deny"]),
(False, False, ["once", "deny"]),
],
)
def test_emit_approval_request_honors_allowed_scopes(
self, monkeypatch, allow_session, allow_permanent, expected
):
from tui_gateway import server as tui_server
emitted = {}
monkeypatch.setattr(
tui_server,
"_emit",
lambda event, sid, payload=None: emitted.update({"payload": payload}),
)
tui_server._emit_approval_request(
"sess-1",
{
"allow_permanent": allow_permanent,
"allow_session": allow_session,
"command": "<write to AGENTS.md>",
},
)
assert emitted["payload"]["choices"] == expected
+8 -4
View File
@@ -1953,10 +1953,14 @@ def _approval_request_payload(data: dict | None) -> dict:
if "choices" not in payload:
if payload.get("smart_denied"):
payload["choices"] = ["once", "deny"]
elif payload.get("allow_permanent") is False:
payload["choices"] = ["once", "session", "deny"]
elif "allow_permanent" in payload:
payload["choices"] = ["once", "session", "always", "deny"]
else:
choices = ["once"]
if payload.get("allow_session") is not False:
choices.append("session")
if payload.get("allow_permanent") is not False:
choices.append("always")
choices.append("deny")
payload["choices"] = choices
if "command" in payload:
from gateway.run import _redact_approval_command