migrate the rest

Author: brendan-kellam

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

@@ -14,14 +14,14 @@ import {
 } from "ai";
 import { randomUUID } from "crypto";
 import _dedent from "dedent";
-import { ANSWER_TAG, FILE_REFERENCE_PREFIX, toolNames } from "./constants";
-import { findSymbolDefinitionsTool, findSymbolReferencesTool, searchCodeTool } from "./tools";
-import { toVercelAITool } from "@/features/tools/adapters";
+import { ANSWER_TAG, FILE_REFERENCE_PREFIX } from "./constants";
+import { findSymbolReferencesDefinition } from "@/features/tools/findSymbolReferences";
+import { findSymbolDefinitionsDefinition } from "@/features/tools/findSymbolDefinitions";
 import { readFileDefinition } from "@/features/tools/readFile";
-import { listCommitsDefinition } from "@/features/tools/listCommits";
-import { listReposDefinition } from "@/features/tools/listRepos";
+import { searchCodeDefinition } from "@/features/tools/searchCode";
 import { Source } from "./types";
 import { addLineNumbers, fileReferenceToString } from "./utils";
+import { tools } from "./tools";
 
 const dedent = _dedent.withOptions({ alignValues: true });
 
@@ -202,14 +202,7 @@ const createAgentStream = async ({
         providerOptions,
         messages: inputMessages,
         system: systemPrompt,
-        tools: {
-            [toolNames.searchCode]: searchCodeTool,
-            [toolNames.readFile]: toVercelAITool(readFileDefinition),
-            [toolNames.findSymbolReferences]: findSymbolReferencesTool,
-            [toolNames.findSymbolDefinitions]: findSymbolDefinitionsTool,
-            [toolNames.listRepos]: toVercelAITool(listReposDefinition),
-            [toolNames.listCommits]: toVercelAITool(listCommitsDefinition),
-        },
+        tools,
         temperature: env.SOURCEBOT_CHAT_MODEL_TEMPERATURE,
         stopWhen: [
             stepCountIsGTE(env.SOURCEBOT_CHAT_MAX_STEP_COUNT),
@@ -227,7 +220,7 @@ const createAgentStream = async ({
                     return;
                 }
 
-                if (toolName === toolNames.readFile) {
+                if (toolName === readFileDefinition.name) {
                     onWriteSource({
                         type: 'file',
                         language: output.metadata.language,
@@ -236,8 +229,8 @@ const createAgentStream = async ({
                         revision: output.metadata.revision,
                         name: output.metadata.path.split('/').pop() ?? output.metadata.path,
                     });
-                } else if (toolName === toolNames.searchCode) {
-                    output.files.forEach((file) => {
+                } else if (toolName === searchCodeDefinition.name) {
+                    output.metadata.files.forEach((file) => {
                         onWriteSource({
                             type: 'file',
                             language: file.language,
@@ -247,8 +240,8 @@ const createAgentStream = async ({
                             name: file.fileName.split('/').pop() ?? file.fileName,
                         });
                     });
-                } else if (toolName === toolNames.findSymbolDefinitions || toolName === toolNames.findSymbolReferences) {
-                    output.forEach((file) => {
+                } else if (toolName === findSymbolDefinitionsDefinition.name || toolName === findSymbolReferencesDefinition.name) {
+                    output.metadata.files.forEach((file) => {
                         onWriteSource({
                             type: 'file',
                             language: file.language,

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

@@ -13,7 +13,6 @@ import { AnswerCard } from './answerCard';
 import { DetailsCard } from './detailsCard';
 import { MarkdownRenderer, REFERENCE_PAYLOAD_ATTRIBUTE } from './markdownRenderer';
 import { ReferencedSourcesListView } from './referencedSourcesListView';
-import { uiVisiblePartTypes } from '../../constants';
 import isEqual from "fast-deep-equal/react";
 
 interface ChatThreadListItemProps {
@@ -102,7 +101,12 @@ const ChatThreadListItemComponent = forwardRef<HTMLDivElement, ChatThreadListIte
                         return part.text !== answerPart?.text;
                     })
                     .filter((part) => {
-                        return uiVisiblePartTypes.includes(part.type);
+                        // Only include text, reasoning, and tool parts
+                        return (
+                            part.type === 'text' ||
+                            part.type === 'reasoning' ||
+                            part.type.startsWith('tool-')
+                        )
                     })
             )
             // Then, filter out any steps that are empty

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

@@ -43,11 +43,11 @@ export const FindSymbolDefinitionsToolComponent = ({ part }: { part: FindSymbolD
                         </TreeList>
                     ) : (
                         <>
-                            {part.output.length === 0 ? (
+                            {part.output.metadata.files.length === 0 ? (
                                 <span className="text-sm text-muted-foreground ml-[25px]">No matches found</span>
                             ) : (
                                 <TreeList>
-                                    {part.output.map((file) => {
+                                    {part.output.metadata.files.map((file) => {
                                         return (
                                             <FileListItem
                                                 key={file.fileName}

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

@@ -43,11 +43,11 @@ export const FindSymbolReferencesToolComponent = ({ part }: { part: FindSymbolRe
                         </TreeList>
                     ) : (
                         <>
-                            {part.output.length === 0 ? (
+                            {part.output.metadata.files.length === 0 ? (
                                 <span className="text-sm text-muted-foreground ml-[25px]">No matches found</span>
                             ) : (
                                 <TreeList>
-                                    {part.output.map((file) => {
+                                    {part.output.metadata.files.map((file) => {
                                         return (
                                             <FileListItem
                                                 key={file.fileName}

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

@@ -1,6 +1,6 @@
 'use client';
 
-import { ListCommitsToolUIPart } from "@/features/tools/registry";
+import { ListCommitsToolUIPart } from "@/features/chat/tools";
 import { isServiceError } from "@/lib/utils";
 import { useMemo, useState } from "react";
 import { ToolHeader, TreeList } from "./shared";

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

@@ -1,6 +1,6 @@
 'use client';
 
-import { ListReposToolUIPart } from "@/features/tools/registry";
+import { ListReposToolUIPart } from "@/features/chat/tools";
 import { isServiceError } from "@/lib/utils";
 import { useMemo, useState } from "react";
 import { ToolHeader, TreeList } from "./shared";

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

@@ -2,7 +2,7 @@
 
 import { CodeSnippet } from "@/app/components/codeSnippet";
 import { Separator } from "@/components/ui/separator";
-import { ReadFileToolUIPart } from "@/features/tools/registry";
+import { ReadFileToolUIPart } from "@/features/chat/tools";
 import { isServiceError } from "@/lib/utils";
 import { EyeIcon } from "lucide-react";
 import { useMemo, useState } from "react";

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

@@ -49,11 +49,11 @@ export const SearchCodeToolComponent = ({ part }: { part: SearchCodeToolUIPart }
                         </TreeList>
                     ) : (
                         <>
-                            {part.output.files.length === 0 ? (
+                            {part.output.metadata.files.length === 0 ? (
                                 <span className="text-sm text-muted-foreground ml-[25px]">No matches found</span>
                             ) : (
                                 <TreeList>
-                                    {part.output.files.map((file) => {
+                                    {part.output.metadata.files.map((file) => {
                                         return (
                                             <FileListItem
                                                 key={file.fileName}

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

@@ -1,5 +1,3 @@
-import { SBChatMessagePart } from "./types";
-
 export const FILE_REFERENCE_PREFIX = '@file:';
 export const FILE_REFERENCE_REGEX = new RegExp(
     // @file:{repoName::fileName:startLine-endLine}
@@ -8,24 +6,3 @@ export const FILE_REFERENCE_REGEX = new RegExp(
 );
 
 export const ANSWER_TAG = '<!--answer-->';
-
-export const toolNames = {
-    searchCode: 'searchCode',
-    readFile: 'readFile',
-    findSymbolReferences: 'findSymbolReferences',
-    findSymbolDefinitions: 'findSymbolDefinitions',
-    listRepos: 'listRepos',
-    listCommits: 'listCommits',
-} as const;
-
-// These part types are visible in the UI.
-export const uiVisiblePartTypes: SBChatMessagePart['type'][] = [
-    'reasoning',
-    'text',
-    'tool-searchCode',
-    'tool-readFile',
-    'tool-findSymbolDefinitions',
-    'tool-findSymbolReferences',
-    'tool-listRepos',
-    'tool-listCommits',
-] as const;

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

@@ -0,0 +1,27 @@
+import {
+    toVercelAITool, 
+    readFileDefinition,
+    listCommitsDefinition,
+    listReposDefinition,
+    searchCodeDefinition,
+    findSymbolReferencesDefinition,
+    findSymbolDefinitionsDefinition,
+} from "@/features/tools";
+import { ToolUIPart } from "ai";
+import { SBChatMessageToolTypes } from "./types";
+
+export const tools = {
+    [readFileDefinition.name]: toVercelAITool(readFileDefinition),
+    [listCommitsDefinition.name]: toVercelAITool(listCommitsDefinition),
+    [listReposDefinition.name]: toVercelAITool(listReposDefinition),
+    [searchCodeDefinition.name]: toVercelAITool(searchCodeDefinition),
+    [findSymbolReferencesDefinition.name]: toVercelAITool(findSymbolReferencesDefinition),
+    [findSymbolDefinitionsDefinition.name]: toVercelAITool(findSymbolDefinitionsDefinition),
+} as const;
+
+export type ReadFileToolUIPart = ToolUIPart<{ readFile: SBChatMessageToolTypes['readFile'] }>;
+export type ListCommitsToolUIPart = ToolUIPart<{ listCommits: SBChatMessageToolTypes['listCommits'] }>;
+export type ListReposToolUIPart = ToolUIPart<{ listRepos: SBChatMessageToolTypes['listRepos'] }>;
+export type SearchCodeToolUIPart = ToolUIPart<{ searchCode: SBChatMessageToolTypes['searchCode'] }>;
+export type FindSymbolReferencesToolUIPart = ToolUIPart<{ findSymbolReferences: SBChatMessageToolTypes['findSymbolReferences'] }>;
+export type FindSymbolDefinitionsToolUIPart = ToolUIPart<{ findSymbolDefinitions: SBChatMessageToolTypes['findSymbolDefinitions'] }>;