fix conflicts

Author: brendan-kellam

packages/mcp/src/client.ts

@@ -106,28 +106,4 @@ export const listCommits = async (queryParams: ListCommitsQueryParamsSchema) =>
     const commits = await parseResponse(response, listCommitsResponseSchema);
     const totalCount = parseInt(response.headers.get('X-Total-Count') ?? '0', 10);
     return { commits, totalCount };
-}
-<<<<<<< Updated upstream
-=======
-
-/**
- * Asks a natural language question about the codebase using the Sourcebot AI agent.
- * This is a blocking call that runs the full agent loop and returns when complete.
- * 
- * @param request - The question and optional repo filters
- * @returns The agent's answer, chat URL, sources, and metadata
- */
-export const askCodebase = async (request: AskCodebaseRequest): Promise<AskCodebaseResponse> => {
-    const response = await fetch(`${env.SOURCEBOT_HOST}/api/chat/blocking`, {
-        method: 'POST',
-        headers: {
-            'Content-Type': 'application/json',
-            'X-Sourcebot-Client-Source': 'mcp',
-            ...(env.SOURCEBOT_API_KEY ? { 'X-Sourcebot-Api-Key': env.SOURCEBOT_API_KEY } : {})
-        },
-        body: JSON.stringify(request),
-    });
-
-    return parseResponse(response, askCodebaseResponseSchema);
-}
->>>>>>> Stashed changes
+}

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

@@ -1,17 +1,12 @@
-<<<<<<< Updated upstream
-import { NextRequest } from "next/server";
 import { sew } from "@/actions";
-import { withOptionalAuthV2 } from "@/withAuthV2";
-=======
+import { getBrowsePath } from "@/app/[domain]/browse/hooks/utils";
 import { apiHandler } from "@/lib/apiHandler";
 import { buildLinkHeader } from "@/lib/pagination";
-import { listReposQueryParamsSchema } from "@/lib/schemas";
->>>>>>> Stashed changes
+import { listReposQueryParamsSchema, repositoryQuerySchema } from "@/lib/schemas";
 import { queryParamsSchemaValidationError, serviceErrorResponse } from "@/lib/serviceError";
 import { isServiceError } from "@/lib/utils";
-import { listReposQueryParamsSchema, repositoryQuerySchema } from "@/lib/schemas";
-import { buildLinkHeader } from "@/lib/pagination";
-import { getBrowsePath } from "@/app/[domain]/browse/hooks/utils";
+import { withOptionalAuthV2 } from "@/withAuthV2";
+import { NextRequest } from "next/server";
 
 export const GET = apiHandler(async (request: NextRequest) => {
     const rawParams = Object.fromEntries(