Search scope refactor

CHANGELOG.md

@@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 - Add search context to ask sourcebot context selector. [#397](https://github.com/sourcebot-dev/sourcebot/pull/397)
 - Add ability to include/exclude connection in search context. [#399](https://github.com/sourcebot-dev/sourcebot/pull/399)
+- Search context refactor to search scope and demo card UI changes. [#405](https://github.com/sourcebot-dev/sourcebot/pull/405)
 
 ### Fixed
 - Fixed multiple writes race condition on config file watcher. [#398](https://github.com/sourcebot-dev/sourcebot/pull/398)

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

@@ -2,13 +2,12 @@
 
 import { ResizablePanel } from '@/components/ui/resizable';
 import { ChatThread } from '@/features/chat/components/chatThread';
-import { LanguageModelInfo, SBChatMessage, SET_CHAT_STATE_QUERY_PARAM, SetChatStatePayload } from '@/features/chat/types';
+import { LanguageModelInfo, SBChatMessage, SearchScope, SET_CHAT_STATE_QUERY_PARAM, SetChatStatePayload } from '@/features/chat/types';
 import { RepositoryQuery, SearchContextQuery } from '@/lib/types';
 import { CreateUIMessage } from 'ai';
 import { useRouter, useSearchParams } from 'next/navigation';
 import { useEffect, useState } from 'react';
 import { useChatId } from '../../useChatId';
-import { ContextItem } from '@/features/chat/components/chatBox/contextSelector';
 
 interface ChatThreadPanelProps {
     languageModels: LanguageModelInfo[];
@@ -33,62 +32,22 @@ export const ChatThreadPanel = ({
     const router = useRouter();
     const searchParams = useSearchParams();
     const [inputMessage, setInputMessage] = useState<CreateUIMessage<SBChatMessage> | undefined>(undefined);
-
+    
     // Use the last user's last message to determine what repos and contexts we should select by default.
     const lastUserMessage = messages.findLast((message) => message.role === "user");
-    const defaultSelectedRepos = lastUserMessage?.metadata?.selectedRepos ?? [];
-    const defaultSelectedContexts = lastUserMessage?.metadata?.selectedContexts ?? [];
+    const defaultSelectedSearchScopes = lastUserMessage?.metadata?.selectedSearchScopes ?? [];
+    const [selectedSearchScopes, setSelectedSearchScopes] = useState<SearchScope[]>(defaultSelectedSearchScopes);
 
-    const [selectedItems, setSelectedItems] = useState<ContextItem[]>([
-        ...defaultSelectedRepos.map(repoName => {
-            const repoInfo = repos.find(r => r.repoName === repoName);
-            return {
-                type: 'repo' as const,
-                value: repoName,
-                name: repoInfo?.repoDisplayName || repoName.split('/').pop() || repoName,
-                codeHostType: repoInfo?.codeHostType || ''
-            };
-        }),
-        ...defaultSelectedContexts.map(contextName => {
-            const context = searchContexts.find(c => c.name === contextName);
-            return {
-                type: 'context' as const,
-                value: contextName,
-                name: contextName,
-                repoCount: context?.repoNames.length || 0
-            };
-        })
-    ]);
-
     useEffect(() => {
         const setChatState = searchParams.get(SET_CHAT_STATE_QUERY_PARAM);
         if (!setChatState) {
             return;
         }
 
         try {
-            const { inputMessage, selectedRepos, selectedContexts } = JSON.parse(setChatState) as SetChatStatePayload;
+            const { inputMessage, selectedSearchScopes } = JSON.parse(setChatState) as SetChatStatePayload;
             setInputMessage(inputMessage);
-            setSelectedItems([
-                ...selectedRepos.map(repoName => {
-                    const repoInfo = repos.find(r => r.repoName === repoName);
-                    return {
-                        type: 'repo' as const,
-                        value: repoName,
-                        name: repoInfo?.repoDisplayName || repoName.split('/').pop() || repoName,
-                        codeHostType: repoInfo?.codeHostType || ''
-                    };
-                }),
-                ...selectedContexts.map(contextName => {
-                    const context = searchContexts.find(c => c.name === contextName);
-                    return {
-                        type: 'context' as const,
-                        value: contextName,
-                        name: contextName,  
-                        repoCount: context?.repoNames.length || 0
-                    };
-                })
-            ]);
+            setSelectedSearchScopes(selectedSearchScopes);
         } catch {
             console.error('Invalid message in URL');
         }
@@ -97,7 +56,7 @@ export const ChatThreadPanel = ({
         const newSearchParams = new URLSearchParams(searchParams.toString());
         newSearchParams.delete(SET_CHAT_STATE_QUERY_PARAM);
         router.replace(`?${newSearchParams.toString()}`, { scroll: false });
-    }, [searchParams, router, repos, searchContexts]);
+    }, [searchParams, router]);
 
     return (
         <ResizablePanel
@@ -113,8 +72,8 @@ export const ChatThreadPanel = ({
                     languageModels={languageModels}
                     repos={repos}
                     searchContexts={searchContexts}
-                    selectedItems={selectedItems}
-                    onSelectedItemsChange={setSelectedItems}
+                    selectedSearchScopes={selectedSearchScopes}
+                    onSelectedSearchScopesChange={setSelectedSearchScopes}
                     isChatReadonly={isChatReadonly}
                 />
             </div>

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

@@ -5,12 +5,11 @@ import { ChatBox } from "@/features/chat/components/chatBox";
 import { ChatBoxToolbar } from "@/features/chat/components/chatBox/chatBoxToolbar";
 import { CustomSlateEditor } from "@/features/chat/customSlateEditor";
 import { useCreateNewChatThread } from "@/features/chat/useCreateNewChatThread";
-import { LanguageModelInfo } from "@/features/chat/types";
+import { LanguageModelInfo, SearchScope } from "@/features/chat/types";
 import { RepositoryQuery, SearchContextQuery } from "@/lib/types";
 import { useCallback, useState } from "react";
 import { Descendant } from "slate";
 import { useLocalStorage } from "usehooks-ts";
-import { ContextItem } from "@/features/chat/components/chatBox/contextSelector";
 
 interface NewChatPanelProps {
     languageModels: LanguageModelInfo[];
@@ -25,13 +24,13 @@ export const NewChatPanel = ({
     searchContexts,
     order,
 }: NewChatPanelProps) => {
-    const [selectedItems, setSelectedItems] = useLocalStorage<ContextItem[]>("selectedContextItems", [], { initializeWithValue: false });
+    const [selectedSearchScopes, setSelectedSearchScopes] = useLocalStorage<SearchScope[]>("selectedSearchScopes", [], { initializeWithValue: false });
     const { createNewChatThread, isLoading } = useCreateNewChatThread();
     const [isContextSelectorOpen, setIsContextSelectorOpen] = useState(false);
 
     const onSubmit = useCallback((children: Descendant[]) => {
-        createNewChatThread(children, selectedItems);
-    }, [createNewChatThread, selectedItems]);
+        createNewChatThread(children, selectedSearchScopes);
+    }, [createNewChatThread, selectedSearchScopes]);
 
 
     return (
@@ -50,7 +49,7 @@ export const NewChatPanel = ({
                             preferredSuggestionsBoxPlacement="bottom-start"
                             isRedirecting={isLoading}
                             languageModels={languageModels}
-                            selectedItems={selectedItems}
+                            selectedSearchScopes={selectedSearchScopes}
                             searchContexts={searchContexts}
                             onContextSelectorOpenChanged={setIsContextSelectorOpen}
                         />
@@ -59,8 +58,8 @@ export const NewChatPanel = ({
                                 languageModels={languageModels}
                                 repos={repos}
                                 searchContexts={searchContexts}
-                                selectedItems={selectedItems}
-                                onSelectedItemsChange={setSelectedItems}
+                                selectedSearchScopes={selectedSearchScopes}
+                                onSelectedSearchScopesChange={setSelectedSearchScopes}
                                 isContextSelectorOpen={isContextSelectorOpen}
                                 onContextSelectorOpenChanged={setIsContextSelectorOpen}
                             />

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

@@ -3,13 +3,12 @@
 import { Separator } from "@/components/ui/separator";
 import { ChatBox } from "@/features/chat/components/chatBox";
 import { ChatBoxToolbar } from "@/features/chat/components/chatBox/chatBoxToolbar";
-import { LanguageModelInfo } from "@/features/chat/types";
+import { LanguageModelInfo, SearchScope } from "@/features/chat/types";
 import { useCreateNewChatThread } from "@/features/chat/useCreateNewChatThread";
 import { RepositoryQuery, SearchContextQuery } from "@/lib/types";
 import { useState } from "react";
 import { SearchModeSelector, SearchModeSelectorProps } from "./toolbar";
 import { useLocalStorage } from "usehooks-ts";
-import { ContextItem } from "@/features/chat/components/chatBox/contextSelector";
 import { DemoExamples } from "@/types";
 import { AskSourcebotDemoCards } from "./askSourcebotDemoCards";
 
@@ -34,20 +33,20 @@ export const AgenticSearch = ({
     demoExamples,
 }: AgenticSearchProps) => {
     const { createNewChatThread, isLoading } = useCreateNewChatThread();
-    const [selectedItems, setSelectedItems] = useLocalStorage<ContextItem[]>("selectedContextItems", [], { initializeWithValue: false });
+    const [selectedSearchScopes, setSelectedSearchScopes] = useLocalStorage<SearchScope[]>("selectedSearchScopes", [], { initializeWithValue: false });
     const [isContextSelectorOpen, setIsContextSelectorOpen] = useState(false);
 
     return (
         <div className="flex flex-col items-center w-full">
             <div className="mt-4 w-full border rounded-md shadow-sm max-w-[800px]">
                 <ChatBox
                     onSubmit={(children) => {
-                        createNewChatThread(children, selectedItems);
+                        createNewChatThread(children, selectedSearchScopes);
                     }}
                     className="min-h-[50px]"
                     isRedirecting={isLoading}
                     languageModels={languageModels}
-                    selectedItems={selectedItems}
+                    selectedSearchScopes={selectedSearchScopes}
                     searchContexts={searchContexts}
                     onContextSelectorOpenChanged={setIsContextSelectorOpen}
                 />
@@ -58,8 +57,8 @@ export const AgenticSearch = ({
                             languageModels={languageModels}
                             repos={repos}
                             searchContexts={searchContexts}
-                            selectedItems={selectedItems}
-                            onSelectedItemsChange={setSelectedItems}
+                            selectedSearchScopes={selectedSearchScopes}
+                            onSelectedSearchScopesChange={setSelectedSearchScopes}
                             isContextSelectorOpen={isContextSelectorOpen}
                             onContextSelectorOpenChanged={setIsContextSelectorOpen}
                         />
@@ -74,10 +73,6 @@ export const AgenticSearch = ({
             {demoExamples && (
                 <AskSourcebotDemoCards
                     demoExamples={demoExamples}
-                    selectedItems={selectedItems}
-                    setSelectedItems={setSelectedItems}
-                    searchContexts={searchContexts}
-                    repos={repos}
                 />
             )}
         </div >