Skip to content

fix(research): gate trigger_research behind the web-search toggle #5571

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Ninthkitten wants to merge 1 commit into
base: dev
Choose a base branch
from
+7 −4
Open

fix(research): gate trigger_research behind the web-search toggle #5571

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions routes/chat_routes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -880,8 +880,11 @@ async def chat_stream(request: Request) -> StreamingResponse:
if allow_bash is not None and str(allow_bash).lower() != "true":
disabled_tools.add("bash")
_explicit_web_intent = bool(_tool_intent and _tool_intent.category == "web")
# trigger_research reaches the internet too, so gate it with the same
# per-turn web toggle as web_search/web_fetch — "web off" must mean offline.
_web_gated_tools = set(WEB_TOOL_NAMES) | {"trigger_research"}
if is_web_search_explicitly_denied(allow_web_search) or not _search_enabled:
disabled_tools.update(WEB_TOOL_NAMES)
disabled_tools.update(_web_gated_tools)
if _explicit_web_intent:
# A direct lookup/search request should not drift into personal
# tools or shell fallbacks. It can only use web_search/web_fetch
Expand All @@ -896,11 +899,11 @@ async def chat_stream(request: Request) -> StreamingResponse:
"api_call", "builtin_browser",
})
if _search_enabled:
disabled_tools.difference_update(WEB_TOOL_NAMES)
disabled_tools.difference_update(_web_gated_tools)
else:
disabled_tools.update(WEB_TOOL_NAMES)
disabled_tools.update(_web_gated_tools)
elif _search_enabled:
disabled_tools.difference_update(WEB_TOOL_NAMES)
disabled_tools.difference_update(_web_gated_tools)

# Nobody/incognito mode: deny tools that would expose the user's
# persistent memory, past chats, or other identity-linked data.
Expand Down
Loading