fix

Author: brendan-kellam

packages/web/package.json

@@ -145,6 +145,7 @@
     "input-otp": "^1.4.2",
     "langfuse": "^3.38.4",
     "langfuse-vercel": "^3.38.4",
+    "linguist-languages": "^9.3.1",
     "lucide-react": "^0.517.0",
     "micromatch": "^4.0.8",
     "next": "15.5.9",

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

@@ -1,85 +1,68 @@
 import 'server-only';
-import { fileNotFound, ServiceError, unexpectedError } from "../../lib/serviceError";
+import { fileNotFound, notFound, ServiceError, unexpectedError } from "../../lib/serviceError";
 import { FileSourceRequest, FileSourceResponse } from "./types";
-import { isServiceError } from "../../lib/utils";
-import { search } from "./searchApi";
 import { sew } from "@/actions";
 import { withOptionalAuthV2 } from "@/withAuthV2";
-import { QueryIR } from './ir';
-import escapeStringRegexp from "escape-string-regexp";
+import { getRepoPath } from '@sourcebot/shared';
+import { simpleGit } from 'simple-git';
+import { detectLanguageFromFilename } from "@/lib/languageDetection";
+import { getBrowsePath } from "@/app/[domain]/browse/hooks/utils";
+import { getCodeHostBrowseFileAtBranchUrl } from "@/lib/utils";
+import { SINGLE_TENANT_ORG_DOMAIN } from "@/lib/constants";
 
