mirror of
https://github.com/pewdiepie-archdaemon/odysseus.git
synced 2026-09-12 03:02:21 +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>
36 lines
1.3 KiB
Python
36 lines
1.3 KiB
Python
"""Shared wire values and scope markers for tool approval continuations."""
|
|
|
|
from __future__ import annotations
|
|
|
|
from enum import Enum
|
|
|
|
|
|
# Keep the existing wire values so the current route and no-build frontend do
|
|
# not need a second protocol migration. ``approve`` no longer means one action;
|
|
# it now selects chat-session scope.
|
|
TASK_APPROVAL_DECISION = "approve_task"
|
|
CHAT_SESSION_APPROVAL_DECISION = "approve"
|
|
DENY_APPROVAL_DECISION = "deny"
|
|
|
|
# Session.get_context_messages() adds this server-owned marker only when the
|
|
# session history contains a matching, resolved chat-session approval.
|
|
CHAT_SESSION_APPROVAL_CONTEXT_MARKER = "_tool_approval_chat_session_granted"
|
|
|
|
|
|
class ToolApprovalScope(str, Enum):
|
|
# Surfaces without a resumable chat (the skill tester, unattended audits)
|
|
# keep the original one-use meaning: the sealed action runs and the gate
|
|
# re-arms immediately for anything after it.
|
|
SINGLE_ACTION = "single_action"
|
|
TASK = "task"
|
|
CHAT_SESSION = "chat_session"
|
|
|
|
|
|
def scope_for_decision(decision: object) -> ToolApprovalScope | None:
|
|
normalized = str(decision or "").strip().lower()
|
|
if normalized == TASK_APPROVAL_DECISION:
|
|
return ToolApprovalScope.TASK
|
|
if normalized == CHAT_SESSION_APPROVAL_DECISION:
|
|
return ToolApprovalScope.CHAT_SESSION
|
|
return None
|