Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 28 additions & 0 deletions packages/mcp/src/client.ts
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ export const search = async (request: SearchRequest) => {
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)
Expand All @@ -56,6 +57,7 @@ export const listRepos = async (queryParams: ListReposQueryParams = {}) => {
method: 'GET',
headers: {
'Content-Type': 'application/json',
'X-Sourcebot-Client-Source': 'mcp',
...(env.SOURCEBOT_API_KEY ? { 'X-Sourcebot-Api-Key': env.SOURCEBOT_API_KEY } : {})
},
});
Expand All @@ -76,6 +78,7 @@ export const getFileSource = async (request: FileSourceRequest) => {
const response = await fetch(url, {
method: 'GET',
headers: {
'X-Sourcebot-Client-Source': 'mcp',
...(env.SOURCEBOT_API_KEY ? { 'X-Sourcebot-Api-Key': env.SOURCEBOT_API_KEY } : {})
},
});
Expand All @@ -95,6 +98,7 @@ export const listCommits = async (queryParams: ListCommitsQueryParamsSchema) =>
method: 'GET',
headers: {
'X-Org-Domain': '~',
'X-Sourcebot-Client-Source': 'mcp',
...(env.SOURCEBOT_API_KEY ? { 'X-Sourcebot-Api-Key': env.SOURCEBOT_API_KEY } : {})
},
});
Expand All @@ -103,3 +107,27 @@ export const listCommits = async (queryParams: ListCommitsQueryParamsSchema) =>
const totalCount = parseInt(response.headers.get('X-Total-Count') ?? '0', 10);
return { commits, totalCount };
}
<<<<<<< Updated upstream
Comment thread
brendan-kellam marked this conversation as resolved.
Outdated
=======

