fix(web): resolve path type for the commits view and tighten path handling

The commits view URL pattern (/-/commits/<path>) doesn't carry whether
the path is a file or a folder, so PathHeader was rendering folder
paths with the file-icon last-segment treatment. Add a small
getPathType helper backed by `git cat-file -t <ref>:<path>` and use it
to pick the correct PathHeader behaviour. CommitRow and HistoryRow now
gate the "view code at this commit" action on the same blob check so
the file-only link doesn't appear on folder rows.

Also fix a related path-handling bug: PathHeader's repo-name link
called getBrowsePath with `path: '/'`, which encoded as `%2F` and
parsed back as `path: '/'` — that leaked through as `git log -- /`,
which git correctly rejects with "outside repository". Strip leading
slashes both when generating and when parsing browse URLs so any path
that comes through as a literal `/` resolves to the repo root.

When clicking "View full history" the bottom panel now collapses
on the same click, so the new full-view page renders without the
panel still hovering on top of it.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

Author: brendan-kellam

packages/web/src/app/(app)/browse/[...path]/components/commitRow.tsx

@@ -5,7 +5,7 @@ import { formatDistanceToNow } from "date-fns";
 import { Code, FileCode } from "lucide-react";
 import { CopyIconButton } from "@/app/(app)/components/copyIconButton";
 import { useToast } from "@/components/hooks/use-toast";
