nits

brendan-kellam · brendan-kellam · commit 1cdd83191e84 · 2026-02-23T13:18:10.000-08:00
diff --git a/packages/web/src/app/api/(server)/chat/blocking/route.ts b/packages/web/src/app/api/(server)/chat/blocking/route.ts
@@ -135,7 +135,7 @@ export const POST = apiHandler(async (request: NextRequest) => {
                 parts: [{ type: 'text', text: query }],
             };
 
-            const selectedSearchScopes = await Promise.all(repos.map(async (repo) => {
+            const selectedRepos = (await Promise.all(repos.map(async (repo) => {
                 const repoDB = await prisma.repo.findFirst({
                     where: {
                         name: repo,
@@ -156,24 +156,26 @@ export const POST = apiHandler(async (request: NextRequest) => {
                     name: repoDB.displayName ?? repoDB.name.split('/').pop() ?? repoDB.name,
                     codeHostType: repoDB.external_codeHostType,
                 } satisfies SearchScope;
-            }));
+            })));
 
             // We'll capture the final messages and usage from the stream
             let finalMessages: SBChatMessage[] = [];
 
-            const expandedRepos = selectedSearchScopes.map(s => s.value);
-
             await captureEvent('wa_chat_message_sent', {
                 chatId: chat.id,
                 messageCount: 1,
-                ...(env.EXPERIMENT_ASK_GH_ENABLED === 'true' ? { selectedRepos: expandedRepos } : {}),
+                ...(env.EXPERIMENT_ASK_GH_ENABLED === 'true' ? {
+                    selectedRepos: selectedRepos.map(r => r.value)
+                } : {}),
             });
 
             const stream = await createMessageStream({
                 chatId: chat.id,
                 messages: [userMessage],
-                selectedSearchScopes,
-                selectedRepos: expandedRepos,
+                metadata: {
+                    selectedSearchScopes: selectedRepos,
+                },
+                selectedRepos: selectedRepos.map(r => r.value),
                 model,
                 modelName,
                 modelProviderOptions: providerOptions,
diff --git a/packages/web/src/app/api/(server)/chat/route.ts b/packages/web/src/app/api/(server)/chat/route.ts
@@ -1,7 +1,7 @@
 import { sew } from "@/actions";
 import { _getConfiguredLanguageModelsFull, _getAISDKLanguageModelAndOptions, _updateChatMessages, _isOwnerOfChat } from "@/features/chat/actions";
 import { createAgentStream } from "@/features/chat/agent";
-import { additionalChatRequestParamsSchema, LanguageModelInfo, SBChatMessage, SearchScope } from "@/features/chat/types";
+import { additionalChatRequestParamsSchema, LanguageModelInfo, SBChatMessage, SBChatMessageMetadata, SearchScope } from "@/features/chat/types";
 import { getAnswerPartFromAssistantMessage, getLanguageModelKey } from "@/features/chat/utils";
 import { apiHandler } from "@/lib/apiHandler";
 import { ErrorCode } from "@/lib/errorCodes";
@@ -109,7 +109,9 @@ export const POST = apiHandler(async (req: NextRequest) => {
             const stream = await createMessageStream({
                 chatId: id,
                 messages,
-                selectedSearchScopes,
+                metadata: {
+                    selectedSearchScopes,
+                },
                 selectedRepos: expandedRepos,
                 model,
                 modelName: languageModelConfig.displayName ?? languageModelConfig.model,
@@ -163,19 +165,19 @@ const mergeStreamAsync = async (stream: StreamTextResult<any, any>, writer: UIMe
 interface CreateMessageStreamResponseProps {
     chatId: string;
     messages: SBChatMessage[];
-    selectedSearchScopes: SearchScope[];
     selectedRepos: string[];
     model: AISDKLanguageModelV2;
     modelName: string;
-    modelProviderOptions?: Record<string, Record<string, JSONValue>>;
     onFinish: UIMessageStreamOnFinishCallback<SBChatMessage>;
     onError: (error: unknown) => string;
+    modelProviderOptions?: Record<string, Record<string, JSONValue>>;
+    metadata?: Partial<SBChatMessageMetadata>;
 }
 
 export const createMessageStream = async ({
     chatId,
     messages,
-    selectedSearchScopes,
+    metadata,
     selectedRepos,
     model,
     modelName,
@@ -252,8 +254,8 @@ export const createMessageStream = async ({
                     totalOutputTokens: totalUsage.outputTokens,
                     totalResponseTimeMs: new Date().getTime() - startTime.getTime(),
                     modelName,
-                    selectedSearchScopes,
                     traceId,
+                    ...metadata,
                 }
             });
 
