s

brendan-kellam · brendan-kellam · commit 85401be05069 · 2026-03-22T22:02:17.000-07:00
diff --git a/packages/web/src/features/chat/agent.ts b/packages/web/src/features/chat/agent.ts
@@ -170,7 +170,7 @@ const createAgentStream = async ({
             const fileSource = await getFileSource({
                 path: source.path,
                 repo: source.repo,
-                ref: source.revision,
+                ref: source.ref,
             }, { source: 'sourcebot-ask-agent' });
 
             if (isServiceError(fileSource)) {
@@ -183,7 +183,7 @@ const createAgentStream = async ({
                 source: fileSource.source,
                 repo: fileSource.repo,
                 language: fileSource.language,
-                revision: source.revision,
+                revision: source.ref,
             };
         }))
     ).filter((source) => source !== undefined);
diff --git a/packages/web/src/features/chat/components/chatThread/chatThreadListItem.tsx b/packages/web/src/features/chat/components/chatThread/chatThreadListItem.tsx
@@ -299,7 +299,7 @@ const ChatThreadListItemComponent = forwardRef<HTMLDivElement, ChatThreadListIte
                 index === self.findIndex((t) =>
                     t?.path === file?.path
                     && t?.repo === file?.repo
-                    && t?.revision === file?.revision
+                    && t?.ref === file?.ref
                 )
             );
     }, [references, sources]);
