chore(web): Reorganize git apis

CHANGELOG.md

@@ -7,6 +7,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Fixed
+- Fixed issue where files with a comma would not render correctly in file tree. [#831](https://github.com/sourcebot-dev/sourcebot/pull/831)
+
 ### Changed
 - Changed `/api/source` api to support fetching source code for any revision, not just revisions that are indexed by zoekt. [#829](https://github.com/sourcebot-dev/sourcebot/pull/829)
 

packages/mcp/src/schemas.ts

@@ -213,7 +213,6 @@ export const fileSourceResponseSchema = z.object({
     repoCodeHostType: z.string(),
     repoDisplayName: z.string().optional(),
     repoExternalWebUrl: z.string().optional(),
-    branch: z.string().optional(),
     webUrl: z.string(),
     externalWebUrl: z.string().optional(),
 });

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

@@ -4,7 +4,7 @@ import { Separator } from "@/components/ui/separator";
 import { cn, getCodeHostInfoForRepo, isServiceError } from "@/lib/utils";
 import Image from "next/image";
 import { PureCodePreviewPanel } from "./pureCodePreviewPanel";
-import { getFileSource } from "@/features/search/fileSourceApi";
+import { getFileSource } from '@/features/git';
 
 interface CodePreviewPanelProps {
     path: string;

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

@@ -1,12 +1,12 @@
 'use client';
 
 import { useRef } from "react";
-import { FileTreeItemComponent } from "@/features/fileTree/components/fileTreeItemComponent";
+import { FileTreeItemComponent } from "@/app/[domain]/browse/components/fileTreeItemComponent";
 import { getBrowsePath } from "../../hooks/utils";
 import { ScrollArea } from "@/components/ui/scroll-area";
 import { useBrowseParams } from "../../hooks/useBrowseParams";
 import { useDomain } from "@/hooks/useDomain";
-import { FileTreeItem } from "@/features/fileTree/types";
+import { FileTreeItem } from "@/features/git";
 
 interface PureTreePreviewPanelProps {
     items: FileTreeItem[];

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

@@ -2,7 +2,7 @@
 import { Separator } from "@/components/ui/separator";
 import { getRepoInfoByName } from "@/actions";
 import { PathHeader } from "@/app/[domain]/components/pathHeader";
-import { getFolderContents } from "@/features/fileTree/api";
+import { getFolderContents } from "@/features/git/getFolderContentsApi";
 import { isServiceError } from "@/lib/utils";
 import { PureTreePreviewPanel } from "./pureTreePreviewPanel";
 

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

@@ -9,10 +9,10 @@ import { Dialog, DialogContent, DialogDescription, DialogTitle } from "@/compone
 import { useBrowseNavigation } from "../hooks/useBrowseNavigation";
 import { useBrowseState } from "../hooks/useBrowseState";
 import { useBrowseParams } from "../hooks/useBrowseParams";
-import { FileTreeItemIcon } from "@/features/fileTree/components/fileTreeItemIcon";
+import { FileTreeItemIcon } from "@/app/[domain]/browse/components/fileTreeItemIcon";
 import { useLocalStorage } from "usehooks-ts";
 import { Skeleton } from "@/components/ui/skeleton";
-import { FileTreeItem } from "@/features/fileTree/types";
+import { FileTreeItem } from "@/features/git";
 import { getFiles } from "@/app/api/(client)/client";
 
 const MAX_RESULTS = 100;

packages/web/src/features/fileTree/components/fileTreeItemComponent.tsx → packages/web/src/app/[domain]/browse/components/fileTreeItemComponent.tsx

@@ -6,7 +6,7 @@ import scrollIntoView from 'scroll-into-view-if-needed';
 import { ChevronDownIcon, ChevronRightIcon } from "@radix-ui/react-icons";
 import { FileTreeItemIcon } from "./fileTreeItemIcon";
 import Link from "next/link";
-import { FileTreeItem } from "../types";
+import { FileTreeItem } from "@/features/git";
 
 export const FileTreeItemComponent = ({
     node,

packages/web/src/features/fileTree/components/fileTreeItemIcon.tsx → packages/web/src/app/[domain]/browse/components/fileTreeItemIcon.tsx

@@ -3,7 +3,7 @@
 import { useMemo } from "react";
 import { VscodeFolderIcon } from "@/app/components/vscodeFolderIcon";
 import { VscodeFileIcon } from "@/app/components/vscodeFileIcon";
-import { FileTreeItem } from "../types";
+import { FileTreeItem } from "@/features/git";
 
 interface FileTreeItemIconProps {
     item: FileTreeItem;

packages/web/src/features/fileTree/components/fileTreePanel.tsx → packages/web/src/app/[domain]/browse/components/fileTreePanel.tsx

@@ -20,7 +20,7 @@ import {
     GoSidebarCollapse as ExpandIcon
 } from "react-icons/go";
 import { ImperativePanelHandle } from "react-resizable-panels";
-import { FileTreeNode } from "../types";
+import { FileTreeNode } from "@/features/git";
 import { PureFileTreePanel } from "./pureFileTreePanel";
 
 interface FileTreePanelProps {

packages/web/src/features/fileTree/components/pureFileTreePanel.tsx → packages/web/src/app/[domain]/browse/components/pureFileTreePanel.tsx

@@ -1,6 +1,6 @@
 'use client';
 
-import { FileTreeNode } from "../types";
+import { FileTreeNode } from "@/features/git";
 import { ScrollArea, ScrollBar } from "@/components/ui/scroll-area";
 import React, { useCallback, useMemo, useRef } from "react";
 import { FileTreeItemComponent } from "./fileTreeItemComponent";

packages/web/src/app/[domain]/browse/layout.tsx

@@ -4,7 +4,7 @@ import { ResizablePanel, ResizablePanelGroup } from "@/components/ui/resizable";
 import { BottomPanel } from "./components/bottomPanel";
 import { AnimatedResizableHandle } from "@/components/ui/animatedResizableHandle";
 import { BrowseStateProvider } from "./browseStateProvider";
-import { FileTreePanel } from "@/features/fileTree/components/fileTreePanel";
+import { FileTreePanel } from "./components/fileTreePanel";
 import { TopBar } from "@/app/[domain]/components/topBar";
 import { useBrowseParams } from "./hooks/useBrowseParams";
 import { FileSearchCommandDialog } from "./components/fileSearchCommandDialog";

packages/web/src/app/api/(client)/client.ts

@@ -7,10 +7,6 @@ import {
     SearchRequest,
     SearchResponse,
 } from "@/features/search";
-import {
-    FileSourceRequest,
-    FileSourceResponse,
-} from "@/features/search/types";
 import {
     FindRelatedSymbolsRequest,
     FindRelatedSymbolsResponse,
@@ -20,7 +16,9 @@ import {
     GetFilesResponse,
     GetTreeRequest,
     GetTreeResponse,
-} from "@/features/fileTree/types";
+    FileSourceRequest,
+    FileSourceResponse,
+} from "@/features/git";
 
 export const search = async (body: SearchRequest): Promise<SearchResponse | ServiceError> => {
     const result = await fetch("/api/search", {

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

@@ -1,4 +1,4 @@
-import { listCommits } from "@/features/search/gitApi";
+import { listCommits } from "@/features/git";
 import { buildLinkHeader } from "@/lib/pagination";
 import { serviceErrorResponse, queryParamsSchemaValidationError } from "@/lib/serviceError";
 import { isServiceError } from "@/lib/utils";

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

@@ -1,7 +1,6 @@
 'use server';
 
-import { getFiles } from "@/features/fileTree/api";
-import { getFilesRequestSchema } from "@/features/fileTree/types";
+import { getFiles, getFilesRequestSchema } from "@/features/git/getFilesApi";
 import { requestBodySchemaValidationError, serviceErrorResponse } from "@/lib/serviceError";
 import { isServiceError } from "@/lib/utils";
 import { NextRequest } from "next/server";

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

@@ -1,6 +1,6 @@
 'use server';
 
-import { getFileSource } from "@/features/search/fileSourceApi";
+import { getFileSource } from '@/features/git';
 import { queryParamsSchemaValidationError, serviceErrorResponse } from "@/lib/serviceError";
 import { isServiceError } from "@/lib/utils";
 import { NextRequest } from "next/server";

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

@@ -1,7 +1,7 @@
 'use server';
 
-import { getTree } from "@/features/fileTree/api";
-import { getTreeRequestSchema } from "@/features/fileTree/types";
+import { getTree } from "@/features/git/getTreeApi";
+import { getTreeRequestSchema } from "@/features/git";
 import { requestBodySchemaValidationError, serviceErrorResponse } from "@/lib/serviceError";
 import { isServiceError } from "@/lib/utils";
 import { NextRequest } from "next/server";

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

@@ -1,6 +1,5 @@
 import { sourcebot_context, sourcebot_pr_payload } from "@/features/agents/review-agent/types";
-import { getFileSource } from "@/features/search/fileSourceApi";
-import { fileSourceResponseSchema } from "@/features/search/types";
+import { fileSourceResponseSchema, getFileSource } from '@/features/git';
 import { isServiceError } from "@/lib/utils";
 import { createLogger } from "@sourcebot/shared";
 

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

@@ -1,6 +1,6 @@
 import { env } from "@sourcebot/shared";
 import { env as clientEnv } from "@sourcebot/shared/client";
-import { getFileSource } from "@/features/search/fileSourceApi";
+import { getFileSource } from '@/features/git';
 import { isServiceError } from "@/lib/utils";
 import { ProviderOptions } from "@ai-sdk/provider-utils";
 import { createLogger } from "@sourcebot/shared";

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

@@ -2,9 +2,8 @@ import { z } from "zod"
 import { search } from "@/features/search"
 import { InferToolInput, InferToolOutput, InferUITool, tool, ToolUIPart } from "ai";
 import { isServiceError } from "@/lib/utils";
-import { getFileSource } from "../search/fileSourceApi";
+import { FileSourceResponse, getFileSource } from '@/features/git';
 import { findSearchBasedSymbolDefinitions, findSearchBasedSymbolReferences } from "../codeNav/api";
-import { FileSourceResponse } from "../search/types";
 import { addLineNumbers, buildSearchQuery } from "./utils";
 import { toolNames } from "./constants";
 import { getRepos } from "@/actions";