refactor(web): unify tool definitions between ask agent and MCP server #1014
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -144,6 +144,7 @@ | |
| "escape-string-regexp": "^5.0.0", | ||
| "fast-deep-equal": "^3.1.3", | ||
| "fuse.js": "^7.0.0", | ||
| "glob-to-regexp": "^0.4.1", | ||
| "google-auth-library": "^10.1.0", | ||
| "graphql": "^16.9.0", | ||
| "http-status-codes": "^2.3.0", | ||
|
|
@@ -202,6 +203,7 @@ | |
| "@tanstack/eslint-plugin-query": "^5.74.7", | ||
| "@testing-library/dom": "^10.4.1", | ||
| "@testing-library/react": "^16.3.0", | ||
| "@types/glob-to-regexp": "^0.4.4", | ||
| "@types/micromatch": "^4.0.9", | ||
| "@types/node": "^20", | ||
| "@types/nodemailer": "^6.4.17", | ||
|
|
@@ -218,6 +220,7 @@ | |
| "jsdom": "^25.0.1", | ||
| "npm-run-all": "^4.1.5", | ||
| "postcss": "^8", | ||
| "raw-loader": "^4.0.2", | ||
| "react-email": "^5.1.0", | ||
| "react-grab": "^0.1.23", | ||
| "tailwindcss": "^3.4.1", | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -14,10 +14,15 @@ import { | |
| } from "ai"; | ||
| import { randomUUID } from "crypto"; | ||
| import _dedent from "dedent"; | ||
| 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 { grepDefinition } from "@/features/tools/grep"; | ||
| import { Source } from "./types"; | ||
| import { addLineNumbers, fileReferenceToString } from "./utils"; | ||
| import { tools } from "./tools"; | ||
| import { listTreeDefinition } from "../tools"; | ||
|
|
||
| const dedent = _dedent.withOptions({ alignValues: true }); | ||
|
|
||
|
|
@@ -198,14 +203,7 @@ const createAgentStream = async ({ | |
| providerOptions, | ||
| messages: inputMessages, | ||
| system: systemPrompt, | ||
| tools, | ||
| temperature: env.SOURCEBOT_CHAT_MODEL_TEMPERATURE, | ||
| stopWhen: [ | ||
| stepCountIsGTE(env.SOURCEBOT_CHAT_MAX_STEP_COUNT), | ||
|
|
@@ -223,39 +221,46 @@ const createAgentStream = async ({ | |
| return; | ||
| } | ||
|
|
||
| if (toolName === readFileDefinition.name) { | ||
| onWriteSource({ | ||
| type: 'file', | ||
| repo: output.metadata.repo, | ||
| path: output.metadata.path, | ||
| revision: output.metadata.revision, | ||
| name: output.metadata.path.split('/').pop() ?? output.metadata.path, | ||
| }); | ||
| } else if (toolName === grepDefinition.name) { | ||
| output.metadata.files.forEach((file) => { | ||
| onWriteSource({ | ||
| type: 'file', | ||
| repo: file.repo, | ||
| path: file.path, | ||
| revision: file.revision, | ||
| name: file.path.split('/').pop() ?? file.path, | ||
| }); | ||
| }); | ||
| } else if (toolName === findSymbolDefinitionsDefinition.name || toolName === findSymbolReferencesDefinition.name) { | ||
| output.metadata.files.forEach((file) => { | ||
| onWriteSource({ | ||
| type: 'file', | ||
| repo: file.repo, | ||
| path: file.fileName, | ||
| revision: file.revision, | ||
| name: file.fileName.split('/').pop() ?? file.fileName, | ||
| }); | ||
| }); | ||
| } else if (toolName === listTreeDefinition.name) { | ||
| output.metadata.entries | ||
| .filter((entry) => entry.type === 'blob') | ||
| .forEach((entry) => { | ||
| onWriteSource({ | ||
| type: 'file', | ||
| repo: output.metadata.repo, | ||
| path: entry.path, | ||
| revision: output.metadata.ref, | ||
| name: entry.name, | ||
| }); | ||
| }); | ||
| } | ||
| }); | ||
| }, | ||
|
|
@@ -312,6 +317,8 @@ const createPrompt = ({ | |
| <selected_repositories> | ||
| The user has explicitly selected the following repositories for analysis: | ||
| ${repos.map(repo => `- ${repo}`).join('\n')} | ||
|
|
||
| When calling tools that accept a \`repo\` parameter (e.g. \`read_file\`, \`list_commits\`, \`list_tree\`, \`grep\`), use these repository names exactly as listed above, including the full host prefix (e.g. \`github.com/org/repo\`). | ||
| </selected_repositories> | ||
| ` : ''} | ||
|
|
||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -13,7 +13,6 @@ import { AnswerCard } from './answerCard'; | |
| import { DetailsCard } from './detailsCard'; | ||
| import { MarkdownRenderer, REFERENCE_PAYLOAD_ATTRIBUTE } from './markdownRenderer'; | ||
| import { ReferencedSourcesListView } from './referencedSourcesListView'; | ||
| 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) => { | ||
| // 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 | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -5,17 +5,18 @@ import { Collapsible, CollapsibleContent, CollapsibleTrigger } from "@/component | |
| import { Separator } from '@/components/ui/separator'; | ||
| import { Skeleton } from '@/components/ui/skeleton'; | ||
| import { Tooltip, TooltipContent, TooltipTrigger } from '@/components/ui/tooltip'; | ||
| import { cn, getShortenedNumberDisplayString } from '@/lib/utils'; | ||
| import { Brain, ChevronDown, ChevronRight, Clock, InfoIcon, Loader2, List, ScanSearchIcon, Zap } from 'lucide-react'; | ||
| import { memo, useCallback } from 'react'; | ||
| import useCaptureEvent from '@/hooks/useCaptureEvent'; | ||
| import { MarkdownRenderer } from './markdownRenderer'; | ||
| import { FindSymbolDefinitionsToolComponent } from './tools/findSymbolDefinitionsToolComponent'; | ||
| import { FindSymbolReferencesToolComponent } from './tools/findSymbolReferencesToolComponent'; | ||
| import { ReadFileToolComponent } from './tools/readFileToolComponent'; | ||
| import { GrepToolComponent } from './tools/grepToolComponent'; | ||
| import { ListReposToolComponent } from './tools/listReposToolComponent'; | ||
| import { ListCommitsToolComponent } from './tools/listCommitsToolComponent'; | ||
| import { ListTreeToolComponent } from './tools/listTreeToolComponent'; | ||
| import { SBChatMessageMetadata, SBChatMessagePart } from '../../types'; | ||
| import { SearchScopeIcon } from '../searchScopeIcon'; | ||
| import isEqual from "fast-deep-equal/react"; | ||
|
|
@@ -105,15 +106,35 @@ const DetailsCardComponent = ({ | |
| </div> | ||
| )} | ||
| {metadata?.totalTokens && ( | ||
| <Tooltip> | ||
| <TooltipTrigger asChild> | ||
| <div className="flex items-center text-xs cursor-help"> | ||
| <Zap className="w-3 h-3 mr-1 flex-shrink-0" /> | ||
| {getShortenedNumberDisplayString(metadata.totalTokens, 0)} tokens | ||
| </div> | ||
| </TooltipTrigger> | ||
| <TooltipContent side="bottom"> | ||
| <div className="space-y-1 text-xs"> | ||
| <div className="flex justify-between gap-4"> | ||
| <span className="text-muted-foreground">Input</span> | ||
| <span>{metadata.totalInputTokens?.toLocaleString() ?? '—'}</span> | ||
| </div> | ||
| <div className="flex justify-between gap-4"> | ||
| <span className="text-muted-foreground">Output</span> | ||
| <span>{metadata.totalOutputTokens?.toLocaleString() ?? '—'}</span> | ||
| </div> | ||
| <div className="flex justify-between gap-4 border-t border-border pt-1"> | ||
| <span className="text-muted-foreground">Total</span> | ||
| <span>{metadata.totalTokens.toLocaleString()}</span> | ||
| </div> | ||
| </div> | ||
| </TooltipContent> | ||
| </Tooltip> | ||
| )} | ||
| {metadata?.totalResponseTimeMs && ( | ||
| <div className="flex items-center text-xs"> | ||
| <Clock className="w-3 h-3 mr-1 flex-shrink-0" /> | ||
| {Math.round(metadata.totalResponseTimeMs / 1000)} seconds | ||
| </div> | ||
| )} | ||
| <div className="flex items-center text-xs"> | ||
|
|
@@ -166,49 +187,65 @@ const DetailsCardComponent = ({ | |
| className="text-sm" | ||
| /> | ||
| ) | ||
| case 'tool-read_file': | ||
| return ( | ||
| <ReadFileToolComponent | ||
| key={index} | ||
| part={part} | ||
| /> | ||
| ) | ||
| case 'tool-grep': | ||
| return ( | ||
| <GrepToolComponent | ||
| key={index} | ||
| part={part} | ||
| /> | ||
| ) | ||
| case 'tool-find_symbol_definitions': | ||
| return ( | ||
| <FindSymbolDefinitionsToolComponent | ||
| key={index} | ||
| part={part} | ||
| /> | ||
| ) | ||
| case 'tool-find_symbol_references': | ||
| return ( | ||
| <FindSymbolReferencesToolComponent | ||
| key={index} | ||
| part={part} | ||
| /> | ||
| ) | ||
| case 'tool-list_repos': | ||
| return ( | ||
| <ListReposToolComponent | ||
| key={index} | ||
| part={part} | ||
| /> | ||
| ) | ||
| case 'tool-list_commits': | ||
| return ( | ||
| <ListCommitsToolComponent | ||
| key={index} | ||
| part={part} | ||
| /> | ||
| ) | ||
| case 'tool-list_tree': | ||
| return ( | ||
| <ListTreeToolComponent | ||
| key={index} | ||
| part={part} | ||
| /> | ||
| ) | ||
| case 'data-source': | ||
| case 'dynamic-tool': | ||
| case 'file': | ||
| case 'source-document': | ||
| case 'source-url': | ||
| case 'step-start': | ||
| return null; | ||
| default: | ||
| // Guarantees this switch-case to be exhaustive | ||
| part satisfies never; | ||
| return null; | ||
| } | ||
| })} | ||
|
|
||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Add a trailing newline at EOF.
dotenv-linterflaggedEndingBlankLineon Line 80; please add a final blank line to satisfy the linter.🧰 Tools
🪛 dotenv-linter (4.0.0)
[warning] 80-80: [EndingBlankLine] No blank line at the end of the file
(EndingBlankLine)
🤖 Prompt for AI Agents