-// @todo (bkellam) #574 : We should really be using `git show <hash>:<path>` to fetch file contents here.
-// 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 ({ path, repo, ref }: FileSourceRequest): Promise<FileSourceResponse | ServiceError> => sew(() =>
-    withOptionalAuthV2(async () => {
-        const query: QueryIR = {
-            and: {
-                children: [
-                    {
-                        repo: {
-                            regexp: `^${escapeStringRegexp(repo)}$`,
-                        },
-                    },
-                    {
-                        substring: {
-                            pattern: path,
-                            case_sensitive: true,
-                            file_name: true,
-                            content: false,
-                        }
-                    },
-                    ...(ref ? [{
-                        branch: {
-                            pattern: ref,
-                            exact: true,
-                        },
-                    }]: [])
-                ]
-            }
-        }
-
-        const searchResponse = await search({
-            queryType: 'ir',
-            query,
-            options: {
-                matches: 1,
-                whole: true,
-            }
+export const getFileSource = async ({ path: filePath, repo: repoName, ref }: FileSourceRequest): Promise<FileSourceResponse | ServiceError> => sew(() =>
+    withOptionalAuthV2(async ({ org, prisma }) => {
+        const repo = await prisma.repo.findFirst({
+            where: { name: repoName, orgId: org.id },
         });
-
-        if (isServiceError(searchResponse)) {
-            return searchResponse;
+        if (!repo) {
+            return notFound(`Repository "${repoName}" not found.`);
         }
 
-        const files = searchResponse.files;
-
-        if (!files || files.length === 0) {
-            return fileNotFound(path, repo);
-        }
+        const { path: repoPath } = getRepoPath(repo);
+        const git = simpleGit().cwd(repoPath);
 
-        const file = files[0];
-        const source = file.content ?? '';
-        const language = file.language;
+        const gitRef = ref ?? 'HEAD';
 
-        const repoInfo = searchResponse.repositoryInfo.find((repo) => repo.id === file.repositoryId);
-        if (!repoInfo) {
-            // This should never happen.
-            return unexpectedError("Repository info not found");
+        let source: string;
+        try {
+            source = await git.raw(['show', `${gitRef}:${filePath}`]);
+        } catch (error: unknown) {
+            const errorMessage = error instanceof Error ? error.message : String(error);
+            if (errorMessage.includes('does not exist') || errorMessage.includes('fatal: path')) {
+                return fileNotFound(filePath, repoName);
+            }
+            if (errorMessage.includes('unknown revision') || errorMessage.includes('bad revision')) {
+                return unexpectedError(`Invalid git reference: ${gitRef}`);
+            }
+            throw error;
         }
 
+        const language = detectLanguageFromFilename(filePath);
+        const webUrl = getBrowsePath({
+            repoName: repo.name,
+            revisionName: ref,
+            path: filePath,
+            pathType: 'blob',
+            domain: SINGLE_TENANT_ORG_DOMAIN,
+        });
+        const externalWebUrl = getCodeHostBrowseFileAtBranchUrl({
+            webUrl: repo.webUrl,
+            codeHostType: repo.external_codeHostType,
+            branchName: gitRef,
+            filePath,
+        });
+
         return {
             source,
             language,
-            path,
-            repo,
-            repoCodeHostType: repoInfo.codeHostType,
-            repoDisplayName: repoInfo.displayName,
-            repoExternalWebUrl: repoInfo.webUrl,
+            path: filePath,
+            repo: repoName,
+            repoCodeHostType: repo.external_codeHostType,
+            repoDisplayName: repo.displayName ?? undefined,
+            repoExternalWebUrl: repo.webUrl ?? undefined,
             branch: ref,
-            webUrl: file.webUrl,
-            externalWebUrl: file.externalWebUrl,
+            webUrl,
+            externalWebUrl,
         } satisfies FileSourceResponse;
-
     }));

packages/web/src/lib/languageDetection.ts

@@ -0,0 +1,38 @@
+import * as linguistLanguages from 'linguist-languages';
+import path from 'path';
+
+const extensionToLanguage = new Map<string, string>();
+
+for (const [languageName, languageData] of Object.entries(linguistLanguages)) {
+    if ('extensions' in languageData && languageData.extensions) {
+        for (const ext of languageData.extensions) {
+            if (!extensionToLanguage.has(ext)) {
+                extensionToLanguage.set(ext, languageName);
+            }
+        }
+    }
+    if ('filenames' in languageData && languageData.filenames) {
+        for (const filename of languageData.filenames) {
+            if (!extensionToLanguage.has(filename)) {
+                extensionToLanguage.set(filename, languageName);
+            }
+        }
+    }
+}
+
+export const detectLanguageFromFilename = (filename: string): string => {
+    const basename = path.basename(filename);
+
+    // Check for exact filename match (e.g., Makefile, Dockerfile)
+    if (extensionToLanguage.has(basename)) {
+        return extensionToLanguage.get(basename)!;
+    }
+
+    // Check for extension match
+    const ext = path.extname(filename).toLowerCase();
+    if (ext && extensionToLanguage.has(ext)) {
+        return extensionToLanguage.get(ext)!;
+    }
+
+    return '';
+};

packages/web/src/lib/serviceError.ts

@@ -72,7 +72,7 @@ export const invalidZoektResponse = async (zoektResponse: Response): Promise<Ser
     };
 }
 
-export const fileNotFound = async (fileName: string, repository: string): Promise<ServiceError> => {
+export const fileNotFound = (fileName: string, repository: string): ServiceError => {
     return {
         statusCode: StatusCodes.NOT_FOUND,
         errorCode: ErrorCode.FILE_NOT_FOUND,

yarn.lock

@@ -8395,6 +8395,7 @@ __metadata:
     jsdom: "npm:^25.0.1"
     langfuse: "npm:^3.38.4"
     langfuse-vercel: "npm:^3.38.4"
+    linguist-languages: "npm:^9.3.1"
     lucide-react: "npm:^0.517.0"
     micromatch: "npm:^4.0.8"
     next: "npm:15.5.9"
@@ -15018,6 +15019,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"linguist-languages@npm:^9.3.1":
+  version: 9.3.1
+  resolution: "linguist-languages@npm:9.3.1"
+  checksum: 10c0/41d5c16b9f7095310003598f4568254ac9736fc6f67daa1f62a11ae9aaf6acc847451675dbb8387b70ed8daaef75656dba8c8057ae93e07152304f3c27aa7440
+  languageName: node
+  linkType: hard
+
 "linkify-it@npm:^5.0.0":
   version: 5.0.0
   resolution: "linkify-it@npm:5.0.0"