Merge branch 'sourcebot-dev:main' into zoekt-pipe-fix

Author: xPartyBear

CHANGELOG.md

@@ -7,6 +7,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [4.6.8] - 2025-09-15
+
+### Fixed
+- Fixed Bitbucket Cloud pagination not working beyond first page. [#295](https://github.com/sourcebot-dev/sourcebot/issues/295)
+- Fixed search bar line wrapping. [#501](https://github.com/sourcebot-dev/sourcebot/pull/501)
+- Fixed carousel perf issues. [#507](https://github.com/sourcebot-dev/sourcebot/pull/507)
+
 ## [4.6.7] - 2025-09-08
 
 ### Added

packages/backend/src/bitbucket.ts

@@ -148,13 +148,14 @@ function cloudClient(user: string | undefined, token: string | undefined): Bitbu
 **/
 const getPaginatedCloud = async <T>(
     path: CloudGetRequestPath,
-    get: (url: CloudGetRequestPath) => Promise<CloudPaginatedResponse<T>>
+    get: (path: CloudGetRequestPath, query?: Record<string, string>) => Promise<CloudPaginatedResponse<T>>
 ): Promise<T[]> => {
     const results: T[] = [];
-    let url = path;
+    let nextPath = path;
+    let nextQuery = undefined;
 
     while (true) {
-        const response = await get(url);
+        const response = await get(nextPath, nextQuery);
 
         if (!response.values || response.values.length === 0) { 
             break;
@@ -166,25 +167,38 @@ const getPaginatedCloud = async <T>(
             break;
         }
 
-        url = response.next as CloudGetRequestPath;
+        const parsedUrl = parseUrl(response.next);
+        nextPath = parsedUrl.path as CloudGetRequestPath;
+        nextQuery = parsedUrl.query;
     }
     return results;
 }
-   
+
+/**
+ * Parse the url into a path and query parameters to be used with the api client (openapi-fetch)
+ */
+function parseUrl(url: string): { path: string; query: Record<string, string>; } {
+    const fullUrl = new URL(url);
+    const path = fullUrl.pathname.replace(/^\/\d+(\.\d+)*/, ''); // remove version number in the beginning of the path
+    const query = Object.fromEntries(fullUrl.searchParams);
+    logger.debug(`Parsed url ${url} into path ${path} and query ${JSON.stringify(query)}`);
+    return { path, query };
+}
+
 
 async function cloudGetReposForWorkspace(client: BitbucketClient, workspaces: string[]): Promise<{validRepos: CloudRepository[], notFoundWorkspaces: string[]}> {
     const results = await Promise.allSettled(workspaces.map(async (workspace) => {
         try {
             logger.debug(`Fetching all repos for workspace ${workspace}...`);
 
-            const path = `/repositories/${workspace}` as CloudGetRequestPath;
             const { durationMs, data } = await measure(async () => {
-                const fetchFn = () => getPaginatedCloud<CloudRepository>(path, async (url) => {
-                    const response = await client.apiClient.GET(url, {
+                const fetchFn = () => getPaginatedCloud<CloudRepository>(`/repositories/${workspace}` as CloudGetRequestPath, async (path, query) => {
+                    const response = await client.apiClient.GET(path, {
                         params: {
                             path: {
                                 workspace,
-                            }
+                            },
+                            query: query,
                         }
                     });
                     const { data, error } = response;
@@ -238,11 +252,14 @@ async function cloudGetReposForProjects(client: BitbucketClient, projects: strin
 
         logger.debug(`Fetching all repos for project ${project} for workspace ${workspace}...`);
         try {
-            const path = `/repositories/${workspace}` as CloudGetRequestPath;
-            const repos = await getPaginatedCloud<CloudRepository>(path, async (url) => {
-                const response = await client.apiClient.GET(url, {
+            const repos = await getPaginatedCloud<CloudRepository>(`/repositories/${workspace}` as CloudGetRequestPath, async (path, query) => {
+                const response = await client.apiClient.GET(path, {
                     params: {
+                        path: {
+                            workspace,
+                        },
                         query: {
+                            ...query,
                             q: `project.key="${project_name}"`
                         }
                     }

packages/mcp/CHANGELOG.md

@@ -7,6 +7,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [1.0.5] - 2025-09-15
+
+### Changed
+- Updated API client to match the latest Sourcebot release. [#356](https://github.com/sourcebot-dev/sourcebot/pull/356)
+
 ## [1.0.4] - 2025-08-04
 
 ### Fixed

packages/mcp/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@sourcebot/mcp",
-    "version": "1.0.4",
+    "version": "1.0.5",
     "type": "module",
     "main": "dist/index.js",
     "types": "dist/index.d.ts",

packages/mcp/src/index.ts

@@ -161,10 +161,10 @@ server.tool(
             };
         }
 
-        const content: TextContent[] = response.repos.map(repo => {
+        const content: TextContent[] = response.map(repo => {
             return {
                 type: "text",
-                text: `id: ${repo.name}\nurl: ${repo.webUrl}`,
+                text: `id: ${repo.repoName}\nurl: ${repo.webUrl}`,
             }
         });
 

packages/mcp/src/schemas.ts

@@ -92,16 +92,34 @@ export const searchResponseSchema = z.object({
     isBranchFilteringEnabled: z.boolean(),
 });
 
-export const repositorySchema = z.object({
-    name: z.string(),
-    branches: z.array(z.string()),
+enum RepoIndexingStatus {
+    NEW = 'NEW',
+    IN_INDEX_QUEUE = 'IN_INDEX_QUEUE',
+    INDEXING = 'INDEXING',
+    INDEXED = 'INDEXED',
+    FAILED = 'FAILED',
+    IN_GC_QUEUE = 'IN_GC_QUEUE',
+    GARBAGE_COLLECTING = 'GARBAGE_COLLECTING',
+    GARBAGE_COLLECTION_FAILED = 'GARBAGE_COLLECTION_FAILED'
+}
+
+export const repositoryQuerySchema = z.object({
+    codeHostType: z.string(),
+    repoId: z.number(),
+    repoName: z.string(),
+    repoDisplayName: z.string().optional(),
+    repoCloneUrl: z.string(),
     webUrl: z.string().optional(),
-    rawConfig: z.record(z.string(), z.string()).optional(),
+    linkedConnections: z.array(z.object({
+        id: z.number(),
+        name: z.string(),
+    })),
+    imageUrl: z.string().optional(),
+    indexedAt: z.coerce.date().optional(),
+    repoIndexingStatus: z.nativeEnum(RepoIndexingStatus),
 });
 
-export const listRepositoriesResponseSchema = z.object({
-    repos: z.array(repositorySchema),
-});
+export const listRepositoriesResponseSchema = repositoryQuerySchema.array();
 
 export const fileSourceRequestSchema = z.object({
     fileName: z.string(),

packages/mcp/src/types.ts

@@ -22,7 +22,6 @@ export type SearchResultChunk = SearchResultFile["chunks"][number];
 export type SearchSymbol = z.infer<typeof symbolSchema>;
 
 export type ListRepositoriesResponse = z.infer<typeof listRepositoriesResponseSchema>;
-export type Repository = ListRepositoriesResponse["repos"][number];
 
 export type FileSourceRequest = z.infer<typeof fileSourceRequestSchema>;
 export type FileSourceResponse = z.infer<typeof fileSourceResponseSchema>;

packages/web/package.json

@@ -7,7 +7,7 @@
     "build": "cross-env SKIP_ENV_VALIDATION=1 next build",
     "start": "next start",
     "lint": "cross-env SKIP_ENV_VALIDATION=1 eslint .",
-    "test": "vitest",
+    "test": "cross-env SKIP_ENV_VALIDATION=1 vitest",
     "dev:emails": "email dev --dir ./src/emails",
     "stripe:listen": "stripe listen --forward-to http://localhost:3000/api/stripe"
   },
@@ -212,7 +212,8 @@
     "tsx": "^4.19.2",
     "typescript": "^5",
     "vite-tsconfig-paths": "^5.1.3",
-    "vitest": "^2.1.5"
+    "vitest": "^2.1.5",
+    "vitest-mock-extended": "^3.1.0"
   },
   "resolutions": {
     "@types/react": "19.1.10",

packages/web/src/__mocks__/prisma.ts

@@ -0,0 +1,48 @@
+import { SINGLE_TENANT_ORG_DOMAIN, SINGLE_TENANT_ORG_ID, SINGLE_TENANT_ORG_NAME } from '@/lib/constants';
+import { ApiKey, Org, PrismaClient, User } from '@prisma/client';
+import { beforeEach } from 'vitest';
+import { mockDeep, mockReset } from 'vitest-mock-extended';
+
+beforeEach(() => {
+    mockReset(prisma);
+});
+
+export const prisma = mockDeep<PrismaClient>();
+
+export const MOCK_ORG: Org = {
+    id: SINGLE_TENANT_ORG_ID,
+    name: SINGLE_TENANT_ORG_NAME,
+    domain: SINGLE_TENANT_ORG_DOMAIN,
+    createdAt: new Date(),
+    updatedAt: new Date(),
+    isOnboarded: true,
+    imageUrl: null,
+    metadata: null,
+    memberApprovalRequired: false,
+    stripeCustomerId: null,
+    stripeSubscriptionStatus: null,
+    stripeLastUpdatedAt: null,
+    inviteLinkEnabled: false,
+    inviteLinkId: null
+}
+
+export const MOCK_API_KEY: ApiKey = {
+    name: 'Test API Key',
+    hash: 'apikey',
+    createdAt: new Date(),
+    lastUsedAt: new Date(),
+    orgId: 1,
+    createdById: '1',
+}
+
+export const MOCK_USER: User = {
+    id: '1',
+    name: 'Test User',
+    email: 'test@test.com',
+    createdAt: new Date(),
+    updatedAt: new Date(),
+    hashedPassword: null,
+    emailVerified: null,
+    image: null
+}
+

packages/web/src/actions.ts

@@ -40,6 +40,7 @@ import { getAuditService } from "@/ee/features/audit/factory";
 import { addUserToOrganization, orgHasAvailability } from "@/lib/authUtils";
 import { getOrgMetadata } from "@/lib/utils";
 import { getOrgFromDomain } from "./data/org";
+import { withOptionalAuthV2 } from "./withAuthV2";
 
 const ajv = new Ajv({
     validateFormats: false,
@@ -637,49 +638,47 @@ export const getConnectionInfo = async (connectionId: number, domain: string) =>
             }
         })));
 
-export const getRepos = async (domain: string, filter: { status?: RepoIndexingStatus[], connectionId?: number } = {}) => sew(() =>
-    withAuth((userId) =>
-        withOrgMembership(userId, domain, async ({ org }) => {
-            const repos = await prisma.repo.findMany({
-                where: {
-                    orgId: org.id,
-                    ...(filter.status ? {
-                        repoIndexingStatus: { in: filter.status }
-                    } : {}),
-                    ...(filter.connectionId ? {
-                        connections: {
-                            some: {
-                                connectionId: filter.connectionId
-                            }
-                        }
-                    } : {}),
-                },
-                include: {
+export const getRepos = async (filter: { status?: RepoIndexingStatus[], connectionId?: number } = {}) => sew(() =>
+    withOptionalAuthV2(async ({ org }) => {
+        const repos = await prisma.repo.findMany({
+            where: {
+                orgId: org.id,
+                ...(filter.status ? {
+                    repoIndexingStatus: { in: filter.status }
+                } : {}),
+                ...(filter.connectionId ? {
                     connections: {
-                        include: {
-                            connection: true,
+                        some: {
+                            connectionId: filter.connectionId
                         }
                     }
+                } : {}),
+            },
+            include: {
+                connections: {
+                    include: {
+                        connection: true,
+                    }
                 }
-            });
+            }
+        });
 
-            return repos.map((repo) => repositoryQuerySchema.parse({
-                codeHostType: repo.external_codeHostType,
-                repoId: repo.id,
-                repoName: repo.name,
-                repoDisplayName: repo.displayName ?? undefined,
-                repoCloneUrl: repo.cloneUrl,
-                webUrl: repo.webUrl ?? undefined,
-                linkedConnections: repo.connections.map(({ connection }) => ({
-                    id: connection.id,
-                    name: connection.name,
-                })),
-                imageUrl: repo.imageUrl ?? undefined,
-                indexedAt: repo.indexedAt ?? undefined,
-                repoIndexingStatus: repo.repoIndexingStatus,
-            }));
-        }, /* minRequiredRole = */ OrgRole.GUEST), /* allowAnonymousAccess = */ true
-    ));
+        return repos.map((repo) => repositoryQuerySchema.parse({
+            codeHostType: repo.external_codeHostType,
+            repoId: repo.id,
+            repoName: repo.name,
+            repoDisplayName: repo.displayName ?? undefined,
+            repoCloneUrl: repo.cloneUrl,
+            webUrl: repo.webUrl ?? undefined,
+            linkedConnections: repo.connections.map(({ connection }) => ({
+                id: connection.id,
+                name: connection.name,
+            })),
+            imageUrl: repo.imageUrl ?? undefined,
+            indexedAt: repo.indexedAt ?? undefined,
+            repoIndexingStatus: repo.repoIndexingStatus,
+        }))
+    }));
 
 export const getRepoInfoByName = async (repoName: string, domain: string) => sew(() =>
     withAuth((userId) =>