multi_agent_chat/connectors+builtins: adopt symmetric self_gated_tool_permission_row helper

surfsense_backend/app/agents/multi_agent_chat/subagents/builtins/deliverables/agent.py

@@ -7,17 +7,19 @@ from typing import Any
 from deepagents import SubAgent
 from langchain_core.language_models import BaseChatModel
 
+from app.agents.multi_agent_chat.subagents.shared.hitl.approvals.middleware_gated import (
+    middleware_gated_interrupt_on,
+)
 from app.agents.multi_agent_chat.subagents.shared.md_file_reader import (
     read_md_file,
 )
-from app.agents.multi_agent_chat.subagents.shared.permissions import (
-    ToolsPermissions,
-    merge_tools_permissions,
-    middleware_gated_interrupt_on,
-)
 from app.agents.multi_agent_chat.subagents.shared.subagent_builder import (
     pack_subagent,
 )
+from app.agents.multi_agent_chat.subagents.shared.tool_kinds import (
+    ToolsPermissions,
+    merge_tools_permissions,
+)
 
 from .tools.index import load_tools
 

surfsense_backend/app/agents/multi_agent_chat/subagents/builtins/deliverables/tools/index.py

@@ -2,7 +2,10 @@ from __future__ import annotations
 
 from typing import Any
 
