search context for chat suggestion, nits

Author: msukkari

packages/web/src/actions.ts

@@ -1868,9 +1868,10 @@ export const getSearchContexts = async (domain: string) => sew(() =>
             });
 
             return searchContexts.map((context) => ({
+                id: context.id,
                 name: context.name,
                 description: context.description ?? undefined,
-                repoCount: context.repos.length,
+                repoNames: context.repos.map((repo) => repo.name),
             }));
         }, /* minRequiredRole = */ OrgRole.GUEST), /* allowAnonymousAccess = */ true
     ));

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

@@ -55,7 +55,7 @@ export const ChatThreadPanel = ({
                 type: 'context' as const,
                 value: contextName,
                 name: contextName,
-                repoCount: context?.repoCount || 0
+                repoCount: context?.repoNames.length || 0
             };
         })
     ]);
@@ -79,13 +79,13 @@ export const ChatThreadPanel = ({
                         codeHostType: repoInfo?.codeHostType || ''
                     };
                 }),
-                ...(selectedContexts || []).map(contextName => {
+                ...selectedContexts.map(contextName => {
                     const context = searchContexts.find(c => c.name === contextName);
                     return {
                         type: 'context' as const,
                         value: contextName,
                         name: contextName,  
-                        repoCount: context?.repoCount || 0
+                        repoCount: context?.repoNames.length || 0
                     };
                 })
             ]);

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

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

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

@@ -167,6 +167,7 @@ export const AgenticSearch = ({
                     isRedirecting={isLoading}
                     languageModels={languageModels}
                     selectedItems={selectedItems}
+                    searchContexts={searchContexts}
                     onContextSelectorOpenChanged={setIsContextSelectorOpen}
                 />
                 <Separator />

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

@@ -19,6 +19,7 @@ import { useSuggestionModeAndQuery } from "./useSuggestionModeAndQuery";
 import { useSuggestionsData } from "./useSuggestionsData";
 import { useToast } from "@/components/hooks/use-toast";
 import { ContextItem } from "./contextSelector";
+import { SearchContextQuery } from "@/lib/types";
 
 interface ChatBoxProps {
     onSubmit: (children: Descendant[], editor: CustomEditor) => void;
@@ -29,6 +30,7 @@ interface ChatBoxProps {
     isGenerating?: boolean;
     languageModels: LanguageModelInfo[];
     selectedItems: ContextItem[];
+    searchContexts: SearchContextQuery[];
     onContextSelectorOpenChanged: (isOpen: boolean) => void;
 }
 
@@ -41,6 +43,7 @@ export const ChatBox = ({
     isGenerating,
     languageModels,
     selectedItems,
+    searchContexts,
     onContextSelectorOpenChanged,
 }: ChatBoxProps) => {
     const suggestionsBoxRef = useRef<HTMLDivElement>(null);
@@ -50,7 +53,20 @@ export const ChatBox = ({
     const { suggestions, isLoading } = useSuggestionsData({
         suggestionMode,
         suggestionQuery,
-        selectedRepos: selectedItems.filter(item => item.type === 'repo').map(item => item.value),
+        selectedRepos: selectedItems.map((item) => {
+            if (item.type === 'repo') {
+                return [item.value];
+            }
+
+            if (item.type === 'context') {
+                const context = searchContexts.find((context) => context.name === item.value);
+                if (context) {
+                    return context.repoNames;
+                }
+            }
+
+            return [];
+        }).flat(),
     });
     const { selectedLanguageModel } = useSelectedLanguageModel({
         initialLanguageModel: languageModels.length > 0 ? languageModels[0] : undefined,

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

@@ -118,7 +118,7 @@ export const ContextSelector = React.forwardRef<
                 type: 'context' as const,
                 value: context.name,
                 name: context.name,
-                repoCount: context.repoCount
+                repoCount: context.repoNames.length
             }));
 
             const repoItems: ContextItem[] = repos.map(repo => ({

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

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

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

@@ -140,7 +140,7 @@ export const SET_CHAT_STATE_QUERY_PARAM = 'setChatState';
 export type SetChatStatePayload = {
     inputMessage: CreateUIMessage<SBChatMessage>;
     selectedRepos: string[];
-    selectedContexts?: string[];
+    selectedContexts: string[];
 }
 
 
@@ -158,6 +158,6 @@ export type LanguageModelInfo = {
 export const additionalChatRequestParamsSchema = z.object({
     languageModelId: z.string(),
     selectedRepos: z.array(z.string()),
-    selectedContexts: z.array(z.string()).optional(),
+    selectedContexts: z.array(z.string()),
 });
 export type AdditionalChatRequestParams = z.infer<typeof additionalChatRequestParamsSchema>;

packages/web/src/lib/schemas.ts

@@ -29,9 +29,10 @@ export const repositoryQuerySchema = z.object({
 });
 
 export const searchContextQuerySchema = z.object({
+    id: z.number(),
     name: z.string(),
     description: z.string().optional(),
-    repoCount: z.number(),
+    repoNames: z.array(z.string()),
 });
 
 export const verifyCredentialsRequestSchema = z.object({