feat(ask_sb): Improved search tool ; tools for listing / searching repos ; removed search scope constraint (#400)

* wip

* Add additional tools for repo searching and listing

* Remove search scope constraint

* Only show the selected search scopes when there is > 0

* changelog

* fix build

Author: brendan-kellam

CHANGELOG.md

@@ -13,6 +13,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Search context refactor to search scope and demo card UI changes. [#405](https://github.com/sourcebot-dev/sourcebot/pull/405)
 - Add GitHub star toast. [#409](https://github.com/sourcebot-dev/sourcebot/pull/409)
 - Added a onboarding modal when first visiting the homepage when `ask` mode is selected. [#408](https://github.com/sourcebot-dev/sourcebot/pull/408)
+- [ask sb] Added `searchReposTool` and `listAllReposTool`. [#400](https://github.com/sourcebot-dev/sourcebot/pull/400)
 
 ### Fixed
 - Fixed multiple writes race condition on config file watcher. [#398](https://github.com/sourcebot-dev/sourcebot/pull/398)
@@ -21,6 +22,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Bumped AI SDK and associated packages version. [#404](https://github.com/sourcebot-dev/sourcebot/pull/404)
 - Bumped form-data package version. [#407](https://github.com/sourcebot-dev/sourcebot/pull/407)
 - Bumped next version. [#406](https://github.com/sourcebot-dev/sourcebot/pull/406)
+- [ask sb] Improved search code tool with filter options. [#400](https://github.com/sourcebot-dev/sourcebot/pull/400)
+- [ask sb] Removed search scope constraint. [#400](https://github.com/sourcebot-dev/sourcebot/pull/400)
 
 ## [4.6.0] - 2025-07-25
 

packages/web/src/app/[domain]/chat/components/newChatPanel.tsx

@@ -51,7 +51,6 @@ export const NewChatPanel = ({
                             languageModels={languageModels}
                             selectedSearchScopes={selectedSearchScopes}
                             searchContexts={searchContexts}
-                            onContextSelectorOpenChanged={setIsContextSelectorOpen}
                         />
                         <div className="w-full flex flex-row items-center bg-accent rounded-b-md px-2">
                             <ChatBoxToolbar

packages/web/src/app/[domain]/components/homepage/agenticSearch.tsx

@@ -58,7 +58,6 @@ export const AgenticSearch = ({
                     languageModels={languageModels}
                     selectedSearchScopes={selectedSearchScopes}
                     searchContexts={searchContexts}
-                    onContextSelectorOpenChanged={setIsContextSelectorOpen}
                 />
                 <Separator />
                 <div className="relative">

packages/web/src/features/chat/agent.ts

@@ -6,7 +6,7 @@ import { ProviderOptions } from "@ai-sdk/provider-utils";
 import { createLogger } from "@sourcebot/logger";
 import { LanguageModel, ModelMessage, StopCondition, streamText } from "ai";
 import { ANSWER_TAG, FILE_REFERENCE_PREFIX, toolNames } from "./constants";
-import { createCodeSearchTool, findSymbolDefinitionsTool, findSymbolReferencesTool, readFilesTool } from "./tools";
+import { createCodeSearchTool, findSymbolDefinitionsTool, findSymbolReferencesTool, readFilesTool, searchReposTool, listAllReposTool } from "./tools";
 import { FileSource, Source } from "./types";
 import { addLineNumbers, fileReferenceToString } from "./utils";
 
@@ -54,6 +54,8 @@ export const createAgentStream = async ({
             [toolNames.readFiles]: readFilesTool,
             [toolNames.findSymbolReferences]: findSymbolReferencesTool,
             [toolNames.findSymbolDefinitions]: findSymbolDefinitionsTool,
+            [toolNames.searchRepos]: searchReposTool,
+            [toolNames.listAllRepos]: listAllReposTool,
         },
         prepareStep: async ({ stepNumber }) => {
             // The first step attaches any mentioned sources to the system prompt.
@@ -185,13 +187,7 @@ ${searchScopeRepoNames.map(repo => `- ${repo}`).join('\n')}
 </available_repositories>
 
 <research_phase_instructions>
-During the research phase, you have these tools available:
-- \`${toolNames.searchCode}\`: Search for code patterns, functions, or text across repositories
-- \`${toolNames.readFiles}\`: Read the contents of specific files
-- \`${toolNames.findSymbolReferences}\`: Find where symbols are referenced
-- \`${toolNames.findSymbolDefinitions}\`: Find where symbols are defined
-
-Use these tools to gather comprehensive context before answering. Always explain why you're using each tool.
+During the research phase, use the tools available to you to gather comprehensive context before answering. Always explain why you're using each tool. Depending on the user's question, you may need to use multiple tools. If the question is vague, ask the user for more information.
 </research_phase_instructions>
 
 ${answerInstructions}

packages/web/src/features/chat/components/chatBox/chatBox.tsx

@@ -5,9 +5,10 @@ import { Button } from "@/components/ui/button";
 import { Tooltip, TooltipContent, TooltipTrigger } from "@/components/ui/tooltip";
 import { CustomEditor, LanguageModelInfo, MentionElement, RenderElementPropsFor, SearchScope } from "@/features/chat/types";
 import { insertMention, slateContentToString } from "@/features/chat/utils";
+import { SearchContextQuery } from "@/lib/types";
 import { cn, IS_MAC } from "@/lib/utils";
 import { computePosition, flip, offset, shift, VirtualElement } from "@floating-ui/react";
-import { ArrowUp, Loader2, StopCircleIcon, TriangleAlertIcon } from "lucide-react";
+import { ArrowUp, Loader2, StopCircleIcon } from "lucide-react";
 import { Fragment, KeyboardEvent, useCallback, useEffect, useMemo, useRef, useState } from "react";
 import { useHotkeys } from "react-hotkeys-hook";
 import { Descendant, insertText } from "slate";
@@ -17,8 +18,6 @@ import { SuggestionBox } from "./suggestionsBox";
 import { Suggestion } from "./types";
 import { useSuggestionModeAndQuery } from "./useSuggestionModeAndQuery";
 import { useSuggestionsData } from "./useSuggestionsData";
-import { useToast } from "@/components/hooks/use-toast";
-import { SearchContextQuery } from "@/lib/types";
 
 interface ChatBoxProps {
     onSubmit: (children: Descendant[], editor: CustomEditor) => void;
@@ -30,7 +29,6 @@ interface ChatBoxProps {
     languageModels: LanguageModelInfo[];
     selectedSearchScopes: SearchScope[];
     searchContexts: SearchContextQuery[];
-    onContextSelectorOpenChanged: (isOpen: boolean) => void;
 }
 
 export const ChatBox = ({
@@ -43,7 +41,6 @@ export const ChatBox = ({
     languageModels,
     selectedSearchScopes,
     searchContexts,
-    onContextSelectorOpenChanged,
 }: ChatBoxProps) => {
     const suggestionsBoxRef = useRef<HTMLDivElement>(null);
     const [index, setIndex] = useState(0);
@@ -70,7 +67,6 @@ export const ChatBox = ({
     const { selectedLanguageModel } = useSelectedLanguageModel({
         initialLanguageModel: languageModels.length > 0 ? languageModels[0] : undefined,
     });
-    const { toast } = useToast();
 
     // Reset the index when the suggestion mode changes.
     useEffect(() => {
@@ -101,9 +97,9 @@ export const ChatBox = ({
         return <Leaf {...props} />
     }, []);
 
-    const { isSubmitDisabled, isSubmitDisabledReason } = useMemo((): {
+    const { isSubmitDisabled } = useMemo((): {
         isSubmitDisabled: true,
-        isSubmitDisabledReason: "empty" | "redirecting" | "generating" | "no-repos-selected" | "no-language-model-selected"
+        isSubmitDisabledReason: "empty" | "redirecting" | "generating" | "no-language-model-selected"
     } | {
         isSubmitDisabled: false,
         isSubmitDisabledReason: undefined,
@@ -129,13 +125,6 @@ export const ChatBox = ({
             }
         }
 
-        if (selectedSearchScopes.length === 0) {
-            return {
-                isSubmitDisabled: true,
-                isSubmitDisabledReason: "no-repos-selected",
-            }
-        }
-
         if (selectedLanguageModel === undefined) {
 
             return {
@@ -149,29 +138,11 @@ export const ChatBox = ({
             isSubmitDisabledReason: undefined,
         }
 
-    }, [
-        editor.children,
-        isRedirecting,
-        isGenerating,
-        selectedSearchScopes.length,
-        selectedLanguageModel,
-    ])
+    }, [editor.children, isRedirecting, isGenerating, selectedLanguageModel])
 
     const onSubmit = useCallback(() => {
-        if (isSubmitDisabled) {
-            if (isSubmitDisabledReason === "no-repos-selected") {
-                toast({
-                    description: "⚠️ You must select at least one search scope",
-                    variant: "destructive",
-                });
-                onContextSelectorOpenChanged(true);
-            }
-
-            return;
-        }
-
         _onSubmit(editor.children, editor);
-    }, [_onSubmit, editor, isSubmitDisabled, isSubmitDisabledReason, toast, onContextSelectorOpenChanged]);
+    }, [_onSubmit, editor]);
 
     const onInsertSuggestion = useCallback((suggestion: Suggestion) => {
         switch (suggestion.type) {
@@ -310,39 +281,15 @@ export const ChatBox = ({
                             Stop
                         </Button>
                     ) : (
-                        <Tooltip>
-                            <TooltipTrigger asChild>
-                                <div
-                                    onClick={() => {
-                                        // @hack: When submission is disabled, we still want to issue
-                                        // a warning to the user as to why the submission is disabled.
-                                        // onSubmit on the Button will not be called because of the
-                                        // disabled prop, hence the call here.
-                                        if (isSubmitDisabled) {
-                                            onSubmit();
-                                        }
-                                    }}
-                                >
-                                    <Button
-                                        variant={isSubmitDisabled ? "outline" : "default"}
-                                        size="sm"
-                                        className="w-6 h-6"
-                                        onClick={onSubmit}
-                                        disabled={isSubmitDisabled}
-                                    >
-                                        <ArrowUp className="w-4 h-4" />
-                                    </Button>
-                                </div>
-                            </TooltipTrigger>
-                            {(isSubmitDisabled && isSubmitDisabledReason === "no-repos-selected") && (
-                                <TooltipContent>
-                                    <div className="flex flex-row items-center">
-                                        <TriangleAlertIcon className="h-4 w-4 text-warning mr-1" />
-                                        <span className="text-destructive">You must select at least one search scope</span>
-                                    </div>
-                                </TooltipContent>
-                            )}
-                        </Tooltip>
+                            <Button
+                                variant={isSubmitDisabled ? "outline" : "default"}
+                                size="sm"
+                                className="w-6 h-6"
+                                onClick={onSubmit}
+                                disabled={isSubmitDisabled}
+                            >
+                                <ArrowUp className="w-4 h-4" />
+                            </Button>
                     )}
             </div>
             {suggestionMode !== "none" && (

packages/web/src/features/chat/components/chatThread/chatThread.tsx

@@ -321,7 +321,6 @@ export const ChatThread = ({
                             languageModels={languageModels}
                             selectedSearchScopes={selectedSearchScopes}
                             searchContexts={searchContexts}
-                            onContextSelectorOpenChanged={setIsContextSelectorOpen}
                         />
                         <div className="w-full flex flex-row items-center bg-accent rounded-b-md px-2">
                             <ChatBoxToolbar

packages/web/src/features/chat/components/chatThread/detailsCard.tsx

@@ -12,6 +12,8 @@ import { FindSymbolDefinitionsToolComponent } from './tools/findSymbolDefinition
 import { FindSymbolReferencesToolComponent } from './tools/findSymbolReferencesToolComponent';
 import { ReadFilesToolComponent } from './tools/readFilesToolComponent';
 import { SearchCodeToolComponent } from './tools/searchCodeToolComponent';
+import { SearchReposToolComponent } from './tools/searchReposToolComponent';
+import { ListAllReposToolComponent } from './tools/listAllReposToolComponent';
 import { SBChatMessageMetadata, SBChatMessagePart } from '../../types';
 import { SearchScopeIcon } from '../searchScopeIcon';
 
@@ -63,7 +65,7 @@ export const DetailsCard = ({
                                 {!isStreaming && (
                                     <>
                                         <Separator orientation="vertical" className="h-4" />
-                                        {metadata?.selectedSearchScopes && (
+                                        {(metadata?.selectedSearchScopes && metadata.selectedSearchScopes.length > 0) && (
                                             <Tooltip>
                                                 <TooltipTrigger asChild>
                                                     <div className="flex items-center text-xs cursor-help">
@@ -181,6 +183,20 @@ export const DetailsCard = ({
                                                         part={part}
                                                     />
                                                 )
+                                            case 'tool-searchRepos':
+                                                return (
+                                                    <SearchReposToolComponent
+                                                        key={index}
+                                                        part={part}
+                                                    />
+                                                )
+                                            case 'tool-listAllRepos':
+                                                return (
+                                                    <ListAllReposToolComponent
+                                                        key={index}
+                                                        part={part}
+                                                    />
+                                                )
                                             default:
                                                 return null;
                                         }

packages/web/src/features/chat/components/chatThread/referencedSourcesListView.tsx

@@ -221,7 +221,7 @@ export const ReferencedSourcesListView = ({
                                     <span className="text-sm font-medium">{fileName}</span>
                                 </div>
                                 <div className="p-4 text-sm text-destructive bg-destructive/10 rounded border">
-                                    Failed to load file: {isServiceError(query.data) ? query.data.message : 'Unknown error'}
+                                    Failed to load file: {isServiceError(query.data) ? query.data.message : query.error?.message ?? 'Unknown error'}
                                 </div>
                             </div>
                         );

packages/web/src/features/chat/components/chatThread/tools/listAllReposToolComponent.tsx

@@ -0,0 +1,66 @@
+'use client';
+
+import { ListAllReposToolUIPart } from "@/features/chat/tools";
+import { isServiceError } from "@/lib/utils";
+import { useMemo, useState } from "react";
+import { ToolHeader, TreeList } from "./shared";
+import { CodeSnippet } from "@/app/components/codeSnippet";
+import { Separator } from "@/components/ui/separator";
+import { FolderOpenIcon } from "lucide-react";
+
+export const ListAllReposToolComponent = ({ part }: { part: ListAllReposToolUIPart }) => {
+    const [isExpanded, setIsExpanded] = useState(false);
+
+    const label = useMemo(() => {
+        switch (part.state) {
+            case 'input-streaming':
+                return 'Loading all repositories...';
+            case 'output-error':
+                return '"List all repositories" tool call failed';
+            case 'input-available':
+            case 'output-available':
+                return 'Listed all repositories';
+        }
+    }, [part]);
+
+    return (
+        <div className="my-4">
+            <ToolHeader
+                isLoading={part.state !== 'output-available' && part.state !== 'output-error'}
+                isError={part.state === 'output-error' || (part.state === 'output-available' && isServiceError(part.output))}
+                isExpanded={isExpanded}
+                label={label}
+                Icon={FolderOpenIcon}
+                onExpand={setIsExpanded}
+            />
+            {part.state === 'output-available' && isExpanded && (
+                <>
+                    {isServiceError(part.output) ? (
+                        <TreeList>
+                            <span>Failed with the following error: <CodeSnippet className="text-sm text-destructive">{part.output.message}</CodeSnippet></span>
+                        </TreeList>
+                    ) : (
+                        <>
+                            {part.output.length === 0 ? (
+                                <span className="text-sm text-muted-foreground ml-[25px]">No repositories found</span>
+                            ) : (
+                                <TreeList>
+                                    <div className="text-sm text-muted-foreground mb-2">
+                                        Found {part.output.length} repositories:
+                                    </div>
+                                    {part.output.map((repoName, index) => (
+                                        <div key={index} className="flex items-center gap-2 text-sm">
+                                            <FolderOpenIcon className="h-4 w-4 text-muted-foreground" />
+                                            <span className="truncate">{repoName}</span>
+                                        </div>
+                                    ))}
+                                </TreeList>
+                            )}
+                        </>
+                    )}
+                    <Separator className='ml-[7px] my-2' />
+                </>
+            )}
+        </div>
+    )
+} 

packages/web/src/features/chat/components/chatThread/tools/searchCodeToolComponent.tsx

@@ -11,24 +11,38 @@ import { SearchIcon } from "lucide-react";
 import Link from "next/link";
 import { SearchQueryParams } from "@/lib/types";
 import { PlayIcon } from "@radix-ui/react-icons";
-
+import { buildSearchQuery } from "@/features/chat/utils";
 
 export const SearchCodeToolComponent = ({ part }: { part: SearchCodeToolUIPart }) => {
     const [isExpanded, setIsExpanded] = useState(false);
     const domain = useDomain();
 
+    const displayQuery = useMemo(() => {
+        if (part.state !== 'input-available' && part.state !== 'output-available') {
+            return '';
+        }
+
+        const query = buildSearchQuery({
+            query: part.input.queryRegexp,
+            repoNamesFilterRegexp: part.input.repoNamesFilterRegexp,
+            languageNamesFilter: part.input.languageNamesFilter,
+            fileNamesFilterRegexp: part.input.fileNamesFilterRegexp,
+        });
+
+        return query;
+    }, [part]);
+
     const label = useMemo(() => {
         switch (part.state) {
             case 'input-streaming':
                 return 'Searching...';
-            case 'input-available':
-                return <span>Searching for <CodeSnippet>{part.input.query}</CodeSnippet></span>;
             case 'output-error':
                 return '"Search code" tool call failed';
+            case 'input-available':
             case 'output-available':
-                return <span>Searched for <CodeSnippet>{part.input.query}</CodeSnippet></span>;
+                return <span>Searched for <CodeSnippet>{displayQuery}</CodeSnippet></span>;
         }
-    }, [part]);
+    }, [part, displayQuery]);
 
     return (
         <div className="my-4">