-from app.agents.multi_agent_chat.subagents.shared.permissions import (
+from app.agents.multi_agent_chat.subagents.shared.hitl.approvals.self_gated import (
+    self_gated_tool_permission_row,
+)
+from app.agents.multi_agent_chat.subagents.shared.tool_kinds import (
     ToolsPermissions,
 )
 
@@ -44,11 +47,11 @@ def load_tools(
     )
     return {
         "allow": [
-            {"name": getattr(podcast, "name", "") or "", "tool": podcast},
-            {"name": getattr(video, "name", "") or "", "tool": video},
-            {"name": getattr(report, "name", "") or "", "tool": report},
-            {"name": getattr(resume, "name", "") or "", "tool": resume},
-            {"name": getattr(image, "name", "") or "", "tool": image},
+            self_gated_tool_permission_row(podcast),
+            self_gated_tool_permission_row(video),
+            self_gated_tool_permission_row(report),
+            self_gated_tool_permission_row(resume),
+            self_gated_tool_permission_row(image),
         ],
         "ask": [],
     }

surfsense_backend/app/agents/multi_agent_chat/subagents/builtins/memory/agent.py

@@ -7,17 +7,19 @@ from typing import Any
 from deepagents import SubAgent
 from langchain_core.language_models import BaseChatModel
 
+from app.agents.multi_agent_chat.subagents.shared.hitl.approvals.middleware_gated import (
+    middleware_gated_interrupt_on,
+)
 from app.agents.multi_agent_chat.subagents.shared.md_file_reader import (
     read_md_file,
 )
-from app.agents.multi_agent_chat.subagents.shared.permissions import (
-    ToolsPermissions,
-    merge_tools_permissions,
-    middleware_gated_interrupt_on,
-)
 from app.agents.multi_agent_chat.subagents.shared.subagent_builder import (
     pack_subagent,
 )
+from app.agents.multi_agent_chat.subagents.shared.tool_kinds import (
+    ToolsPermissions,
+    merge_tools_permissions,
+)
 
 from .tools.index import load_tools
 

surfsense_backend/app/agents/multi_agent_chat/subagents/builtins/memory/tools/index.py

@@ -2,7 +2,10 @@ from __future__ import annotations
 
 from typing import Any
 
-from app.agents.multi_agent_chat.subagents.shared.permissions import (
+from app.agents.multi_agent_chat.subagents.shared.hitl.approvals.self_gated import (
+    self_gated_tool_permission_row,
+)
+from app.agents.multi_agent_chat.subagents.shared.tool_kinds import (
     ToolsPermissions,
 )
 from app.db import ChatVisibility
@@ -21,7 +24,7 @@ def load_tools(
             llm=resolved_dependencies.get("llm"),
         )
         return {
-            "allow": [{"name": getattr(mem, "name", "") or "", "tool": mem}],
+            "allow": [self_gated_tool_permission_row(mem)],
             "ask": [],
         }
     mem = create_update_memory_tool(
@@ -29,4 +32,4 @@ def load_tools(
         db_session=resolved_dependencies["db_session"],
         llm=resolved_dependencies.get("llm"),
     )
-    return {"allow": [{"name": getattr(mem, "name", "") or "", "tool": mem}], "ask": []}
+    return {"allow": [self_gated_tool_permission_row(mem)], "ask": []}

surfsense_backend/app/agents/multi_agent_chat/subagents/builtins/research/agent.py

@@ -7,17 +7,19 @@ from typing import Any
 from deepagents import SubAgent
 from langchain_core.language_models import BaseChatModel
 
+from app.agents.multi_agent_chat.subagents.shared.hitl.approvals.middleware_gated import (
+    middleware_gated_interrupt_on,
+)
 from app.agents.multi_agent_chat.subagents.shared.md_file_reader import (
     read_md_file,
 )
-from app.agents.multi_agent_chat.subagents.shared.permissions import (
-    ToolsPermissions,
-    merge_tools_permissions,
-    middleware_gated_interrupt_on,
-)
 from app.agents.multi_agent_chat.subagents.shared.subagent_builder import (
     pack_subagent,
 )
+from app.agents.multi_agent_chat.subagents.shared.tool_kinds import (
+    ToolsPermissions,
+    merge_tools_permissions,
+)
 
 from .tools.index import load_tools
 

surfsense_backend/app/agents/multi_agent_chat/subagents/builtins/research/tools/index.py

@@ -2,7 +2,10 @@ from __future__ import annotations
 
 from typing import Any
 
-from app.agents.multi_agent_chat.subagents.shared.permissions import (
+from app.agents.multi_agent_chat.subagents.shared.hitl.approvals.self_gated import (
+    self_gated_tool_permission_row,
+)
+from app.agents.multi_agent_chat.subagents.shared.tool_kinds import (
     ToolsPermissions,
 )
 
@@ -27,9 +30,9 @@ def load_tools(
     )
     return {
         "allow": [
-            {"name": getattr(web, "name", "") or "", "tool": web},
-            {"name": getattr(scrape, "name", "") or "", "tool": scrape},
-            {"name": getattr(docs, "name", "") or "", "tool": docs},
+            self_gated_tool_permission_row(web),
+            self_gated_tool_permission_row(scrape),
+            self_gated_tool_permission_row(docs),
         ],
         "ask": [],
     }

surfsense_backend/app/agents/multi_agent_chat/subagents/connectors/airtable/agent.py

@@ -7,17 +7,19 @@ from typing import Any
 from deepagents import SubAgent
 from langchain_core.language_models import BaseChatModel
 
+from app.agents.multi_agent_chat.subagents.shared.hitl.approvals.middleware_gated import (
+    middleware_gated_interrupt_on,
+)
 from app.agents.multi_agent_chat.subagents.shared.md_file_reader import (
     read_md_file,
 )
-from app.agents.multi_agent_chat.subagents.shared.permissions import (
-    ToolsPermissions,
-    merge_tools_permissions,
-    middleware_gated_interrupt_on,
-)
 from app.agents.multi_agent_chat.subagents.shared.subagent_builder import (
     pack_subagent,
 )
+from app.agents.multi_agent_chat.subagents.shared.tool_kinds import (
+    ToolsPermissions,
+    merge_tools_permissions,
+)
 
 from .tools.index import load_tools
 

surfsense_backend/app/agents/multi_agent_chat/subagents/connectors/airtable/tools/index.py

@@ -2,7 +2,7 @@ from __future__ import annotations
 
 from typing import Any
 
-from app.agents.multi_agent_chat.subagents.shared.permissions import (
+from app.agents.multi_agent_chat.subagents.shared.tool_kinds import (
     ToolsPermissions,
 )
 

surfsense_backend/app/agents/multi_agent_chat/subagents/connectors/calendar/agent.py

@@ -7,17 +7,19 @@ from typing import Any
 from deepagents import SubAgent
 from langchain_core.language_models import BaseChatModel
 
+from app.agents.multi_agent_chat.subagents.shared.hitl.approvals.middleware_gated import (
+    middleware_gated_interrupt_on,
+)
 from app.agents.multi_agent_chat.subagents.shared.md_file_reader import (
     read_md_file,
 )
-from app.agents.multi_agent_chat.subagents.shared.permissions import (
-    ToolsPermissions,
-    merge_tools_permissions,
-    middleware_gated_interrupt_on,
-)
 from app.agents.multi_agent_chat.subagents.shared.subagent_builder import (
     pack_subagent,
 )
+from app.agents.multi_agent_chat.subagents.shared.tool_kinds import (
+    ToolsPermissions,
+    merge_tools_permissions,
+)
 
 from .tools.index import load_tools
 

surfsense_backend/app/agents/multi_agent_chat/subagents/connectors/calendar/tools/create_event.py

@@ -8,7 +8,9 @@ from googleapiclient.discovery import build
 from langchain_core.tools import tool
 from sqlalchemy.ext.asyncio import AsyncSession
 
-from app.agents.new_chat.tools.hitl import request_approval
+from app.agents.multi_agent_chat.subagents.shared.hitl.approvals.self_gated import (
+    request_approval,
+)
 from app.services.google_calendar import GoogleCalendarToolMetadataService
 
 logger = logging.getLogger(__name__)

surfsense_backend/app/agents/multi_agent_chat/subagents/connectors/calendar/tools/delete_event.py

@@ -8,7 +8,9 @@ from googleapiclient.discovery import build
 from langchain_core.tools import tool
 from sqlalchemy.ext.asyncio import AsyncSession
 
-from app.agents.new_chat.tools.hitl import request_approval
+from app.agents.multi_agent_chat.subagents.shared.hitl.approvals.self_gated import (
+    request_approval,
+)
 from app.services.google_calendar import GoogleCalendarToolMetadataService
 
 logger = logging.getLogger(__name__)

surfsense_backend/app/agents/multi_agent_chat/subagents/connectors/calendar/tools/index.py

@@ -2,7 +2,10 @@ from __future__ import annotations
 
 from typing import Any
 
-from app.agents.multi_agent_chat.subagents.shared.permissions import (
+from app.agents.multi_agent_chat.subagents.shared.hitl.approvals.self_gated import (
+    self_gated_tool_permission_row,
+)
+from app.agents.multi_agent_chat.subagents.shared.tool_kinds import (
     ToolsPermissions,
 )
 
@@ -26,10 +29,10 @@ def load_tools(
     update = create_update_calendar_event_tool(**session_dependencies)
     delete = create_delete_calendar_event_tool(**session_dependencies)
     return {
-        "allow": [{"name": getattr(search, "name", "") or "", "tool": search}],
+        "allow": [self_gated_tool_permission_row(search)],
         "ask": [
-            {"name": getattr(create, "name", "") or "", "tool": create},
-            {"name": getattr(update, "name", "") or "", "tool": update},
-            {"name": getattr(delete, "name", "") or "", "tool": delete},
+            self_gated_tool_permission_row(create),
+            self_gated_tool_permission_row(update),
+            self_gated_tool_permission_row(delete),
         ],
     }

surfsense_backend/app/agents/multi_agent_chat/subagents/connectors/calendar/tools/update_event.py

@@ -8,7 +8,9 @@ from googleapiclient.discovery import build
 from langchain_core.tools import tool
 from sqlalchemy.ext.asyncio import AsyncSession
 
-from app.agents.new_chat.tools.hitl import request_approval
+from app.agents.multi_agent_chat.subagents.shared.hitl.approvals.self_gated import (
+    request_approval,
+)
 from app.services.google_calendar import GoogleCalendarToolMetadataService
 
 logger = logging.getLogger(__name__)

surfsense_backend/app/agents/multi_agent_chat/subagents/connectors/clickup/agent.py

@@ -7,17 +7,19 @@ from typing import Any
 from deepagents import SubAgent
 from langchain_core.language_models import BaseChatModel
 
+from app.agents.multi_agent_chat.subagents.shared.hitl.approvals.middleware_gated import (
+    middleware_gated_interrupt_on,
+)
 from app.agents.multi_agent_chat.subagents.shared.md_file_reader import (
     read_md_file,
 )
-from app.agents.multi_agent_chat.subagents.shared.permissions import (
-    ToolsPermissions,
-    merge_tools_permissions,
-    middleware_gated_interrupt_on,
-)
 from app.agents.multi_agent_chat.subagents.shared.subagent_builder import (
     pack_subagent,
 )
+from app.agents.multi_agent_chat.subagents.shared.tool_kinds import (
+    ToolsPermissions,
+    merge_tools_permissions,
+)
 
 from .tools.index import load_tools
 

surfsense_backend/app/agents/multi_agent_chat/subagents/connectors/clickup/tools/index.py

@@ -2,7 +2,7 @@ from __future__ import annotations
 
 from typing import Any
 
-from app.agents.multi_agent_chat.subagents.shared.permissions import (
+from app.agents.multi_agent_chat.subagents.shared.tool_kinds import (
     ToolsPermissions,
 )
 

surfsense_backend/app/agents/multi_agent_chat/subagents/connectors/confluence/agent.py

@@ -7,17 +7,19 @@ from typing import Any
 from deepagents import SubAgent
 from langchain_core.language_models import BaseChatModel
 
+from app.agents.multi_agent_chat.subagents.shared.hitl.approvals.middleware_gated import (
+    middleware_gated_interrupt_on,
+)
 from app.agents.multi_agent_chat.subagents.shared.md_file_reader import (
     read_md_file,
 )
-from app.agents.multi_agent_chat.subagents.shared.permissions import (
-    ToolsPermissions,
-    merge_tools_permissions,
-    middleware_gated_interrupt_on,
-)
 from app.agents.multi_agent_chat.subagents.shared.subagent_builder import (
     pack_subagent,
 )
+from app.agents.multi_agent_chat.subagents.shared.tool_kinds import (
+    ToolsPermissions,
+    merge_tools_permissions,
+)
 
 from .tools.index import load_tools
 

surfsense_backend/app/agents/multi_agent_chat/subagents/connectors/confluence/tools/create_page.py

@@ -5,7 +5,9 @@ from langchain_core.tools import tool
 from sqlalchemy.ext.asyncio import AsyncSession
 from sqlalchemy.orm.attributes import flag_modified
 
-from app.agents.new_chat.tools.hitl import request_approval
+from app.agents.multi_agent_chat.subagents.shared.hitl.approvals.self_gated import (
+    request_approval,
+)
 from app.connectors.confluence_history import ConfluenceHistoryConnector
 from app.services.confluence import ConfluenceToolMetadataService
 

surfsense_backend/app/agents/multi_agent_chat/subagents/connectors/confluence/tools/delete_page.py

@@ -5,7 +5,9 @@ from langchain_core.tools import tool
 from sqlalchemy.ext.asyncio import AsyncSession
 from sqlalchemy.orm.attributes import flag_modified
 
-from app.agents.new_chat.tools.hitl import request_approval
+from app.agents.multi_agent_chat.subagents.shared.hitl.approvals.self_gated import (
+    request_approval,
+)
 from app.connectors.confluence_history import ConfluenceHistoryConnector
 from app.services.confluence import ConfluenceToolMetadataService
 

surfsense_backend/app/agents/multi_agent_chat/subagents/connectors/confluence/tools/index.py

@@ -2,7 +2,10 @@ from __future__ import annotations
 
 from typing import Any
 
-from app.agents.multi_agent_chat.subagents.shared.permissions import (
+from app.agents.multi_agent_chat.subagents.shared.hitl.approvals.self_gated import (
+    self_gated_tool_permission_row,
+)
+from app.agents.multi_agent_chat.subagents.shared.tool_kinds import (
     ToolsPermissions,
 )
 
@@ -27,8 +30,8 @@ def load_tools(
     return {
         "allow": [],
         "ask": [
-            {"name": getattr(create, "name", "") or "", "tool": create},
-            {"name": getattr(update, "name", "") or "", "tool": update},
-            {"name": getattr(delete, "name", "") or "", "tool": delete},
+            self_gated_tool_permission_row(create),
+            self_gated_tool_permission_row(update),
+            self_gated_tool_permission_row(delete),
         ],
     }

surfsense_backend/app/agents/multi_agent_chat/subagents/connectors/confluence/tools/update_page.py

@@ -5,7 +5,9 @@ from langchain_core.tools import tool
 from sqlalchemy.ext.asyncio import AsyncSession
 from sqlalchemy.orm.attributes import flag_modified
 
-from app.agents.new_chat.tools.hitl import request_approval
+from app.agents.multi_agent_chat.subagents.shared.hitl.approvals.self_gated import (
+    request_approval,
+)
 from app.connectors.confluence_history import ConfluenceHistoryConnector
 from app.services.confluence import ConfluenceToolMetadataService
 

surfsense_backend/app/agents/multi_agent_chat/subagents/connectors/discord/agent.py

@@ -7,17 +7,19 @@ from typing import Any
 from deepagents import SubAgent
 from langchain_core.language_models import BaseChatModel
 
+from app.agents.multi_agent_chat.subagents.shared.hitl.approvals.middleware_gated import (
+    middleware_gated_interrupt_on,
+)
 from app.agents.multi_agent_chat.subagents.shared.md_file_reader import (
     read_md_file,
 )
-from app.agents.multi_agent_chat.subagents.shared.permissions import (
-    ToolsPermissions,
-    merge_tools_permissions,
-    middleware_gated_interrupt_on,
-)
 from app.agents.multi_agent_chat.subagents.shared.subagent_builder import (
     pack_subagent,
 )
+from app.agents.multi_agent_chat.subagents.shared.tool_kinds import (
+    ToolsPermissions,
+    merge_tools_permissions,
+)
 
 from .tools.index import load_tools
 

surfsense_backend/app/agents/multi_agent_chat/subagents/connectors/discord/tools/index.py

@@ -2,7 +2,10 @@ from __future__ import annotations
 
 from typing import Any
 
-from app.agents.multi_agent_chat.subagents.shared.permissions import (
+from app.agents.multi_agent_chat.subagents.shared.hitl.approvals.self_gated import (
+    self_gated_tool_permission_row,
+)
+from app.agents.multi_agent_chat.subagents.shared.tool_kinds import (
     ToolsPermissions,
 )
 
@@ -25,8 +28,8 @@ def load_tools(
     send = create_send_discord_message_tool(**common)
     return {
         "allow": [
-            {"name": getattr(list_ch, "name", "") or "", "tool": list_ch},
-            {"name": getattr(read_msg, "name", "") or "", "tool": read_msg},
+            self_gated_tool_permission_row(list_ch),
+            self_gated_tool_permission_row(read_msg),
         ],
-        "ask": [{"name": getattr(send, "name", "") or "", "tool": send}],
+        "ask": [self_gated_tool_permission_row(send)],
     }

surfsense_backend/app/agents/multi_agent_chat/subagents/connectors/discord/tools/send_message.py

@@ -5,7 +5,9 @@ import httpx
 from langchain_core.tools import tool
 from sqlalchemy.ext.asyncio import AsyncSession
 
-from app.agents.new_chat.tools.hitl import request_approval
+from app.agents.multi_agent_chat.subagents.shared.hitl.approvals.self_gated import (
+    request_approval,
+)
 
 from ._auth import DISCORD_API, get_bot_token, get_discord_connector
 

surfsense_backend/app/agents/multi_agent_chat/subagents/connectors/dropbox/agent.py

@@ -7,17 +7,19 @@ from typing import Any
 from deepagents import SubAgent
 from langchain_core.language_models import BaseChatModel
 
+from app.agents.multi_agent_chat.subagents.shared.hitl.approvals.middleware_gated import (
+    middleware_gated_interrupt_on,
+)
 from app.agents.multi_agent_chat.subagents.shared.md_file_reader import (
     read_md_file,
 )
-from app.agents.multi_agent_chat.subagents.shared.permissions import (
-    ToolsPermissions,
-    merge_tools_permissions,
-    middleware_gated_interrupt_on,
-)
 from app.agents.multi_agent_chat.subagents.shared.subagent_builder import (
     pack_subagent,
 )
+from app.agents.multi_agent_chat.subagents.shared.tool_kinds import (
+    ToolsPermissions,
+    merge_tools_permissions,
+)
 
 from .tools.index import load_tools
 

surfsense_backend/app/agents/multi_agent_chat/subagents/connectors/dropbox/tools/create_file.py

@@ -8,7 +8,9 @@ from langchain_core.tools import tool
 from sqlalchemy.ext.asyncio import AsyncSession
 from sqlalchemy.future import select
 
-from app.agents.new_chat.tools.hitl import request_approval
+from app.agents.multi_agent_chat.subagents.shared.hitl.approvals.self_gated import (
+    request_approval,
+)
 from app.connectors.dropbox.client import DropboxClient
 from app.db import SearchSourceConnector, SearchSourceConnectorType
 

surfsense_backend/app/agents/multi_agent_chat/subagents/connectors/dropbox/tools/index.py

@@ -2,7 +2,10 @@ from __future__ import annotations
 
 from typing import Any
 
-from app.agents.multi_agent_chat.subagents.shared.permissions import (
+from app.agents.multi_agent_chat.subagents.shared.hitl.approvals.self_gated import (
+    self_gated_tool_permission_row,
+)
+from app.agents.multi_agent_chat.subagents.shared.tool_kinds import (
     ToolsPermissions,
 )
 
@@ -24,7 +27,7 @@ def load_tools(
     return {
         "allow": [],
         "ask": [
-            {"name": getattr(create, "name", "") or "", "tool": create},
-            {"name": getattr(delete, "name", "") or "", "tool": delete},
+            self_gated_tool_permission_row(create),
+            self_gated_tool_permission_row(delete),
         ],
     }

surfsense_backend/app/agents/multi_agent_chat/subagents/connectors/dropbox/tools/trash_file.py

@@ -6,7 +6,9 @@ from sqlalchemy import String, and_, cast, func
 from sqlalchemy.ext.asyncio import AsyncSession
 from sqlalchemy.future import select
 
-from app.agents.new_chat.tools.hitl import request_approval
+from app.agents.multi_agent_chat.subagents.shared.hitl.approvals.self_gated import (
+    request_approval,
+)
 from app.connectors.dropbox.client import DropboxClient
 from app.db import (
     Document,

surfsense_backend/app/agents/multi_agent_chat/subagents/connectors/gmail/agent.py

@@ -7,17 +7,19 @@ from typing import Any
 from deepagents import SubAgent
 from langchain_core.language_models import BaseChatModel
 
+from app.agents.multi_agent_chat.subagents.shared.hitl.approvals.middleware_gated import (
+    middleware_gated_interrupt_on,
+)
 from app.agents.multi_agent_chat.subagents.shared.md_file_reader import (
     read_md_file,
 )
-from app.agents.multi_agent_chat.subagents.shared.permissions import (
-    ToolsPermissions,
-    merge_tools_permissions,
-    middleware_gated_interrupt_on,
-)
 from app.agents.multi_agent_chat.subagents.shared.subagent_builder import (
     pack_subagent,
 )
+from app.agents.multi_agent_chat.subagents.shared.tool_kinds import (
+    ToolsPermissions,
+    merge_tools_permissions,
+)
 
 from .tools.index import load_tools
 

surfsense_backend/app/agents/multi_agent_chat/subagents/connectors/gmail/tools/create_draft.py

@@ -8,7 +8,9 @@ from typing import Any
 from langchain_core.tools import tool
 from sqlalchemy.ext.asyncio import AsyncSession
 
-from app.agents.new_chat.tools.hitl import request_approval
+from app.agents.multi_agent_chat.subagents.shared.hitl.approvals.self_gated import (
+    request_approval,
+)
 from app.services.gmail import GmailToolMetadataService
 
 logger = logging.getLogger(__name__)

surfsense_backend/app/agents/multi_agent_chat/subagents/connectors/gmail/tools/index.py

@@ -2,7 +2,10 @@ from __future__ import annotations
 
 from typing import Any
 
-from app.agents.multi_agent_chat.subagents.shared.permissions import (
+from app.agents.multi_agent_chat.subagents.shared.hitl.approvals.self_gated import (
+    self_gated_tool_permission_row,
+)
+from app.agents.multi_agent_chat.subagents.shared.tool_kinds import (
     ToolsPermissions,
 )
 
@@ -31,13 +34,13 @@ def load_tools(
     updraft = create_update_gmail_draft_tool(**common)
     return {
         "allow": [
-            {"name": getattr(search, "name", "") or "", "tool": search},
-            {"name": getattr(read, "name", "") or "", "tool": read},
+            self_gated_tool_permission_row(search),
+            self_gated_tool_permission_row(read),
         ],
         "ask": [
-            {"name": getattr(draft, "name", "") or "", "tool": draft},
-            {"name": getattr(send, "name", "") or "", "tool": send},
-            {"name": getattr(trash, "name", "") or "", "tool": trash},
-            {"name": getattr(updraft, "name", "") or "", "tool": updraft},
+            self_gated_tool_permission_row(draft),
+            self_gated_tool_permission_row(send),
+            self_gated_tool_permission_row(trash),
+            self_gated_tool_permission_row(updraft),
         ],
     }

surfsense_backend/app/agents/multi_agent_chat/subagents/connectors/gmail/tools/send_email.py

@@ -8,7 +8,9 @@ from typing import Any
 from langchain_core.tools import tool
 from sqlalchemy.ext.asyncio import AsyncSession
 
-from app.agents.new_chat.tools.hitl import request_approval
+from app.agents.multi_agent_chat.subagents.shared.hitl.approvals.self_gated import (
+    request_approval,
+)
 from app.services.gmail import GmailToolMetadataService
 
 logger = logging.getLogger(__name__)

surfsense_backend/app/agents/multi_agent_chat/subagents/connectors/gmail/tools/trash_email.py

@@ -6,7 +6,9 @@ from typing import Any
 from langchain_core.tools import tool
 from sqlalchemy.ext.asyncio import AsyncSession
 
-from app.agents.new_chat.tools.hitl import request_approval
+from app.agents.multi_agent_chat.subagents.shared.hitl.approvals.self_gated import (
+    request_approval,
+)
 from app.services.gmail import GmailToolMetadataService
 
 logger = logging.getLogger(__name__)

surfsense_backend/app/agents/multi_agent_chat/subagents/connectors/gmail/tools/update_draft.py

@@ -8,7 +8,9 @@ from typing import Any
 from langchain_core.tools import tool
 from sqlalchemy.ext.asyncio import AsyncSession
 
-from app.agents.new_chat.tools.hitl import request_approval
+from app.agents.multi_agent_chat.subagents.shared.hitl.approvals.self_gated import (
+    request_approval,
+)
 from app.services.gmail import GmailToolMetadataService
 
 logger = logging.getLogger(__name__)

surfsense_backend/app/agents/multi_agent_chat/subagents/connectors/google_drive/agent.py

@@ -7,17 +7,19 @@ from typing import Any
 from deepagents import SubAgent
 from langchain_core.language_models import BaseChatModel
 
+from app.agents.multi_agent_chat.subagents.shared.hitl.approvals.middleware_gated import (
+    middleware_gated_interrupt_on,
+)
 from app.agents.multi_agent_chat.subagents.shared.md_file_reader import (
     read_md_file,
 )
-from app.agents.multi_agent_chat.subagents.shared.permissions import (
-    ToolsPermissions,
-    merge_tools_permissions,
-    middleware_gated_interrupt_on,
-)
 from app.agents.multi_agent_chat.subagents.shared.subagent_builder import (
     pack_subagent,
 )
+from app.agents.multi_agent_chat.subagents.shared.tool_kinds import (
+    ToolsPermissions,
+    merge_tools_permissions,
+)
 
 from .tools.index import load_tools
 

surfsense_backend/app/agents/multi_agent_chat/subagents/connectors/google_drive/tools/create_file.py

@@ -5,7 +5,9 @@ from googleapiclient.errors import HttpError
 from langchain_core.tools import tool
 from sqlalchemy.ext.asyncio import AsyncSession
 
-from app.agents.new_chat.tools.hitl import request_approval
+from app.agents.multi_agent_chat.subagents.shared.hitl.approvals.self_gated import (
+    request_approval,
+)
 from app.connectors.google_drive.client import GoogleDriveClient
 from app.connectors.google_drive.file_types import GOOGLE_DOC, GOOGLE_SHEET
 from app.services.google_drive import GoogleDriveToolMetadataService

surfsense_backend/app/agents/multi_agent_chat/subagents/connectors/google_drive/tools/index.py

@@ -2,7 +2,10 @@ from __future__ import annotations
 
 from typing import Any
 
-from app.agents.multi_agent_chat.subagents.shared.permissions import (
+from app.agents.multi_agent_chat.subagents.shared.hitl.approvals.self_gated import (
+    self_gated_tool_permission_row,
+)
+from app.agents.multi_agent_chat.subagents.shared.tool_kinds import (
     ToolsPermissions,
 )
 
@@ -24,7 +27,7 @@ def load_tools(
     return {
         "allow": [],
         "ask": [
-            {"name": getattr(create, "name", "") or "", "tool": create},
-            {"name": getattr(delete, "name", "") or "", "tool": delete},
+            self_gated_tool_permission_row(create),
+            self_gated_tool_permission_row(delete),
         ],
     }

surfsense_backend/app/agents/multi_agent_chat/subagents/connectors/google_drive/tools/trash_file.py

@@ -5,7 +5,9 @@ from googleapiclient.errors import HttpError
 from langchain_core.tools import tool
 from sqlalchemy.ext.asyncio import AsyncSession
 
-from app.agents.new_chat.tools.hitl import request_approval
+from app.agents.multi_agent_chat.subagents.shared.hitl.approvals.self_gated import (
+    request_approval,
+)
 from app.connectors.google_drive.client import GoogleDriveClient
 from app.services.google_drive import GoogleDriveToolMetadataService
 

surfsense_backend/app/agents/multi_agent_chat/subagents/connectors/jira/agent.py

@@ -7,17 +7,19 @@ from typing import Any
 from deepagents import SubAgent
 from langchain_core.language_models import BaseChatModel
 
+from app.agents.multi_agent_chat.subagents.shared.hitl.approvals.middleware_gated import (
+    middleware_gated_interrupt_on,
+)
 from app.agents.multi_agent_chat.subagents.shared.md_file_reader import (
     read_md_file,
 )
-from app.agents.multi_agent_chat.subagents.shared.permissions import (
-    ToolsPermissions,
-    merge_tools_permissions,
-    middleware_gated_interrupt_on,
-)
 from app.agents.multi_agent_chat.subagents.shared.subagent_builder import (
     pack_subagent,
 )
+from app.agents.multi_agent_chat.subagents.shared.tool_kinds import (
+    ToolsPermissions,
+    merge_tools_permissions,
+)
 
 from .tools.index import load_tools
 

surfsense_backend/app/agents/multi_agent_chat/subagents/connectors/jira/tools/index.py

@@ -2,7 +2,7 @@ from __future__ import annotations
 
 from typing import Any
 
-from app.agents.multi_agent_chat.subagents.shared.permissions import (
+from app.agents.multi_agent_chat.subagents.shared.tool_kinds import (
     ToolsPermissions,
 )
 

surfsense_backend/app/agents/multi_agent_chat/subagents/connectors/linear/agent.py

@@ -7,17 +7,19 @@ from typing import Any
 from deepagents import SubAgent
 from langchain_core.language_models import BaseChatModel
 
+from app.agents.multi_agent_chat.subagents.shared.hitl.approvals.middleware_gated import (
+    middleware_gated_interrupt_on,
+)
 from app.agents.multi_agent_chat.subagents.shared.md_file_reader import (
     read_md_file,
 )
-from app.agents.multi_agent_chat.subagents.shared.permissions import (
-    ToolsPermissions,
-    merge_tools_permissions,
-    middleware_gated_interrupt_on,
-)
 from app.agents.multi_agent_chat.subagents.shared.subagent_builder import (
     pack_subagent,
 )
+from app.agents.multi_agent_chat.subagents.shared.tool_kinds import (
+    ToolsPermissions,
+    merge_tools_permissions,
+)
 
 from .tools.index import load_tools
 

surfsense_backend/app/agents/multi_agent_chat/subagents/connectors/linear/tools/index.py

@@ -2,7 +2,7 @@ from __future__ import annotations
 
 from typing import Any
 
-from app.agents.multi_agent_chat.subagents.shared.permissions import (
+from app.agents.multi_agent_chat.subagents.shared.tool_kinds import (
     ToolsPermissions,
 )
 

surfsense_backend/app/agents/multi_agent_chat/subagents/connectors/luma/agent.py

@@ -7,17 +7,19 @@ from typing import Any
 from deepagents import SubAgent
 from langchain_core.language_models import BaseChatModel
 
+from app.agents.multi_agent_chat.subagents.shared.hitl.approvals.middleware_gated import (
+    middleware_gated_interrupt_on,
+)
 from app.agents.multi_agent_chat.subagents.shared.md_file_reader import (
     read_md_file,
 )
-from app.agents.multi_agent_chat.subagents.shared.permissions import (
-    ToolsPermissions,
-    merge_tools_permissions,
-    middleware_gated_interrupt_on,
-)
 from app.agents.multi_agent_chat.subagents.shared.subagent_builder import (
     pack_subagent,
 )
+from app.agents.multi_agent_chat.subagents.shared.tool_kinds import (
+    ToolsPermissions,
+    merge_tools_permissions,
+)
 
 from .tools.index import load_tools
 

surfsense_backend/app/agents/multi_agent_chat/subagents/connectors/luma/tools/create_event.py

@@ -5,7 +5,9 @@ import httpx
 from langchain_core.tools import tool
 from sqlalchemy.ext.asyncio import AsyncSession
 
-from app.agents.new_chat.tools.hitl import request_approval
+from app.agents.multi_agent_chat.subagents.shared.hitl.approvals.self_gated import (
+    request_approval,
+)
 
 from ._auth import LUMA_API, get_api_key, get_luma_connector, luma_headers
 

surfsense_backend/app/agents/multi_agent_chat/subagents/connectors/luma/tools/index.py

@@ -2,7 +2,10 @@ from __future__ import annotations
 
 from typing import Any
 
-from app.agents.multi_agent_chat.subagents.shared.permissions import (
+from app.agents.multi_agent_chat.subagents.shared.hitl.approvals.self_gated import (
+    self_gated_tool_permission_row,
+)
+from app.agents.multi_agent_chat.subagents.shared.tool_kinds import (
     ToolsPermissions,
 )
 
@@ -25,8 +28,8 @@ def load_tools(
     create = create_create_luma_event_tool(**common)
     return {
         "allow": [
-            {"name": getattr(list_ev, "name", "") or "", "tool": list_ev},
-            {"name": getattr(read_ev, "name", "") or "", "tool": read_ev},
+            self_gated_tool_permission_row(list_ev),
+            self_gated_tool_permission_row(read_ev),
         ],
-        "ask": [{"name": getattr(create, "name", "") or "", "tool": create}],
+        "ask": [self_gated_tool_permission_row(create)],
     }

surfsense_backend/app/agents/multi_agent_chat/subagents/connectors/notion/agent.py

@@ -7,17 +7,19 @@ from typing import Any
 from deepagents import SubAgent
 from langchain_core.language_models import BaseChatModel
 
+from app.agents.multi_agent_chat.subagents.shared.hitl.approvals.middleware_gated import (
+    middleware_gated_interrupt_on,
+)
 from app.agents.multi_agent_chat.subagents.shared.md_file_reader import (
     read_md_file,
 )
-from app.agents.multi_agent_chat.subagents.shared.permissions import (
-    ToolsPermissions,
-    merge_tools_permissions,
-    middleware_gated_interrupt_on,
-)
 from app.agents.multi_agent_chat.subagents.shared.subagent_builder import (
     pack_subagent,
 )
+from app.agents.multi_agent_chat.subagents.shared.tool_kinds import (
+    ToolsPermissions,
+    merge_tools_permissions,
+)
 
 from .tools.index import load_tools
 

surfsense_backend/app/agents/multi_agent_chat/subagents/connectors/notion/tools/create_page.py

@@ -4,7 +4,9 @@ from typing import Any
 from langchain_core.tools import tool
 from sqlalchemy.ext.asyncio import AsyncSession
 
-from app.agents.new_chat.tools.hitl import request_approval
+from app.agents.multi_agent_chat.subagents.shared.hitl.approvals.self_gated import (
+    request_approval,
+)
 from app.connectors.notion_history import NotionAPIError, NotionHistoryConnector
 from app.services.notion import NotionToolMetadataService
 

surfsense_backend/app/agents/multi_agent_chat/subagents/connectors/notion/tools/delete_page.py

@@ -4,7 +4,9 @@ from typing import Any
 from langchain_core.tools import tool
 from sqlalchemy.ext.asyncio import AsyncSession
 
-from app.agents.new_chat.tools.hitl import request_approval
+from app.agents.multi_agent_chat.subagents.shared.hitl.approvals.self_gated import (
+    request_approval,
+)
 from app.connectors.notion_history import NotionAPIError, NotionHistoryConnector
 from app.services.notion.tool_metadata_service import NotionToolMetadataService
 

surfsense_backend/app/agents/multi_agent_chat/subagents/connectors/notion/tools/index.py

@@ -2,7 +2,10 @@ from __future__ import annotations
 
 from typing import Any
 
-from app.agents.multi_agent_chat.subagents.shared.permissions import (
+from app.agents.multi_agent_chat.subagents.shared.hitl.approvals.self_gated import (
+    self_gated_tool_permission_row,
+)
+from app.agents.multi_agent_chat.subagents.shared.tool_kinds import (
     ToolsPermissions,
 )
 
@@ -26,8 +29,8 @@ def load_tools(
     return {
         "allow": [],
         "ask": [
-            {"name": getattr(create, "name", "") or "", "tool": create},
-            {"name": getattr(update, "name", "") or "", "tool": update},
-            {"name": getattr(delete, "name", "") or "", "tool": delete},
+            self_gated_tool_permission_row(create),
+            self_gated_tool_permission_row(update),
+            self_gated_tool_permission_row(delete),
         ],
     }

surfsense_backend/app/agents/multi_agent_chat/subagents/connectors/notion/tools/update_page.py

@@ -4,7 +4,9 @@ from typing import Any
 from langchain_core.tools import tool
 from sqlalchemy.ext.asyncio import AsyncSession
 
-from app.agents.new_chat.tools.hitl import request_approval
+from app.agents.multi_agent_chat.subagents.shared.hitl.approvals.self_gated import (
+    request_approval,
+)
 from app.connectors.notion_history import NotionAPIError, NotionHistoryConnector
 from app.services.notion import NotionToolMetadataService
 

surfsense_backend/app/agents/multi_agent_chat/subagents/connectors/onedrive/agent.py

@@ -7,17 +7,19 @@ from typing import Any
 from deepagents import SubAgent
 from langchain_core.language_models import BaseChatModel
 
+from app.agents.multi_agent_chat.subagents.shared.hitl.approvals.middleware_gated import (
+    middleware_gated_interrupt_on,
+)
 from app.agents.multi_agent_chat.subagents.shared.md_file_reader import (
     read_md_file,
 )
-from app.agents.multi_agent_chat.subagents.shared.permissions import (
-    ToolsPermissions,
-    merge_tools_permissions,
-    middleware_gated_interrupt_on,
-)
 from app.agents.multi_agent_chat.subagents.shared.subagent_builder import (
     pack_subagent,
 )
+from app.agents.multi_agent_chat.subagents.shared.tool_kinds import (
+    ToolsPermissions,
+    merge_tools_permissions,
+)
 
 from .tools.index import load_tools
 

surfsense_backend/app/agents/multi_agent_chat/subagents/connectors/onedrive/tools/create_file.py

@@ -8,7 +8,9 @@ from langchain_core.tools import tool
 from sqlalchemy.ext.asyncio import AsyncSession
 from sqlalchemy.future import select
 
-from app.agents.new_chat.tools.hitl import request_approval
+from app.agents.multi_agent_chat.subagents.shared.hitl.approvals.self_gated import (
+    request_approval,
+)
 from app.connectors.onedrive.client import OneDriveClient
 from app.db import SearchSourceConnector, SearchSourceConnectorType
 

surfsense_backend/app/agents/multi_agent_chat/subagents/connectors/onedrive/tools/index.py

@@ -2,7 +2,10 @@ from __future__ import annotations
 
 from typing import Any
 
-from app.agents.multi_agent_chat.subagents.shared.permissions import (
+from app.agents.multi_agent_chat.subagents.shared.hitl.approvals.self_gated import (
+    self_gated_tool_permission_row,
+)
+from app.agents.multi_agent_chat.subagents.shared.tool_kinds import (
     ToolsPermissions,
 )
 
@@ -24,7 +27,7 @@ def load_tools(
     return {
         "allow": [],
         "ask": [
-            {"name": getattr(create, "name", "") or "", "tool": create},
-            {"name": getattr(delete, "name", "") or "", "tool": delete},
+            self_gated_tool_permission_row(create),
+            self_gated_tool_permission_row(delete),
         ],
     }

surfsense_backend/app/agents/multi_agent_chat/subagents/connectors/onedrive/tools/trash_file.py

@@ -6,7 +6,9 @@ from sqlalchemy import String, and_, cast, func
 from sqlalchemy.ext.asyncio import AsyncSession
 from sqlalchemy.future import select
 
-from app.agents.new_chat.tools.hitl import request_approval
+from app.agents.multi_agent_chat.subagents.shared.hitl.approvals.self_gated import (
+    request_approval,
+)
 from app.connectors.onedrive.client import OneDriveClient
 from app.db import (
     Document,

surfsense_backend/app/agents/multi_agent_chat/subagents/connectors/slack/agent.py

@@ -7,17 +7,19 @@ from typing import Any
 from deepagents import SubAgent
 from langchain_core.language_models import BaseChatModel
 
+from app.agents.multi_agent_chat.subagents.shared.hitl.approvals.middleware_gated import (
+    middleware_gated_interrupt_on,
+)
 from app.agents.multi_agent_chat.subagents.shared.md_file_reader import (
     read_md_file,
 )
-from app.agents.multi_agent_chat.subagents.shared.permissions import (
-    ToolsPermissions,
-    merge_tools_permissions,
-    middleware_gated_interrupt_on,
-)
 from app.agents.multi_agent_chat.subagents.shared.subagent_builder import (
     pack_subagent,
 )
+from app.agents.multi_agent_chat.subagents.shared.tool_kinds import (
+    ToolsPermissions,
+    merge_tools_permissions,
+)
 
 from .tools.index import load_tools
 

surfsense_backend/app/agents/multi_agent_chat/subagents/connectors/slack/tools/index.py

@@ -2,7 +2,7 @@ from __future__ import annotations
 
 from typing import Any
 
-from app.agents.multi_agent_chat.subagents.shared.permissions import (
+from app.agents.multi_agent_chat.subagents.shared.tool_kinds import (
     ToolsPermissions,
 )
 

surfsense_backend/app/agents/multi_agent_chat/subagents/connectors/teams/agent.py

@@ -7,17 +7,19 @@ from typing import Any
 from deepagents import SubAgent
 from langchain_core.language_models import BaseChatModel
 
+from app.agents.multi_agent_chat.subagents.shared.hitl.approvals.middleware_gated import (
+    middleware_gated_interrupt_on,
+)
 from app.agents.multi_agent_chat.subagents.shared.md_file_reader import (
     read_md_file,
 )
-from app.agents.multi_agent_chat.subagents.shared.permissions import (
-    ToolsPermissions,
-    merge_tools_permissions,
-    middleware_gated_interrupt_on,
-)
 from app.agents.multi_agent_chat.subagents.shared.subagent_builder import (
     pack_subagent,
 )
+from app.agents.multi_agent_chat.subagents.shared.tool_kinds import (
+    ToolsPermissions,
+    merge_tools_permissions,
+)
 
 from .tools.index import load_tools
 

surfsense_backend/app/agents/multi_agent_chat/subagents/connectors/teams/tools/index.py

@@ -2,7 +2,10 @@ from __future__ import annotations
 
 from typing import Any
 
-from app.agents.multi_agent_chat.subagents.shared.permissions import (
+from app.agents.multi_agent_chat.subagents.shared.hitl.approvals.self_gated import (
+    self_gated_tool_permission_row,
+)
+from app.agents.multi_agent_chat.subagents.shared.tool_kinds import (
     ToolsPermissions,
 )
 
@@ -25,8 +28,8 @@ def load_tools(
     send = create_send_teams_message_tool(**common)
     return {
         "allow": [
-            {"name": getattr(list_ch, "name", "") or "", "tool": list_ch},
-            {"name": getattr(read_msg, "name", "") or "", "tool": read_msg},
+            self_gated_tool_permission_row(list_ch),
+            self_gated_tool_permission_row(read_msg),
         ],
-        "ask": [{"name": getattr(send, "name", "") or "", "tool": send}],
+        "ask": [self_gated_tool_permission_row(send)],
     }

surfsense_backend/app/agents/multi_agent_chat/subagents/connectors/teams/tools/send_message.py

@@ -5,7 +5,9 @@ import httpx
 from langchain_core.tools import tool
 from sqlalchemy.ext.asyncio import AsyncSession
 
-from app.agents.new_chat.tools.hitl import request_approval
+from app.agents.multi_agent_chat.subagents.shared.hitl.approvals.self_gated import (
+    request_approval,
+)
 
 from ._auth import GRAPH_API, get_access_token, get_teams_connector