apunkt/SurfSense
1
0
Fork 0
mirror of https://github.com/MODSetter/SurfSense.git synced 2026-05-17 18:35:19 +02:00
Code Issues Projects Releases Packages Wiki Activity

permissions/ask: gate 'approve_always' palette entry on MCP-ness

Browse source 
Only MCP tools have a persistence target for 'approve_always' (the
connector's trusted-tools list); for native tools the decision lives
only in the in-memory runtime ruleset. Reflect that in the wire palette
so the FE can stay a pure renderer of allowed_decisions instead of
peeking at context.mcp_connector_id to decide whether to show the
'Always Allow' button.

The backend still accepts an 'approve_always' reply for any tool kind
(in-memory promotion is harmless), it just doesn't advertise it when
there's nowhere to persist.
This commit is contained in:
CREDO23 2026-05-15 14:54:16 +02:00
parent c8b756ae8f
commit 98b6977c68
3 changed files with 71 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

24
surfsense_backend/app/agents/multi_agent_chat/middleware/shared/permissions/ask/payload.py
View file

@ -17,14 +17,21 @@ from app.agents.new_chat.permissions import Rule
PERMISSION_ASK_INTERRUPT_TYPE = "permission_ask"
_PERMISSION_ASK_DECISIONS: list[str] = [
_BASE_PERMISSION_ASK_DECISIONS: list[str] = [
LC_DECISION_APPROVE,
LC_DECISION_REJECT,
LC_DECISION_EDIT,
SURFSENSE_DECISION_APPROVE_ALWAYS,
]
def _is_mcp_tool(tool: BaseTool | None) -> bool:
"""An MCP tool advertises a connector id in its langchain metadata."""
if tool is None:
return False
metadata = getattr(tool, "metadata", None) or {}
return metadata.get("mcp_connector_id") is not None
def _card_fields_from_tool(tool: BaseTool | None) -> dict[str, Any]:
"""Project the FE card's tool-scoped fields out of a BaseTool."""
if tool is None:
@ -52,10 +59,15 @@ def build_permission_ask_payload(
) -> dict[str, Any]:
"""Build the permission-ask interrupt payload.
``tool`` carries the FE card's tool-scoped fields (description, MCP
connector). When omitted the card still renders, just without the
"Always Allow against this connected account" surface.
``approve_always`` is added to the palette only for MCP tools, since that
is the only case where the user's choice can persist beyond the current
agent instance (saved to the connector's trusted-tools list). Native
tools fall back to the once/reject/edit triad.
"""
allowed_decisions = list(_BASE_PERMISSION_ASK_DECISIONS)
if _is_mcp_tool(tool):
allowed_decisions.append(SURFSENSE_DECISION_APPROVE_ALWAYS)
context: dict[str, Any] = {
"patterns": patterns,
"rules": [
@ -68,7 +80,7 @@ def build_permission_ask_payload(
return build_lc_hitl_payload(
tool_name=tool_name,
args=args,
allowed_decisions=_PERMISSION_ASK_DECISIONS,
allowed_decisions=allowed_decisions,
interrupt_type=PERMISSION_ASK_INTERRUPT_TYPE,
context=context,
)