fix

Author: brendan-kellam

packages/web/src/app/[domain]/browse/[...path]/components/codePreviewPanel.tsx

@@ -15,9 +15,9 @@ interface CodePreviewPanelProps {
 export const CodePreviewPanel = async ({ path, repoName, revisionName }: CodePreviewPanelProps) => {
     const [fileSourceResponse, repoInfoResponse] = await Promise.all([
         getFileSource({
-            fileName: path,
-            repository: repoName,
-            branch: revisionName,
+            path,
+            repo: repoName,
+            ref: revisionName,
         }),
         getRepoInfoByName(repoName),
     ]);

packages/web/src/app/[domain]/search/components/codePreviewPanel/index.tsx

@@ -32,9 +32,9 @@ export const CodePreviewPanel = ({
         queryKey: ["source", previewedFile, branch],
         queryFn: () => unwrapServiceError(
             getFileSource({
-                fileName: previewedFile.fileName.text,
-                repository: previewedFile.repository,
-                branch,
+                path: previewedFile.fileName.text,
+                repo: previewedFile.repository,
+                ref: branch,
             })
         ),
         select: (data) => {

packages/web/src/app/api/(server)/source/route.ts

@@ -29,9 +29,9 @@ export const GET = async (request: NextRequest) => {
 
     const { repo, path, ref } = parsed.data;
     const response = await getFileSource({
-        fileName: path,
-        repository: repo,
-        branch: ref,
+        path,
+        repo,
+        ref,
     });
 
     if (isServiceError(response)) {

packages/web/src/features/agents/review-agent/nodes/fetchFileContent.ts

@@ -11,8 +11,8 @@ export const fetchFileContent = async (pr_payload: sourcebot_pr_payload, filenam
 
     const repoPath = pr_payload.hostDomain + "/" + pr_payload.owner + "/" + pr_payload.repo;
     const fileSourceRequest = {
-        fileName: filename,
-        repository: repoPath,
+        path: filename,
+        repo: repoPath,
     }
     logger.debug(JSON.stringify(fileSourceRequest, null, 2));
 

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

@@ -248,9 +248,9 @@ ${addLineNumbers(file.source)}
 
 const resolveFileSource = async ({ path, repo, revision }: FileSource) => {
     const fileSource = await getFileSource({
-        fileName: path,
-        repository: repo,
-        branch: revision,
+        path,
+        repo,
+        ref: revision,
     });
 
     if (isServiceError(fileSource)) {

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

@@ -76,9 +76,9 @@ const ReferencedSourcesListViewComponent = ({
         queries: sources.map((file) => ({
             queryKey: ['fileSource', file.path, file.repo, file.revision],
             queryFn: () => unwrapServiceError(getFileSource({
-                fileName: file.path,
-                repository: file.repo,
-                branch: file.revision,
+                path: file.path,
+                repo: file.repo,
+                ref: file.revision,
             })),
             staleTime: Infinity,
         })),

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

@@ -111,9 +111,9 @@ export const readFilesTool = tool({
 
         const responses = await Promise.all(paths.map(async (path) => {
             return getFileSource({
-                fileName: path,
-                repository,
-                branch: revision,
+                path,
+                repo: repository,
+                ref: revision,
                 // @todo(mt): handle multi-tenancy.
             });
         }));

packages/web/src/features/search/fileSourceApi.ts

@@ -12,27 +12,27 @@ import escapeStringRegexp from "escape-string-regexp";
 // This will allow us to support permalinks to files at a specific revision that may not be indexed
 // by zoekt. We should also refactor this out of the /search folder.
 
-export const getFileSource = async ({ fileName, repository, branch }: FileSourceRequest): Promise<FileSourceResponse | ServiceError> => sew(() =>
+export const getFileSource = async ({ path, repo, ref }: FileSourceRequest): Promise<FileSourceResponse | ServiceError> => sew(() =>
     withOptionalAuthV2(async () => {
         const query: QueryIR = {
             and: {
                 children: [
                     {
                         repo: {
-                            regexp: `^${escapeStringRegexp(repository)}$`,
+                            regexp: `^${escapeStringRegexp(repo)}$`,
                         },
                     },
                     {
                         substring: {
-                            pattern: fileName,
+                            pattern: path,
                             case_sensitive: true,
                             file_name: true,
                             content: false,
                         }
                     },
-                    ...(branch ? [{
+                    ...(ref ? [{
                         branch: {
-                            pattern: branch,
+                            pattern: ref,
                             exact: true,
                         },
                     }]: [])
@@ -56,7 +56,7 @@ export const getFileSource = async ({ fileName, repository, branch }: FileSource
         const files = searchResponse.files;
 
         if (!files || files.length === 0) {
-            return fileNotFound(fileName, repository);
+            return fileNotFound(path, repo);
         }
 
         const file = files[0];
@@ -72,12 +72,12 @@ export const getFileSource = async ({ fileName, repository, branch }: FileSource
         return {
             source,
             language,
-            path: fileName,
-            repo: repository,
+            path,
+            repo,
             repoCodeHostType: repoInfo.codeHostType,
             repoDisplayName: repoInfo.displayName,
             repoExternalWebUrl: repoInfo.webUrl,
-            branch,
+            branch: ref,
             webUrl: file.webUrl,
             externalWebUrl: file.externalWebUrl,
         } satisfies FileSourceResponse;

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

@@ -145,11 +145,13 @@ export const streamedSearchResponseSchema = z.discriminatedUnion('type', [
 ]);
 export type StreamedSearchResponse = z.infer<typeof streamedSearchResponseSchema>;
 
-export interface FileSourceRequest {
-    fileName: string;
-    repository: string;
-    branch?: string;
-}
+
+export const fileSourceRequestSchema = z.object({
+    path: z.string(),
+    repo: z.string(),
+    ref: z.string().optional(),
+});
+export type FileSourceRequest = z.infer<typeof fileSourceRequestSchema>;
 
 export const fileSourceResponseSchema = z.object({
     source: z.string(),