-import type { Commit } from "@/features/git";
+import type { Commit, GitObjectPathType } from "@/features/git";
 import { getBrowsePath } from "../../hooks/utils";
 import { formatAuthorsText, getCommitAuthors } from "../../components/commitAuthors";
 import {
@@ -19,16 +19,17 @@ interface CommitRowProps {
     commit: Commit;
     repoName: string;
     path: string;
+    pathType: GitObjectPathType;
 }
 
-export const CommitRow = ({ commit, repoName, path }: CommitRowProps) => {
+export const CommitRow = ({ commit, repoName, path, pathType }: CommitRowProps) => {
     const [isBodyExpanded, setIsBodyExpanded] = useState(false);
     const { toast } = useToast();
 
     const shortSha = commit.hash.slice(0, 7);
     const relativeDate = formatDistanceToNow(new Date(commit.date), { addSuffix: true });
     const hasBody = commit.body.trim().length > 0;
-    const hasFilePath = path !== '' && path !== '/';
+    const isBlobPath = pathType === 'blob';
 
     const authors = useMemo(
         () => getCommitAuthors(commit),
@@ -82,7 +83,7 @@ export const CommitRow = ({ commit, repoName, path }: CommitRowProps) => {
                         {shortSha}
                     </span>
                     <CopyIconButton onCopy={onCopySha} />
-                    {hasFilePath && (
+                    {isBlobPath && (
                         <CommitActionLink
                             href={viewFileAtCommitHref}
                             label="View code at this commit"

packages/web/src/app/(app)/browse/[...path]/components/commitsPanel.tsx

@@ -3,7 +3,7 @@ import { GitCommitHorizontal } from "lucide-react";
 import { getRepoInfoByName } from "@/actions";
 import { PathHeader } from "@/app/(app)/components/pathHeader";
 import { Separator } from "@/components/ui/separator";
-import { listCommitAuthors, listCommits } from "@/features/git";
+import { getPathType, listCommitAuthors, listCommits } from "@/features/git";
 import { isServiceError } from "@/lib/utils";
 import { AuthorFilter } from "./authorFilter";
 import { dedupeCommitAuthorsByEmail, escapeGitBreLiteral } from "../../components/commitAuthors";
@@ -34,7 +34,7 @@ export const CommitsPanel = async ({ path, repoName, revisionName, page, author,
     const sinceForGit = since ? `${since}T00:00:00` : undefined;
     const untilForGit = until ? `${until}T23:59:59` : undefined;
 
-    const [commitsResponse, repoInfoResponse, authorsResponse] = await Promise.all([
+    const [commitsResponse, repoInfoResponse, authorsResponse, pathTypeResponse] = await Promise.all([
         listCommits({
             repo: repoName,
             path: path || undefined,
@@ -53,6 +53,11 @@ export const CommitsPanel = async ({ path, repoName, revisionName, page, author,
             maxCount: AUTHORS_PER_PAGE,
             skip: 0,
         }),
+        getPathType({
+            repo: repoName,
+            ref: revisionName,
+            path,
+        }),
     ]);
 
     if (isServiceError(commitsResponse)) {
@@ -64,6 +69,8 @@ export const CommitsPanel = async ({ path, repoName, revisionName, page, author,
     if (isServiceError(authorsResponse)) {
         return <div className="p-4 text-sm">Error loading commit authors: {authorsResponse.message}</div>;
     }
+    // Fall back to 'blob' if the lookup fails so PathHeader still renders.
+    const headerPathType = isServiceError(pathTypeResponse) ? 'blob' : pathTypeResponse;
 
     const authors = dedupeCommitAuthorsByEmail(authorsResponse.authors);
     const { commits, totalCount } = commitsResponse;
@@ -89,13 +96,15 @@ export const CommitsPanel = async ({ path, repoName, revisionName, page, author,
                     <span className="text-sm text-muted-foreground flex-shrink-0">History for</span>
                     <PathHeader
                         path={path}
+                        pathType={headerPathType}
                         repo={{
                             name: repoName,
                             codeHostType: repoInfoResponse.codeHostType,
                             displayName: repoInfoResponse.displayName,
                             externalWebUrl: repoInfoResponse.externalWebUrl,
                         }}
                         revisionName={revisionName}
+                        isFileIconVisible={headerPathType === 'blob'}
                     />
                 </div>
                 <div className="flex flex-row items-center gap-2 flex-shrink-0">
@@ -117,6 +126,7 @@ export const CommitsPanel = async ({ path, repoName, revisionName, page, author,
                                 commit={commit}
                                 repoName={repoName}
                                 path={path}
+                                pathType={headerPathType}
                             />
                         ))}
                     </div>

packages/web/src/app/(app)/browse/components/bottomPanel.tsx

@@ -130,7 +130,10 @@ export const BottomPanel = ({ order }: BottomPanelProps) => {
                     <div className="flex flex-row items-center gap-1 self-center">
                         {activeBottomPanelTab === "history" && (
                             <Button asChild variant="ghost" size="sm">
-                                <Link href={fullHistoryHref}>
+                                <Link
+                                    href={fullHistoryHref}
+                                    onClick={() => updateBrowseState({ isBottomPanelCollapsed: true })}
+                                >
                                     <ExternalLink className="w-4 h-4" />
                                     View full history
                                 </Link>

packages/web/src/app/(app)/browse/components/historyPanel.tsx

@@ -14,7 +14,7 @@ const PER_PAGE = 25;
 type CommitsPage = ListCommitsResponse & { page: number };
 
 export const HistoryPanel = () => {
-    const { repoName, revisionName, path } = useBrowseParams();
+    const { repoName, revisionName, path, pathType } = useBrowseParams();
 
     const {
         data,
@@ -94,6 +94,7 @@ export const HistoryPanel = () => {
                         commit={commit}
                         repoName={repoName}
                         path={path}
+                        pathType={pathType}
                     />
                 ))}
                 {hasNextPage && (

packages/web/src/app/(app)/browse/components/historyRow.tsx

@@ -4,20 +4,21 @@ import { useMemo } from "react";
 import { formatDistanceToNow } from "date-fns";
 import { Code, FileCode } from "lucide-react";
 import type { Commit } from "@/features/git";
-import { getBrowsePath } from "../hooks/utils";
+import { BrowsePathType, getBrowsePath } from "../hooks/utils";
 import { formatAuthorsText, getCommitAuthors } from "./commitAuthors";
 import { AuthorsAvatarGroup, CommitActionLink } from "./commitParts";
 
 interface HistoryRowProps {
     commit: Commit;
     repoName: string;
     path: string;
+    pathType: BrowsePathType;
 }
 
-export const HistoryRow = ({ commit, repoName, path }: HistoryRowProps) => {
+export const HistoryRow = ({ commit, repoName, path, pathType }: HistoryRowProps) => {
     const shortSha = commit.hash.slice(0, 7);
     const relativeDate = formatDistanceToNow(new Date(commit.date), { addSuffix: true });
-    const hasFilePath = path !== '' && path !== '/';
+    const isBlobPath = pathType === 'blob';
 
     const authors = useMemo(() => getCommitAuthors(commit), [commit]);
 
@@ -60,7 +61,7 @@ export const HistoryRow = ({ commit, repoName, path }: HistoryRowProps) => {
                 {relativeDate}
             </span>
             <div className="flex flex-row items-center gap-1 flex-shrink-0">
-                {hasFilePath && (
+                {isBlobPath && (
                     <CommitActionLink
                         href={viewCodeHref}
                         label="View code at this commit"

packages/web/src/app/(app)/browse/hooks/utils.ts

@@ -61,18 +61,28 @@ export const getBrowseParamsFromPathParam = (pathParam: string) => {
         }
     })();
 
-    if (pathType === 'blob' && path === '') {
+    // Normalize parsed paths the same way URL generation does, so URLs that
+    // happen to contain a leading slash (e.g. legacy bookmarks with `%2F`)
+    // don't leak `/foo` into git log args.
+    const normalizedPath = path.replace(/^\/+/, '');
+
+    if (pathType === 'blob' && normalizedPath === '') {
         throw new Error(`Invalid browse pathname: "${pathParam}" - expected to contain a path for blob type`);
     }
 
     return {
         repoName,
         revisionName,
-        path,
+        path: normalizedPath,
         pathType,
     }
 };
 
+// Repo-relative paths shouldn't have leading slashes — `git log -- /foo` (or
+// just `--`) treats them as absolute filesystem paths. Repo root and `/`
+// both map to the empty path.
+const normalizeRepoPath = (path: string): string => path.replace(/^\/+/, '');
+
 export const getBrowsePath = ({
     repoName, revisionName, path, pathType, highlightRange, setBrowseState,
 }: GetBrowsePathProps) => {
@@ -92,7 +102,7 @@ export const getBrowsePath = ({
         params.set(SET_BROWSE_STATE_QUERY_PARAM, JSON.stringify(setBrowseState));
     }
 
-    const encodedPath = encodeURIComponent(path);
+    const encodedPath = encodeURIComponent(normalizeRepoPath(path));
     const browsePath = `/browse/${repoName}${revisionName ? `@${revisionName}` : ''}/-/${pathType}/${encodedPath}${params.size > 0 ? `?${params.toString()}` : ''}`;
     return browsePath;
 };

packages/web/src/features/git/getPathTypeApi.ts

@@ -0,0 +1,84 @@
+import { sew } from "@/middleware/sew";
+import { invalidGitRef, notFound, ServiceError, unexpectedError } from '@/lib/serviceError';
+import { withOptionalAuth } from '@/middleware/withAuth';
+import { getRepoPath } from '@sourcebot/shared';
+import { simpleGit } from 'simple-git';
+import { isGitRefValid } from './utils';
+
+export type GitObjectPathType = 'blob' | 'tree';
+
+type GetPathTypeRequest = {
+    repo: string;
+    ref?: string;
+    path: string;
+};
+
+/**
+ * Resolve whether a given path inside a repo is a file (`blob`) or a
+ * directory (`tree`) at the supplied ref. Empty paths always resolve to
+ * `tree` (the repo root).
+ *
+ * Backed by `git cat-file -t <ref>:<path>`, which is a constant-time
+ * object lookup — no walking, just an index read.
+ */
+export const getPathType = async ({
+    repo: repoName,
+    ref = 'HEAD',
+    path,
+}: GetPathTypeRequest): Promise<GitObjectPathType | ServiceError> => sew(() =>
+    withOptionalAuth(async ({ org, prisma }) => {
+        if (path === '' || path === '/') {
+            return 'tree';
+        }
+
+        const repo = await prisma.repo.findFirst({
+            where: {
+                name: repoName,
+                orgId: org.id,
+            },
+        });
+
+        if (!repo) {
+            return notFound(`Repository "${repoName}" not found.`);
+        }
+
+        if (!isGitRefValid(ref)) {
+            return invalidGitRef(ref);
+        }
+
+        const { path: repoPath } = getRepoPath(repo);
+        const git = simpleGit().cwd(repoPath);
+
+        try {
+            const output = await git.raw(['cat-file', '-t', `${ref}:${path}`]);
+            const type = output.trim();
+            if (type === 'blob' || type === 'tree') {
+                return type;
+            }
+            return notFound(`Path "${path}" at ref "${ref}" is not a file or directory.`);
+        } catch (error: unknown) {
+            const errorMessage = error instanceof Error ? error.message : String(error);
+
+            if (errorMessage.includes('not a git repository')) {
+                return unexpectedError(
+                    `Invalid git repository at ${repoPath}. `
+                    + `The directory exists but is not a valid git repository.`,
+                );
+            }
+
+            // `git cat-file` returns "Not a valid object name <ref>:<path>" when
+            // the path doesn't exist at that ref. Treat as not-found.
+            if (errorMessage.includes('Not a valid object name')) {
+                return notFound(`Path "${path}" not found at ref "${ref}".`);
+            }
+
+            if (error instanceof Error) {
+                throw new Error(
+                    `Failed to resolve path type for ${repoName}:${path}: ${error.message}`,
+                );
+            }
+            throw new Error(
+                `Failed to resolve path type for ${repoName}:${path}: ${errorMessage}`,
+            );
+        }
+    }));

packages/web/src/features/git/index.ts

@@ -6,4 +6,5 @@ export * from './getTreeApi';
 export * from './getFileSourceApi';
 export * from './listCommitsApi';
 export * from './listCommitAuthorsApi';
+export * from './getPathTypeApi';
 export * from './types';