diff --git a/packages/web/src/features/chat/components/chatThread/referencedSourcesListView.tsx b/packages/web/src/features/chat/components/chatThread/referencedSourcesListView.tsx
@@ -74,11 +74,11 @@ const ReferencedSourcesListViewComponent = ({
 
     const fileSourceQueries = useQueries({
         queries: sources.map((file) => ({
-            queryKey: ['fileSource', file.path, file.repo, file.revision],
+            queryKey: ['fileSource', file.path, file.repo, file.ref],
             queryFn: () => unwrapServiceError(getFileSource({
                 path: file.path,
                 repo: file.repo,
-                ref: file.revision,
+                ref: file.ref,
             })),
             staleTime: Infinity,
         })),
@@ -233,7 +233,7 @@ const ReferencedSourcesListViewComponent = ({
                             id={fileId}
                             code={fileData.source}
                             language={fileData.language}
-                            revision={fileSource.revision}
+                            revision={fileSource.ref}
                             repoName={fileSource.repo}
                             repoCodeHostType={fileData.repoCodeHostType}
                             repoDisplayName={fileData.repoDisplayName}
diff --git a/packages/web/src/features/chat/components/chatThread/tools/readFileToolComponent.tsx b/packages/web/src/features/chat/components/chatThread/tools/readFileToolComponent.tsx
@@ -12,7 +12,7 @@ export const ReadFileToolComponent = ({ metadata }: ToolResult<ReadFileMetadata>
     const fileName = metadata.path.split('/').pop() ?? metadata.path;
     const href = getBrowsePath({
         repoName: metadata.repo,
-        revisionName: metadata.revision,
+        revisionName: metadata.ref,
         path: metadata.path,
         pathType: 'blob',
         domain: SINGLE_TENANT_ORG_DOMAIN,
diff --git a/packages/web/src/features/chat/utils.ts b/packages/web/src/features/chat/utils.ts
@@ -187,7 +187,7 @@ export const createUIMessage = (text: string, mentions: MentionData[], selectedS
                     path: mention.path,
                     repo: mention.repo,
                     name: mention.name,
-                    revision: mention.revision,
+                    ref: mention.revision,
                 }
                 return fileSource;
             }
diff --git a/packages/web/src/features/mcp/server.ts b/packages/web/src/features/mcp/server.ts
@@ -19,6 +19,7 @@ import {
     registerMcpTool,
     grepDefinition,
     ToolContext,
+    globDefinition,
 } from '../tools';
 
 const dedent = _dedent.withOptions({ alignValues: true });
@@ -37,6 +38,7 @@ export async function createMcpServer(): Promise<McpServer> {
     }
 
     registerMcpTool(server, grepDefinition, toolContext);
+    registerMcpTool(server, globDefinition, toolContext);
     registerMcpTool(server, listCommitsDefinition, toolContext);
     registerMcpTool(server, listReposDefinition, toolContext);
     registerMcpTool(server, readFileDefinition, toolContext);
diff --git a/packages/web/src/features/tools/findSymbolDefinitions.ts b/packages/web/src/features/tools/findSymbolDefinitions.ts
@@ -5,7 +5,7 @@ import { z } from "zod";
 import description from "./findSymbolDefinitions.txt";
 import { FindSymbolFile, FindSymbolRepoInfo } from "./findSymbolReferences";
 import { logger } from "./logger";
-import { ToolDefinition } from "./types";
+import { Source, ToolDefinition } from "./types";
 
 
 const MAX_LINE_LENGTH = 2000;
@@ -99,12 +99,12 @@ export const findSymbolDefinitionsDefinition: ToolDefinition<
             }
         }
 
-        const sources = metadata.files.map((file) => ({
+        const sources: Source[] = metadata.files.map((file) => ({
             type: 'file' as const,
             repo: file.repo,
             path: file.fileName,
             name: file.fileName.split('/').pop() ?? file.fileName,
-            revision: file.revision,
+            ref: file.revision,
         }));
 
         return {
diff --git a/packages/web/src/features/tools/findSymbolReferences.ts b/packages/web/src/features/tools/findSymbolReferences.ts
@@ -1,7 +1,7 @@
 import { z } from "zod";
 import { isServiceError } from "@/lib/utils";
 import { findSearchBasedSymbolReferences } from "@/features/codeNav/api";
-import { ToolDefinition } from "./types";
+import { Source, ToolDefinition } from "./types";
 import { logger } from "./logger";
 import description from "./findSymbolReferences.txt";
 import { getRepoInfoByName } from "@/actions";
@@ -109,12 +109,12 @@ export const findSymbolReferencesDefinition: ToolDefinition<
             }
         }
 
-        const sources = metadata.files.map((file) => ({
+        const sources: Source[] = metadata.files.map((file) => ({
             type: 'file' as const,
             repo: file.repo,
             path: file.fileName,
             name: file.fileName.split('/').pop() ?? file.fileName,
-            revision: file.revision,
+            ref: file.revision,
         }));
 
         return {
diff --git a/packages/web/src/features/tools/glob.ts b/packages/web/src/features/tools/glob.ts
@@ -3,7 +3,7 @@ import globToRegexp from "glob-to-regexp";
 import { isServiceError } from "@/lib/utils";
 import { search } from "@/features/search";
 import escapeStringRegexp from "escape-string-regexp";
-import { ToolDefinition } from "./types";
+import { Source, ToolDefinition } from "./types";
 import { logger } from "./logger";
 import description from "./glob.txt";
 import { CodeHostType } from "@sourcebot/db";
@@ -184,12 +184,12 @@ export const globDefinition: ToolDefinition<'glob', typeof globShape, GlobMetada
             outputLines.push(TRUNCATION_MESSAGE);
         }
 
-        const sources = files.map((file) => ({
+        const sources: Source[] = files.map((file) => ({
             type: 'file' as const,
             repo: file.repo,
             path: file.path,
             name: file.name,
-            revision: file.revision,
+            ref: file.revision,
         }));
 
         return {
diff --git a/packages/web/src/features/tools/grep.ts b/packages/web/src/features/tools/grep.ts
@@ -3,7 +3,7 @@ import globToRegexp from "glob-to-regexp";
 import { isServiceError } from "@/lib/utils";
 import { search } from "@/features/search";
 import escapeStringRegexp from "escape-string-regexp";
-import { ToolDefinition } from "./types";
+import { Source, ToolDefinition } from "./types";
 import { logger } from "./logger";
 import description from "./grep.txt";
 import { CodeHostType } from "@sourcebot/db";
@@ -179,12 +179,12 @@ export const grepDefinition: ToolDefinition<'grep', typeof grepShape, GrepMetada
             };
         }
 
-        const sources = files.map((file) => ({
+        const sources: Source[] = files.map((file) => ({
             type: 'file' as const,
             repo: file.repo,
             path: file.path,
             name: file.path.split('/').pop() ?? file.path,
-            revision: file.revision,
+            ref: file.revision,
         }));
 
         if (groupByRepo) {
diff --git a/packages/web/src/features/tools/listTree.ts b/packages/web/src/features/tools/listTree.ts
@@ -5,7 +5,7 @@ import { CodeHostType } from "@sourcebot/db";
 import { z } from "zod";
 import description from "./listTree.txt";
 import { logger } from "./logger";
-import { ToolDefinition } from "./types";
+import { Source, ToolDefinition } from "./types";
 
 const DEFAULT_TREE_DEPTH = 1;
 const MAX_TREE_DEPTH = 10;
@@ -74,7 +74,6 @@ export const listTreeDefinition: ToolDefinition<'list_tree', typeof listTreeShap
                 repoInfo,
                 ref,
                 path: normalizedPath,
-                entries: [],
                 totalReturned: 0,
                 truncated: false,
             };
@@ -190,14 +189,14 @@ export const listTreeDefinition: ToolDefinition<'list_tree', typeof listTreeShap
             outputLines.push(`(truncated — showing first ${normalizedMaxEntries} entries)`);
         }
 
-        const sources = sortedEntries
+        const sources: Source[] = sortedEntries
             .filter((entry) => entry.type === 'blob')
             .map((entry) => ({
                 type: 'file' as const,
                 repo,
                 path: entry.path,
                 name: entry.name,
-                revision: ref,
+                ref,
             }));
 
         return { output: outputLines.join('\n'), metadata, sources };
diff --git a/packages/web/src/features/tools/readFile.ts b/packages/web/src/features/tools/readFile.ts
@@ -17,6 +17,7 @@ const MAX_BYTES_LABEL = `${MAX_BYTES / 1024}KB`;
 const readFileShape = {
     path: z.string().describe("The path to the file"),
     repo: z.string().describe("The repository to read the file from"),
+    ref: z.string().describe("Commit SHA, branch or tag name to read the file from. If not provided, uses the default branch.").optional().default('HEAD'),
     offset: z.number().int().positive()
         .optional()
         .describe("Line number to start reading from (1-indexed). Omit to start from the beginning."),
@@ -38,7 +39,7 @@ export type ReadFileMetadata = {
     startLine: number;
     endLine: number;
     isTruncated: boolean;
-    revision: string;
+    ref: string;
 };
 
 export const readFileDefinition: ToolDefinition<"read_file", typeof readFileShape, ReadFileMetadata> = {
@@ -48,15 +49,13 @@ export const readFileDefinition: ToolDefinition<"read_file", typeof readFileShap
     isIdempotent: true,
     description,
     inputSchema: z.object(readFileShape),
-    execute: async ({ path, repo, offset, limit }, context) => {
-        logger.debug('read_file', { path, repo, offset, limit });
-        // @todo: make revision configurable.
-        const revision = "HEAD";
+    execute: async ({ path, repo, ref = 'HEAD', offset, limit }, context) => {
+        logger.debug('read_file', { path, repo, ref, offset, limit });
 
         const fileSource = await getFileSource({
             path,
             repo,
-            ref: revision,
+            ref,
         }, { source: context.source });
 
         if (isServiceError(fileSource)) {
@@ -122,7 +121,7 @@ export const readFileDefinition: ToolDefinition<"read_file", typeof readFileShap
             startLine,
             endLine: lastReadLine,
             isTruncated: truncatedByBytes || truncatedByLines,
-            revision,
+            ref,
         };
 
         return {
@@ -133,7 +132,7 @@ export const readFileDefinition: ToolDefinition<"read_file", typeof readFileShap
                 repo: fileSource.repo,
                 path: fileSource.path,
                 name: fileSource.path.split('/').pop() ?? fileSource.path,
-                revision,
+                ref,
             }],
         };
     },
diff --git a/packages/web/src/features/tools/types.ts b/packages/web/src/features/tools/types.ts
@@ -5,7 +5,7 @@ const fileSourceSchema = z.object({
     repo: z.string(),
     path: z.string(),
     name: z.string(),
-    revision: z.string(),
+    ref: z.string(),
 });
 export type FileSource = z.infer<typeof fileSourceSchema>;
 

Original file line number	Diff line number	Diff line change
`@@ -299,7 +299,7 @@ const ChatThreadListItemComponent = forwardRef<HTMLDivElement, ChatThreadListIte`
`299`	`299`	`index === self.findIndex((t) =>`
`300`	`300`	`t?.path === file?.path`
`301`	`301`	`&& t?.repo === file?.repo`
`302`		`- && t?.revision === file?.revision`
	`302`	`+ && t?.ref === file?.ref`
`303`	`303`	`)`
`304`	`304`	`);`
`305`	`305`	`}, [references, sources]);`
Original file line number	Diff line number	Diff line change
`@@ -187,7 +187,7 @@ export const createUIMessage = (text: string, mentions: MentionData[], selectedS`
`187`	`187`	`path: mention.path,`
`188`	`188`	`repo: mention.repo,`
`189`	`189`	`name: mention.name,`
`190`		`- revision: mention.revision,`
	`190`	`+ ref: mention.revision,`
`191`	`191`	`}`
`192`	`192`	`return fileSource;`
`193`	`193`	`}`