/**
* 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
Comment thread
brendan-kellam marked this conversation as resolved.
Outdated
1 change: 0 additions & 1 deletion packages/mcp/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,6 @@ server.tool(
contextLines: env.DEFAULT_CONTEXT_LINES,
isRegexEnabled: useRegex,
isCaseSensitivityEnabled: caseSensitive,
source: 'mcp',
});

if (response.files.length === 0) {
Expand Down
1 change: 0 additions & 1 deletion packages/mcp/src/schemas.ts
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ export const searchOptionsSchema = z.object({

export const searchRequestSchema = z.object({
query: z.string(), // The zoekt query to execute.
source: z.string().optional(), // The source of the search request.
...searchOptionsSchema.shape,
});

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,6 @@ export const useSuggestionsData = ({
query: `file:${suggestionQuery}`,
matches: 15,
contextLines: 1,
source: 'search-bar-file-suggestions'
}),
select: (data): Suggestion[] => {
if (isServiceError(data)) {
Expand All @@ -82,7 +81,6 @@ export const useSuggestionsData = ({
query: `sym:${suggestionQuery.length > 0 ? suggestionQuery : ".*"}`,
matches: 15,
contextLines: 1,
source: 'search-bar-symbol-suggestions'
}),
select: (data): Suggestion[] => {
if (isServiceError(data)) {
Expand Down
2 changes: 1 addition & 1 deletion packages/web/src/app/[domain]/search/useStreamedSearch.ts
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,7 @@ export const useStreamedSearch = ({ query, matches, contextLines, whole, isRegex
method: 'POST',
headers: {
'Content-Type': 'application/json',
'X-Sourcebot-Client-Source': 'sourcebot-web-client',
},
body: JSON.stringify({
query,
Expand All @@ -129,7 +130,6 @@ export const useStreamedSearch = ({ query, matches, contextLines, whole, isRegex
whole,
isRegexEnabled,
isCaseSensitivityEnabled,
source: 'sourcebot-web-client'
} satisfies SearchRequest),
signal: abortControllerRef.current.signal,
});
Expand Down
18 changes: 18 additions & 0 deletions packages/web/src/app/api/(client)/client.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ export const search = async (body: SearchRequest): Promise<SearchResponse | Serv
method: "POST",
headers: {
"Content-Type": "application/json",
"X-Sourcebot-Client-Source": "sourcebot-web-client",
},
body: JSON.stringify(body),
}).then(response => response.json());
Expand All @@ -44,6 +45,9 @@ export const getFileSource = async (queryParams: FileSourceRequest): Promise<Fil

const result = await fetch(url, {
method: "GET",
headers: {
"X-Sourcebot-Client-Source": "sourcebot-web-client",
}
}).then(response => response.json());

return result as FileSourceResponse | ServiceError;
Expand All @@ -59,6 +63,7 @@ export const listRepos = async (queryParams: ListReposQueryParams): Promise<List
method: "GET",
headers: {
"Content-Type": "application/json",
"X-Sourcebot-Client-Source": "sourcebot-web-client",
},
}).then(response => response.json());

Expand All @@ -70,6 +75,7 @@ export const getVersion = async (): Promise<GetVersionResponse> => {
method: "GET",
headers: {
"Content-Type": "application/json",
"X-Sourcebot-Client-Source": "sourcebot-web-client",
},
}).then(response => response.json());
return result as GetVersionResponse;
Expand All @@ -78,6 +84,9 @@ export const getVersion = async (): Promise<GetVersionResponse> => {
export const findSearchBasedSymbolReferences = async (body: FindRelatedSymbolsRequest): Promise<FindRelatedSymbolsResponse | ServiceError> => {
const result = await fetch("/api/find_references", {
method: "POST",
headers: {
"X-Sourcebot-Client-Source": "sourcebot-web-client",
},
body: JSON.stringify(body),
}).then(response => response.json());
return result as FindRelatedSymbolsResponse | ServiceError;
Expand All @@ -86,6 +95,9 @@ export const findSearchBasedSymbolReferences = async (body: FindRelatedSymbolsRe
export const findSearchBasedSymbolDefinitions = async (body: FindRelatedSymbolsRequest): Promise<FindRelatedSymbolsResponse | ServiceError> => {
const result = await fetch("/api/find_definitions", {
method: "POST",
headers: {
"X-Sourcebot-Client-Source": "sourcebot-web-client",
},
body: JSON.stringify(body),
}).then(response => response.json());
return result as FindRelatedSymbolsResponse | ServiceError;
Expand All @@ -94,6 +106,9 @@ export const findSearchBasedSymbolDefinitions = async (body: FindRelatedSymbolsR
export const getTree = async (body: GetTreeRequest): Promise<GetTreeResponse | ServiceError> => {
const result = await fetch("/api/tree", {
method: "POST",
headers: {
"X-Sourcebot-Client-Source": "sourcebot-web-client",
},
body: JSON.stringify(body),
}).then(response => response.json());
return result as GetTreeResponse | ServiceError;
Expand All @@ -102,6 +117,9 @@ export const getTree = async (body: GetTreeRequest): Promise<GetTreeResponse | S
export const getFiles = async (body: GetFilesRequest): Promise<GetFilesResponse | ServiceError> => {
const result = await fetch("/api/files", {
method: "POST",
headers: {
"X-Sourcebot-Client-Source": "sourcebot-web-client",
},
body: JSON.stringify(body),
}).then(response => response.json());
return result as GetFilesResponse | ServiceError;
Expand Down
6 changes: 4 additions & 2 deletions packages/web/src/app/api/(server)/chat/route.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import { _getConfiguredLanguageModelsFull, _getAISDKLanguageModelAndOptions, upd
import { createAgentStream } from "@/features/chat/agent";
import { additionalChatRequestParamsSchema, LanguageModelInfo, SBChatMessage, SearchScope } from "@/features/chat/types";
import { getAnswerPartFromAssistantMessage, getLanguageModelKey } from "@/features/chat/utils";
import { apiHandler } from "@/lib/apiHandler";
import { ErrorCode } from "@/lib/errorCodes";
import { notFound, requestBodySchemaValidationError, serviceErrorResponse } from "@/lib/serviceError";
import { isServiceError } from "@/lib/utils";
Expand All @@ -22,6 +23,7 @@ import {
} from "ai";
import { randomUUID } from "crypto";
import { StatusCodes } from "http-status-codes";
import { NextRequest } from "next/server";
import { z } from "zod";

const logger = createLogger('chat-api');
Expand All @@ -33,7 +35,7 @@ const chatRequestSchema = z.object({
...additionalChatRequestParamsSchema.shape,
})

export async function POST(req: Request) {
export const POST = apiHandler(async (req: NextRequest) => {
const requestBody = await req.json();
const parsed = await chatRequestSchema.safeParseAsync(requestBody);
if (!parsed.success) {
Expand Down Expand Up @@ -102,7 +104,7 @@ export async function POST(req: Request) {
}

return response;
}
});

// eslint-disable-next-line @typescript-eslint/no-explicit-any
const mergeStreamAsync = async (stream: StreamTextResult<any, any>, writer: UIMessageStreamWriter<SBChatMessage>, options: UIMessageStreamOptions<SBChatMessage> = {}) => {
Expand Down
5 changes: 3 additions & 2 deletions packages/web/src/app/api/(server)/commits/route.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { listCommits } from "@/features/git";
import { apiHandler } from "@/lib/apiHandler";
import { buildLinkHeader } from "@/lib/pagination";
import { serviceErrorResponse, queryParamsSchemaValidationError } from "@/lib/serviceError";
import { isServiceError } from "@/lib/utils";
Expand All @@ -16,7 +17,7 @@ const listCommitsQueryParamsSchema = z.object({
perPage: z.coerce.number().int().positive().max(100).default(50),
});

export const GET = async (request: NextRequest): Promise<Response> => {
export const GET = apiHandler(async (request: NextRequest): Promise<Response> => {
const rawParams = Object.fromEntries(
Object.keys(listCommitsQueryParamsSchema.shape).map(key => [
key,
Expand Down Expand Up @@ -61,4 +62,4 @@ export const GET = async (request: NextRequest): Promise<Response> => {
if (linkHeader) headers.set('Link', linkHeader);

return new Response(JSON.stringify(commits), { status: 200, headers });
}
});
5 changes: 3 additions & 2 deletions packages/web/src/app/api/(server)/ee/audit/route.ts
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
'use server';

import { fetchAuditRecords } from "@/ee/features/audit/actions";
import { apiHandler } from "@/lib/apiHandler";
import { ErrorCode } from "@/lib/errorCodes";
import { serviceErrorResponse } from "@/lib/serviceError";
import { isServiceError } from "@/lib/utils";
import { getEntitlements } from "@sourcebot/shared";
import { StatusCodes } from "http-status-codes";

export const GET = async () => {
export const GET = apiHandler(async () => {
const entitlements = getEntitlements();
if (!entitlements.includes('audit')) {
return serviceErrorResponse({
Expand All @@ -22,4 +23,4 @@ export const GET = async () => {
return serviceErrorResponse(result);
}
return Response.json(result);
};
});
15 changes: 8 additions & 7 deletions packages/web/src/app/api/(server)/ee/user/route.ts
Original file line number Diff line number Diff line change
@@ -1,19 +1,20 @@
'use server';

import { getAuditService } from "@/ee/features/audit/factory";
import { apiHandler } from "@/lib/apiHandler";
import { ErrorCode } from "@/lib/errorCodes";
import { serviceErrorResponse, missingQueryParam, notFound } from "@/lib/serviceError";
import { isServiceError } from "@/lib/utils";
import { withAuthV2, withMinimumOrgRole } from "@/withAuthV2";
import { OrgRole } from "@sourcebot/db";
import { isServiceError } from "@/lib/utils";
import { serviceErrorResponse, missingQueryParam, notFound } from "@/lib/serviceError";
import { createLogger } from "@sourcebot/shared";
import { NextRequest } from "next/server";
import { StatusCodes } from "http-status-codes";
import { ErrorCode } from "@/lib/errorCodes";
import { getAuditService } from "@/ee/features/audit/factory";
import { NextRequest } from "next/server";

const logger = createLogger('ee-user-api');
const auditService = getAuditService();

export const DELETE = async (request: NextRequest) => {
export const DELETE = apiHandler(async (request: NextRequest) => {
const url = new URL(request.url);
const userId = url.searchParams.get('userId');

Expand Down Expand Up @@ -89,5 +90,5 @@ export const DELETE = async (request: NextRequest) => {
}

return Response.json(result, { status: StatusCodes.OK });
};
});

11 changes: 6 additions & 5 deletions packages/web/src/app/api/(server)/ee/users/route.ts
Original file line number Diff line number Diff line change
@@ -1,16 +1,17 @@
'use server';

import { getAuditService } from "@/ee/features/audit/factory";
import { apiHandler } from "@/lib/apiHandler";
import { serviceErrorResponse } from "@/lib/serviceError";
import { isServiceError } from "@/lib/utils";
import { withAuthV2, withMinimumOrgRole } from "@/withAuthV2";
import { OrgRole } from "@sourcebot/db";
import { isServiceError } from "@/lib/utils";
import { serviceErrorResponse } from "@/lib/serviceError";
import { createLogger } from "@sourcebot/shared";
import { getAuditService } from "@/ee/features/audit/factory";

const logger = createLogger('ee-users-api');
const auditService = getAuditService();

export const GET = async () => {
export const GET = apiHandler(async () => {
const result = await withAuthV2(async ({ prisma, org, role, user }) => {
return withMinimumOrgRole(role, OrgRole.OWNER, async () => {
try {
Expand Down Expand Up @@ -77,5 +78,5 @@ export const GET = async () => {
}

return Response.json(result);
};
});

5 changes: 3 additions & 2 deletions packages/web/src/app/api/(server)/files/route.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
'use server';

import { getFiles, getFilesRequestSchema } from "@/features/git/getFilesApi";
import { apiHandler } from "@/lib/apiHandler";
import { requestBodySchemaValidationError, serviceErrorResponse } from "@/lib/serviceError";
import { isServiceError } from "@/lib/utils";
import { NextRequest } from "next/server";

export const POST = async (request: NextRequest) => {
export const POST = apiHandler(async (request: NextRequest) => {
const body = await request.json();
const parsed = await getFilesRequestSchema.safeParseAsync(body);
if (!parsed.success) {
Expand All @@ -18,5 +19,5 @@ export const POST = async (request: NextRequest) => {
}

return Response.json(response);
}
});

5 changes: 3 additions & 2 deletions packages/web/src/app/api/(server)/find_definitions/route.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,12 @@

import { findSearchBasedSymbolDefinitions } from "@/features/codeNav/api";
import { findRelatedSymbolsRequestSchema } from "@/features/codeNav/types";
import { apiHandler } from "@/lib/apiHandler";
import { requestBodySchemaValidationError, serviceErrorResponse } from "@/lib/serviceError";
import { isServiceError } from "@/lib/utils";
import { NextRequest } from "next/server";

export const POST = async (request: NextRequest) => {
export const POST = apiHandler(async (request: NextRequest) => {
const body = await request.json();
const parsed = await findRelatedSymbolsRequestSchema.safeParseAsync(body);
if (!parsed.success) {
Expand All @@ -19,4 +20,4 @@ export const POST = async (request: NextRequest) => {
}

return Response.json(response);
}
});
5 changes: 3 additions & 2 deletions packages/web/src/app/api/(server)/find_references/route.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
import { findSearchBasedSymbolReferences } from "@/features/codeNav/api";
import { findRelatedSymbolsRequestSchema } from "@/features/codeNav/types";
import { apiHandler } from "@/lib/apiHandler";
import { requestBodySchemaValidationError, serviceErrorResponse } from "@/lib/serviceError";
import { isServiceError } from "@/lib/utils";
import { NextRequest } from "next/server";

export const POST = async (request: NextRequest) => {
export const POST = apiHandler(async (request: NextRequest) => {
const body = await request.json();
const parsed = await findRelatedSymbolsRequestSchema.safeParseAsync(body);
if (!parsed.success) {
Expand All @@ -17,4 +18,4 @@ export const POST = async (request: NextRequest) => {
}

return Response.json(response);
}
});
Loading
Loading