mirror of
https://github.com/pewdiepie-archdaemon/odysseus.git
synced 2026-09-10 18:22:20 +02:00
RaresKeYandLéo
981652358e
* fix(agent): allow remaining actions for an approved task * fix(agent): make approval continuation control-only * fix(ci): preserve approval taint and cache-buster contract * fix(ui): keep tool approvals in current chat * fix(ui): route tool approvals through chat submit * test(ui): pin approval submit routing * fix(agent): complete approval denial flow * fix(ui): avoid duplicate ask-user close icon * fix(agent): retain approved tool in continuation set * revert(ui): keep PR 6113 scoped to approval continuation * fix(agent): add task and chat approval scopes * fix(ui): prevent duplicate ask-user close icon * feat(ui): add ask-user option shortcuts * fix(compare): route ask-user choices per pane * fix(agent): keep skill-test approvals to a single action The chat card now reuses the wire value `approve` to mean chat-session scope, and `consume()` returned `allow_remaining_actions=True` for it unconditionally. The skill-test approval route was never updated: it still sends `approve` meaning "once", and its button still reads "Allow once", but the grant it got back set `approval_gate_bypassed` for the rest of the resumed run. That surface wraps the skill body and every transcript byte as untrusted context, so it is the last place where one click should ungate everything that follows. Give `consume()` an explicit `allow_continuation` flag. Callers that own a resumable chat keep the scope the user picked; callers that do not — the skill tester, unattended audits — get SINGLE_ACTION and the gate re-arms behind the sealed action, which is what their label promises. * fix(ui): cache-bust every module the approval click depends on chatStream.js, compare/index.js and compare/stream.js all changed behaviour but kept their old `?v=`, while chat.js and chatRenderer.js were bumped. A returning browser therefore serves the new chat.js — which now deliberately leaves the composer empty and clicks the send button — next to the cached chatStream.js that has no interceptor. With an empty composer that button sits at `data-mode="newchat"`, so the click opens a new chat and the approval is dropped. Bump the three, and version compare/stream.js's chatRenderer import to match everyone else's so the ask_user keydown listener binds to one module instance instead of two. * fix(ui): keep the digit shortcuts off tool approval cards With an approval card on screen and focus anywhere outside an input, a bare `1` fired `approve_task` — the widest of the three grants — with no modifier and no confirmation. That card is the one control whose entire purpose is deliberate consent after untrusted context influenced the run, and Deny sits at 3. Label the card with its kind and skip the shortcut for approvals. Ordinary ask_user questions keep 1-3. * fix(compare): restore a pane's ask_user card instead of dropping the choice renderAskUserCard removes the card as soon as onSubmit accepts, but the resume loop gave up silently after 10s if the originating stream still owned the pane. The user saw the click land, the card vanish, and nothing happen, with no way to get it back. Re-render the card on that deadline and say why. The reroll case still returns without sending — that choice belongs to a stream that no longer exists. * refactor(chat): drop the unreachable deny branch `if decision != "deny"` is always true — the deny path returns a StreamingResponse a few lines above. It reads as if deny still falls through to the toggle restore. --------- Co-authored-by: Léo <leograndcontact@gmail.com>
90 lines
2.7 KiB
Python
90 lines
2.7 KiB
Python
"""Callers with no resumable chat keep the original one-use approval scope.
|
|
|
|
The chat card reuses the wire value ``approve`` for chat-session scope, so any
|
|
caller that still sends ``approve`` meaning "once" has to say so explicitly or
|
|
it silently inherits a run-long gate bypass.
|
|
"""
|
|
|
|
from pathlib import Path
|
|
|
|
from src.tool_approval_scopes import ToolApprovalScope
|
|
from src.tool_approvals import ToolApprovalStore
|
|
from src.tool_capabilities import ToolRunSecurityContext, capabilities_for_action
|
|
|
|
|
|
def _pending(store: ToolApprovalStore, *, session_id=""):
|
|
content = "printf exact"
|
|
return store.create(
|
|
owner="Alice",
|
|
session_id=session_id,
|
|
origin_run_id="run-1",
|
|
tool_name="bash",
|
|
content=content,
|
|
workspace=None,
|
|
external_untrusted_context_seen=True,
|
|
capabilities=capabilities_for_action("bash", content),
|
|
)
|
|
|
|
|
|
def test_single_action_grant_leaves_the_gate_armed_behind_the_sealed_action():
|
|
store = ToolApprovalStore()
|
|
pending = _pending(store)
|
|
|
|
grant = store.consume(
|
|
pending.approval_id,
|
|
decision="approve",
|
|
owner="alice",
|
|
session_id=None,
|
|
allow_continuation=False,
|
|
)
|
|
|
|
assert grant is not None
|
|
assert grant.scope is ToolApprovalScope.SINGLE_ACTION
|
|
assert grant.allow_remaining_actions is False
|
|
assert grant.grants_chat_session is False
|
|
|
|
resumed = ToolRunSecurityContext(
|
|
external_untrusted_context_seen=True,
|
|
approval_gate_bypassed=grant.allow_remaining_actions,
|
|
)
|
|
assert resumed.decision_for("bash").allowed is False
|
|
|
|
|
|
def test_chat_callers_still_get_the_continuation_scope_they_asked_for():
|
|
store = ToolApprovalStore()
|
|
pending = _pending(store, session_id="session-1")
|
|
|
|
grant = store.consume(
|
|
pending.approval_id,
|
|
decision="approve_task",
|
|
owner="alice",
|
|
session_id="session-1",
|
|
)
|
|
|
|
assert grant is not None
|
|
assert grant.scope is ToolApprovalScope.TASK
|
|
assert grant.allow_remaining_actions is True
|
|
|
|
|
|
def test_deny_is_unaffected_by_the_single_action_flag():
|
|
store = ToolApprovalStore()
|
|
pending = _pending(store)
|
|
|
|
assert store.consume(
|
|
pending.approval_id,
|
|
decision="deny",
|
|
owner="alice",
|
|
session_id=None,
|
|
allow_continuation=False,
|
|
) is None
|
|
assert store.peek(pending.approval_id) is None
|
|
|
|
|
|
def test_skill_test_approval_route_opts_out_of_continuation():
|
|
root = Path(__file__).resolve().parents[1]
|
|
skills = (root / "routes/skills_routes.py").read_text(encoding="utf-8")
|
|
|
|
approve_call = skills.index("exact_approval = tool_approval_store.consume(")
|
|
end = skills.index(")", skills.index("allow_continuation", approve_call))
|
|
assert "allow_continuation=False" in skills[approve_call:end]
|